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

Add dummy calc_new_unread_count_from_last_unread.

Browse Source 
GitOrigin-RevId: eb66e452c3e99344180493491d588e0871b3fd91
This commit is contained in:
levlam 2018-05-01 21:12:00 +03:00
parent eeb94af4df
commit 6a3241dc12
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
td/telegram/MessagesManager.cpp
View File

@ -8781,12 +8781,12 @@ bool MessagesManager::read_message_content(Dialog *d, Message *m, bool is_local_
return false; return false;
} }
int32 MessagesManager::calc_new_unread_count(Dialog *d, MessageId max_message_id, MessageType type, int32 MessagesManager::calc_new_unread_count_from_last_unread(Dialog *d, MessageId max_message_id, MessageType type) {
int32 hint_unread_count) { return -1;
if (d->is_empty) {
return 0;
} }
int32 MessagesManager::calc_new_unread_count_from_the_end(Dialog *d, MessageId max_message_id, MessageType type,
int32 hint_unread_count) {
int32 unread_count = 0; int32 unread_count = 0;
MessagesConstIterator it(d, MessageId::max()); MessagesConstIterator it(d, MessageId::max());
while (*it != nullptr && (*it)->message_id.get() > max_message_id.get()) { while (*it != nullptr && (*it)->message_id.get() > max_message_id.get()) {
@ -8821,6 +8821,27 @@ int32 MessagesManager::calc_new_unread_count(Dialog *d, MessageId max_message_id
return unread_count; return unread_count;
} }
int32 MessagesManager::calc_new_unread_count(Dialog *d, MessageId max_message_id, MessageType type,
int32 hint_unread_count) {
if (d->is_empty) {
return 0;
}
if (!d->last_read_inbox_message_id.is_valid()) {
return calc_new_unread_count_from_the_end(d, max_message_id, type, hint_unread_count);
}
if (!d->last_message_id.is_valid() ||
(d->last_message_id.get() - max_message_id.get() > max_message_id.get() - d->last_read_inbox_message_id.get())) {
int32 unread_count = calc_new_unread_count_from_last_unread(d, max_message_id, type);
return unread_count >= 0 ? unread_count
: calc_new_unread_count_from_the_end(d, max_message_id, type, hint_unread_count);
} else {
int32 unread_count = calc_new_unread_count_from_the_end(d, max_message_id, type, hint_unread_count);
return unread_count >= 0 ? unread_count : calc_new_unread_count_from_last_unread(d, max_message_id, type);
}
}
void MessagesManager::read_history_inbox(DialogId dialog_id, MessageId max_message_id, int32 unread_count, void MessagesManager::read_history_inbox(DialogId dialog_id, MessageId max_message_id, int32 unread_count,
const char *source) { const char *source) {
if (td_->auth_manager_->is_bot()) { if (td_->auth_manager_->is_bot()) {

5
td/telegram/MessagesManager.h
View File

@ -2080,6 +2080,11 @@ class MessagesManager : public Actor {
void read_message_contents_on_server(DialogId dialog_id, vector<MessageId> message_ids, uint64 logevent_id); void read_message_contents_on_server(DialogId dialog_id, vector<MessageId> message_ids, uint64 logevent_id);
static int32 calc_new_unread_count_from_last_unread(Dialog *d, MessageId max_message_id, MessageType type);
static int32 calc_new_unread_count_from_the_end(Dialog *d, MessageId max_message_id, MessageType type,
int32 hint_unread_count);
static int32 calc_new_unread_count(Dialog *d, MessageId max_message_id, MessageType type, int32 hint_unread_count); static int32 calc_new_unread_count(Dialog *d, MessageId max_message_id, MessageType type, int32 hint_unread_count);
void read_history_inbox(DialogId dialog_id, MessageId max_message_id, int32 unread_count, const char *source); void read_history_inbox(DialogId dialog_id, MessageId max_message_id, int32 unread_count, const char *source);