diff --git a/Telegram/SourceFiles/ayu/features/forward/ayu_forward.cpp b/Telegram/SourceFiles/ayu/features/forward/ayu_forward.cpp index aad3e5d0a2..f543510d30 100644 --- a/Telegram/SourceFiles/ayu/features/forward/ayu_forward.cpp +++ b/Telegram/SourceFiles/ayu/features/forward/ayu_forward.cpp @@ -224,7 +224,7 @@ bool isAyuForwardNeeded(const std::vector> &items) { } bool isAyuForwardNeeded(not_null item) { - if (item->isDeleted() || item->isAyuNoForwards() || item->unsupportedTTL() || item->media() && item->media()->ttlSeconds()) { + if (item->isDeleted() || item->isAyuNoForwards() || item->unsupportedTTL() || (item->media() && item->media()->ttlSeconds())) { return true; } return false; diff --git a/Telegram/SourceFiles/ayu/utils/rc_manager.h b/Telegram/SourceFiles/ayu/utils/rc_manager.h index 1e590748d6..a19458ded5 100644 --- a/Telegram/SourceFiles/ayu/utils/rc_manager.h +++ b/Telegram/SourceFiles/ayu/utils/rc_manager.h @@ -100,8 +100,8 @@ private: std::unordered_map _customBadges = {}; QString _donateUsername = QString("@ayugramOwner"); - QString _donateAmountUsd = QString("4.50"); - QString _donateAmountTon = QString("3.25"); + QString _donateAmountUsd = QString("4.60"); + QString _donateAmountTon = QString("3.50"); QString _donateAmountRub = QString("360"); QTimer* _timer = nullptr; diff --git a/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp b/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp index 92d71f7119..1afa5f7a7c 100644 --- a/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp +++ b/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp @@ -1077,7 +1077,7 @@ TextWithEntities reverseLocalPremiumEmoji(const TextWithEntities &text, not_null auto result = text; for (auto &entity : result.entities) { if (entity.type() == EntityType::CustomEmoji && entity.isLocal()) { - if (isForQuote || !history->peer->isSelf() && !(history->owner().session().user()->flags() & UserDataFlag::Premium) && !emojiAllowed(entity)) { + if (isForQuote || (!history->peer->isSelf() && !(history->owner().session().user()->flags() & UserDataFlag::Premium) && !emojiAllowed(entity))) { entity = EntityInText( EntityType::CustomUrl, entity.offset(), diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp index 3f71f50473..dbe4e52d3c 100644 --- a/Telegram/SourceFiles/data/data_stories.cpp +++ b/Telegram/SourceFiles/data/data_stories.cpp @@ -2312,7 +2312,7 @@ bool Stories::isQuitPrevent() { } const auto &ghost = AyuSettings::ghost(&_owner->session()); - if (!ghost.sendReadStories() || _markReadRequests.empty() && _incrementViewsRequests.empty()) { + if (!ghost.sendReadStories() || (_markReadRequests.empty() && _incrementViewsRequests.empty())) { return false; } LOG(("Stories prevents quit, marking as read...")); diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp index a76adea3d7..1afca0d829 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp @@ -3390,7 +3390,7 @@ void ComposeControls::updateControlsGeometry(QSize size) { - (commentsShown ? (_commentsShown->width() + _st.commentsSkip) : 0) - - ((_attachToggle && settings.showAttachButtonInMessageField() || _sendAs) ? _st.padding.left() : _st.fieldLeft) + - (((_attachToggle && settings.showAttachButtonInMessageField()) || _sendAs) ? _st.padding.left() : _st.fieldLeft) - (_attachToggle && settings.showAttachButtonInMessageField() ? _attachToggle->width() : 0) - (_sendAs ? _sendAs->width() : 0) - _st.padding.right() diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp index e2902bfb5e..52d80034e6 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp @@ -409,16 +409,13 @@ void GroupedMedia::draw(Painter &p, const PaintContext &context) const { auto fullRect = QRect(); const auto subpartHighlight = IsSubGroupSelection(highlight); - auto allDeleted = true; auto anyDeleted = false; - const auto &ayuSettings = AyuSettings::getInstance(); - const auto perItemOpacityEnabled = ayuSettings.semiTransparentDeletedMessages(); + const auto &settings = AyuSettings::getInstance(); + const auto perItemOpacityEnabled = settings.semiTransparentDeletedMessages(); if (perItemOpacityEnabled) { for (const auto &part : _parts) { if (part.item->isDeleted()) { anyDeleted = true; - } else { - allDeleted = false; } } }