simplified message.cpp

src/messages/message.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "messages/messageelement.hpp"
+#include "util/flagsenum.h"
 #include "widgets/helper/scrollbarhighlight.hpp"
 
 #include <cinttypes>
@@ -11,15 +12,8 @@
 
 namespace chatterino {
 namespace messages {
-class Message;
-
-typedef std::shared_ptr<Message> MessagePtr;
-typedef uint16_t MessageFlagsType;
-
-class Message
-{
-public:
-    enum MessageFlags : MessageFlagsType {
+struct Message {
+    enum MessageFlags : uint16_t {
         None = 0,
         System = (1 << 0),
         Timeout = (1 << 1),
@@ -32,60 +26,33 @@ public:
         DisconnectedMessage = (1 << 8),
     };
 
-    // Elements
+    util::FlagsEnum<MessageFlags> flags;
+    QTime parseTime;
+    QString id;
+    QString searchText;
+    QString loginName;
+    QString displayName;
+    QString localizedName;
+    QString timeoutUser;
+
     // Messages should not be added after the message is done initializing.
     void addElement(MessageElement *element);
     const std::vector<std::unique_ptr<MessageElement>> &getElements() const;
 
-    // Message flags
-    MessageFlags getFlags() const;
-    bool hasFlags(MessageFlags flags) const;
-    //    void setFlags(MessageFlags flags);
-    void addFlags(MessageFlags flags);
-    void removeFlags(MessageFlags flags);
-
-    // Parse Time
-    const QTime &getParseTime() const;
-
-    // Id
-    const QString &getId() const;
-    void setId(const QString &id);
-
-    // Searching
-    const QString &getSearchText() const;
-    void setSearchText(const QString &value);
-
     // Scrollbar
     widgets::ScrollbarHighlight getScrollBarHighlight() const;
 
-    // Usernames
-    QString loginName;
-    QString displayName;
-    QString localizedName;
-
-    // Timeouts
-    const QString &getTimeoutUser(const QString &value) const;
-    void setTimeoutUser();
-
-    // Static
-    static MessagePtr createSystemMessage(const QString &text);
-
-    static MessagePtr createTimeoutMessage(const QString &username,
-                                           const QString &durationInSeconds, const QString &reason,
-                                           bool multipleTimes);
-
 private:
-    static QRegularExpression *cheerRegex;
-
-    MessageFlags flags = MessageFlags::None;
-    QString timeoutUser;
-    bool collapsedDefault = false;
-    QTime parseTime;
-    mutable QString searchText;
-    QString id = "";
-
     std::vector<std::unique_ptr<MessageElement>> elements;
+
+public:
+    static std::shared_ptr<Message> createSystemMessage(const QString &text);
+
+    static std::shared_ptr<Message> createTimeoutMessage(const QString &username,
+                                                         const QString &durationInSeconds,
+                                                         const QString &reason, bool multipleTimes);
 };
 
+typedef std::shared_ptr<Message> MessagePtr;
 }  // namespace messages
 }  // namespace chatterino