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

Fix webview switch_inline to the same chat.

Browse Source
This commit is contained in:
John Preston
2023-03-08 16:48:23 +04:00
parent 05ffc79539
commit de9a757e7a
6 changed files with 40 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Telegram/SourceFiles/window/window_session_controller.cpp
View File

@@ -1184,7 +1184,7 @@ Dialogs::EntryState SessionController::currentDialogsEntryState() const {
return _currentDialogsEntryState;
}
void SessionController::switchInlineQuery(
bool SessionController::switchInlineQuery(
Dialogs::EntryState to,
not_null<UserData*> bot,
const QString &query) {
@@ -1192,6 +1192,12 @@ void SessionController::switchInlineQuery(
using Section = Dialogs::EntryState::Section;
const auto thread = to.key.thread();
if (!thread || !Data::CanSend(thread, ChatRestriction::SendInline)) {
show(Ui::MakeInformBox(tr::lng_inline_switch_cant()));
return false;
}
const auto history = to.key.owningHistory();
const auto textWithTags = TextWithTags{
'@' + bot->username() + ' ' + query,
@@ -1214,6 +1220,7 @@ void SessionController::switchInlineQuery(
params);
} else {
history->setLocalDraft(std::move(draft));
history->clearLocalEditDraft(to.rootId);
if (to.section == Section::Replies) {
const auto commentId = MsgId();
showRepliesForMessage(history, to.rootId, commentId, params);
@@ -1221,6 +1228,21 @@ void SessionController::switchInlineQuery(
showPeerHistory(history->peer, params);
}
}
return true;
}
bool SessionController::switchInlineQuery(
not_null<Data::Thread*> thread,
not_null<UserData*> bot,
const QString &query) {
const auto entryState = Dialogs::EntryState{
.key = thread,
.section = (thread->asTopic()
? Dialogs::EntryState::Section::Replies
: Dialogs::EntryState::Section::History),
.rootId = thread->topicRootId(),
};
return switchInlineQuery(entryState, bot, query);
}
Dialogs::RowDescriptor SessionController::resolveChatNext(

6
Telegram/SourceFiles/window/window_session_controller.h
View File

@@ -379,10 +379,14 @@ public:
void setCurrentDialogsEntryState(Dialogs::EntryState state);
[[nodiscard]] Dialogs::EntryState currentDialogsEntryState() const;
void switchInlineQuery(
bool switchInlineQuery(
Dialogs::EntryState to,
not_null<UserData*> bot,
const QString &query);
bool switchInlineQuery(
not_null<Data::Thread*> thread,
not_null<UserData*> bot,
const QString &query);
[[nodiscard]] Dialogs::RowDescriptor resolveChatNext(
Dialogs::RowDescriptor from = {}) const;