tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correctly add sponsored chat to total chat count.

Browse Source 
GitOrigin-RevId: 94cd41796d06b4a70902b4e424c181bbca740639
This commit is contained in:
levlam 2020-04-23 02:31:16 +03:00
parent 777e26dd77
commit 392b62e40b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/DialogDb.cpp
View File

@ -240,6 +240,7 @@ class DialogDbImpl : public DialogDbSyncInterface {
return std::move(result); return std::move(result);
} }
Result<vector<NotificationGroupKey>> get_notification_groups_by_last_notification_date( Result<vector<NotificationGroupKey>> get_notification_groups_by_last_notification_date(
NotificationGroupKey notification_group_key, int32 limit) override { NotificationGroupKey notification_group_key, int32 limit) override {
auto &stmt = get_notification_groups_by_last_notification_date_stmt_; auto &stmt = get_notification_groups_by_last_notification_date_stmt_;
@ -262,6 +263,7 @@ class DialogDbImpl : public DialogDbSyncInterface {
return std::move(notification_groups); return std::move(notification_groups);
} }
Status begin_transaction() override { Status begin_transaction() override {
return db_.begin_transaction(); return db_.begin_transaction();
} }

8
td/telegram/MessagesManager.cpp
View File

@ -9430,6 +9430,7 @@ int32 MessagesManager::calc_new_unread_count_from_the_end(Dialog *d, MessageId m
} }
// hint_unread_count is definitely wrong, ignore it // hint_unread_count is definitely wrong, ignore it
if (need_unread_counter(d->order)) { if (need_unread_counter(d->order)) {
LOG(ERROR) << "Receive hint_unread_count = " << hint_unread_count << ", but found " << unread_count LOG(ERROR) << "Receive hint_unread_count = " << hint_unread_count << ", but found " << unread_count
<< " unread messages in " << d->dialog_id; << " unread messages in " << d->dialog_id;
@ -9760,7 +9761,7 @@ void MessagesManager::recalc_unread_count(FolderId folder_id) {
} }
} }
} }
if (d->order != DEFAULT_ORDER) { if (d->order != DEFAULT_ORDER || is_dialog_sponsored(d)) {
if (dialog_id.get_type() == DialogType::SecretChat) { if (dialog_id.get_type() == DialogType::SecretChat) {
secret_chat_total_count++; secret_chat_total_count++;
} else { } else {
@ -9849,7 +9850,8 @@ void MessagesManager::set_dialog_last_read_inbox_message_id(Dialog *d, MessageId
} }
send_update_unread_chat_count(d->folder_id, d->dialog_id, force_update, source); send_update_unread_chat_count(d->folder_id, d->dialog_id, force_update, source);
} }
if (message_id != MessageId::min() && d->last_read_inbox_message_id.is_valid() && d->order != DEFAULT_ORDER) { if (message_id != MessageId::min() && d->last_read_inbox_message_id.is_valid() &&
(d->order != DEFAULT_ORDER || is_dialog_sponsored(d))) {
VLOG(notifications) << "Remove some notifications in " << d->dialog_id VLOG(notifications) << "Remove some notifications in " << d->dialog_id
<< " after updating last read inbox message to " << message_id << " after updating last read inbox message to " << message_id
<< " and unread message count to " << server_unread_count << " + " << local_unread_count << " and unread message count to " << server_unread_count << " + " << local_unread_count
@ -10397,7 +10399,7 @@ void MessagesManager::init() {
continue; continue;
} }
auto counts = transform(full_split(it.second), [](Slice str) { return to_integer_safe<int32>(str); }); auto counts = transform(full_split(Slice(it.second)), [](Slice str) { return to_integer_safe<int32>(str); });
if ((counts.size() != 4 && counts.size() != 6) || if ((counts.size() != 4 && counts.size() != 6) ||
std::any_of(counts.begin(), counts.end(), [](auto &c) { return c.is_error(); })) { std::any_of(counts.begin(), counts.end(), [](auto &c) { return c.is_error(); })) {
LOG(ERROR) << "Can't parse " << it.second; LOG(ERROR) << "Can't parse " << it.second;