From 3c1d2646898116cceefb7d66fb44499a10ca570b Mon Sep 17 00:00:00 2001
From: apa420 <erikh.boom@gmail.com>
Date: Sun, 28 Apr 2019 02:25:05 +0200
Subject: [PATCH] Added trashcan, replaced messageID var with
 this-message().id, removed pubsub stuff that didn't belong

---
 resources/buttons/trashCan.png                   | Bin 0 -> 3087 bytes
 resources/resources_autogenerated.qrc            |   1 +
 src/autogenerated/ResourcesAutogen.cpp           |   1 +
 src/autogenerated/ResourcesAutogen.hpp           |   1 +
 src/common/Channel.cpp                           |   8 +-------
 .../moderationactions/ModerationAction.cpp       |   2 +-
 src/providers/twitch/PubsubClient.cpp            |   3 ---
 src/providers/twitch/TwitchMessageBuilder.cpp    |   5 ++---
 src/providers/twitch/TwitchMessageBuilder.hpp    |   7 ++++---
 src/widgets/settingspages/ModerationPage.cpp     |   3 ++-
 10 files changed, 13 insertions(+), 18 deletions(-)
 create mode 100644 resources/buttons/trashCan.png

diff --git a/resources/buttons/trashCan.png b/resources/buttons/trashCan.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5e11bf4969ebe501019b7be6bb691bc5d967cd4
GIT binary patch
literal 3087
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
AivR!s

literal 0
HcmV?d00001

diff --git a/resources/resources_autogenerated.qrc b/resources/resources_autogenerated.qrc
index fcf0b5dac..4c15a6a82 100644
--- a/resources/resources_autogenerated.qrc
+++ b/resources/resources_autogenerated.qrc
@@ -24,6 +24,7 @@
     <file>buttons/modModeEnabled.png</file>
     <file>buttons/modModeEnabled2.png</file>
     <file>buttons/timeout.png</file>
+    <file>buttons/trashCan.png</file>
     <file>buttons/unban.png</file>
     <file>buttons/unmod.png</file>
     <file>buttons/update.png</file>
diff --git a/src/autogenerated/ResourcesAutogen.cpp b/src/autogenerated/ResourcesAutogen.cpp
index 34cf039ef..59f5fce70 100644
--- a/src/autogenerated/ResourcesAutogen.cpp
+++ b/src/autogenerated/ResourcesAutogen.cpp
@@ -18,6 +18,7 @@ Resources2::Resources2()
     this->buttons.modModeEnabled = QPixmap(":/buttons/modModeEnabled.png");
     this->buttons.modModeEnabled2 = QPixmap(":/buttons/modModeEnabled2.png");
     this->buttons.timeout = QPixmap(":/buttons/timeout.png");
+    this->buttons.trashCan = QPixmap(":/buttons/trashCan.png");
     this->buttons.unban = QPixmap(":/buttons/unban.png");
     this->buttons.unmod = QPixmap(":/buttons/unmod.png");
     this->buttons.update = QPixmap(":/buttons/update.png");
diff --git a/src/autogenerated/ResourcesAutogen.hpp b/src/autogenerated/ResourcesAutogen.hpp
index fbbb2fbf3..1c8a0bce4 100644
--- a/src/autogenerated/ResourcesAutogen.hpp
+++ b/src/autogenerated/ResourcesAutogen.hpp
@@ -24,6 +24,7 @@ public:
         QPixmap modModeEnabled;
         QPixmap modModeEnabled2;
         QPixmap timeout;
+        QPixmap trashCan;
         QPixmap unban;
         QPixmap unmod;
         QPixmap update;
diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index 82432db44..caa432752 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -217,18 +217,12 @@ void Channel::deleteMessage(QString messageID)
     LimitedQueueSnapshot<MessagePtr> snapshot = this->getMessageSnapshot();
     int snapshotLength = snapshot.size();
 
-    int end = std::max(0, snapshotLength - 20);
+    int end = std::max(0, snapshotLength - 200);
 
-    QTime minimumTime = QTime::currentTime().addSecs(-5);
     for (int i = snapshotLength - 1; i >= end; --i)
     {
         auto &s = snapshot[i];
 
-        if (s->parseTime < minimumTime)
-        {
-            break;
-        }
-
         if (s->id == messageID)
         {
             s->flags.set(MessageFlag::Disabled);
diff --git a/src/controllers/moderationactions/ModerationAction.cpp b/src/controllers/moderationactions/ModerationAction.cpp
index 8683f2c4e..199ea5521 100644
--- a/src/controllers/moderationactions/ModerationAction.cpp
+++ b/src/controllers/moderationactions/ModerationAction.cpp
@@ -75,7 +75,7 @@ ModerationAction::ModerationAction(const QString &action)
     }
     else if (action.startsWith("/delete"))
     {
-        this->image_ = Image::fromPixmap(getApp()->resources->pajaDank);
+        this->image_ = Image::fromPixmap(getApp()->resources->buttons.trashCan);
     }
     else
     {
diff --git a/src/providers/twitch/PubsubClient.cpp b/src/providers/twitch/PubsubClient.cpp
index 5108c5ad4..0a8976618 100644
--- a/src/providers/twitch/PubsubClient.cpp
+++ b/src/providers/twitch/PubsubClient.cpp
@@ -710,9 +710,6 @@ PubSub::PubSub()
             // qDebug() << QString::fromStdString(rj::stringify(data));
         };
 
-    this->moderationActionHandlers["delete"] =
-        [this](const auto &data, const auto &roomID) { qDebug() << "xd"; };
-
     this->websocketClient.set_access_channels(websocketpp::log::alevel::all);
     this->websocketClient.clear_access_channels(
         websocketpp::log::alevel::frame_payload);
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 6073e6449..b935a2831 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -580,9 +580,8 @@ void TwitchMessageBuilder::parseMessageID()
 
     if (iterator != this->tags.end())
     {
-        this->messageID = iterator.value().toString();
+        this->message().id = iterator.value().toString();
     }
-    this->message().id = this->messageID;
 }
 
 void TwitchMessageBuilder::parseRoomID()
@@ -608,7 +607,7 @@ void TwitchMessageBuilder::parseRoomID()
 void TwitchMessageBuilder::appendChannelName()
 {
     QString channelName("#" + this->channel->getName());
-    Link link(Link::Url, this->channel->getName() + "\n" + this->messageID);
+    Link link(Link::Url, this->channel->getName() + "\n" + this->message().id);
 
     this->emplace<TextElement>(channelName, MessageElementFlag::ChannelName,
                                MessageColor::System)  //
diff --git a/src/providers/twitch/TwitchMessageBuilder.hpp b/src/providers/twitch/TwitchMessageBuilder.hpp
index 5aa72b204..da7b3865c 100644
--- a/src/providers/twitch/TwitchMessageBuilder.hpp
+++ b/src/providers/twitch/TwitchMessageBuilder.hpp
@@ -41,7 +41,6 @@ public:
     MessageParseArgs args;
     const QVariantMap tags;
 
-    QString messageID;
     QString userName;
 
     bool isIgnored() const;
@@ -55,8 +54,10 @@ private:
     void appendUsername();
     void parseHighlights(bool isPastMsg);
 
-    void appendTwitchEmote(const QString &emote,
-        std::vector<std::tuple<int, EmotePtr, EmoteName>> &vec, std::vector<int> &correctPositions);
+    void appendTwitchEmote(
+        const QString &emote,
+        std::vector<std::tuple<int, EmotePtr, EmoteName>> &vec,
+        std::vector<int> &correctPositions);
     Outcome tryAppendEmote(const EmoteName &name);
 
     void addWords(
diff --git a/src/widgets/settingspages/ModerationPage.cpp b/src/widgets/settingspages/ModerationPage.cpp
index 3349d2e93..b44e73274 100644
--- a/src/widgets/settingspages/ModerationPage.cpp
+++ b/src/widgets/settingspages/ModerationPage.cpp
@@ -161,7 +161,8 @@ ModerationPage::ModerationPage()
         // clang-format off
         auto label = modMode.emplace<QLabel>(
             "Moderation mode is enabled by clicking <img width='18' height='18' src=':/buttons/modModeDisabled.png'> in a channel that you moderate.<br><br>"
-            "Moderation buttons can be bound to chat commands such as \"/ban {user}\", \"/timeout {user} 1000\", \"/w someusername !report {user} was bad in channel {channel}\" or any other custom text commands.<br>");
+            "Moderation buttons can be bound to chat commands such as \"/ban {user}\", \"/timeout {user} 1000\", \"/w someusername !report {user} was bad in channel {channel}\" or any other custom text commands.<br>"
+            "For deleting messages use /delete {msg-id}.");
         label->setWordWrap(true);
         label->setStyleSheet("color: #bbb");
         // clang-format on