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

Remove ban reasons because they are not a thing in IRC anymore (#2650)

Browse source
This commit is contained in:
Mm2PL 2021-04-25 13:44:12 +00:00 committed by GitHub
parent 675f99e9cc
commit 08f2773f30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/messages/MessageBuilder.cpp
View file

@ -148,8 +148,7 @@ MessageBuilder::MessageBuilder(TimeoutMessageTag,
MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &username, MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &username,
const QString &durationInSeconds, const QString &durationInSeconds,
const QString &reason, bool multipleTimes, bool multipleTimes, const QTime &time)
const QTime &time)
: MessageBuilder() : MessageBuilder()
{ {
QString fullText; QString fullText;
@ -178,12 +177,6 @@ MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &username,
text.append("has been permanently banned"); text.append("has been permanently banned");
} }
if (reason.length() > 0)
{
text.append(": \"");
text.append(parseTagString(reason));
text.append("\"");
}
text.append("."); text.append(".");
if (multipleTimes) if (multipleTimes)

3
src/messages/MessageBuilder.hpp
View file

@ -44,8 +44,7 @@ public:
MessageBuilder(TimeoutMessageTag, const QString &systemMessageText, MessageBuilder(TimeoutMessageTag, const QString &systemMessageText,
int times, const QTime &time = QTime::currentTime()); int times, const QTime &time = QTime::currentTime());
MessageBuilder(TimeoutMessageTag, const QString &username, MessageBuilder(TimeoutMessageTag, const QString &username,
const QString &durationInSeconds, const QString &reason, const QString &durationInSeconds, bool multipleTimes,
bool multipleTimes,
const QTime &time = QTime::currentTime()); const QTime &time = QTime::currentTime());
MessageBuilder(const BanAction &action, uint32_t count = 1); MessageBuilder(const BanAction &action, uint32_t count = 1);
MessageBuilder(const UnbanAction &action); MessageBuilder(const UnbanAction &action);

12
src/providers/twitch/IrcMessageHandler.cpp
View file

@ -416,22 +416,16 @@ void IrcMessageHandler::handleClearChatMessage(Communi::IrcMessage *message)
// get username, duration and message of the timed out user // get username, duration and message of the timed out user
QString username = message->parameter(1); QString username = message->parameter(1);
QString durationInSeconds, reason; QString durationInSeconds;
QVariant v = message->tag("ban-duration"); QVariant v = message->tag("ban-duration");
if (v.isValid()) if (v.isValid())
{ {
durationInSeconds = v.toString(); durationInSeconds = v.toString();
} }
v = message->tag("ban-reason");
if (v.isValid())
{
reason = v.toString();
}
auto timeoutMsg = auto timeoutMsg =
MessageBuilder(timeoutMessage, username, durationInSeconds, reason, MessageBuilder(timeoutMessage, username, durationInSeconds, false,
false, calculateMessageTimestamp(message)) calculateMessageTimestamp(message))
.release(); .release();
chan->addOrReplaceTimeout(timeoutMsg); chan->addOrReplaceTimeout(timeoutMsg);