Added support for Twitch's Chat Replies

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unversioned
 
+- Major: Added message reply threads. (#3722)
 - Minor: Added `is:first-msg` search option. (#3700)
 - Minor: Added quotation marks in the permitted/blocked Automod messages for clarity. (#3654)
 - Minor: Adjust large stream thumbnail to 16:9 (#3655)

chatterino.pro

@@ -186,6 +186,7 @@ SOURCES += \
     src/messages/MessageColor.cpp \
     src/messages/MessageContainer.cpp \
     src/messages/MessageElement.cpp \
+    src/messages/MessageThread.cpp \
     src/messages/search/AuthorPredicate.cpp \
     src/messages/search/ChannelPredicate.cpp \
     src/messages/search/LinkPredicate.cpp \
@@ -284,6 +285,7 @@ SOURCES += \
     src/widgets/dialogs/LoginDialog.cpp \
     src/widgets/dialogs/NotificationPopup.cpp \
     src/widgets/dialogs/QualityPopup.cpp \
+    src/widgets/dialogs/ReplyThreadPopup.cpp \
     src/widgets/dialogs/SelectChannelDialog.cpp \
     src/widgets/dialogs/SelectChannelFiltersDialog.cpp \
     src/widgets/dialogs/SettingsDialog.cpp \
@@ -336,6 +338,7 @@ SOURCES += \
     src/widgets/splits/ClosedSplits.cpp \
     src/widgets/splits/InputCompletionItem.cpp \
     src/widgets/splits/InputCompletionPopup.cpp \
+    src/widgets/splits/ReplyInput.cpp \
     src/widgets/splits/Split.cpp \
     src/widgets/splits/SplitContainer.cpp \
     src/widgets/splits/SplitHeader.cpp \
@@ -436,6 +439,7 @@ HEADERS += \
     src/messages/MessageContainer.hpp \
     src/messages/MessageElement.hpp \
     src/messages/MessageParseArgs.hpp \
+    src/messages/MessageThread.hpp \
     src/messages/search/AuthorPredicate.hpp \
     src/messages/search/ChannelPredicate.hpp \
     src/messages/search/LinkPredicate.hpp \
@@ -565,6 +569,7 @@ HEADERS += \
     src/widgets/dialogs/LoginDialog.hpp \
     src/widgets/dialogs/NotificationPopup.hpp \
     src/widgets/dialogs/QualityPopup.hpp \
+    src/widgets/dialogs/ReplyThreadPopup.hpp \
     src/widgets/dialogs/SelectChannelDialog.hpp \
     src/widgets/dialogs/SelectChannelFiltersDialog.hpp \
     src/widgets/dialogs/SettingsDialog.hpp \
@@ -620,6 +625,7 @@ HEADERS += \
     src/widgets/splits/ClosedSplits.hpp \
     src/widgets/splits/InputCompletionItem.hpp \
     src/widgets/splits/InputCompletionPopup.hpp \
+    src/widgets/splits/ReplyInput.hpp \
     src/widgets/splits/Split.hpp \
     src/widgets/splits/SplitContainer.hpp \
     src/widgets/splits/SplitHeader.hpp \

resources/resources_autogenerated.qrc

@@ -33,6 +33,8 @@
     <file>buttons/modModeDisabled2.png</file>
     <file>buttons/modModeEnabled.png</file>
     <file>buttons/modModeEnabled2.png</file>
+    <file>buttons/replyDark.png</file>
+    <file>buttons/replyThreadDark.png</file>
     <file>buttons/search.png</file>
     <file>buttons/timeout.png</file>
     <file>buttons/trashCan.png</file>
@@ -114,4 +116,4 @@
     <file>twitch/verified.png</file>
     <file>twitch/vip.png</file>
   </qresource>
-</RCC>
+</RCC>

src/CMakeLists.txt

@@ -142,6 +142,8 @@ set(SOURCE_FILES
         messages/MessageContainer.hpp
         messages/MessageElement.cpp
         messages/MessageElement.hpp
+        messages/MessageThread.cpp
+        messages/MessageThread.hpp
 
         messages/SharedMessageBuilder.cpp
         messages/SharedMessageBuilder.hpp
@@ -379,6 +381,8 @@ set(SOURCE_FILES
         widgets/dialogs/NotificationPopup.hpp
         widgets/dialogs/QualityPopup.cpp
         widgets/dialogs/QualityPopup.hpp
+        widgets/dialogs/ReplyThreadPopup.cpp
+        widgets/dialogs/ReplyThreadPopup.hpp
         widgets/dialogs/SelectChannelDialog.cpp
         widgets/dialogs/SelectChannelDialog.hpp
         widgets/dialogs/SelectChannelFiltersDialog.cpp
@@ -479,6 +483,8 @@ set(SOURCE_FILES
         widgets/splits/InputCompletionItem.hpp
         widgets/splits/InputCompletionPopup.cpp
         widgets/splits/InputCompletionPopup.hpp
+        widgets/splits/ReplyInput.cpp
+        widgets/splits/ReplyInput.hpp
         widgets/splits/Split.cpp
         widgets/splits/Split.hpp
         widgets/splits/SplitContainer.cpp
@@ -707,4 +713,3 @@ if (LIBRT)
         ${LIBRT}
         )
 endif ()
-

src/autogenerated/ResourcesAutogen.cpp

@@ -31,6 +31,8 @@ Resources2::Resources2()
     this->buttons.modModeDisabled2 = QPixmap(":/buttons/modModeDisabled2.png");
     this->buttons.modModeEnabled = QPixmap(":/buttons/modModeEnabled.png");
     this->buttons.modModeEnabled2 = QPixmap(":/buttons/modModeEnabled2.png");
+    this->buttons.replyDark = QPixmap(":/buttons/replyDark.png");
+    this->buttons.replyThreadDark = QPixmap(":/buttons/replyThreadDark.png");
     this->buttons.search = QPixmap(":/buttons/search.png");
     this->buttons.timeout = QPixmap(":/buttons/timeout.png");
     this->buttons.trashCan = QPixmap(":/buttons/trashCan.png");
@@ -69,4 +71,4 @@ Resources2::Resources2()
     this->twitch.vip = QPixmap(":/twitch/vip.png");
 }
 
-}  // namespace chatterino
+}  // namespace chatterino

src/autogenerated/ResourcesAutogen.hpp

@@ -38,6 +38,8 @@ class Resources2 : public Singleton
         QPixmap modModeDisabled2;
         QPixmap modModeEnabled;
         QPixmap modModeEnabled2;
+        QPixmap replyDark;
+        QPixmap replyThreadDark;
         QPixmap search;
         QPixmap timeout;
         QPixmap trashCan;
@@ -85,4 +87,4 @@ class Resources2 : public Singleton
     } twitch;
 };
 
-}  // namespace chatterino
+}  // namespace chatterino

src/common/Channel.hpp

@@ -49,6 +49,9 @@ class Channel : public std::enable_shared_from_this<Channel>
     // SIGNALS
     pajlada::Signals::Signal<const QString &, const QString &, bool &>
         sendMessageSignal;
+    pajlada::Signals::Signal<const QString &, const QString &, const QString &,
+                             bool &>
+        sendReplySignal;
     pajlada::Signals::Signal<MessagePtr &> messageRemovedFromStart;
     pajlada::Signals::Signal<MessagePtr &, boost::optional<MessageFlags>>
         messageAppended;

src/controllers/commands/CommandController.cpp

@@ -516,7 +516,8 @@ void CommandController::initialize(Settings &, Paths &paths)
 
         auto *userPopup = new UserInfoPopup(
             getSettings()->autoCloseUserPopup,
-            static_cast<QWidget *>(&(getApp()->windows->getMainWindow())));
+            static_cast<QWidget *>(&(getApp()->windows->getMainWindow())),
+            nullptr);
         userPopup->setData(userName, channel);
         userPopup->move(QCursor::pos());
         userPopup->show();

src/controllers/filters/parser/FilterParser.cpp

@@ -82,6 +82,7 @@ ContextMap buildContextMap(const MessagePtr &m, chatterino::Channel *channel)
          m->flags.has(MessageFlag::RedeemedChannelPointReward)},
         {"flags.first_message", m->flags.has(MessageFlag::FirstMessage)},
         {"flags.whisper", m->flags.has(MessageFlag::Whisper)},
+        {"flags.reply", m->flags.has(MessageFlag::ReplyMessage)},
 
         {"message.content", m->messageText},
         {"message.length", m->messageText.length()},

src/controllers/filters/parser/Tokenizer.hpp

@@ -25,6 +25,7 @@ static const QMap<QString, QString> validIdentifiersMap = {
     {"flags.reward_message", "channel point reward message?"},
     {"flags.first_message", "first message?"},
     {"flags.whisper", "whisper message?"},
+    {"flags.reply", "reply message?"},
     {"message.content", "message text"},
     {"message.length", "message length"}};
 

src/messages/Link.hpp

@@ -23,6 +23,8 @@ struct Link {
         JumpToChannel,
         Reconnect,
         CopyToClipboard,
+        ReplyToMessage,
+        ViewThread
     };
 
     Link();

src/messages/Message.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "common/FlagsEnum.hpp"
+#include "messages/MessageThread.hpp"
 #include "providers/twitch/TwitchBadge.hpp"
 #include "widgets/helper/ScrollbarHighlight.hpp"
 
@@ -12,6 +13,7 @@
 
 namespace chatterino {
 class MessageElement;
+class MessageThread;
 
 enum class MessageFlag : uint32_t {
     None = 0,
@@ -39,6 +41,7 @@ enum class MessageFlag : uint32_t {
     RedeemedChannelPointReward = (1 << 21),
     ShowInMentions = (1 << 22),
     FirstMessage = (1 << 23),
+    ReplyMessage = (1 << 24),
 };
 using MessageFlags = FlagsEnum<MessageFlag>;
 
@@ -66,6 +69,10 @@ struct Message : boost::noncopyable {
     std::vector<Badge> badges;
     std::map<QString, QString> badgeInfos;
     std::shared_ptr<QColor> highlightColor;
+    // Each reply holds a reference to the thread. When every reply is dropped,
+    // the reply thread will be cleaned up by the TwitchChannel.
+    // The root of the thread does not have replyThread set. TODO(dnsge)
+    std::shared_ptr<MessageThread> replyThread;
     uint32_t count = 1;
     std::vector<std::unique_ptr<MessageElement>> elements;
 

src/messages/MessageElement.cpp

@@ -132,6 +132,31 @@ void ImageElement::addToContainer(MessageLayoutContainer &container,
     }
 }
 
+PrettyImageElement::PrettyImageElement(ImagePtr image, int padding,
+                                       QColor background,
+                                       MessageElementFlags flags)
+    : MessageElement(flags)
+    , image_(image)
+    , padding_(padding)
+    , background_(background)
+{
+}
+
+void PrettyImageElement::addToContainer(MessageLayoutContainer &container,
+                                        MessageElementFlags flags)
+{
+    if (flags.hasAny(this->getFlags()))
+    {
+        auto size = QSize(this->image_->width() * container.getScale(),
+                          this->image_->height() * container.getScale());
+
+        container.addFloatingElement(
+            (new PrettyFloatingImageLayoutElement(
+                 *this, this->image_, size, this->padding_, this->background_))
+                ->setLink(this->getLink()));
+    }
+}
+
 // EMOTE
 EmoteElement::EmoteElement(const EmotePtr &emote, MessageElementFlags flags,
                            const MessageColor &textElementColor)
@@ -395,6 +420,100 @@ void TextElement::addToContainer(MessageLayoutContainer &container,
     }
 }
 
+SingleLineTextElement::SingleLineTextElement(const QString &text,
+                                             MessageElementFlags flags,
+                                             const MessageColor &color,
+                                             FontStyle style)
+    : MessageElement(flags)
+    , color_(color)
+    , style_(style)
+{
+    for (const auto &word : text.split(' '))
+    {
+        this->words_.push_back({word, -1});
+        // fourtf: add logic to store multiple spaces after message
+    }
+}
+
+void SingleLineTextElement::addToContainer(MessageLayoutContainer &container,
+                                           MessageElementFlags flags)
+{
+    auto app = getApp();
+
+    if (flags.hasAny(this->getFlags()))
+    {
+        QFontMetrics metrics =
+            app->fonts->getFontMetrics(this->style_, container.getScale());
+
+        auto getTextLayoutElement = [&](QString text, int width,
+                                        bool hasTrailingSpace) {
+            auto color = this->color_.getColor(*app->themes);
+            app->themes->normalizeColor(color);
+
+            auto e = (new TextLayoutElement(
+                          *this, text, QSize(width, metrics.height()), color,
+                          this->style_, container.getScale()))
+                         ->setLink(this->getLink());
+            e->setTrailingSpace(hasTrailingSpace);
+            e->setText(text);
+
+            // If URL link was changed,
+            // Should update it in MessageLayoutElement too!
+            if (this->getLink().type == Link::Url)
+            {
+                static_cast<TextLayoutElement *>(e)->listenToLinkChanges();
+            }
+            return e;
+        };
+
+        QString ellipsis = "...";
+
+        for (Word &word : this->words_)
+        {
+            word.width = metrics.horizontalAdvance(word.text);
+
+            // see if the text fits in the current line
+            if (container.fitsInLine(word.width))
+            {
+                container.addElementNoLineBreak(getTextLayoutElement(
+                    word.text, word.width, this->hasTrailingSpace()));
+            }
+            else
+            {
+                // word overflows, try minimum truncation
+                bool cutSuccess = false;
+                for (size_t cut = 1; cut < word.text.length(); ++cut)
+                {
+                    // Cut off n characters and append the ellipsis.
+                    // Try removing characters one by one until the word fits.
+                    QString truncatedWord = word.text.chopped(cut) + ellipsis;
+                    int newSize = metrics.horizontalAdvance(truncatedWord);
+                    if (container.fitsInLine(newSize))
+                    {
+                        container.addElementNoLineBreak(getTextLayoutElement(
+                            truncatedWord, newSize, false));
+                        cutSuccess = true;
+                        break;
+                    }
+                }
+
+                if (!cutSuccess)
+                {
+                    // We weren't able to show any part of the current word, so
+                    // just append the ellipsis.
+                    int ellipsisSize = metrics.horizontalAdvance(ellipsis);
+                    container.addElementNoLineBreak(
+                        getTextLayoutElement(ellipsis, ellipsisSize, false));
+                }
+
+                break;
+            }
+        }
+
+        container.breakLine();
+    }
+}
+
 // TIMESTAMP
 TimestampElement::TimestampElement(QTime time)
     : MessageElement(MessageElementFlag::Timestamp)