2
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-04 08:25:38 +00:00

FullMsgId rely on PeerId instead of ChannelId.

This commit is contained in:
John Preston
2021-12-09 11:32:54 +04:00
parent a8f05a01ed
commit 5e7e7eaa83
61 changed files with 446 additions and 475 deletions

View File

@@ -376,8 +376,8 @@ void SessionNavigation::showRepliesForMessage(
}
_session->api().request(base::take(_showingRepliesRequestId)).cancel();
const auto channelId = history->channelId();
//const auto item = _session->data().message(channelId, rootId);
const auto postPeer = history->peer;
//const auto item = _session->data().message(postPeer, rootId);
//if (!commentId && (!item || !item->repliesAreComments())) {
// showSection(std::make_shared<HistoryView::RepliesMemento>(history, rootId));
// return;
@@ -411,9 +411,7 @@ void SessionNavigation::showRepliesForMessage(
if (!peer || !id) {
return;
}
auto item = _session->data().message(
peerToChannel(peer),
id);
auto item = _session->data().message(peer, id);
if (const auto group = _session->data().groups().find(item)) {
item = group->items.front();
}
@@ -426,8 +424,8 @@ void SessionNavigation::showRepliesForMessage(
data.vunread_count().v);
item->setRepliesOutboxReadTill(
data.vread_outbox_max_id().value_or_empty());
const auto post = _session->data().message(channelId, rootId);
if (post && item->history()->channelId() != channelId) {
const auto post = _session->data().message(postPeer, rootId);
if (post && item->history()->peer != postPeer) {
post->setCommentsItemId(item->fullId());
if (const auto maxId = data.vmax_id()) {
post->setRepliesMaxId(maxId->v);