diff --git a/Telegram/SourceFiles/ayu/features/forward/ayu_forward.cpp b/Telegram/SourceFiles/ayu/features/forward/ayu_forward.cpp index f543510d30..298fe28d98 100644 --- a/Telegram/SourceFiles/ayu/features/forward/ayu_forward.cpp +++ b/Telegram/SourceFiles/ayu/features/forward/ayu_forward.cpp @@ -423,7 +423,6 @@ void forwardMessages( auto bundle = Ui::PrepareFilesBundle( std::move(groups), way, - message.textWithTags, false); sendMedia(session, bundle, media, std::move(message), way.sendImagesAsPhotos()); } diff --git a/Telegram/SourceFiles/ayu/features/forward/ayu_sync.cpp b/Telegram/SourceFiles/ayu/features/forward/ayu_sync.cpp index df9f576e8a..4b86440641 100644 --- a/Telegram/SourceFiles/ayu/features/forward/ayu_sync.cpp +++ b/Telegram/SourceFiles/ayu/features/forward/ayu_sync.cpp @@ -272,7 +272,14 @@ void sendDocumentSync(not_null session, crl::on_main([=, lst = std::move(group.list), caption = std::move(caption)]() mutable { auto size = lst.files.size(); - session->api().sendFiles(std::move(lst), type, std::move(caption), size > 1 ? groupId : nullptr, action); + if (!lst.files.empty()) { + lst.files.front().caption = std::move(caption); + } + session->api().sendFiles( + std::move(lst), + type, + size > 1 ? groupId : nullptr, + action); }); waitForMsgSync(session, action); diff --git a/Telegram/SourceFiles/ayu/features/translator/implementations/telegram.cpp b/Telegram/SourceFiles/ayu/features/translator/implementations/telegram.cpp index 78bca3c4ba..9898db1cfa 100644 --- a/Telegram/SourceFiles/ayu/features/translator/implementations/telegram.cpp +++ b/Telegram/SourceFiles/ayu/features/translator/implementations/telegram.cpp @@ -30,7 +30,8 @@ CallbackCancel TelegramTranslator::startTranslation( args.requestData.peer, args.requestData.idList, args.requestData.text, - args.requestData.toLang + args.requestData.toLang, + MTP_string() // tone )).done([=](const MTPmessages_TranslatedText &result) { const auto &data = result.data(); diff --git a/Telegram/SourceFiles/ayu/ui/ayu_styles.style b/Telegram/SourceFiles/ayu/ui/ayu_styles.style index 6fcab4d31a..f4d841d273 100644 --- a/Telegram/SourceFiles/ayu/ui/ayu_styles.style +++ b/Telegram/SourceFiles/ayu/ui/ayu_styles.style @@ -63,8 +63,6 @@ exteraBadgeToast: Toast(defaultToast) { minWidth: 40px; maxWidth: 480px; padding: margins(54px, 13px, 19px, 12px); - icon: icon {{ "ayu/extera_badge", toastFg }}; - iconPosition: point(13px, 13px); } supportLogoSize: 96px; diff --git a/Telegram/SourceFiles/ayu/ui/message_history/history_inner.cpp b/Telegram/SourceFiles/ayu/ui/message_history/history_inner.cpp index 0a3019df33..b8151bc6b0 100644 --- a/Telegram/SourceFiles/ayu/ui/message_history/history_inner.cpp +++ b/Telegram/SourceFiles/ayu/ui/message_history/history_inner.cpp @@ -539,6 +539,16 @@ void InnerWidget::elementShowPollResults( FullMsgId context) { } +void InnerWidget::elementShowAddPollOption( + not_null view, + not_null poll, + FullMsgId context, + QRect optionRect) { +} + +void InnerWidget::elementSubmitAddPollOption(FullMsgId context) { +} + void InnerWidget::elementOpenPhoto( not_null photo, FullMsgId context) { diff --git a/Telegram/SourceFiles/ayu/ui/message_history/history_inner.h b/Telegram/SourceFiles/ayu/ui/message_history/history_inner.h index 089f58258a..ddb1f78271 100644 --- a/Telegram/SourceFiles/ayu/ui/message_history/history_inner.h +++ b/Telegram/SourceFiles/ayu/ui/message_history/history_inner.h @@ -99,6 +99,12 @@ public: void elementShowPollResults( not_null poll, FullMsgId context) override; + void elementShowAddPollOption( + not_null view, + not_null poll, + FullMsgId context, + QRect optionRect) override; + void elementSubmitAddPollOption(FullMsgId context) override; void elementOpenPhoto( not_null photo, FullMsgId context) override; diff --git a/Telegram/SourceFiles/settings/sections/settings_chat.cpp b/Telegram/SourceFiles/settings/sections/settings_chat.cpp index 636c6eb492..6fbcaca4bc 100644 --- a/Telegram/SourceFiles/settings/sections/settings_chat.cpp +++ b/Telegram/SourceFiles/settings/sections/settings_chat.cpp @@ -290,12 +290,16 @@ void ColorsPalette::show(Type type) { return; } list.insert(list.begin(), scheme->accentColor); - const auto &settings = AyuFeatures::MessageShot::isChoosingTheme() ? AyuFeatures::MessageShot::getSelectedColorFromDefault() : Core::App().settings(); - const auto color = settings.themesAccentColors().get(type); - const auto current = (settings.systemAccentColorEnabled() - ? Window::Theme::SystemAccentColor() - : std::optional()).value_or( - color.value_or(scheme->accentColor)); + const auto &settings = Core::App().settings(); + const auto messageShotSelected = AyuFeatures::MessageShot::isChoosingTheme() + ? AyuFeatures::MessageShot::getSelectedColorFromDefault() + : std::optional(); + const auto color = messageShotSelected.has_value() + ? messageShotSelected + : (settings.systemAccentColorEnabled() + ? Window::Theme::SystemAccentColor() + : settings.themesAccentColors().get(type)); + const auto current = color.value_or(scheme->accentColor); const auto i = ranges::find(list, current); if (i == end(list)) { list.back() = current; diff --git a/Telegram/codegen b/Telegram/codegen index 1c919609d4..17a10c1b72 160000 --- a/Telegram/codegen +++ b/Telegram/codegen @@ -1 +1 @@ -Subproject commit 1c919609d4573f2be91dafef923f8f9e2c08cdff +Subproject commit 17a10c1b721288f9cced2b5401f40eb87025edbb diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 864dd38ffd..df52e7459b 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 864dd38ffd5d95e42dac411bcb9d715415fbddfb +Subproject commit df52e7459b424ed3a26a858c100efba77f8eb14c diff --git a/docs/building-win-x64.md b/docs/building-win-x64.md index 570e43bc81..89cfec407d 100644 --- a/docs/building-win-x64.md +++ b/docs/building-win-x64.md @@ -33,7 +33,7 @@ Go to ***BuildPath*\\tdesktop\\Telegram** and run configure.bat x64 -D TDESKTOP_API_ID=2040 -D TDESKTOP_API_HASH=b18441a1ff607e10a989891a5462e627 -* Open ***BuildPath*\\tdesktop\\out\\Telegram.sln** in Visual Studio 2022 +* Open ***BuildPath*\\tdesktop\\out\\Telegram.slnx** in Visual Studio 2022 * Select Telegram project and press Build > Build Telegram (Debug and Release configurations) * The result AyuGram.exe will be located in **D:\TBuild\tdesktop\out\Debug** (and **Release**)