void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix showing comments from the beginning.

Browse source
This commit is contained in:
John Preston 2021-03-29 19:53:55 +04:00
parent 1050447eed
commit 320adcd389
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Telegram/SourceFiles/history/history_message.cpp
View file

@ -857,7 +857,12 @@ MsgId HistoryMessage::computeRepliesInboxReadTillFull() const {
? history()->owner().historyLoaded( ? history()->owner().historyLoaded(
peerFromChannel(views->commentsMegagroupId)) peerFromChannel(views->commentsMegagroupId))
: history().get(); : history().get();
return group ? std::max(local, group->inboxReadTillId()) : local; if (const auto megagroup = group->peer->asChannel()) {
if (megagroup->amIn()) {
return std::max(local, group->inboxReadTillId());
}
}
return local;
} }
MsgId HistoryMessage::repliesOutboxReadTill() const { MsgId HistoryMessage::repliesOutboxReadTill() const {
@ -891,7 +896,12 @@ MsgId HistoryMessage::computeRepliesOutboxReadTillFull() const {
? history()->owner().historyLoaded( ? history()->owner().historyLoaded(
peerFromChannel(views->commentsMegagroupId)) peerFromChannel(views->commentsMegagroupId))
: history().get(); : history().get();
return group ? std::max(local, group->outboxReadTillId()) : local; if (const auto megagroup = group->peer->asChannel()) {
if (megagroup->amIn()) {
return std::max(local, group->outboxReadTillId());
}
}
return local;
} }
void HistoryMessage::setRepliesMaxId(MsgId maxId) { void HistoryMessage::setRepliesMaxId(MsgId maxId) {

20
Telegram/SourceFiles/window/window_session_controller.cpp
View file

@ -354,24 +354,20 @@ void SessionNavigation::showRepliesForMessage(
if (const auto maxId = data.vmax_id()) { if (const auto maxId = data.vmax_id()) {
item->setRepliesMaxId(maxId->v); item->setRepliesMaxId(maxId->v);
} }
if (const auto readTill = data.vread_inbox_max_id()) { item->setRepliesInboxReadTill(
item->setRepliesInboxReadTill(readTill->v); data.vread_inbox_max_id().value_or_empty());
} item->setRepliesOutboxReadTill(
if (const auto readTill = data.vread_outbox_max_id()) { data.vread_outbox_max_id().value_or_empty());
item->setRepliesOutboxReadTill(readTill->v);
}
const auto post = _session->data().message(channelId, rootId); const auto post = _session->data().message(channelId, rootId);
if (post && item->history()->channelId() != channelId) { if (post && item->history()->channelId() != channelId) {
post->setCommentsItemId(item->fullId()); post->setCommentsItemId(item->fullId());
if (const auto maxId = data.vmax_id()) { if (const auto maxId = data.vmax_id()) {
post->setRepliesMaxId(maxId->v); post->setRepliesMaxId(maxId->v);
} }
if (const auto readTill = data.vread_inbox_max_id()) { post->setRepliesInboxReadTill(
post->setRepliesInboxReadTill(readTill->v); data.vread_inbox_max_id().value_or_empty());
} post->setRepliesOutboxReadTill(
if (const auto readTill = data.vread_outbox_max_id()) { data.vread_outbox_max_id().value_or_empty());
post->setRepliesOutboxReadTill(readTill->v);
}
} }
showSection(std::make_shared<HistoryView::RepliesMemento>( showSection(std::make_shared<HistoryView::RepliesMemento>(
item, item,