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

Ignore non-personal reply markups.

Browse Source 
GitOrigin-RevId: 6dfc3d93ea3a1fdfa8a314e64f89498e050ab34b
This commit is contained in:
levlam 2018-02-03 16:38:02 +03:00
parent da4714b3ca
commit b9be89eff9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
td/telegram/MessagesManager.cpp
View File

@ -9451,7 +9451,7 @@ FullMessageId MessagesManager::on_get_message(MessageInfo &&message_info, bool f
} }
if (need_update && m->reply_markup != nullptr && m->reply_markup->type != ReplyMarkup::Type::InlineKeyboard && if (need_update && m->reply_markup != nullptr && m->reply_markup->type != ReplyMarkup::Type::InlineKeyboard &&
!td_->auth_manager_->is_bot()) { m->reply_markup->is_personal && !td_->auth_manager_->is_bot()) {
set_dialog_reply_markup(d, message_id); set_dialog_reply_markup(d, message_id);
} }
@ -9639,7 +9639,8 @@ void MessagesManager::try_restore_dialog_reply_markup(Dialog *d, const Message *
if (m->had_reply_markup) { if (m->had_reply_markup) {
LOG(INFO) << "Restore deleted reply markup in " << d->dialog_id; LOG(INFO) << "Restore deleted reply markup in " << d->dialog_id;
set_dialog_reply_markup(d, MessageId()); set_dialog_reply_markup(d, MessageId());
} else if (m->reply_markup != nullptr && m->reply_markup->type != ReplyMarkup::Type::InlineKeyboard) { } else if (m->reply_markup != nullptr && m->reply_markup->type != ReplyMarkup::Type::InlineKeyboard &&
m->reply_markup->is_personal) {
LOG(INFO) << "Restore reply markup in " << d->dialog_id << " to " << m->message_id; LOG(INFO) << "Restore reply markup in " << d->dialog_id << " to " << m->message_id;
set_dialog_reply_markup(d, m->message_id); set_dialog_reply_markup(d, m->message_id);
} }