diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp index 43abc5c27..4123ceb28 100644 --- a/src/messages/MessageBuilder.cpp +++ b/src/messages/MessageBuilder.cpp @@ -148,8 +148,7 @@ MessageBuilder::MessageBuilder(TimeoutMessageTag, MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &username, const QString &durationInSeconds, - const QString &reason, bool multipleTimes, - const QTime &time) + bool multipleTimes, const QTime &time) : MessageBuilder() { QString fullText; @@ -178,12 +177,6 @@ MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &username, text.append("has been permanently banned"); } - if (reason.length() > 0) - { - text.append(": \""); - text.append(parseTagString(reason)); - text.append("\""); - } text.append("."); if (multipleTimes) diff --git a/src/messages/MessageBuilder.hpp b/src/messages/MessageBuilder.hpp index 8a9468f0d..e7a5d453d 100644 --- a/src/messages/MessageBuilder.hpp +++ b/src/messages/MessageBuilder.hpp @@ -44,8 +44,7 @@ public: MessageBuilder(TimeoutMessageTag, const QString &systemMessageText, int times, const QTime &time = QTime::currentTime()); MessageBuilder(TimeoutMessageTag, const QString &username, - const QString &durationInSeconds, const QString &reason, - bool multipleTimes, + const QString &durationInSeconds, bool multipleTimes, const QTime &time = QTime::currentTime()); MessageBuilder(const BanAction &action, uint32_t count = 1); MessageBuilder(const UnbanAction &action); diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp index 3e794202e..884a4ec92 100644 --- a/src/providers/twitch/IrcMessageHandler.cpp +++ b/src/providers/twitch/IrcMessageHandler.cpp @@ -416,22 +416,16 @@ void IrcMessageHandler::handleClearChatMessage(Communi::IrcMessage *message) // get username, duration and message of the timed out user QString username = message->parameter(1); - QString durationInSeconds, reason; + QString durationInSeconds; QVariant v = message->tag("ban-duration"); if (v.isValid()) { durationInSeconds = v.toString(); } - v = message->tag("ban-reason"); - if (v.isValid()) - { - reason = v.toString(); - } - auto timeoutMsg = - MessageBuilder(timeoutMessage, username, durationInSeconds, reason, - false, calculateMessageTimestamp(message)) + MessageBuilder(timeoutMessage, username, durationInSeconds, false, + calculateMessageTimestamp(message)) .release(); chan->addOrReplaceTimeout(timeoutMsg);