mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Pass FullReplyTo everywhere.

Browse Source
This commit is contained in:
John Preston
2023-10-10 10:49:22 +04:00
parent a77131dfd6
commit 4240568ea5
53 changed files with 964 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,8 +177,7 @@ void History::takeLocalDraft(not_null<History*> from) {
&& !_drafts.contains(Data::DraftKey::Local(topicRootId))) {
// Edit and reply to drafts can't migrate.
// Cloud drafts do not migrate automatically.
draft->msgId = 0;
draft->reply = FullReplyTo();
setLocalDraft(std::move(draft));
}
from->clearLocalDraft(topicRootId);
@@ -194,6 +193,7 @@ void History::createLocalDraftFromCloud(MsgId topicRootId) {
return;
}
draft->reply.topicRootId = topicRootId;
auto existing = localDraft(topicRootId);
if (Data::DraftIsNull(existing)
|| !existing->date
@@ -201,15 +201,13 @@ void History::createLocalDraftFromCloud(MsgId topicRootId) {
if (!existing) {
setLocalDraft(std::make_unique<Data::Draft>(
draft->textWithTags,
draft->msgId,
topicRootId,
draft->reply,
draft->cursor,
draft->previewState));
existing = localDraft(topicRootId);
} else if (existing != draft) {
existing->textWithTags = draft->textWithTags;
existing->msgId = draft->msgId;
existing->topicRootId = draft->topicRootId;
existing->reply = draft->reply;
existing->cursor = draft->cursor;
existing->previewState = draft->previewState;
}
@@ -277,8 +275,7 @@ Data::Draft *History::createCloudDraft(
if (Data::DraftIsNull(fromDraft)) {
setCloudDraft(std::make_unique<Data::Draft>(
TextWithTags(),
0,
topicRootId,
FullReplyTo(),
MessageCursor(),
Data::PreviewState::Allowed));
cloudDraft(topicRootId)->date = TimeId(0);
@@ -287,18 +284,18 @@ Data::Draft *History::createCloudDraft(
if (!existing) {
setCloudDraft(std::make_unique<Data::Draft>(
fromDraft->textWithTags,
fromDraft->msgId,
topicRootId,
fromDraft->reply,
fromDraft->cursor,
fromDraft->previewState));
existing = cloudDraft(topicRootId);
} else if (existing != fromDraft) {
existing->textWithTags = fromDraft->textWithTags;
existing->msgId = fromDraft->msgId;
existing->reply = fromDraft->reply;
existing->cursor = fromDraft->cursor;
existing->previewState = fromDraft->previewState;
}
existing->date = base::unixtime::now();
existing->reply.topicRootId = topicRootId;
}
if (const auto thread = threadFor(topicRootId)) {