this commit is too big

src/controllers/moderationactions/ModerationAction.cpp

@@ -1,5 +1,6 @@
 #include "ModerationAction.hpp"
 
+#include <QRegularExpression>
 #include "Application.hpp"
 #include "singletons/Resources.hpp"
 
@@ -57,7 +58,7 @@ ModerationAction::ModerationAction(const QString &action)
         //     this->_moderationActions.emplace_back(app->resources->buttonTimeout, str);
         // }
     } else if (action.startsWith("/ban ")) {
-        this->image_ = getApp()->resources->buttonBan;
+        this->image_ = Image::fromNonOwningPixmap(&getApp()->resources->buttons.ban);
     } else {
         QString xD = action;
 
@@ -75,10 +76,10 @@ bool ModerationAction::operator==(const ModerationAction &other) const
 
 bool ModerationAction::isImage() const
 {
-    return this->image_ != nullptr;
+    return bool(this->image_);
 }
 
-Image *ModerationAction::getImage() const
+const boost::optional<ImagePtr> &ModerationAction::getImage() const
 {
     return this->image_;
 }

src/controllers/moderationactions/ModerationAction.hpp

@@ -1,14 +1,14 @@
 #pragma once
 
 #include <QString>
+#include <boost/optional.hpp>
 #include <pajlada/settings/serialize.hpp>
 
+#include "messages/Image.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
 namespace chatterino {
 
-class Image;
-
 class ModerationAction
 {
 public:
@@ -17,13 +17,13 @@ public:
     bool operator==(const ModerationAction &other) const;
 
     bool isImage() const;
-    Image *getImage() const;
+    const boost::optional<ImagePtr> &getImage() const;
     const QString &getLine1() const;
     const QString &getLine2() const;
     const QString &getAction() const;
 
 private:
-    Image *image_ = nullptr;
+    boost::optional<ImagePtr> image_;
     QString line1_;
     QString line2_;
     QString action_;

src/controllers/moderationactions/ModerationActions.cpp

@@ -12,7 +12,7 @@ ModerationActions::ModerationActions()
 {
 }
 
-void ModerationActions::initialize(Application &app)
+void ModerationActions::initialize(Settings &settings, Paths &paths)
 {
     assert(!this->initialized_);
     this->initialized_ = true;

src/controllers/moderationactions/ModerationActions.hpp

@@ -8,6 +8,9 @@
 
 namespace chatterino {
 
+class Settings;
+class Paths;
+
 class ModerationActionModel;
 
 class ModerationActions final : public Singleton
@@ -15,7 +18,7 @@ class ModerationActions final : public Singleton
 public:
     ModerationActions();
 
-    virtual void initialize(Application &app) override;
+    virtual void initialize(Settings &settings, Paths &paths) override;
 
     UnsortedSignalVector<ModerationAction> items;