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

Fixed WebPageId removing from api_editing.

Browse source
This commit is contained in:
23rd 2020-05-30 02:23:27 +03:00
parent 63dff9ff91
commit c52da743fd
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/api/api_editing.cpp
View file

@ -60,7 +60,7 @@ mtpRequestId EditMessage(
| ((media && inputMedia.has_value()) | ((media && inputMedia.has_value())
? MTPmessages_EditMessage::Flag::f_media ? MTPmessages_EditMessage::Flag::f_media
: emptyFlag) : emptyFlag)
| ((!media || !media->webpage()) | (options.removeWebPageId
? MTPmessages_EditMessage::Flag::f_no_webpage ? MTPmessages_EditMessage::Flag::f_no_webpage
: emptyFlag) : emptyFlag)
| (!sentEntities.v.isEmpty() | (!sentEntities.v.isEmpty()

15
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -3002,24 +3002,15 @@ void HistoryWidget::saveEditMsg() {
return; return;
} }
auto sendFlags = MTPmessages_EditMessage::Flag::f_message | 0; auto options = Api::SendOptions();
if (webPageId == CancelledWebPageId) { options.removeWebPageId = (webPageId == CancelledWebPageId);
sendFlags |= MTPmessages_EditMessage::Flag::f_no_webpage;
}
auto sentEntities = Api::EntitiesToMTP(
&session(),
sending.entities,
Api::ConvertOption::SkipLocal);
if (!sentEntities.v.isEmpty()) {
sendFlags |= MTPmessages_EditMessage::Flag::f_entities;
}
const auto weak = Ui::MakeWeak(this); const auto weak = Ui::MakeWeak(this);
const auto history = _history; const auto history = _history;
_saveEditMsgRequestId = Api::EditTextMessage( _saveEditMsgRequestId = Api::EditTextMessage(
session().data().message(_channel, _editMsgId), session().data().message(_channel, _editMsgId),
sending, sending,
Api::SendOptions(), options,
[history, weak](const MTPUpdates &result, mtpRequestId requestId) { [history, weak](const MTPUpdates &result, mtpRequestId requestId) {
SaveEditMsgDone(history, result, requestId); SaveEditMsgDone(history, result, requestId);
if (const auto strong = weak.data()) { if (const auto strong = weak.data()) {

3
Telegram/SourceFiles/history/view/history_view_context_menu.cpp
View file

@ -415,6 +415,9 @@ bool AddRescheduleMessageAction(
return; return;
} }
const auto callback = [=](Api::SendOptions options) { const auto callback = [=](Api::SendOptions options) {
if (!item->media() || !item->media()->webpage()) {
options.removeWebPageId = true;
}
Api::RescheduleMessage(item, options); Api::RescheduleMessage(item, options);
}; };