andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Keep reply_markup in some forwarded messages.

Browse Source 
GitOrigin-RevId: 8059cf0b071edb6ac62eff5d77749080d48916c3
This commit is contained in:
levlam 2019-05-24 14:48:10 +03:00
parent 096a0434b0
commit 55fd1c30af
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
td/telegram/MessagesManager.cpp
View File

@ -18104,6 +18104,35 @@ Result<vector<MessageId>> MessagesManager::forward_messages(DialogId to_dialog_i
m->via_bot_user_id = forwarded_message->sender_user_id;
}
}
if (!to_secret && forwarded_message->reply_markup != nullptr &&
forwarded_message->reply_markup->type == ReplyMarkup::Type::InlineKeyboard) {
bool need_reply_markup = true;
for (auto &row : forwarded_message->reply_markup->inline_keyboard) {
for (auto &button : row) {
if (button.type == InlineKeyboardButton::Type::Url || button.type == InlineKeyboardButton::Type::UrlAuth) {
// ok
continue;
}
if (m->via_bot_user_id.is_valid() && (button.type == InlineKeyboardButton::Type::SwitchInline ||
button.type == InlineKeyboardButton::Type::SwitchInlineCurrentDialog)) {
// ok
continue;
}
need_reply_markup = false;
}
}
if (need_reply_markup) {
m->reply_markup = make_unique<ReplyMarkup>(*forwarded_message->reply_markup);
for (auto &row : m->reply_markup->inline_keyboard) {
for (auto &button : row) {
if (button.type == InlineKeyboardButton::Type::SwitchInlineCurrentDialog) {
button.type = InlineKeyboardButton::Type::SwitchInline;
}
}
}
}
}
result[i] = m->message_id;
forwarded_messages.push_back(m);