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 migrated history in chat preview.

Browse source
This commit is contained in:
John Preston 2024-05-03 18:28:52 +04:00
parent 0f524ac67d
commit aee62c7591
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/data/data_history_messages.cpp
View file

@ -151,7 +151,7 @@ rpl::producer<SparseIdsMergedSlice> HistoryMergedViewer(
const auto chosen = (history->peer->id == peerId) const auto chosen = (history->peer->id == peerId)
? history ? history
: history->owner().history(peerId); : history->owner().history(peerId);
return HistoryViewer(history, simpleKey, limitBefore, limitAfter); return HistoryViewer(chosen, simpleKey, limitBefore, limitAfter);
}; };
const auto peerId = history->peer->id; const auto peerId = history->peer->id;
const auto topicRootId = MsgId(); const auto topicRootId = MsgId();

6
Telegram/SourceFiles/history/history.cpp
View file

@ -3107,8 +3107,9 @@ Data::HistoryMessages &History::messages() {
if (!_messages) { if (!_messages) {
_messages = std::make_unique<Data::HistoryMessages>(); _messages = std::make_unique<Data::HistoryMessages>();
const auto max = maxMsgId();
const auto from = loadedAtTop() ? 0 : minMsgId(); const auto from = loadedAtTop() ? 0 : minMsgId();
const auto till = loadedAtBottom() ? ServerMaxMsgId : maxMsgId(); const auto till = loadedAtBottom() ? ServerMaxMsgId : max;
auto list = std::vector<MsgId>(); auto list = std::vector<MsgId>();
list.reserve(std::min( list.reserve(std::min(
int(_items.size()), int(_items.size()),
@ -3122,13 +3123,14 @@ Data::HistoryMessages &History::messages() {
if (!list.empty() && list.back() >= id) { if (!list.empty() && list.back() >= id) {
sort = true; sort = true;
} }
list.push_back(id);
} }
} }
} }
if (sort) { if (sort) {
ranges::sort(list); ranges::sort(list);
} }
if (till) { if (max || (loadedAtTop() && loadedAtBottom())) {
_messages->addSlice(std::move(list), { from, till }, {}); _messages->addSlice(std::move(list), { from, till }, {});
} }
} }