From 17a3a964644cfd92b58a8e2cb0d6ceffa53aaa05 Mon Sep 17 00:00:00 2001 From: ZavaruKitsu Date: Sun, 23 Jul 2023 01:11:30 +0000 Subject: [PATCH] fix: update submodules fix: make it compile --- Telegram/SourceFiles/history/history.cpp | 8 +++++++- Telegram/SourceFiles/window/window_main_menu.cpp | 6 +++--- Telegram/ThirdParty/GSL | 2 +- Telegram/ThirdParty/tgcalls | 2 +- Telegram/lib_base | 2 +- Telegram/lib_ui | 2 +- Telegram/lib_webview | 2 +- cmake | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp index 73aa7a83e..b1acb3727 100644 --- a/Telegram/SourceFiles/history/history.cpp +++ b/Telegram/SourceFiles/history/history.cpp @@ -510,11 +510,17 @@ void History::destroyMessage(not_null item) { flags |= MessageFlag::Post; } + FullReplyTo replyTo = { + .msgId = item->id, + .topicRootId = item->topicRootId(), + .storyId = {} + }; + addNewLocalMessage( session().data().nextLocalMessageId(), flags, UserId(), - item->id, + replyTo, base::unixtime::now(), item->author()->id, "AyuGram"_q, diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index c6fe9f493..0a09ed21d 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -802,7 +802,7 @@ void MainMenu::setupMenu() { }); addAction( rpl::single(QString("LRead Messages")), - {&st::settingsIconForward, kIconPurple} + { &st::menuIconMarkRead } )->setClickedCallback([=] { auto settings = &AyuSettings::getInstance(); @@ -816,7 +816,7 @@ void MainMenu::setupMenu() { }); addAction( rpl::single(QString("SRead Messages")), - {&st::settingsIconForward, kIconPurple} + { &st::menuIconMarkRead } )->setClickedCallback([=] { auto box = Box(controller); @@ -888,7 +888,7 @@ void MainMenu::setupMenu() { { _ghostModeToggle = addAction( tr::ayu_DrawerGhostModeToggle(), - {&st::ayuGhostIcon, kIconPurple} + { &st::menuIconSilent } // todo: fix `ayuGhostIcon` )->toggleOn(AyuSettings::get_ghostModeEnabledReactive()); _ghostModeToggle->toggledChanges( diff --git a/Telegram/ThirdParty/GSL b/Telegram/ThirdParty/GSL index a35345671..09938e870 160000 --- a/Telegram/ThirdParty/GSL +++ b/Telegram/ThirdParty/GSL @@ -1 +1 @@ -Subproject commit a3534567187d2edc428efd3f13466ff75fe5805c +Subproject commit 09938e870420b69a01f55c755207c871bc20b4e5 diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls index 2e2797648..258cf9b35 160000 --- a/Telegram/ThirdParty/tgcalls +++ b/Telegram/ThirdParty/tgcalls @@ -1 +1 @@ -Subproject commit 2e2797648aac2588e7fe479c2e8b4455ec65c5e6 +Subproject commit 258cf9b352ee2afde7e08e431f5887cd13119931 diff --git a/Telegram/lib_base b/Telegram/lib_base index 9aaee8907..2669a0457 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 9aaee890765618e9d9ea52fba0a03ab4baa7dfda +Subproject commit 2669a04579069942b6208a18abe93c26adfddf2a diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 435b884b8..9f91b83c4 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 435b884b8bc05457b2d9b46a84c05d44f10dace9 +Subproject commit 9f91b83c4c85b476a83f5da5e2b7986c68f410cf diff --git a/Telegram/lib_webview b/Telegram/lib_webview index 5c3e82bfe..ebb8b8b91 160000 --- a/Telegram/lib_webview +++ b/Telegram/lib_webview @@ -1 +1 @@ -Subproject commit 5c3e82bfe71627ddeffee6ec44a7215bfb52e38e +Subproject commit ebb8b8b91fe357b2c397a3eb98655c585b8c856e diff --git a/cmake b/cmake index f20e647e2..0620bb7b8 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit f20e647e297b6dd006e77f288465e6a1cdab10e9 +Subproject commit 0620bb7b87a0ec9195151fd5eb0cf38656c1280b