From 834b1f3c53a0126330cc59a39358176a446a03e8 Mon Sep 17 00:00:00 2001
From: apa420 <17131426+apa420@users.noreply.github.com>
Date: Fri, 10 May 2019 23:16:34 +0200
Subject: [PATCH] Option to hide system moderation messages (#1066)

---
 src/messages/layouts/MessageLayout.cpp    | 7 +++++++
 src/singletons/Settings.hpp               | 1 +
 src/widgets/settingspages/GeneralPage.cpp | 1 +
 3 files changed, 9 insertions(+)

diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp
index 5bafe8c1..831b0413 100644
--- a/src/messages/layouts/MessageLayout.cpp
+++ b/src/messages/layouts/MessageLayout.cpp
@@ -121,6 +121,13 @@ void MessageLayout::actuallyLayout(int width, MessageElementFlags flags)
         {
             continue;
         }
+
+        if (getSettings()->hideModerationActions &&
+                this->message_->flags.has(MessageFlag::Timeout))
+        {
+            continue;
+        }
+
         element->addToContainer(*this->container_, flags);
     }
 
diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index eef7a96f..79cecb03 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -39,6 +39,7 @@ public:
                                     false};
     BoolSetting compactEmotes = {"/appearance/messages/compactEmotes", true};
     BoolSetting hideModerated = {"/appearance/messages/hideModerated", false};
+    BoolSetting hideModerationActions = {"/appearance/messages/hideModerationActions", false};
 
     //    BoolSetting collapseLongMessages =
     //    {"/appearance/messages/collapseLongMessages", false};
diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
index 8e448479..76e0deae 100644
--- a/src/widgets/settingspages/GeneralPage.cpp
+++ b/src/widgets/settingspages/GeneralPage.cpp
@@ -214,6 +214,7 @@ void GeneralPage::initLayout(SettingsLayout &layout)
     // layout.addCheckbox("Mark last message you read");
     // layout.addDropdown("Last read message style", {"Default"});
     layout.addCheckbox("Hide moderated messages", s.hideModerated);
+    layout.addCheckbox("Hide moderation messages", s.hideModerationActions);
 
     layout.addTitle("Emotes");
     layout.addDropdown<float>(