noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed automod and unban messages showing when moderation actions were disabled (#3548)

Browse source
This commit is contained in:
Mm2PL 2022-01-28 22:30:32 +00:00 committed by GitHub
parent e2eb73d817
commit ddbeb356a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -93,6 +93,7 @@
- Bugfix: Fixed being unable to open a usercard from inside a usercard while "Automatically close user popup when it loses focus" was enabled. (#3518) - Bugfix: Fixed being unable to open a usercard from inside a usercard while "Automatically close user popup when it loses focus" was enabled. (#3518)
- Bugfix: Usercards no longer close when the originating window (e.g. a search popup) is closed. (#3518) - Bugfix: Usercards no longer close when the originating window (e.g. a search popup) is closed. (#3518)
- Bugfix: Disabled /popout and /streamlink from working in non-twitch channels (e.g. /whispers) when supplied no arguments. (#3541) - Bugfix: Disabled /popout and /streamlink from working in non-twitch channels (e.g. /whispers) when supplied no arguments. (#3541)
- Bugfix: Fixed automod and unban messages showing when moderation actions were disabled (#3548)
- Dev: Batch checking live status for channels with live notifications that aren't connected. (#3442) - Dev: Batch checking live status for channels with live notifications that aren't connected. (#3442)
- Dev: Add GitHub action to test builds without precompiled headers enabled. (#3327) - Dev: Add GitHub action to test builds without precompiled headers enabled. (#3327)
- Dev: Renamed CMake's build option `USE_SYSTEM_QT5KEYCHAIN` to `USE_SYSTEM_QTKEYCHAIN`. (#3103) - Dev: Renamed CMake's build option `USE_SYSTEM_QT5KEYCHAIN` to `USE_SYSTEM_QTKEYCHAIN`. (#3103)

6
src/messages/MessageBuilder.cpp
View file

@ -98,6 +98,8 @@ std::pair<MessagePtr, MessagePtr> makeAutomodMessage(
// Builder for AutoMod message with explanation // Builder for AutoMod message with explanation
builder.message().loginName = "automod"; builder.message().loginName = "automod";
builder.message().flags.set(MessageFlag::PubSub); builder.message().flags.set(MessageFlag::PubSub);
builder.message().flags.set(MessageFlag::Timeout);
builder.message().flags.set(MessageFlag::AutoMod);
// AutoMod shield badge // AutoMod shield badge
builder.emplace<BadgeElement>(makeAutoModBadge(), builder.emplace<BadgeElement>(makeAutoModBadge(),
@ -129,7 +131,6 @@ std::pair<MessagePtr, MessagePtr> makeAutomodMessage(
// ID of message caught by AutoMod // ID of message caught by AutoMod
// builder.emplace<TextElement>(action.msgID, MessageElementFlag::Text, // builder.emplace<TextElement>(action.msgID, MessageElementFlag::Text,
// MessageColor::Text); // MessageColor::Text);
builder.message().flags.set(MessageFlag::AutoMod);
auto text1 = auto text1 =
QString("AutoMod: Held a message for reason: %1. Allow will post " QString("AutoMod: Held a message for reason: %1. Allow will post "
"it in chat. Allow Deny") "it in chat. Allow Deny")
@ -145,6 +146,8 @@ std::pair<MessagePtr, MessagePtr> makeAutomodMessage(
builder2.emplace<TwitchModerationElement>(); builder2.emplace<TwitchModerationElement>();
builder2.message().loginName = action.target.login; builder2.message().loginName = action.target.login;
builder2.message().flags.set(MessageFlag::PubSub); builder2.message().flags.set(MessageFlag::PubSub);
builder2.message().flags.set(MessageFlag::Timeout);
builder2.message().flags.set(MessageFlag::AutoMod);
// sender username // sender username
builder2 builder2
@ -160,7 +163,6 @@ std::pair<MessagePtr, MessagePtr> makeAutomodMessage(
// sender's message caught by AutoMod // sender's message caught by AutoMod
builder2.emplace<TextElement>(action.message, MessageElementFlag::Text, builder2.emplace<TextElement>(action.message, MessageElementFlag::Text,
MessageColor::Text); MessageColor::Text);
builder2.message().flags.set(MessageFlag::AutoMod);
auto text2 = auto text2 =
QString("%1: %2").arg(action.target.displayName, action.message); QString("%1: %2").arg(action.target.displayName, action.message);
builder2.message().messageText = text2; builder2.message().messageText = text2;

3
src/messages/layouts/MessageLayout.cpp
View file

@ -135,7 +135,8 @@ void MessageLayout::actuallyLayout(int width, MessageElementFlags flags)
} }
if (getSettings()->hideModerationActions && if (getSettings()->hideModerationActions &&
this->message_->flags.has(MessageFlag::Timeout)) (this->message_->flags.has(MessageFlag::Timeout) ||
this->message_->flags.has(MessageFlag::Untimeout)))
{ {
continue; continue;
} }