fixed emotes settings a little bit

src/messages/messageelement.cpp

@@ -61,27 +61,40 @@ ImageElement::ImageElement(Image *_image, MessageElement::Flags flags)
 
 void ImageElement::addToContainer(MessageLayoutContainer &container, MessageElement::Flags _flags)
 {
+    if (_flags & this->getFlags()) {
         QSize size(this->image->getWidth() * this->image->getScale() * container.scale,
                    this->image->getHeight() * this->image->getScale() * container.scale);
 
         container.addElement(
             (new ImageLayoutElement(*this, this->image, size))->setLink(this->getLink()));
     }
+}
 
 // EMOTE
 EmoteElement::EmoteElement(const util::EmoteData &_data, MessageElement::Flags flags)
     : MessageElement(flags)
     , data(_data)
+    , textElement(nullptr)
 {
     if (_data.isValid()) {
         this->setTooltip(data.image1x->getTooltip());
+        qDebug() << "valid xDDDDDDDDD" << _data.image1x->getName();
+        this->textElement = new TextElement(_data.image1x->getName(), MessageElement::Misc);
+    }
+}
+
+EmoteElement::~EmoteElement()
+{
+    if (this->textElement != nullptr) {
+        delete this->textElement;
     }
 }
 
 void EmoteElement::addToContainer(MessageLayoutContainer &container, MessageElement::Flags _flags)
 {
+    if (_flags & this->getFlags()) {
+        if (_flags & this->getFlags() & MessageElement::EmoteImages) {
             if (!this->data.isValid()) {
-        qDebug() << "EmoteElement::data is invalid xD";
                 return;
             }
 
@@ -99,7 +112,14 @@ void EmoteElement::addToContainer(MessageLayoutContainer &container, MessageElem
             QSize size((int)(container.scale * _image->getScaledWidth()),
                        (int)(container.scale * _image->getScaledHeight()));
 
-    container.addElement((new ImageLayoutElement(*this, _image, size))->setLink(this->getLink()));
+            container.addElement(
+                (new ImageLayoutElement(*this, _image, size))->setLink(this->getLink()));
+        } else {
+            if (this->textElement != nullptr) {
+                this->textElement->addToContainer(container, MessageElement::Misc);
+            }
+        }
+    }
 }
 
 // TEXT
@@ -117,9 +137,11 @@ TextElement::TextElement(const QString &text, MessageElement::Flags flags,
 
 void TextElement::addToContainer(MessageLayoutContainer &container, MessageElement::Flags _flags)
 {
+    if (_flags & this->getFlags()) {
         QFontMetrics &metrics =
             singletons::FontManager::getInstance().getFontMetrics(this->style, container.scale);
-    singletons::ThemeManager &themeManager = singletons::ThemeManager::ThemeManager::getInstance();
+        singletons::ThemeManager &themeManager =
+            singletons::ThemeManager::ThemeManager::getInstance();
 
         for (Word &word : this->words) {
             auto getTextLayoutElement = [&](QString text, int width, bool trailingSpace) {
@@ -188,6 +210,7 @@ void TextElement::addToContainer(MessageLayoutContainer &container, MessageEleme
             container.breakLine();
         }
     }
+}
 
 // TIMESTAMP
 TimestampElement::TimestampElement()
@@ -211,6 +234,7 @@ TimestampElement::~TimestampElement()
 void TimestampElement::addToContainer(MessageLayoutContainer &container,
                                       MessageElement::Flags _flags)
 {
+    if (_flags & this->getFlags()) {
         if (singletons::SettingManager::getInstance().timestampFormat != this->format) {
             this->format = singletons::SettingManager::getInstance().timestampFormat.getValue();
             delete this->element;
@@ -219,6 +243,7 @@ void TimestampElement::addToContainer(MessageLayoutContainer &container,
 
         this->element->addToContainer(container, _flags);
     }
+}
 
 TextElement *TimestampElement::formatTime(const QTime &time)
 {
@@ -239,8 +264,6 @@ TwitchModerationElement::TwitchModerationElement()
 void TwitchModerationElement::addToContainer(MessageLayoutContainer &container,
                                              MessageElement::Flags _flags)
 {
-    // qDebug() << _flags;
-
     if (_flags & MessageElement::ModeratorTools) {
         QSize size((int)(container.scale * 16), (int)(container.scale * 16));
 

src/messages/messageelement.hpp

@@ -145,20 +145,6 @@ public:
                                 MessageElement::Flags flags) override;
 };
 
-// contains emote data and will pick the emote based on :
-//   a) are images for the emote type enabled
-//   b) which size it wants
-class EmoteElement : public MessageElement
-{
-    const util::EmoteData data;
-
-public:
-    EmoteElement(const util::EmoteData &data, MessageElement::Flags flags);
-
-    virtual void addToContainer(MessageLayoutContainer &container,
-                                MessageElement::Flags flags) override;
-};
-
 // contains a text, it will split it into words
 class TextElement : public MessageElement
 {
@@ -180,6 +166,22 @@ public:
                                 MessageElement::Flags flags) override;
 };
 
+// contains emote data and will pick the emote based on :
+//   a) are images for the emote type enabled
+//   b) which size it wants
+class EmoteElement : public MessageElement
+{
+    const util::EmoteData data;
+    TextElement *textElement;
+
+public:
+    EmoteElement(const util::EmoteData &data, MessageElement::Flags flags);
+    ~EmoteElement();
+
+    virtual void addToContainer(MessageLayoutContainer &container,
+                                MessageElement::Flags flags) override;
+};
+
 // contains a text, formated depending on the preferences
 class TimestampElement : public MessageElement
 {
@@ -208,12 +210,5 @@ public:
     virtual void addToContainer(MessageLayoutContainer &container,
                                 MessageElement::Flags flags) override;
 };
-
-// adds bits as text, static image or animated image
-// class BitsElement : public MessageElement
-//{
-// public:
-//    virtual void addToContainer(LayoutContainer &container) override;
-//};
 }  // namespace messages
 }  // namespace chatterino

src/twitch/twitchmessagebuilder.cpp

@@ -450,36 +450,33 @@ bool TwitchMessageBuilder::tryAppendEmote(QString &emoteString)
     singletons::EmoteManager &emoteManager = singletons::EmoteManager::getInstance();
     util::EmoteData emoteData;
 
+    auto appendEmote = [=](MessageElement::Flags flags) {
+        this->emplace<EmoteElement>(emoteData, flags);
+        return true;
+    };
+
     if (emoteManager.bttvGlobalEmotes.tryGet(emoteString, emoteData)) {
         // BTTV Global Emote
-        return this->appendEmote(emoteData);
+        return appendEmote(MessageElement::BttvEmote);
     } else if (this->twitchChannel != nullptr &&
                this->twitchChannel->bttvChannelEmotes->tryGet(emoteString, emoteData)) {
         // BTTV Channel Emote
-        return this->appendEmote(emoteData);
+        return appendEmote(MessageElement::BttvEmote);
     } else if (emoteManager.ffzGlobalEmotes.tryGet(emoteString, emoteData)) {
         // FFZ Global Emote
-        return this->appendEmote(emoteData);
+        return appendEmote(MessageElement::FfzEmote);
     } else if (this->twitchChannel != nullptr &&
                this->twitchChannel->ffzChannelEmotes->tryGet(emoteString, emoteData)) {
         // FFZ Channel Emote
-        return this->appendEmote(emoteData);
+        return appendEmote(MessageElement::FfzEmote);
     } else if (emoteManager.getChatterinoEmotes().tryGet(emoteString, emoteData)) {
         // Chatterino Emote
-        return this->appendEmote(emoteData);
+        return appendEmote(MessageElement::Misc);
     }
 
     return false;
 }
 
-bool TwitchMessageBuilder::appendEmote(const util::EmoteData &emoteData)
-{
-    this->emplace<EmoteElement>(emoteData, MessageElement::BttvEmote);
-
-    // Perhaps check for ignored emotes here?
-    return true;
-}
-
 // fourtf: this is ugly
 //		   maybe put the individual badges into a map instead of this mess
 void TwitchMessageBuilder::parseTwitchBadges()

src/twitch/twitchmessagebuilder.hpp

@@ -55,7 +55,6 @@ private:
     void appendTwitchEmote(const Communi::IrcPrivateMessage *ircMessage, const QString &emote,
                            std::vector<std::pair<long, util::EmoteData>> &vec);
     bool tryAppendEmote(QString &emoteString);
-    bool appendEmote(const util::EmoteData &emoteData);
 
     void parseTwitchBadges();
     void addChatterinoBadges();