Added continue for readability and removed to hide moderated messages

src/messages/layouts/MessageLayout.cpp

@@ -127,11 +127,12 @@ void MessageLayout::actuallyLayout(int width, MessageElementFlags _flags)
 
     for (const auto &element : this->message_->elements)
     {
-        if (!(getSettings()->removeModerated &&
+        if (getSettings()->hideModerated &&
-              this->message_->flags.has(MessageFlag::Disabled)))
+            this->message_->flags.has(MessageFlag::Disabled))
         {
-            element->addToContainer(*this->container_, _flags);
+            continue;
         }
+        element->addToContainer(*this->container_, _flags);
     }
 
     if (addTest)

src/providers/twitch/IrcMessageHandler.cpp

@@ -203,7 +203,7 @@ void IrcMessageHandler::handleClearChatMessage(Communi::IrcMessage *message)
 
     // refresh all
     app->windows->repaintVisibleChatWidgets(chan.get());
-    if (getSettings()->removeModerated)
+    if (getSettings()->hideModerated)
     {
         app->windows->forceLayoutChannelViews();
     }

src/singletons/Settings.hpp

@@ -41,8 +41,7 @@ public:
     BoolSetting separateMessages = {"/appearance/messages/separateMessages",
                                     false};
     BoolSetting compactEmotes = {"/appearance/messages/compactEmotes", true};
-    BoolSetting removeModerated = {"/appearance/messages/removeModerated",
+    BoolSetting hideModerated = {"/appearance/messages/hideModerated", false};
-                                   false};
 
     //    BoolSetting collapseLongMessages =
     //    {"/appearance/messages/collapseLongMessages", false};

src/widgets/settingspages/GeneralPage.cpp

@@ -210,7 +210,7 @@ void GeneralPage::initLayout(SettingsLayout &layout)
     layout.addCheckbox("Alternate background color", s.alternateMessages);
     // layout.addCheckbox("Mark last message you read");
     // layout.addDropdown("Last read message style", {"Default"});
-    layout.addCheckbox("Remove moderated messages", s.removeModerated);
+    layout.addCheckbox("Hide moderated messages", s.hideModerated);
 
     layout.addTitle("Emotes");
     layout.addDropdown<float>(