From 0b1e6bd1deef8bc4ce161fd0be0ec01e36c3565e Mon Sep 17 00:00:00 2001
From: AlexeyZavar <sltkval1@gmail.com>
Date: Tue, 4 Jun 2024 04:11:16 +0300
Subject: [PATCH] fix: make it build
---
.../ayu/ui/context_menu/context_menu.cpp | 33 ++++++++++---------
.../ui/sections/edited/edited_log_inner.cpp | 9 +++--
.../ayu/ui/sections/edited/edited_log_inner.h | 9 ++---
Telegram/SourceFiles/mainwidget.cpp | 3 +-
Telegram/lib_ui | 2 +-
5 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp b/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp
index 5742ef383..cd1d161a8 100644
--- a/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp
+++ b/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp
@@ -77,22 +77,23 @@ void AddUserMessagesAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item) {
}
if (item->history()->peer->isChat() || item->history()->peer->isMegagroup()) {
- menu->addAction(tr::ayu_UserMessagesMenuText(tr::now),
- [=]
- {
- if (const auto window = item->history()->session().tryResolveWindow()) {
- if (const auto mainWidget = window->widget()->sessionController()) {
- const auto peer = item->history()->peer;
- const auto key = (peer && !peer->isUser())
- ? item->topic()
- ? Dialogs::Key{item->topic()}
- : Dialogs::Key{item->history()}
- : Dialogs::Key();
- mainWidget->content()->searchMessages(QString(), key, item->from()->asUser());
- }
- }
- },
- &st::menuIconTTL);
+ menu->addAction(
+ tr::ayu_UserMessagesMenuText(tr::now),
+ [=]
+ {
+ if (const auto window = item->history()->session().tryResolveWindow()) {
+ if (const auto mainWidget = window->widget()->sessionController()) {
+ const auto peer = item->history()->peer;
+ const auto key = (peer && !peer->isUser())
+ ? item->topic()
+ ? Dialogs::Key{item->topic()}
+ : Dialogs::Key{item->history()}
+ : Dialogs::Key();
+ mainWidget->content()->searchMessages(QString(), key, item->from()->asUser());
+ }
+ }
+ },
+ &st::menuIconTTL);
}
}
diff --git a/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.cpp b/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.cpp
index 96036d505..e101e7a38 100644
--- a/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.cpp
+++ b/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.cpp
@@ -610,13 +610,18 @@ void InnerWidget::elementStartInteraction(not_null<const Element*> view) {
}
void InnerWidget::elementStartPremium(
- not_null<const Element*> view,
- Element *replacing) {
+ not_null<const HistoryView::Element*> view,
+ HistoryView::Element *replacing) {
}
void InnerWidget::elementCancelPremium(not_null<const Element*> view) {
}
+void InnerWidget::elementStartEffect(
+ not_null<const Element*> view,
+ Element *replacing) {
+}
+
QString InnerWidget::elementAuthorRank(not_null<const Element*> view) {
return {};
}
diff --git a/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.h b/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.h
index 8c363036f..c9c7b61de 100644
--- a/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.h
+++ b/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.h
@@ -127,10 +127,11 @@ public:
void elementStartPremium(
not_null<const HistoryView::Element*> view,
HistoryView::Element *replacing) override;
- void elementCancelPremium(
- not_null<const HistoryView::Element*> view) override;
- QString elementAuthorRank(
- not_null<const HistoryView::Element*> view) override;
+ void elementCancelPremium(not_null<const HistoryView::Element*> view) override;
+ void elementStartEffect(
+ not_null<const HistoryView::Element*> view,
+ HistoryView::Element *replacing) override;
+ QString elementAuthorRank(not_null<const HistoryView::Element*> view) override;
~InnerWidget();
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index ef7fb5abb..53342f7e1 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -730,13 +730,14 @@ void MainWidget::hideSingleUseKeyboard(FullMsgId replyToId) {
_history->hideSingleUseKeyboard(replyToId);
}
-void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat) {
+void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat, UserData *from) {
auto tags = Data::SearchTagsFromQuery(query);
if (controller()->isPrimary()) {
auto state = Dialogs::SearchState{
.inChat = ((tags.empty() || inChat.sublist())
? inChat
: session().data().history(session().user())),
+ .fromPeer = from,
.tags = tags,
.query = tags.empty() ? query : QString(),
};
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 07cda692d..2918db18e 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 07cda692d99a9acdea6406516fead0a1517ab032
+Subproject commit 2918db18e0fb2d1be05d4e43fb9192e3a7cf6408