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

Get better timeout messages for self (#1629)

Browse source 
* Don't require mod rights to listen to moderation actions topic

* Format timeout messages directed at you differently

e.g. "You were banned" or "You were timed out for 4h20m", also including
reason if specified.
This commit is contained in:
pajlada 2020-04-13 06:31:06 -04:00 committed by GitHub
parent 2ac0b60952
commit 6f926e7d77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
src/messages/MessageBuilder.cpp
View file

@ -2,6 +2,7 @@
#include "Application.hpp"
#include "common/LinkParser.hpp"
#include "controllers/accounts/AccountController.hpp"
#include "messages/Image.hpp"
#include "messages/Message.hpp"
#include "messages/MessageElement.hpp"
@ -170,9 +171,12 @@ MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &username,
this->message().searchText = text;
}
// XXX: This does not belong in the MessageBuilder, this should be part of the TwitchMessageBuilder
MessageBuilder::MessageBuilder(const BanAction &action, uint32_t count)
: MessageBuilder()
{
auto current = getApp()->accounts->twitch.getCurrent();
this->emplace<TimestampElement>();
this->message().flags.set(MessageFlag::System);
this->message().flags.set(MessageFlag::Timeout);
@ -181,43 +185,74 @@ MessageBuilder::MessageBuilder(const BanAction &action, uint32_t count)
QString text;
if (action.isBan())
if (action.target.id == current->getUserId())
{
if (action.reason.isEmpty())
text.append("You were ");
if (action.isBan())
{
text = QString("%1 banned %2.") //
.arg(action.source.name)
.arg(action.target.name);
text.append("banned");
}
else
{
text = QString("%1 banned %2: \"%3\".") //
.arg(action.source.name)
.arg(action.target.name)
.arg(action.reason);
text.append(
QString("timed out for %1").arg(formatTime(action.duration)));
}
if (!action.source.name.isEmpty())
{
text.append(" by ");
text.append(action.source.name);
}
if (action.reason.isEmpty())
{
text.append(".");
}
else
{
text.append(QString(": \"%1\".").arg(action.reason));
}
}
else
{
if (action.reason.isEmpty())
if (action.isBan())
{
text = QString("%1 timed out %2 for %3.") //
.arg(action.source.name)
.arg(action.target.name)
.arg(formatTime(action.duration));
if (action.reason.isEmpty())
{
text = QString("%1 banned %2.") //
.arg(action.source.name)
.arg(action.target.name);
}
else
{
text = QString("%1 banned %2: \"%3\".") //
.arg(action.source.name)
.arg(action.target.name)
.arg(action.reason);
}
}
else
{
text = QString("%1 timed out %2 for %3: \"%4\".") //
.arg(action.source.name)
.arg(action.target.name)
.arg(formatTime(action.duration))
.arg(action.reason);
}
if (action.reason.isEmpty())
{
text = QString("%1 timed out %2 for %3.") //
.arg(action.source.name)
.arg(action.target.name)
.arg(formatTime(action.duration));
}
else
{
text = QString("%1 timed out %2 for %3: \"%4\".") //
.arg(action.source.name)
.arg(action.target.name)
.arg(formatTime(action.duration))
.arg(action.reason);
}
if (count > 1)
{
text.append(QString(" (%1 times)").arg(count));
if (count > 1)
{
text.append(QString(" (%1 times)").arg(count));
}
}
}

3
src/providers/twitch/TwitchChannel.cpp
View file

@ -600,9 +600,6 @@ void TwitchChannel::loadRecentMessages()
void TwitchChannel::refreshPubsub()
{
// listen to moderation actions
if (!this->hasModRights())
return;
auto roomId = this->roomId();
if (roomId.isEmpty())
return;