procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix 'reading' of an empty history.

This commit is contained in:
John Preston 2020-02-20 13:37:00 +04:00
parent 388173f0ad
commit a3f19c073b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/data/data_histories.cpp
View File

@ -131,6 +131,8 @@ void Histories::readInboxTill(
not_null<History*> history, not_null<History*> history,
MsgId tillId, MsgId tillId,
bool force) { bool force) {
Expects(IsServerMsgId(tillId) || (!tillId && !force));
if (!history->readInboxTillNeedsRequest(tillId) && !force) { if (!history->readInboxTillNeedsRequest(tillId) && !force) {
return; return;
} else if (!force) { } else if (!force) {
@ -202,7 +204,9 @@ void Histories::sendReadRequests() {
const auto now = crl::now(); const auto now = crl::now();
auto next = std::optional<crl::time>(); auto next = std::optional<crl::time>();
for (auto &[history, state] : _states) { for (auto &[history, state] : _states) {
if (state.readTill && state.readWhen <= now) { if (!state.readTill) {
continue;
} else if (state.readWhen <= now) {
sendReadRequest(history, state); sendReadRequest(history, state);
} else if (!next || *next > state.readWhen) { } else if (!next || *next > state.readWhen) {
next = state.readWhen; next = state.readWhen;

4
Telegram/SourceFiles/history/history.cpp
View File

@ -1615,13 +1615,13 @@ void History::calculateFirstUnreadMessage() {
} }
bool History::readInboxTillNeedsRequest(MsgId tillId) { bool History::readInboxTillNeedsRequest(MsgId tillId) {
Expects(IsServerMsgId(tillId)); Expects(!tillId || IsServerMsgId(tillId));
readClientSideMessages(); readClientSideMessages();
if (unreadMark()) { if (unreadMark()) {
session().api().changeDialogUnreadMark(this, false); session().api().changeDialogUnreadMark(this, false);
} }
return (_inboxReadBefore.value_or(1) <= tillId); return IsServerMsgId(tillId) && (_inboxReadBefore.value_or(1) <= tillId);
} }
void History::readClientSideMessages() { void History::readClientSideMessages() {