diff --git a/Telegram/SourceFiles/ayu/ayu_settings.cpp b/Telegram/SourceFiles/ayu/ayu_settings.cpp index 4541c15a2..c6251e217 100644 --- a/Telegram/SourceFiles/ayu/ayu_settings.cpp +++ b/Telegram/SourceFiles/ayu/ayu_settings.cpp @@ -206,9 +206,9 @@ namespace AyuSettings saveMessagesHistory = val; } - void AyuGramSettings::set_enableAds(bool val) + void AyuGramSettings::set_disableAds(bool val) { - enableAds = val; + disableAds = val; } void AyuGramSettings::set_disableStories(bool val) diff --git a/Telegram/SourceFiles/ayu/ayu_settings.h b/Telegram/SourceFiles/ayu/ayu_settings.h index a773a05b3..39e9d7d93 100644 --- a/Telegram/SourceFiles/ayu/ayu_settings.h +++ b/Telegram/SourceFiles/ayu/ayu_settings.h @@ -34,7 +34,7 @@ namespace AyuSettings saveMessagesHistory = true; // ~ QoL toggles - enableAds = false; + disableAds = true; disableStories = false; copyUsernameAsLink = true; @@ -68,7 +68,7 @@ namespace AyuSettings bool useScheduledMessages; bool saveDeletedMessages; bool saveMessagesHistory; - bool enableAds; + bool disableAds; bool disableStories; bool copyUsernameAsLink; QString deletedMark; @@ -102,7 +102,7 @@ namespace AyuSettings void set_keepMessagesHistory(bool val); - void set_enableAds(bool val); + void set_disableAds(bool val); void set_disableStories(bool val); @@ -138,7 +138,7 @@ namespace AyuSettings useScheduledMessages, saveDeletedMessages, saveMessagesHistory, - enableAds, + disableAds, disableStories, copyUsernameAsLink, deletedMark, diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp index ef3dcf528..5284a08ec 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp @@ -217,14 +217,14 @@ namespace Settings tr::ayu_DisableAds(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(!settings->enableAds) + rpl::single(settings->disableAds) )->toggledValue( ) | rpl::filter([=](bool enabled) { - return (enabled == settings->enableAds); + return (enabled != settings->disableAds); }) | start_with_next([=](bool enabled) { - settings->set_enableAds(!enabled); + settings->set_disableAds(enabled); AyuSettings::save(); }, container->lifetime()); diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp index 8912d8990..1f19c9264 100644 --- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp +++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp @@ -177,8 +177,9 @@ void SponsoredMessages::inject( } bool SponsoredMessages::canHaveFor(not_null history) const { + // AyuGram disableAds auto settings = &AyuSettings::getInstance(); - return settings->enableAds && history->peer->isChannel(); + return !settings->disableAds && history->peer->isChannel(); } void SponsoredMessages::request(not_null history, Fn done) {