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

Merge branch 'dev' into settings

Browse Source 
Conflicts:
	Telegram/SourceFiles/boxes/addcontactbox.h
	Telegram/SourceFiles/boxes/confirmbox.h
This commit is contained in:
John Preston
2016-08-16 20:19:57 +03:00
parent 392984f276 362b942a22
commit 4a6e669a53
23 changed files with 1071 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Telegram/SourceFiles/facades.cpp
View File

@@ -91,6 +91,7 @@ void activateBotCommand(const HistoryItem *msg, int row, int col) {
Ui::showLayer(box);
} break;
case HistoryMessageReplyMarkup::Button::SwitchInlineSame:
case HistoryMessageReplyMarkup::Button::SwitchInline: {
if (auto m = App::main()) {
auto getMessageBot = [msg]() -> UserData* {
@@ -104,8 +105,12 @@ void activateBotCommand(const HistoryItem *msg, int row, int col) {
return nullptr;
};
if (auto bot = getMessageBot()) {
auto tryFastSwitch = [bot, &button]() -> bool {
if (bot->botInfo && bot->botInfo->inlineReturnPeerId) {
auto tryFastSwitch = [bot, &button, msgId = msg->id]() -> bool {
auto samePeer = (button->type == HistoryMessageReplyMarkup::Button::SwitchInlineSame);
if (samePeer) {
Notify::switchInlineBotButtonReceived(QString::fromUtf8(button->data), bot, msgId);
return true;
} else if (bot->botInfo && bot->botInfo->inlineReturnPeerId) {
if (Notify::switchInlineBotButtonReceived(QString::fromUtf8(button->data))) {
return true;
}
@@ -332,9 +337,9 @@ void inlineKeyboardMoved(const HistoryItem *item, int oldKeyboardTop, int newKey
}
}
bool switchInlineBotButtonReceived(const QString &query) {
if (MainWidget *m = App::main()) {
return m->notify_switchInlineBotButtonReceived(query);
bool switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot, MsgId samePeerReplyTo) {
if (auto m = App::main()) {
return m->notify_switchInlineBotButtonReceived(query, samePeerBot, samePeerReplyTo);
}
return false;
}