andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Fix usages of full_split.

Browse Source 
GitOrigin-RevId: 17a750e4a9a7add83302694ad2e8771bf8ed6199
This commit is contained in:
levlam 2018-09-23 02:46:09 +03:00
parent 23e4c95c1c
commit 86bc53bb0e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
td/telegram/InlineQueriesManager.cpp
View File

@ -1713,6 +1713,12 @@ bool InlineQueriesManager::load_recently_used_bots(Promise<Unit> &promise) {
auto bot_ids = full_split(saved_bot_ids, ','); auto bot_ids = full_split(saved_bot_ids, ',');
string saved_bots = G()->td_db()->get_binlog_pmc()->get("recently_used_inline_bot_usernames"); string saved_bots = G()->td_db()->get_binlog_pmc()->get("recently_used_inline_bot_usernames");
auto bot_usernames = full_split(saved_bots, ','); auto bot_usernames = full_split(saved_bots, ',');
if (bot_ids.size() == 1 && bot_ids[0].empty()) {
bot_ids.clear();
}
if (bot_usernames.size() == 1 && bot_usernames[0].empty()) {
bot_usernames.clear();
}
if (bot_ids.empty() && bot_usernames.empty()) { if (bot_ids.empty() && bot_usernames.empty()) {
recently_used_bots_loaded_ = 2; recently_used_bots_loaded_ = 2;
if (!recently_used_bot_user_ids_.empty()) { if (!recently_used_bot_user_ids_.empty()) {

4
td/telegram/MessagesManager.cpp
View File

@ -26903,8 +26903,7 @@ bool MessagesManager::load_recently_found_dialogs(Promise<Unit> &promise) {
} }
string found_dialogs_str = G()->td_db()->get_binlog_pmc()->get("recently_found_dialog_usernames_and_ids"); string found_dialogs_str = G()->td_db()->get_binlog_pmc()->get("recently_found_dialog_usernames_and_ids");
auto found_dialogs = full_split(found_dialogs_str, ','); if (found_dialogs_str.empty()) {
if (found_dialogs.empty()) {
recently_found_dialogs_loaded_ = 2; recently_found_dialogs_loaded_ = 2;
if (!recently_found_dialog_ids_.empty()) { if (!recently_found_dialog_ids_.empty()) {
save_recently_found_dialogs(); save_recently_found_dialogs();
@ -26912,6 +26911,7 @@ bool MessagesManager::load_recently_found_dialogs(Promise<Unit> &promise) {
return true; return true;
} }
auto found_dialogs = full_split(found_dialogs_str, ',');
if (recently_found_dialogs_loaded_ == 1 && resolve_recent_found_dialogs_multipromise_.promise_count() == 0) { if (recently_found_dialogs_loaded_ == 1 && resolve_recent_found_dialogs_multipromise_.promise_count() == 0) {
// queries was sent and have already been finished // queries was sent and have already been finished
auto newly_found_dialogs = std::move(recently_found_dialog_ids_); auto newly_found_dialogs = std::move(recently_found_dialog_ids_);