From 812186dc4c4d7447104ca43802de65ab4c69ea34 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Sun, 3 Dec 2023 14:41:33 +0100
Subject: [PATCH 01/42] Return correct hit-test values for title bar buttons on
 Windows (#4994)

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
---
 CHANGELOG.md                           |   1 +
 src/CMakeLists.txt                     |   2 +
 src/widgets/BaseWindow.cpp             | 172 ++++++++++++++++++++-----
 src/widgets/BaseWindow.hpp             |   6 +-
 src/widgets/helper/TitlebarButton.cpp  |  35 +++++
 src/widgets/helper/TitlebarButton.hpp  |  18 +++
 src/widgets/helper/TitlebarButtons.cpp | 116 +++++++++++++++++
 src/widgets/helper/TitlebarButtons.hpp |  69 ++++++++++
 8 files changed, 381 insertions(+), 38 deletions(-)
 create mode 100644 src/widgets/helper/TitlebarButtons.cpp
 create mode 100644 src/widgets/helper/TitlebarButtons.hpp

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89bd46229..00c765cd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 - Bugfix: Fixed lookahead/-behind not working in _Ignores_. (#4965)
 - Bugfix: Fixed Image Uploader accidentally deleting images with some hosts when link resolver was enabled. (#4971)
 - Bugfix: Fixed rare crash with Image Uploader when closing a split right after starting an upload. (#4971)
+- Bugfix: Fixed support for Windows 11 Snap layouts. (#4994)
 - Bugfix: Fixed some windows appearing between screens. (#4797)
 - Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978)
 - Dev: Change clang-format from v14 to v16. (#4929)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 86c24c15b..1c6c3c0a0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -626,6 +626,8 @@ set(SOURCE_FILES
         widgets/helper/SignalLabel.hpp
         widgets/helper/TitlebarButton.cpp
         widgets/helper/TitlebarButton.hpp
+        widgets/helper/TitlebarButtons.cpp
+        widgets/helper/TitlebarButtons.hpp
 
         widgets/listview/GenericItemDelegate.cpp
         widgets/listview/GenericItemDelegate.hpp
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index a98ab8da8..59abe0a4f 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -8,6 +8,7 @@
 #include "util/PostToThread.hpp"
 #include "util/WindowsHelper.hpp"
 #include "widgets/helper/EffectLabel.hpp"
+#include "widgets/helper/TitlebarButtons.hpp"
 #include "widgets/Label.hpp"
 #include "widgets/TooltipWidget.hpp"
 #include "widgets/Window.hpp"
@@ -180,9 +181,8 @@ void BaseWindow::init()
                                      this->close();
                                  });
 
-                this->ui_.minButton = _minButton;
-                this->ui_.maxButton = _maxButton;
-                this->ui_.exitButton = _exitButton;
+                this->ui_.titlebarButtons = new TitleBarButtons(
+                    this, _minButton, _maxButton, _exitButton);
 
                 this->ui_.buttons.push_back(_minButton);
                 this->ui_.buttons.push_back(_maxButton);
@@ -474,12 +474,9 @@ void BaseWindow::changeEvent(QEvent *)
     }
 
 #ifdef USEWINSDK
-    if (this->ui_.maxButton)
+    if (this->ui_.titlebarButtons)
     {
-        this->ui_.maxButton->setButtonStyle(
-            this->windowState() & Qt::WindowMaximized
-                ? TitleBarButtonStyle::Unmaximize
-                : TitleBarButtonStyle::Maximize);
+        this->ui_.titlebarButtons->updateMaxButton();
     }
 
     if (this->isVisible() && this->hasCustomWindowFrame())
@@ -585,6 +582,11 @@ bool BaseWindow::nativeEvent(const QByteArray &eventType, void *message,
 
     bool returnValue = false;
 
+    auto isHoveringTitlebarButton = [&]() {
+        auto ht = msg->wParam;
+        return ht == HTMAXBUTTON || ht == HTMINBUTTON || ht == HTCLOSE;
+    };
+
     switch (msg->message)
     {
         case WM_DPICHANGED:
@@ -612,6 +614,91 @@ bool BaseWindow::nativeEvent(const QByteArray &eventType, void *message,
             returnValue = this->handleNCHITTEST(msg, result);
             break;
 
+        case WM_NCMOUSEHOVER:
+        case WM_NCMOUSEMOVE: {
+            // WM_NCMOUSEMOVE/WM_NCMOUSEHOVER gets sent when the mouse is
+            // moving/hovering in the non-client area
+            // - (mostly) the edges and the titlebar.
+            // We only need to handle the event for the titlebar buttons,
+            // as Qt doesn't create mouse events for these events.
+            if (!this->ui_.titlebarButtons)
+            {
+                // we don't consume the event if we don't have custom buttons
+                break;
+            }
+
+            if (isHoveringTitlebarButton())
+            {
+                *result = 0;
+                returnValue = true;
+                long x = GET_X_LPARAM(msg->lParam);
+                long y = GET_Y_LPARAM(msg->lParam);
+
+                RECT winrect;
+                GetWindowRect(HWND(winId()), &winrect);
+                QPoint globalPos(x, y);
+                this->ui_.titlebarButtons->hover(msg->wParam, globalPos);
+                this->lastEventWasNcMouseMove_ = true;
+            }
+            else
+            {
+                this->ui_.titlebarButtons->leave();
+            }
+        }
+        break;
+
+        case WM_MOUSEMOVE: {
+            if (!this->lastEventWasNcMouseMove_)
+            {
+                break;
+            }
+            this->lastEventWasNcMouseMove_ = false;
+            // Windows doesn't send WM_NCMOUSELEAVE in some cases,
+            // so the buttons show as hovered even though they're not hovered.
+            [[fallthrough]];
+        }
+        case WM_NCMOUSELEAVE: {
+            // WM_NCMOUSELEAVE gets sent when the mouse leaves any
+            // non-client area. In case we have titlebar buttons,
+            // we want to ensure they're deselected.
+            if (this->ui_.titlebarButtons)
+            {
+                this->ui_.titlebarButtons->leave();
+            }
+        }
+        break;
+
+        case WM_NCLBUTTONDOWN:
+        case WM_NCLBUTTONUP: {
+            // WM_NCLBUTTON{DOWN, UP} gets called when the left mouse button
+            // was pressed in a non-client area.
+            // We simulate a mouse down/up event for the titlebar buttons
+            // as Qt doesn't create an event in that case.
+            if (!this->ui_.titlebarButtons || !isHoveringTitlebarButton())
+            {
+                break;
+            }
+            returnValue = true;
+            *result = 0;
+
+            auto ht = msg->wParam;
+            long x = GET_X_LPARAM(msg->lParam);
+            long y = GET_Y_LPARAM(msg->lParam);
+
+            RECT winrect;
+            GetWindowRect(HWND(winId()), &winrect);
+            QPoint globalPos(x, y);
+            if (msg->message == WM_NCLBUTTONDOWN)
+            {
+                this->ui_.titlebarButtons->mousePress(ht, globalPos);
+            }
+            else
+            {
+                this->ui_.titlebarButtons->mouseRelease(ht, globalPos);
+            }
+        }
+        break;
+
         default:
             return QWidget::nativeEvent(eventType, message, result);
     }
@@ -668,29 +755,21 @@ void BaseWindow::calcButtonsSizes()
         return;
     }
 
-    if (this->frameless_)
+    if (this->frameless_ || !this->ui_.titlebarButtons)
     {
         return;
     }
 
-    if ((this->width() / this->scale()) < 300)
+#ifdef USEWINSDK
+    if ((static_cast<float>(this->width()) / this->scale()) < 300)
     {
-        if (this->ui_.minButton)
-            this->ui_.minButton->setScaleIndependantSize(30, 30);
-        if (this->ui_.maxButton)
-            this->ui_.maxButton->setScaleIndependantSize(30, 30);
-        if (this->ui_.exitButton)
-            this->ui_.exitButton->setScaleIndependantSize(30, 30);
+        this->ui_.titlebarButtons->setSmallSize();
     }
     else
     {
-        if (this->ui_.minButton)
-            this->ui_.minButton->setScaleIndependantSize(46, 30);
-        if (this->ui_.maxButton)
-            this->ui_.maxButton->setScaleIndependantSize(46, 30);
-        if (this->ui_.exitButton)
-            this->ui_.exitButton->setScaleIndependantSize(46, 30);
+        this->ui_.titlebarButtons->setRegularSize();
     }
+#endif
 }
 
 void BaseWindow::drawCustomWindowFrame(QPainter &painter)
@@ -943,32 +1022,55 @@ bool BaseWindow::handleNCHITTEST(MSG *msg, long *result)
 
         if (*result == 0)
         {
-            bool client = false;
-
             // Check the main layout first, as it's the largest area
             if (this->ui_.layoutBase->geometry().contains(point))
             {
-                client = true;
+                *result = HTCLIENT;
             }
 
             // Check the titlebar buttons
-            if (!client && this->ui_.titlebarBox->geometry().contains(point))
+            if (*result == 0 &&
+                this->ui_.titlebarBox->geometry().contains(point))
             {
-                for (QWidget *widget : this->ui_.buttons)
+                for (const auto *widget : this->ui_.buttons)
                 {
-                    if (widget->isVisible() &&
-                        widget->geometry().contains(point))
+                    if (!widget->isVisible() ||
+                        !widget->geometry().contains(point))
                     {
-                        client = true;
+                        continue;
                     }
+
+                    if (const auto *btn =
+                            dynamic_cast<const TitleBarButton *>(widget))
+                    {
+                        switch (btn->getButtonStyle())
+                        {
+                            case TitleBarButtonStyle::Minimize: {
+                                *result = HTMINBUTTON;
+                                break;
+                            }
+                            case TitleBarButtonStyle::Unmaximize:
+                            case TitleBarButtonStyle::Maximize: {
+                                *result = HTMAXBUTTON;
+                                break;
+                            }
+                            case TitleBarButtonStyle::Close: {
+                                *result = HTCLOSE;
+                                break;
+                            }
+                            default: {
+                                *result = HTCLIENT;
+                                break;
+                            }
+                        }
+                        break;
+                    }
+                    *result = HTCLIENT;
+                    break;
                 }
             }
 
-            if (client)
-            {
-                *result = HTCLIENT;
-            }
-            else
+            if (*result == 0)
             {
                 *result = HTCAPTION;
             }
diff --git a/src/widgets/BaseWindow.hpp b/src/widgets/BaseWindow.hpp
index 3b46aea6b..d55b5bd6d 100644
--- a/src/widgets/BaseWindow.hpp
+++ b/src/widgets/BaseWindow.hpp
@@ -18,6 +18,7 @@ namespace chatterino {
 class Button;
 class EffectLabel;
 class TitleBarButton;
+class TitleBarButtons;
 enum class TitleBarButtonStyle;
 
 class BaseWindow : public BaseWidget
@@ -135,9 +136,7 @@ private:
         QLayout *windowLayout = nullptr;
         QHBoxLayout *titlebarBox = nullptr;
         QWidget *titleLabel = nullptr;
-        TitleBarButton *minButton = nullptr;
-        TitleBarButton *maxButton = nullptr;
-        TitleBarButton *exitButton = nullptr;
+        TitleBarButtons *titlebarButtons = nullptr;
         QWidget *layoutBase = nullptr;
         std::vector<Button *> buttons;
     } ui_;
@@ -148,6 +147,7 @@ private:
     QRect nextBounds_;
     QTimer useNextBounds_;
     bool isNotMinimizedOrMaximized_{};
+    bool lastEventWasNcMouseMove_ = false;
 #endif
 
     pajlada::Signals::SignalHolder connections_;
diff --git a/src/widgets/helper/TitlebarButton.cpp b/src/widgets/helper/TitlebarButton.cpp
index fa2d6bb24..c8c00efe3 100644
--- a/src/widgets/helper/TitlebarButton.cpp
+++ b/src/widgets/helper/TitlebarButton.cpp
@@ -124,4 +124,39 @@ void TitleBarButton::paintEvent(QPaintEvent *event)
     this->paintButton(painter);
 }
 
+void TitleBarButton::ncEnter()
+{
+    this->enterEvent(nullptr);
+    this->update();
+}
+
+void TitleBarButton::ncLeave()
+{
+    this->leaveEvent(nullptr);
+    this->update();
+}
+
+void TitleBarButton::ncMove(QPoint at)
+{
+    QMouseEvent evt(QMouseEvent::MouseMove, at, Qt::NoButton, Qt::NoButton,
+                    Qt::NoModifier);
+    this->mouseMoveEvent(&evt);
+}
+
+void TitleBarButton::ncMousePress(QPoint at)
+{
+    QMouseEvent evt(QMouseEvent::MouseButtonPress, at, Qt::LeftButton,
+                    Qt::NoButton, Qt::NoModifier);
+    this->mousePressEvent(&evt);
+    this->update();
+}
+
+void TitleBarButton::ncMouseRelease(QPoint at)
+{
+    QMouseEvent evt(QMouseEvent::MouseButtonRelease, at, Qt::LeftButton,
+                    Qt::NoButton, Qt::NoModifier);
+    this->mouseReleaseEvent(&evt);
+    this->update();
+}
+
 }  // namespace chatterino
diff --git a/src/widgets/helper/TitlebarButton.hpp b/src/widgets/helper/TitlebarButton.hpp
index 9599fa8e1..c1868f9d9 100644
--- a/src/widgets/helper/TitlebarButton.hpp
+++ b/src/widgets/helper/TitlebarButton.hpp
@@ -23,6 +23,24 @@ public:
     TitleBarButtonStyle getButtonStyle() const;
     void setButtonStyle(TitleBarButtonStyle style_);
 
+    /// Simulate a `mouseEnter` event.
+    void ncEnter();
+
+    /// Simulate a `mouseLeave` event.
+    void ncLeave();
+
+    /// Simulate a `mouseMove` event.
+    /// @param at a local position relative to this widget
+    void ncMove(QPoint at);
+
+    /// Simulate a `mousePress` event with the left mouse button.
+    /// @param at a local position relative to this widget
+    void ncMousePress(QPoint at);
+
+    /// Simulate a `mouseRelease` event with the left mouse button.
+    /// @param at a local position relative to this widget
+    void ncMouseRelease(QPoint at);
+
 protected:
     void paintEvent(QPaintEvent *) override;
 
diff --git a/src/widgets/helper/TitlebarButtons.cpp b/src/widgets/helper/TitlebarButtons.cpp
new file mode 100644
index 000000000..42a1c93aa
--- /dev/null
+++ b/src/widgets/helper/TitlebarButtons.cpp
@@ -0,0 +1,116 @@
+#include "widgets/helper/TitlebarButtons.hpp"
+
+#ifdef USEWINSDK
+
+#    include "widgets/helper/TitlebarButton.hpp"
+
+#    include <Windows.h>
+
+#    include <cassert>
+
+namespace chatterino {
+
+TitleBarButtons::TitleBarButtons(QWidget *window, TitleBarButton *minButton,
+                                 TitleBarButton *maxButton,
+                                 TitleBarButton *closeButton)
+    : QObject(window)
+    , window_(window)
+    , minButton_(minButton)
+    , maxButton_(maxButton)
+    , closeButton_(closeButton)
+{
+}
+
+void TitleBarButtons::hover(size_t ht, QPoint at)
+{
+    TitleBarButton *hovered{};
+    TitleBarButton *other1{};
+    TitleBarButton *other2{};
+    switch (ht)
+    {
+        case HTMAXBUTTON:
+            hovered = this->maxButton_;
+            other1 = this->minButton_;
+            other2 = this->closeButton_;
+            break;
+        case HTMINBUTTON:
+            hovered = this->minButton_;
+            other1 = this->maxButton_;
+            other2 = this->closeButton_;
+            break;
+        case HTCLOSE:
+            hovered = this->closeButton_;
+            other1 = this->minButton_;
+            other2 = this->maxButton_;
+            break;
+        default:
+            assert(false && "TitleBarButtons::hover precondition violated");
+            return;
+    }
+    hovered->ncEnter();
+    hovered->ncMove(hovered->mapFromGlobal(at));
+    other1->ncLeave();
+    other2->ncLeave();
+}
+
+void TitleBarButtons::leave()
+{
+    this->minButton_->ncLeave();
+    this->maxButton_->ncLeave();
+    this->closeButton_->ncLeave();
+}
+
+void TitleBarButtons::mousePress(size_t ht, QPoint at)
+{
+    auto *button = this->buttonForHt(ht);
+    button->ncMousePress(button->mapFromGlobal(at));
+}
+
+void TitleBarButtons::mouseRelease(size_t ht, QPoint at)
+{
+    auto *button = this->buttonForHt(ht);
+    button->ncMouseRelease(button->mapFromGlobal(at));
+}
+
+void TitleBarButtons::updateMaxButton()
+{
+    this->maxButton_->setButtonStyle(
+        this->window_->windowState().testFlag(Qt::WindowMaximized)
+            ? TitleBarButtonStyle::Unmaximize
+            : TitleBarButtonStyle::Maximize);
+}
+
+void TitleBarButtons::setSmallSize()
+{
+    this->minButton_->setScaleIndependantSize(30, 30);
+    this->maxButton_->setScaleIndependantSize(30, 30);
+    this->closeButton_->setScaleIndependantSize(30, 30);
+}
+
+void TitleBarButtons::setRegularSize()
+{
+    this->minButton_->setScaleIndependantSize(46, 30);
+    this->maxButton_->setScaleIndependantSize(46, 30);
+    this->closeButton_->setScaleIndependantSize(46, 30);
+}
+
+TitleBarButton *TitleBarButtons::buttonForHt(size_t ht) const
+{
+    switch (ht)
+    {
+        case HTMAXBUTTON:
+            return this->maxButton_;
+        case HTMINBUTTON:
+            return this->minButton_;
+        case HTCLOSE:
+            return this->closeButton_;
+        default:
+            assert(false &&
+                   "TitleBarButtons::buttonForHt precondition violated");
+            return nullptr;
+    }
+}
+
+}  // namespace chatterino
+
+#endif
diff --git a/src/widgets/helper/TitlebarButtons.hpp b/src/widgets/helper/TitlebarButtons.hpp
new file mode 100644
index 000000000..42a430d69
--- /dev/null
+++ b/src/widgets/helper/TitlebarButtons.hpp
@@ -0,0 +1,69 @@
+#pragma once
+
+class QPoint;
+class QWidget;
+
+#include <QtGlobal>
+
+namespace chatterino {
+
+#ifdef USEWINSDK
+
+class TitleBarButton;
+class TitleBarButtons : QObject
+{
+public:
+    /// The parent of this object is set to `window`.
+    ///
+    /// All parameters must have a parent;
+    /// they're not deleted in the destructor.
+    TitleBarButtons(QWidget *window, TitleBarButton *minButton,
+                    TitleBarButton *maxButton, TitleBarButton *closeButton);
+
+    /// Hover over the button `ht` at the global position `at`.
+    ///
+    /// @pre `ht` must be one of { HTMAXBUTTON, HTMINBUTTON, HTCLOSE }.
+    /// @param ht The hovered button
+    /// @param at The global position of the event
+    void hover(size_t ht, QPoint at);
+
+    /// Leave all buttons - simulate `leaveEvent` for all buttons.
+    void leave();
+
+    /// Press the left mouse over the button `ht` at the global position `at`.
+    ///
+    /// @pre `ht` must be one of { HTMAXBUTTON, HTMINBUTTON, HTCLOSE }.
+    /// @param ht The clicked button
+    /// @param at The global position of the event
+    void mousePress(size_t ht, QPoint at);
+
+    /// Release the left mouse button over the button `ht` at the
+    /// global position `at`.
+    ///
+    /// @pre `ht` must be one of { HTMAXBUTTON, HTMINBUTTON, HTCLOSE }.
+    /// @param ht The clicked button
+    /// @param at The global position of the event
+    void mouseRelease(size_t ht, QPoint at);
+
+    /// Update the maximize/restore button to show the correct image
+    /// according to the current window state.
+    void updateMaxButton();
+
+    /// Set buttons to be narrow.
+    void setSmallSize();
+    /// Set buttons to be regular size.
+    void setRegularSize();
+
+private:
+    /// @pre ht must be one of { HTMAXBUTTON, HTMINBUTTON, HTCLOSE }.
+    TitleBarButton *buttonForHt(size_t ht) const;
+
+    QWidget *window_ = nullptr;
+    TitleBarButton *minButton_ = nullptr;
+    TitleBarButton *maxButton_ = nullptr;
+    TitleBarButton *closeButton_ = nullptr;
+};
+
+#endif
+
+}  // namespace chatterino

From 44abe6b487272ec11f0e5f2cd05e7bd635b0bddc Mon Sep 17 00:00:00 2001
From: iProdigy <8106344+iProdigy@users.noreply.github.com>
Date: Sun, 3 Dec 2023 14:07:30 -0800
Subject: [PATCH 02/42] feat: add channel for messages caught by AutoMod
 (#4986)

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
---
 CHANGELOG.md                                |  1 +
 src/Application.cpp                         | 10 ++++--
 src/common/Channel.cpp                      |  6 ++--
 src/common/Channel.hpp                      |  1 +
 src/common/WindowDescriptors.hpp            |  2 +-
 src/messages/MessageBuilder.cpp             |  9 +++++-
 src/messages/MessageBuilder.hpp             |  2 +-
 src/providers/twitch/TwitchIrcServer.cpp    |  7 +++++
 src/providers/twitch/TwitchIrcServer.hpp    |  1 +
 src/singletons/WindowManager.cpp            |  8 +++++
 src/singletons/helper/LoggingChannel.cpp    |  7 ++++-
 src/widgets/Notebook.cpp                    |  5 +--
 src/widgets/dialogs/SelectChannelDialog.cpp | 35 ++++++++++++++++++---
 src/widgets/dialogs/SelectChannelDialog.hpp |  1 +
 src/widgets/helper/ChannelView.cpp          | 23 +++++++++-----
 src/widgets/helper/SearchPopup.cpp          |  8 ++++-
 src/widgets/splits/Split.cpp                |  5 ++-
 17 files changed, 107 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00c765cd7..544306830 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unversioned
 
 - Major: Allow use of Twitch follower emotes in other channels if subscribed. (#4922)
+- Major: Add `/automod` split to track automod caught messages across all open channels the user moderates. (#4986)
 - Minor: Migrate to the new Get Channel Followers Helix endpoint, fixing follower count not showing up in usercards. (#4809)
 - Minor: The account switcher is now styled to match your theme. (#4817)
 - Minor: Add an invisible resize handle to the bottom of frameless user info popups and reply thread popups. (#4795)
diff --git a/src/Application.cpp b/src/Application.cpp
index 0a2f8b4de..d8a7a5754 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -546,9 +546,15 @@ void Application::initPubSub()
                                 msg.senderUserID, msg.senderUserLogin,
                                 senderDisplayName, senderColor};
                             postToThread([chan, action] {
-                                const auto p = makeAutomodMessage(action);
+                                const auto p =
+                                    makeAutomodMessage(action, chan->getName());
                                 chan->addMessage(p.first);
                                 chan->addMessage(p.second);
+
+                                getApp()->twitch->automodChannel->addMessage(
+                                    p.first);
+                                getApp()->twitch->automodChannel->addMessage(
+                                    p.second);
                             });
                         }
                         // "ALLOWED" and "DENIED" statuses remain unimplemented
@@ -573,7 +579,7 @@ void Application::initPubSub()
                 }
 
                 postToThread([chan, action] {
-                    const auto p = makeAutomodMessage(action);
+                    const auto p = makeAutomodMessage(action, chan->getName());
                     chan->addMessage(p.first);
                     chan->addMessage(p.second);
                 });
diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index f0dc5d185..47ae99c1c 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -295,7 +295,8 @@ bool Channel::isWritable() const
 {
     using Type = Channel::Type;
     auto type = this->getType();
-    return type != Type::TwitchMentions && type != Type::TwitchLive;
+    return type != Type::TwitchMentions && type != Type::TwitchLive &&
+           type != Type::TwitchAutomod;
 }
 
 void Channel::sendMessage(const QString &message)
@@ -330,7 +331,8 @@ bool Channel::isLive() const
 
 bool Channel::shouldIgnoreHighlights() const
 {
-    return this->type_ == Type::TwitchMentions ||
+    return this->type_ == Type::TwitchAutomod ||
+           this->type_ == Type::TwitchMentions ||
            this->type_ == Type::TwitchWhispers;
 }
 
diff --git a/src/common/Channel.hpp b/src/common/Channel.hpp
index 7fcb5636c..4fc686c06 100644
--- a/src/common/Channel.hpp
+++ b/src/common/Channel.hpp
@@ -38,6 +38,7 @@ public:
         TwitchWatching,
         TwitchMentions,
         TwitchLive,
+        TwitchAutomod,
         TwitchEnd,
         Irc,
         Misc
diff --git a/src/common/WindowDescriptors.hpp b/src/common/WindowDescriptors.hpp
index 820916c36..0a7a72d16 100644
--- a/src/common/WindowDescriptors.hpp
+++ b/src/common/WindowDescriptors.hpp
@@ -30,7 +30,7 @@ namespace chatterino {
 enum class WindowType;
 
 struct SplitDescriptor {
-    // Twitch or mentions or watching or whispers or IRC
+    // Twitch or mentions or watching or live or automod or whispers or IRC
     QString type_;
 
     // Twitch Channel name or IRC channel name
diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp
index c34fe74e5..b605544b9 100644
--- a/src/messages/MessageBuilder.cpp
+++ b/src/messages/MessageBuilder.cpp
@@ -141,13 +141,14 @@ MessagePtr makeAutomodInfoMessage(const AutomodInfoAction &action)
 }
 
 std::pair<MessagePtr, MessagePtr> makeAutomodMessage(
-    const AutomodAction &action)
+    const AutomodAction &action, const QString &channelName)
 {
     MessageBuilder builder, builder2;
 
     //
     // Builder for AutoMod message with explanation
     builder.message().loginName = "automod";
+    builder.message().channelName = channelName;
     builder.message().flags.set(MessageFlag::PubSub);
     builder.message().flags.set(MessageFlag::Timeout);
     builder.message().flags.set(MessageFlag::AutoMod);
@@ -193,6 +194,12 @@ std::pair<MessagePtr, MessagePtr> makeAutomodMessage(
 
     //
     // Builder for offender's message
+    builder2.message().channelName = channelName;
+    builder2
+        .emplace<TextElement>("#" + channelName,
+                              MessageElementFlag::ChannelName,
+                              MessageColor::System)
+        ->setLink({Link::JumpToChannel, channelName});
     builder2.emplace<TimestampElement>();
     builder2.emplace<TwitchModerationElement>();
     builder2.message().loginName = action.target.login;
diff --git a/src/messages/MessageBuilder.hpp b/src/messages/MessageBuilder.hpp
index 28874439b..333d23469 100644
--- a/src/messages/MessageBuilder.hpp
+++ b/src/messages/MessageBuilder.hpp
@@ -54,7 +54,7 @@ const ImageUploaderResultTag imageUploaderResultMessage{};
 MessagePtr makeSystemMessage(const QString &text);
 MessagePtr makeSystemMessage(const QString &text, const QTime &time);
 std::pair<MessagePtr, MessagePtr> makeAutomodMessage(
-    const AutomodAction &action);
+    const AutomodAction &action, const QString &channelName);
 MessagePtr makeAutomodInfoMessage(const AutomodInfoAction &action);
 
 struct MessageParseArgs {
diff --git a/src/providers/twitch/TwitchIrcServer.cpp b/src/providers/twitch/TwitchIrcServer.cpp
index 3039f7358..5982b893d 100644
--- a/src/providers/twitch/TwitchIrcServer.cpp
+++ b/src/providers/twitch/TwitchIrcServer.cpp
@@ -43,6 +43,7 @@ TwitchIrcServer::TwitchIrcServer()
     : whispersChannel(new Channel("/whispers", Channel::Type::TwitchWhispers))
     , mentionsChannel(new Channel("/mentions", Channel::Type::TwitchMentions))
     , liveChannel(new Channel("/live", Channel::Type::TwitchLive))
+    , automodChannel(new Channel("/automod", Channel::Type::TwitchAutomod))
     , watchingChannel(Channel::getEmpty(), Channel::Type::TwitchWatching)
 {
     this->initializeIrc();
@@ -272,6 +273,11 @@ std::shared_ptr<Channel> TwitchIrcServer::getCustomChannel(
         return this->liveChannel;
     }
 
+    if (channelName == "/automod")
+    {
+        return this->automodChannel;
+    }
+
     static auto getTimer = [](ChannelPtr channel, int msBetweenMessages,
                               bool addInitialMessages) {
         if (addInitialMessages)
@@ -383,6 +389,7 @@ void TwitchIrcServer::forEachChannelAndSpecialChannels(
     func(this->whispersChannel);
     func(this->mentionsChannel);
     func(this->liveChannel);
+    func(this->automodChannel);
 }
 
 std::shared_ptr<Channel> TwitchIrcServer::getChannelOrEmptyByID(
diff --git a/src/providers/twitch/TwitchIrcServer.hpp b/src/providers/twitch/TwitchIrcServer.hpp
index c3ff2436f..61fe8ddb3 100644
--- a/src/providers/twitch/TwitchIrcServer.hpp
+++ b/src/providers/twitch/TwitchIrcServer.hpp
@@ -77,6 +77,7 @@ public:
     const ChannelPtr whispersChannel;
     const ChannelPtr mentionsChannel;
     const ChannelPtr liveChannel;
+    const ChannelPtr automodChannel;
     IndirectChannel watchingChannel;
 
     PubSub *pubsub;
diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp
index be352588c..5174f2a33 100644
--- a/src/singletons/WindowManager.cpp
+++ b/src/singletons/WindowManager.cpp
@@ -603,6 +603,10 @@ void WindowManager::encodeChannel(IndirectChannel channel, QJsonObject &obj)
             obj.insert("name", channel.get()->getName());
         }
         break;
+        case Channel::Type::TwitchAutomod: {
+            obj.insert("type", "automod");
+        }
+        break;
         case Channel::Type::TwitchMentions: {
             obj.insert("type", "mentions");
         }
@@ -676,6 +680,10 @@ IndirectChannel WindowManager::decodeChannel(const SplitDescriptor &descriptor)
     {
         return app->twitch->liveChannel;
     }
+    else if (descriptor.type_ == "automod")
+    {
+        return app->twitch->automodChannel;
+    }
     else if (descriptor.type_ == "irc")
     {
         return Irc::instance().getOrAddChannel(descriptor.server_,
diff --git a/src/singletons/helper/LoggingChannel.cpp b/src/singletons/helper/LoggingChannel.cpp
index d73ec79e5..c6b36d11e 100644
--- a/src/singletons/helper/LoggingChannel.cpp
+++ b/src/singletons/helper/LoggingChannel.cpp
@@ -29,6 +29,10 @@ LoggingChannel::LoggingChannel(const QString &_channelName,
     {
         this->subDirectory = "Live";
     }
+    else if (channelName.startsWith("/automod"))
+    {
+        this->subDirectory = "AutoMod";
+    }
     else
     {
         this->subDirectory =
@@ -96,7 +100,8 @@ void LoggingChannel::addMessage(MessagePtr message)
     }
 
     QString str;
-    if (channelName.startsWith("/mentions"))
+    if (channelName.startsWith("/mentions") ||
+        channelName.startsWith("/automod"))
     {
         str.append("#" + message->channelName + " ");
     }
diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp
index efc96daf8..2ac276e3e 100644
--- a/src/widgets/Notebook.cpp
+++ b/src/widgets/Notebook.cpp
@@ -1313,8 +1313,9 @@ SplitNotebook::SplitNotebook(Window *parent)
                 {
                     for (auto *split : sc->getSplits())
                     {
-                        if (split->getChannel()->getType() !=
-                            Channel::Type::TwitchMentions)
+                        auto type = split->getChannel()->getType();
+                        if (type != Channel::Type::TwitchMentions &&
+                            type != Channel::Type::TwitchAutomod)
                         {
                             if (split->getChannelView().scrollToMessage(
                                     message))
diff --git a/src/widgets/dialogs/SelectChannelDialog.cpp b/src/widgets/dialogs/SelectChannelDialog.cpp
index c74bfcc2c..391c85457 100644
--- a/src/widgets/dialogs/SelectChannelDialog.cpp
+++ b/src/widgets/dialogs/SelectChannelDialog.cpp
@@ -140,10 +140,27 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent)
                              live_lbl->setVisible(enabled);
                          });
 
+        // automod_btn
+        auto automod_btn = vbox.emplace<QRadioButton>("AutoMod").assign(
+            &this->ui_.twitch.automod);
+        auto automod_lbl =
+            vbox.emplace<QLabel>("Shows when AutoMod catches a message in any "
+                                 "channel you moderate.")
+                .hidden();
+
+        automod_lbl->setWordWrap(true);
+        automod_btn->installEventFilter(&this->tabFilter_);
+
+        QObject::connect(automod_btn.getElement(), &QRadioButton::toggled,
+                         [=](bool enabled) mutable {
+                             automod_lbl->setVisible(enabled);
+                         });
+
         vbox->addStretch(1);
 
         // tabbing order
-        QWidget::setTabOrder(live_btn.getElement(), channel_btn.getElement());
+        QWidget::setTabOrder(automod_btn.getElement(),
+                             channel_btn.getElement());
         QWidget::setTabOrder(channel_btn.getElement(),
                              whispers_btn.getElement());
         QWidget::setTabOrder(whispers_btn.getElement(),
@@ -151,6 +168,7 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent)
         QWidget::setTabOrder(mentions_btn.getElement(),
                              watching_btn.getElement());
         QWidget::setTabOrder(watching_btn.getElement(), live_btn.getElement());
+        QWidget::setTabOrder(live_btn.getElement(), automod_btn.getElement());
 
         // tab
         auto tab = notebook->addPage(obj.getElement());
@@ -311,6 +329,11 @@ void SelectChannelDialog::setSelectedChannel(IndirectChannel _channel)
             this->ui_.twitch.live->setFocus();
         }
         break;
+        case Channel::Type::TwitchAutomod: {
+            this->ui_.notebook->selectIndex(TAB_TWITCH);
+            this->ui_.twitch.automod->setFocus();
+        }
+        break;
         case Channel::Type::Irc: {
             this->ui_.notebook->selectIndex(TAB_IRC);
             this->ui_.irc.channel->setText(_channel.get()->getName());
@@ -378,6 +401,10 @@ IndirectChannel SelectChannelDialog::getSelectedChannel() const
             {
                 return app->twitch->liveChannel;
             }
+            else if (this->ui_.twitch.automod->isChecked())
+            {
+                return app->twitch->automodChannel;
+            }
         }
         break;
         case TAB_IRC: {
@@ -442,9 +469,9 @@ bool SelectChannelDialog::EventFilter::eventFilter(QObject *watched,
                 this->dialog->ui_.twitch.whispers->setFocus();
                 return true;
             }
-            else if (widget == this->dialog->ui_.twitch.live)
+            else if (widget == this->dialog->ui_.twitch.automod)
             {
-                // Special case for when current selection is "Live" (the last entry in the list), next wrap is Channel, but we need to select its edit box
+                // Special case for when current selection is "AutoMod" (the last entry in the list), next wrap is Channel, but we need to select its edit box
                 this->dialog->ui_.twitch.channel->setFocus();
                 return true;
             }
@@ -463,7 +490,7 @@ bool SelectChannelDialog::EventFilter::eventFilter(QObject *watched,
             if (widget == this->dialog->ui_.twitch.channelName)
             {
                 // Special case for when current selection is the "Channel" entry's edit box since the Edit box actually has the focus
-                this->dialog->ui_.twitch.live->setFocus();
+                this->dialog->ui_.twitch.automod->setFocus();
                 return true;
             }
 
diff --git a/src/widgets/dialogs/SelectChannelDialog.hpp b/src/widgets/dialogs/SelectChannelDialog.hpp
index bff084d18..65b2cb56b 100644
--- a/src/widgets/dialogs/SelectChannelDialog.hpp
+++ b/src/widgets/dialogs/SelectChannelDialog.hpp
@@ -49,6 +49,7 @@ private:
             QRadioButton *mentions;
             QRadioButton *watching;
             QRadioButton *live;
+            QRadioButton *automod;
         } twitch;
         struct {
             QLineEdit *channel;
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index c0f1f5212..2ac6848be 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -1282,14 +1282,16 @@ MessageElementFlags ChannelView::getFlags() const
             flags.set(MessageElementFlag::ModeratorTools);
         }
         if (this->underlyingChannel_ == app->twitch->mentionsChannel ||
-            this->underlyingChannel_ == app->twitch->liveChannel)
+            this->underlyingChannel_ == app->twitch->liveChannel ||
+            this->underlyingChannel_ == app->twitch->automodChannel)
         {
             flags.set(MessageElementFlag::ChannelName);
             flags.unset(MessageElementFlag::ChannelPointReward);
         }
     }
 
-    if (this->sourceChannel_ == app->twitch->mentionsChannel)
+    if (this->sourceChannel_ == app->twitch->mentionsChannel ||
+        this->sourceChannel_ == app->twitch->automodChannel)
     {
         flags.set(MessageElementFlag::ChannelName);
     }
@@ -2347,11 +2349,13 @@ void ChannelView::addMessageContextMenuItems(QMenu *menu,
                              this->split_;
     bool isMentions =
         this->channel()->getType() == Channel::Type::TwitchMentions;
-    if (isSearch || isMentions || isReplyOrUserCard)
+    bool isAutomod = this->channel()->getType() == Channel::Type::TwitchAutomod;
+    if (isSearch || isMentions || isReplyOrUserCard || isAutomod)
     {
         const auto &messagePtr = layout->getMessagePtr();
         menu->addAction("&Go to message", [this, &messagePtr, isSearch,
-                                           isMentions, isReplyOrUserCard] {
+                                           isMentions, isReplyOrUserCard,
+                                           isAutomod] {
             if (isSearch)
             {
                 if (const auto &search =
@@ -2360,16 +2364,17 @@ void ChannelView::addMessageContextMenuItems(QMenu *menu,
                     search->goToMessage(messagePtr);
                 }
             }
-            else if (isMentions)
+            else if (isMentions || isAutomod)
             {
                 getApp()->windows->scrollToMessage(messagePtr);
             }
             else if (isReplyOrUserCard)
             {
-                // If the thread is in the mentions channel,
+                // If the thread is in the mentions or automod channel,
                 // we need to find the original split.
-                if (this->split_->getChannel()->getType() ==
-                    Channel::Type::TwitchMentions)
+                const auto type = this->split_->getChannel()->getType();
+                if (type == Channel::Type::TwitchMentions ||
+                    type == Channel::Type::TwitchAutomod)
                 {
                     getApp()->windows->scrollToMessage(messagePtr);
                 }
@@ -2606,6 +2611,8 @@ bool ChannelView::mayContainMessage(const MessagePtr &message)
             return message->flags.has(MessageFlag::Highlighted);
         case Channel::Type::TwitchLive:
             return message->flags.has(MessageFlag::System);
+        case Channel::Type::TwitchAutomod:
+            return message->flags.has(MessageFlag::AutoMod);
         case Channel::Type::TwitchEnd:  // TODO: not used?
         case Channel::Type::None:       // Unspecific
         case Channel::Type::Misc:       // Unspecific
diff --git a/src/widgets/helper/SearchPopup.cpp b/src/widgets/helper/SearchPopup.cpp
index 329dff068..b34469308 100644
--- a/src/widgets/helper/SearchPopup.cpp
+++ b/src/widgets/helper/SearchPopup.cpp
@@ -134,7 +134,9 @@ void SearchPopup::goToMessage(const MessagePtr &message)
 {
     for (const auto &view : this->searchChannels_)
     {
-        if (view.get().channel()->getType() == Channel::Type::TwitchMentions)
+        const auto type = view.get().channel()->getType();
+        if (type == Channel::Type::TwitchMentions ||
+            type == Channel::Type::TwitchAutomod)
         {
             getApp()->windows->scrollToMessage(message);
             return;
@@ -166,6 +168,10 @@ void SearchPopup::updateWindowTitle()
     {
         historyName = "multiple channels'";
     }
+    else if (this->channelName_ == "/automod")
+    {
+        historyName = "automod";
+    }
     else if (this->channelName_ == "/mentions")
     {
         historyName = "mentions";
diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp
index 046b905ae..50d231fe7 100644
--- a/src/widgets/splits/Split.cpp
+++ b/src/widgets/splits/Split.cpp
@@ -1454,7 +1454,10 @@ void Split::showSearch(bool singleChannel)
         auto container = dynamic_cast<SplitContainer *>(notebook.getPageAt(i));
         for (auto split : container->getSplits())
         {
-            popup->addChannel(split->getChannelView());
+            if (split->channel_.getType() != Channel::Type::TwitchAutomod)
+            {
+                popup->addChannel(split->getChannelView());
+            }
         }
     }
 

From c3d3903b6fa8809f46bb12cb41fafbcc2c68b403 Mon Sep 17 00:00:00 2001
From: Mm2PL <mm2pl+gh@kotmisia.pl>
Date: Tue, 5 Dec 2023 18:37:42 +0100
Subject: [PATCH 03/42] feat: add `--safe-mode` command line option (#4985)

This ensures the settings button isn't hidden, and disables plugins from being loaded to make sure the user can always recover from messing things up
---
 CHANGELOG.md                                 |  1 +
 src/common/Args.cpp                          |  8 +++++++
 src/common/Args.hpp                          |  1 +
 src/controllers/plugins/PluginController.cpp | 15 ++++++++++---
 src/widgets/Notebook.cpp                     | 22 ++++++++++++++------
 src/widgets/Window.cpp                       |  6 ++++++
 src/widgets/settingspages/PluginsPage.cpp    | 14 +++++++++++++
 7 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 544306830..9048d8a64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Minor: The `/reply` command now replies to the latest message of the user. (#4919)
 - Minor: All sound capabilities can now be disabled by setting your "Sound backend" setting to "Null" and restarting Chatterino. (#4978)
 - Minor: Add an option to use new experimental smarter emote completion. (#4987)
+- Minor: Add `--safe-mode` command line option that can be used for troubleshooting when Chatterino is misbehaving or is misconfigured. It disables hiding the settings button & prevents plugins from loading. (#4985)
 - Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840)
 - Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848)
 - Bugfix: Trimmed custom streamlink paths on all platforms making sure you don't accidentally add spaces at the beginning or end of its path. (#4834)
diff --git a/src/common/Args.cpp b/src/common/Args.cpp
index 2894c3f7b..7bc48573c 100644
--- a/src/common/Args.cpp
+++ b/src/common/Args.cpp
@@ -38,6 +38,9 @@ Args::Args(const QApplication &app)
                                       "Attaches to the Console on windows, "
                                       "allowing you to see debug output."});
     crashRecoveryOption.setFlags(QCommandLineOption::HiddenFromHelp);
+    QCommandLineOption safeModeOption(
+        "safe-mode", "Starts Chatterino without loading Plugins and always "
+                     "show the settings button.");
 
     parser.addOptions({
         {{"V", "version"}, "Displays version information."},
@@ -45,6 +48,7 @@ Args::Args(const QApplication &app)
         parentWindowOption,
         parentWindowIdOption,
         verboseOption,
+        safeModeOption,
     });
     parser.addOption(QCommandLineOption(
         {"c", "channels"},
@@ -89,6 +93,10 @@ Args::Args(const QApplication &app)
 
         this->parentWindowId = parser.value(parentWindowIdOption).toULongLong();
     }
+    if (parser.isSet(safeModeOption))
+    {
+        this->safeMode = true;
+    }
 }
 
 void Args::applyCustomChannelLayout(const QString &argValue)
diff --git a/src/common/Args.hpp b/src/common/Args.hpp
index 9fba4bdaf..73144b7da 100644
--- a/src/common/Args.hpp
+++ b/src/common/Args.hpp
@@ -26,6 +26,7 @@ public:
     bool dontLoadMainWindow{};
     std::optional<WindowLayout> customChannelLayout;
     bool verbose{};
+    bool safeMode{};
 
 private:
     void applyCustomChannelLayout(const QString &argValue);
diff --git a/src/controllers/plugins/PluginController.cpp b/src/controllers/plugins/PluginController.cpp
index e98a30720..9a3356e96 100644
--- a/src/controllers/plugins/PluginController.cpp
+++ b/src/controllers/plugins/PluginController.cpp
@@ -2,6 +2,7 @@
 #    include "controllers/plugins/PluginController.hpp"
 
 #    include "Application.hpp"
+#    include "common/Args.hpp"
 #    include "common/QLogging.hpp"
 #    include "controllers/commands/CommandContext.hpp"
 #    include "controllers/commands/CommandController.hpp"
@@ -194,12 +195,20 @@ void PluginController::openLibrariesFor(lua_State *L,
 void PluginController::load(const QFileInfo &index, const QDir &pluginDir,
                             const PluginMeta &meta)
 {
-    lua_State *l = luaL_newstate();
-    PluginController::openLibrariesFor(l, meta);
-
     auto pluginName = pluginDir.dirName();
+    lua_State *l = luaL_newstate();
     auto plugin = std::make_unique<Plugin>(pluginName, l, meta, pluginDir);
     this->plugins_.insert({pluginName, std::move(plugin)});
+
+    if (getArgs().safeMode)
+    {
+        // This isn't done earlier to ensure the user can disable a misbehaving plugin
+        qCWarning(chatterinoLua) << "Skipping loading plugin " << meta.name
+                                 << " because safe mode is enabled.";
+        return;
+    }
+    PluginController::openLibrariesFor(l, meta);
+
     if (!PluginController::isPluginEnabled(pluginName) ||
         !getSettings()->pluginsEnabled)
     {
diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp
index 2ac276e3e..adb427ac3 100644
--- a/src/widgets/Notebook.cpp
+++ b/src/widgets/Notebook.cpp
@@ -1,6 +1,7 @@
 #include "widgets/Notebook.hpp"
 
 #include "Application.hpp"
+#include "common/Args.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/hotkeys/HotkeyCategory.hpp"
 #include "controllers/hotkeys/HotkeyController.hpp"
@@ -1345,13 +1346,22 @@ void SplitNotebook::addCustomButtons()
     // settings
     auto settingsBtn = this->addCustomButton();
 
-    settingsBtn->setVisible(!getSettings()->hidePreferencesButton.getValue());
+    // This is to ensure you can't lock yourself out of the settings
+    if (getArgs().safeMode)
+    {
+        settingsBtn->setVisible(true);
+    }
+    else
+    {
+        settingsBtn->setVisible(
+            !getSettings()->hidePreferencesButton.getValue());
 
-    getSettings()->hidePreferencesButton.connect(
-        [settingsBtn](bool hide, auto) {
-            settingsBtn->setVisible(!hide);
-        },
-        this->signalHolder_);
+        getSettings()->hidePreferencesButton.connect(
+            [settingsBtn](bool hide, auto) {
+                settingsBtn->setVisible(!hide);
+            },
+            this->signalHolder_);
+    }
 
     settingsBtn->setIcon(NotebookButton::Settings);
 
diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp
index 0193b4359..be9f7f7ff 100644
--- a/src/widgets/Window.cpp
+++ b/src/widgets/Window.cpp
@@ -1,6 +1,7 @@
 #include "widgets/Window.hpp"
 
 #include "Application.hpp"
+#include "common/Args.hpp"
 #include "common/Credentials.hpp"
 #include "common/Modes.hpp"
 #include "common/QLogging.hpp"
@@ -736,6 +737,11 @@ void Window::onAccountSelected()
     }
 #endif
 
+    if (getArgs().safeMode)
+    {
+        windowTitle += " (safe mode)";
+    }
+
     this->setWindowTitle(windowTitle);
 
     // update user
diff --git a/src/widgets/settingspages/PluginsPage.cpp b/src/widgets/settingspages/PluginsPage.cpp
index 20e65fd3c..87966a81a 100644
--- a/src/widgets/settingspages/PluginsPage.cpp
+++ b/src/widgets/settingspages/PluginsPage.cpp
@@ -2,6 +2,7 @@
 #    include "widgets/settingspages/PluginsPage.hpp"
 
 #    include "Application.hpp"
+#    include "common/Args.hpp"
 #    include "controllers/plugins/PluginController.hpp"
 #    include "singletons/Paths.hpp"
 #    include "singletons/Settings.hpp"
@@ -52,6 +53,15 @@ PluginsPage::PluginsPage()
             this->rebuildContent();
         });
         groupLayout->addRow(box);
+        if (getArgs().safeMode)
+        {
+            box->setEnabled(false);
+            auto *disabledLabel = new QLabel(this);
+            disabledLabel->setText("Plugins will not be fully loaded because "
+                                   "Chatterino is in safe mode. You can still "
+                                   "enable and disable them.");
+            groupLayout->addRow(disabledLabel);
+        }
     }
 
     this->rebuildContent();
@@ -177,6 +187,10 @@ void PluginsPage::rebuildContent()
                              this->rebuildContent();
                          });
         pluginEntry->addRow(reloadButton);
+        if (getArgs().safeMode)
+        {
+            reloadButton->setEnabled(false);
+        }
     }
 }
 

From 036c4f33df98dafa0b676e65d312897ced26f079 Mon Sep 17 00:00:00 2001
From: pajlada <rasmus.karlsson@pajlada.com>
Date: Sat, 9 Dec 2023 00:23:35 +0100
Subject: [PATCH 04/42] conan: Update Boost to 1.83 & OpenSSL to 3.2.0 (#5007)

---
 CHANGELOG.md | 1 +
 conanfile.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9048d8a64..a5fff97a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@
 - Dev: Temporarily disable High DPI scaling on Qt6 builds on Windows. (#4767)
 - Dev: Tests now run on Ubuntu 22.04 instead of 20.04 to loosen C++ restrictions in tests. (#4774)
 - Dev: Do a pretty major refactor of the Settings classes. List settings (e.g. highlights) are most heavily modified, and should have an extra eye kept on them. (#4775)
+- Dev: conan: Update Boost to 1.83 & OpenSSL to 3.2.0. (#5007)
 - Dev: Remove `boost::noncopyable` use & `boost_random` dependency. (#4776)
 - Dev: Fix clang-tidy `cppcoreguidelines-pro-type-member-init` warnings. (#4426)
 - Dev: Immediate layout for invisible `ChannelView`s is skipped. (#4811)
diff --git a/conanfile.py b/conanfile.py
index 7db329b8b..0dd32c730 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -5,7 +5,7 @@ from os import path
 
 class Chatterino(ConanFile):
     name = "Chatterino"
-    requires = "boost/1.81.0"
+    requires = "boost/1.83.0"
     settings = "os", "compiler", "build_type", "arch"
     default_options = {
         "with_benchmark": False,
@@ -24,7 +24,7 @@ class Chatterino(ConanFile):
             self.requires("benchmark/1.7.1")
 
         if self.options.get_safe("with_openssl3", False):
-            self.requires("openssl/3.1.0")
+            self.requires("openssl/3.2.0")
         else:
             self.requires("openssl/1.1.1t")
 

From 3ad2e4b30a170f1f0e375a46aa9bbca33177b13e Mon Sep 17 00:00:00 2001
From: Ilya Zlobintsev <ilya.zl@protonmail.com>
Date: Sat, 9 Dec 2023 10:47:26 +0200
Subject: [PATCH 05/42] Update flatpak nightly build link (#5008)

The `nightly` branch of Chatterino on Flathub will no longer be updated due to changes in Flathub rules. Nightly builds will instead be published in the `flathub-beta` repository. The `.flatpakref` file has been updated to point to the new location.

See also: https://github.com/flathub/flathub/issues/4767
---
 .CI/chatterino-nightly.flatpakref | 6 +++---
 CHANGELOG.md                      | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.CI/chatterino-nightly.flatpakref b/.CI/chatterino-nightly.flatpakref
index a1484546b..61cf409e3 100644
--- a/.CI/chatterino-nightly.flatpakref
+++ b/.CI/chatterino-nightly.flatpakref
@@ -1,9 +1,9 @@
 [Flatpak Ref]
 Name=com.chatterino.chatterino
-Branch=nightly
+Branch=beta
 Title=com.chatterino.chatterino from flathub
 IsRuntime=false
-Url=https://dl.flathub.org/repo/
-SuggestRemoteName=flathub
+Url=https://dl.flathub.org/beta-repo/
+SuggestRemoteName=flathub-beta
 GPGKey=mQINBFlD2sABEADsiUZUOYBg1UdDaWkEdJYkTSZD68214m8Q1fbrP5AptaUfCl8KYKFMNoAJRBXn9FbE6q6VBzghHXj/rSnA8WPnkbaEWR7xltOqzB1yHpCQ1l8xSfH5N02DMUBSRtD/rOYsBKbaJcOgW0K21sX+BecMY/AI2yADvCJEjhVKrjR9yfRX+NQEhDcbXUFRGt9ZT+TI5yT4xcwbvvTu7aFUR/dH7+wjrQ7lzoGlZGFFrQXSs2WI0WaYHWDeCwymtohXryF8lcWQkhH8UhfNJVBJFgCY8Q6UHkZG0FxMu8xnIDBMjBmSZKwKQn0nwzwM2afskZEnmNPYDI8nuNsSZBZSAw+ThhkdCZHZZRwzmjzyRuLLVFpOj3XryXwZcSefNMPDkZAuWWzPYjxS80cm2hG1WfqrG0Gl8+iX69cbQchb7gbEb0RtqNskTo9DDmO0bNKNnMbzmIJ3/rTbSahKSwtewklqSP/01o0WKZiy+n/RAkUKOFBprjJtWOZkc8SPXV/rnoS2dWsJWQZhuPPtv3tefdDiEyp7ePrfgfKxuHpZES0IZRiFI4J/nAUP5bix+srcIxOVqAam68CbAlPvWTivRUMRVbKjJiGXIOJ78wAMjqPg3QIC0GQ0EPAWwAOzzpdgbnG7TCQetaVV8rSYCuirlPYN+bJIwBtkOC9SWLoPMVZTwQARAQABtC5GbGF0aHViIFJlcG8gU2lnbmluZyBLZXkgPGZsYXRodWJAZmxhdGh1Yi5vcmc+iQJUBBMBCAA+FiEEblwF2XnHba+TwIE1QYTdTZB6fK4FAllD2sACGwMFCRLMAwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQQYTdTZB6fK5RJQ/+Ptd4sWxaiAW91FFk7+wmYOkEe1NY2UDNJjEEz34PNP/1RoxveHDt43kYJQ23OWaPJuZAbu+fWtjRYcMBzOsMCaFcRSHFiDIC9aTp4ux/mo+IEeyarYt/oyKb5t5lta6xaAqg7rwt65jW5/aQjnS4h7eFZ+dAKta7Y/fljNrOznUp81/SMcx4QA5G2Pw0hs4Xrxg59oONOTFGBgA6FF8WQghrpR7SnEe0FSEOVsAjwQ13Cfkfa7b70omXSWp7GWfUzgBKyoWxKTqzMN3RQHjjhPJcsQnrqH5enUu4Pcb2LcMFpzimHnUgb9ft72DP5wxfzHGAWOUiUXHbAekfq5iFks8cha/RST6wkxG3Rf44Zn09aOxh1btMcGL+5xb1G0BuCQnA0fP/kDYIPwh9z22EqwRQOspIcvGeLVkFeIfubxpcMdOfQqQnZtHMCabV5Q/Rk9K1ZGc8M2hlg8gHbXMFch2xJ0Wu72eXbA/UY5MskEeBgawTQnQOK/vNm7t0AJMpWK26Qg6178UmRghmeZDj9uNRc3EI1nSbgvmGlpDmCxaAGqaGL1zW4KPW5yN25/qeqXcgCvUjZLI9PNq3Kvizp1lUrbx7heRiSoazCucvHQ1VHUzcPVLUKKTkoTP8okThnRRRsBcZ1+jI4yMWIDLOCT7IW3FePr+3xyuy5eEo9a25Ag0EWUPa7AEQALT/CmSyZ8LWlRYQZKYw417p7Z2hxqd6TjwkwM3IQ1irumkWcTZBZIbBgrSOg6CcXD2oWydCQHWi9qaxhuhEl2bJL5LskmBcMxVdQeD0LLHd8QUnbnnIby8ocvWN1alPfvJFjCUTrmD22U1ycOzRw2lIe4kiQONbOZtdWrVImQQSndjFlisitbmlWHvHm2lOOYy8+GJB7YffVV193hmnBSJffCy4bvkuLxsI+n1DhOzc7MPV3z6HGk4HiEcF0yyt9tCYhpsxHFdBoq2h771HfAcS0s98EVAqYMFnf9em+4cnYpdI6mhIfS1FQiKl6DBAYA8tT3ggla00DurPo0JwX/zN+PaO5h/6O9aCZwV7G6rbkgMuqMergXaf8oP38gr0z+MqWnkfM63Bodq68GP4l4hd02BoFBbDf38TMuGQB14+twJMdfbAxo2MbgluvQgfwHfZ2ca6gyEY+9s/YD1gugLjV+S6CB51WkFNe1z4tAPgJZNxUcKCbeaHNbthl8Hks/pY9RCEseX/EdfzF18epbSjJMPh4DPQXbUoFwmyuYcoBOPmvZHNl9hK7B/1RP8w1ZrXk8qdupC0SNbafX7270B7lMMVImzZetGsM9ypXJ6llhp3FwW09iseNyGJGPsr/dvTMGDXqOPfU/9SAS1LSTY4K9PbRtdrBE318YX8mIk5ABEBAAGJBHIEGAEIACYWIQRuXAXZecdtr5PAgTVBhN1NkHp8rgUCWUPa7AIbAgUJEswDAAJACRBBhN1NkHp8rsF0IAQZAQgAHRYhBFSmzd2JGfsgQgDYrFYnAunj7X7oBQJZQ9rsAAoJEFYnAunj7X7oR6AP/0KYmiAFeqx14Z43/6s2gt3VhxlSd8bmcVV7oJFbMhdHBIeWBp2BvsUf00I0Zl14ZkwCKfLwbbORC2eIxvzJ+QWjGfPhDmS4XUSmhlXxWnYEveSek5Tde+fmu6lqKM8CHg5BNx4GWIX/vdLi1wWJZyhrUwwICAxkuhKxuP2Z1An48930eslTD2GGcjByc27+9cIZjHKa07I/aLffo04V+oMT9/tgzoquzgpVV4jwekADo2MJjhkkPveSNI420bgT+Q7Fi1l0X1aFUniBvQMsaBa27PngWm6xE2ZYvh7nWCdd5g0c0eLIHxWwzV1lZ4Ryx4ITO/VL25ItECcjhTRdYa64sA62MYSaB0x3eR+SihpgP3wSNPFu3MJo6FKTFdi4CBAEmpWHFW7FcRmd+cQXeFrHLN3iNVWryy0HK/CUEJmiZEmpNiXecl4vPIIuyF0zgSCztQtKoMr+injpmQGC/rF/ELBVZTUSLNB350S0Ztvw0FKWDAJSxFmoxt3xycqvvt47rxTrhi78nkk6jATKGyvP55sO+K7Q7Wh0DXA69hvPrYW2eu8jGCdVGxi6HX7L1qcfEd0378S71dZ3g9o6KKl1OsDWWQ6MJ6FGBZedl/ibRfs8p5+sbCX3lQSjEFy3rx6n0rUrXx8U2qb+RCLzJlmC5MNBOTDJwHPcX6gKsUcXZrEQALmRHoo3SrewO41RCr+5nUlqiqV3AohBMhnQbGzyHf2+drutIaoh7Rj80XRh2bkkuPLwlNPf+bTXwNVGse4bej7B3oV6Ae1N7lTNVF4Qh+1OowtGjmfJPWo0z1s6HFJVxoIof9z58Msvgao0zrKGqaMWaNQ6LUeC9g9Aj/9Uqjbo8X54aLiYs8Z1WNc06jKP+gv8AWLtv6CR+l2kLez1YMDucjm7v6iuCMVAmZdmxhg5I/X2+OM3vBsqPDdQpr2TPDLX3rCrSBiS0gOQ6DwN5N5QeTkxmY/7QO8bgLo/Wzu1iilH4vMKW6LBKCaRx5UEJxKpL4wkgITsYKneIt3NTHo5EOuaYk+y2+Dvt6EQFiuMsdbfUjs3seIHsghX/cbPJa4YUqZAL8C4OtVHaijwGo0ymt9MWvS9yNKMyT0JhN2/BdeOVWrHk7wXXJn/ZjpXilicXKPx4udCF76meE+6N2u/T+RYZ7fP1QMEtNZNmYDOfA6sViuPDfQSHLNbauJBo/n1sRYAsL5mcG22UDchJrlKvmK3EOADCQg+myrm8006LltubNB4wWNzHDJ0Ls2JGzQZCd/xGyVmUiidCBUrD537WdknOYE4FD7P0cHaM9brKJ/M8LkEH0zUlo73bY4XagbnCqve6PvQb5G2Z55qhWphd6f4B6DGed86zJEa/RhS
 RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5fff97a6..c958e6292 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - Minor: All sound capabilities can now be disabled by setting your "Sound backend" setting to "Null" and restarting Chatterino. (#4978)
 - Minor: Add an option to use new experimental smarter emote completion. (#4987)
 - Minor: Add `--safe-mode` command line option that can be used for troubleshooting when Chatterino is misbehaving or is misconfigured. It disables hiding the settings button & prevents plugins from loading. (#4985)
+- Minor: Updated the flatpakref link included with nightly builds to point to up-to-date flathub-beta builds. (#5008)
 - Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840)
 - Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848)
 - Bugfix: Trimmed custom streamlink paths on all platforms making sure you don't accidentally add spaces at the beginning or end of its path. (#4834)

From fec8f8c49f187323f08e2c9c93470fa62fc5cf1f Mon Sep 17 00:00:00 2001
From: smc <128479338+crazysmc@users.noreply.github.com>
Date: Sat, 9 Dec 2023 12:28:33 +0100
Subject: [PATCH 06/42] Fix missing parent of tooltips for Wayland (#4998)

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
---
 CHANGELOG.md                       |  1 +
 src/widgets/BaseWindow.cpp         |  7 ------
 src/widgets/TooltipWidget.cpp      |  6 -----
 src/widgets/TooltipWidget.hpp      |  4 +--
 src/widgets/helper/ChannelView.cpp | 39 ++++++++++++++++--------------
 src/widgets/helper/ChannelView.hpp |  3 +++
 src/widgets/splits/Split.cpp       |  3 ---
 src/widgets/splits/SplitHeader.cpp | 20 ++++++++-------
 src/widgets/splits/SplitHeader.hpp |  2 ++
 9 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c958e6292..88558b3c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@
 - Bugfix: Fixed rare crash with Image Uploader when closing a split right after starting an upload. (#4971)
 - Bugfix: Fixed support for Windows 11 Snap layouts. (#4994)
 - Bugfix: Fixed some windows appearing between screens. (#4797)
+- Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998)
 - Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978)
 - Dev: Change clang-format from v14 to v16. (#4929)
 - Dev: Fixed UTF16 encoding of `modes` file for the installer. (#4791)
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index 59abe0a4f..6fdfe75c7 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -10,7 +10,6 @@
 #include "widgets/helper/EffectLabel.hpp"
 #include "widgets/helper/TitlebarButtons.hpp"
 #include "widgets/Label.hpp"
-#include "widgets/TooltipWidget.hpp"
 #include "widgets/Window.hpp"
 
 #include <QApplication>
@@ -468,11 +467,6 @@ EffectLabel *BaseWindow::addTitleBarLabel(std::function<void()> onClicked)
 
 void BaseWindow::changeEvent(QEvent *)
 {
-    if (this->isVisible())
-    {
-        TooltipWidget::instance()->hide();
-    }
-
 #ifdef USEWINSDK
     if (this->ui_.titlebarButtons)
     {
@@ -497,7 +491,6 @@ void BaseWindow::changeEvent(QEvent *)
 
 void BaseWindow::leaveEvent(QEvent *)
 {
-    TooltipWidget::instance()->hide();
 }
 
 void BaseWindow::moveTo(QPoint point, widgets::BoundsChecking mode)
diff --git a/src/widgets/TooltipWidget.cpp b/src/widgets/TooltipWidget.cpp
index dba8afc77..aa4894a8f 100644
--- a/src/widgets/TooltipWidget.cpp
+++ b/src/widgets/TooltipWidget.cpp
@@ -12,12 +12,6 @@
 
 namespace chatterino {
 
-TooltipWidget *TooltipWidget::instance()
-{
-    static TooltipWidget *tooltipWidget = new TooltipWidget();
-    return tooltipWidget;
-}
-
 TooltipWidget::TooltipWidget(BaseWidget *parent)
     : BaseWindow({BaseWindow::TopMost, BaseWindow::DontFocus,
                   BaseWindow::DisableLayoutSave},
diff --git a/src/widgets/TooltipWidget.hpp b/src/widgets/TooltipWidget.hpp
index 526ec7a1c..df40e998a 100644
--- a/src/widgets/TooltipWidget.hpp
+++ b/src/widgets/TooltipWidget.hpp
@@ -29,9 +29,7 @@ class TooltipWidget : public BaseWindow
     Q_OBJECT
 
 public:
-    static TooltipWidget *instance();
-
-    TooltipWidget(BaseWidget *parent = nullptr);
+    TooltipWidget(BaseWidget *parent);
     ~TooltipWidget() override = default;
 
     void setOne(const TooltipEntry &entry,
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 2ac6848be..171f05e65 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -285,6 +285,7 @@ ChannelView::ChannelView(BaseWidget *parent, Split *split, Context context,
     , highlightAnimation_(this)
     , context_(context)
     , messages_(messagesLimit)
+    , tooltipWidget_(new TooltipWidget(this))
 {
     this->setMouseTracking(true);
 
@@ -1632,7 +1633,7 @@ void ChannelView::enterEvent(QEvent * /*event*/)
 
 void ChannelView::leaveEvent(QEvent * /*event*/)
 {
-    TooltipWidget::instance()->hide();
+    this->tooltipWidget_->hide();
 
     this->unpause(PauseReason::Mouse);
 
@@ -1653,7 +1654,6 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
         this->pause(PauseReason::Mouse);
     }
 
-    auto *tooltipWidget = TooltipWidget::instance();
     std::shared_ptr<MessageLayout> layout;
     QPoint relativePos;
     int messageIndex;
@@ -1662,7 +1662,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
     if (!tryGetMessageAt(event->pos(), layout, relativePos, messageIndex))
     {
         this->setCursor(Qt::ArrowCursor);
-        tooltipWidget->hide();
+        this->tooltipWidget_->hide();
         return;
     }
 
@@ -1700,14 +1700,14 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
     if (layout->flags.has(MessageLayoutFlag::Collapsed))
     {
         this->setCursor(Qt::PointingHandCursor);
-        tooltipWidget->hide();
+        this->tooltipWidget_->hide();
         return;
     }
 
     if (hoverLayoutElement == nullptr)
     {
         this->setCursor(Qt::ArrowCursor);
-        tooltipWidget->hide();
+        this->tooltipWidget_->hide();
         return;
     }
 
@@ -1721,7 +1721,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
     if (element->getTooltip().isEmpty() ||
         (isLinkValid && isNotEmote && !getSettings()->linkInfoTooltip))
     {
-        tooltipWidget->hide();
+        this->tooltipWidget_->hide();
     }
     else
     {
@@ -1739,7 +1739,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
 
             if (emoteElement)
             {
-                tooltipWidget->setOne({
+                this->tooltipWidget_->setOne({
                     showThumbnail
                         ? emoteElement->getEmote()->images.getImage(3.0)
                         : nullptr,
@@ -1798,12 +1798,12 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
                     auto style = layeredEmotes.size() > 2
                                      ? TooltipStyle::Grid
                                      : TooltipStyle::Vertical;
-                    tooltipWidget->set(entries, style);
+                    this->tooltipWidget_->set(entries, style);
                 }
             }
             else if (badgeElement)
             {
-                tooltipWidget->setOne({
+                this->tooltipWidget_->setOne({
                     showThumbnail
                         ? badgeElement->getEmote()->images.getImage(3.0)
                         : nullptr,
@@ -1834,7 +1834,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
             if (thumbnailSize == 0)
             {
                 // "Show thumbnails" is set to "Off", show text only
-                tooltipWidget->setOne({nullptr, element->getTooltip()});
+                this->tooltipWidget_->setOne({nullptr, element->getTooltip()});
             }
             else
             {
@@ -1851,21 +1851,24 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
                 if (element->getThumbnailType() ==
                     MessageElement::ThumbnailType::Link_Thumbnail)
                 {
-                    tooltipWidget->setOne({std::move(thumb),
-                                           element->getTooltip(), thumbnailSize,
-                                           thumbnailSize});
+                    this->tooltipWidget_->setOne({
+                        std::move(thumb),
+                        element->getTooltip(),
+                        thumbnailSize,
+                        thumbnailSize,
+                    });
                 }
                 else
                 {
-                    tooltipWidget->setOne({std::move(thumb), ""});
+                    this->tooltipWidget_->setOne({std::move(thumb), ""});
                 }
             }
         }
 
-        tooltipWidget->moveTo(event->globalPos() + QPoint(16, 16),
-                              widgets::BoundsChecking::CursorPosition);
-        tooltipWidget->setWordWrap(isLinkValid);
-        tooltipWidget->show();
+        this->tooltipWidget_->moveTo(event->globalPos() + QPoint(16, 16),
+                                     widgets::BoundsChecking::CursorPosition);
+        this->tooltipWidget_->setWordWrap(isLinkValid);
+        this->tooltipWidget_->show();
     }
 
     // check if word has a link
diff --git a/src/widgets/helper/ChannelView.hpp b/src/widgets/helper/ChannelView.hpp
index 005ba31d7..08da3ae06 100644
--- a/src/widgets/helper/ChannelView.hpp
+++ b/src/widgets/helper/ChannelView.hpp
@@ -7,6 +7,7 @@
 #include "messages/Selection.hpp"
 #include "util/ThreadGuard.hpp"
 #include "widgets/BaseWidget.hpp"
+#include "widgets/TooltipWidget.hpp"
 
 #include <pajlada/signals/signal.hpp>
 #include <QMenu>
@@ -333,6 +334,8 @@ private:
     MessagePreferences messagePreferences_;
 
     void scrollUpdateRequested();
+
+    TooltipWidget *const tooltipWidget_{};
 };
 
 }  // namespace chatterino
diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp
index 50d231fe7..90ab8bd46 100644
--- a/src/widgets/splits/Split.cpp
+++ b/src/widgets/splits/Split.cpp
@@ -39,7 +39,6 @@
 #include "widgets/splits/SplitHeader.hpp"
 #include "widgets/splits/SplitInput.hpp"
 #include "widgets/splits/SplitOverlay.hpp"
-#include "widgets/TooltipWidget.hpp"
 #include "widgets/Window.hpp"
 
 #include <QApplication>
@@ -993,8 +992,6 @@ void Split::leaveEvent(QEvent *event)
 
     this->overlay_->hide();
 
-    TooltipWidget::instance()->hide();
-
     this->handleModifiers(QGuiApplication::queryKeyboardModifiers());
 }
 
diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp
index 19e34e8b3..58d75b44b 100644
--- a/src/widgets/splits/SplitHeader.cpp
+++ b/src/widgets/splits/SplitHeader.cpp
@@ -223,6 +223,7 @@ namespace chatterino {
 SplitHeader::SplitHeader(Split *split)
     : BaseWidget(split)
     , split_(split)
+    , tooltipWidget_(new TooltipWidget(this))
 {
     this->initializeLayout();
 
@@ -948,15 +949,16 @@ void SplitHeader::enterEvent(QEvent *event)
     {
         auto *channel = this->split_->getChannel().get();
 
-        auto *tooltip = TooltipWidget::instance();
-        tooltip->setOne({nullptr, this->tooltipText_});
-        tooltip->setWordWrap(true);
-        tooltip->adjustSize();
-        auto pos = this->mapToGlobal(this->rect().bottomLeft()) +
-                   QPoint((this->width() - tooltip->width()) / 2, 1);
+        this->tooltipWidget_->setOne({nullptr, this->tooltipText_});
+        this->tooltipWidget_->setWordWrap(true);
+        this->tooltipWidget_->adjustSize();
+        auto pos =
+            this->mapToGlobal(this->rect().bottomLeft()) +
+            QPoint((this->width() - this->tooltipWidget_->width()) / 2, 1);
 
-        tooltip->moveTo(pos, widgets::BoundsChecking::CursorPosition);
-        tooltip->show();
+        this->tooltipWidget_->moveTo(pos,
+                                     widgets::BoundsChecking::CursorPosition);
+        this->tooltipWidget_->show();
     }
 
     BaseWidget::enterEvent(event);
@@ -964,7 +966,7 @@ void SplitHeader::enterEvent(QEvent *event)
 
 void SplitHeader::leaveEvent(QEvent *event)
 {
-    TooltipWidget::instance()->hide();
+    this->tooltipWidget_->hide();
 
     BaseWidget::leaveEvent(event);
 }
diff --git a/src/widgets/splits/SplitHeader.hpp b/src/widgets/splits/SplitHeader.hpp
index 321a4e947..872ba8a8b 100644
--- a/src/widgets/splits/SplitHeader.hpp
+++ b/src/widgets/splits/SplitHeader.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "widgets/BaseWidget.hpp"
+#include "widgets/TooltipWidget.hpp"
 
 #include <boost/signals2.hpp>
 #include <pajlada/settings/setting.hpp>
@@ -68,6 +69,7 @@ private:
 
     Split *const split_{};
     QString tooltipText_{};
+    TooltipWidget *const tooltipWidget_{};
     bool isLive_{false};
     QString thumbnail_;
     QElapsedTimer lastThumbnail_;

From 507f27e3d2a94feb6ec9e8375af930f3544e96b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 9 Dec 2023 12:02:01 +0000
Subject: [PATCH 07/42] chore(deps): bump lib/crashpad from `3182e3b` to
 `89991e9` (#5005)

Bumps [lib/crashpad](https://github.com/getsentry/crashpad) from `3182e3b` to `89991e9`.
- [Commits](https://github.com/getsentry/crashpad/compare/3182e3be21a8a753f9f269f0a590370d49c8f3cf...89991e9910bc4c0893e45c8cfad0bdd31cc25a5c)

---
updated-dependencies:
- dependency-name: lib/crashpad
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
---
 lib/crashpad | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/crashpad b/lib/crashpad
index 3182e3be2..89991e991 160000
--- a/lib/crashpad
+++ b/lib/crashpad
@@ -1 +1 @@
-Subproject commit 3182e3be21a8a753f9f269f0a590370d49c8f3cf
+Subproject commit 89991e9910bc4c0893e45c8cfad0bdd31cc25a5c

From 401e097d622cc0301f5b97381a90f6e29a22582c Mon Sep 17 00:00:00 2001
From: Mm2PL <mm2pl+gh@kotmisia.pl>
Date: Sat, 9 Dec 2023 13:21:00 +0100
Subject: [PATCH 08/42] Hide the Usercard button in the User Info Popup in
 special channels (#4972)

---
 CHANGELOG.md                          |  1 +
 src/widgets/dialogs/UserInfoPopup.cpp | 14 +++++++++++++-
 src/widgets/dialogs/UserInfoPopup.hpp |  3 +++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88558b3c7..9bc065e7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
 - Bugfix: Fixed lookahead/-behind not working in _Ignores_. (#4965)
 - Bugfix: Fixed Image Uploader accidentally deleting images with some hosts when link resolver was enabled. (#4971)
 - Bugfix: Fixed rare crash with Image Uploader when closing a split right after starting an upload. (#4971)
+- Bugfix: Hide the Usercard button in the User Info Popup when in special channels. (#4972)
 - Bugfix: Fixed support for Windows 11 Snap layouts. (#4994)
 - Bugfix: Fixed some windows appearing between screens. (#4797)
 - Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998)
diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index 4045ed33d..e0f1e57f1 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -385,7 +385,10 @@ UserInfoPopup::UserInfoPopup(bool closeAutomatically, QWidget *parent,
         user.emplace<QCheckBox>("Block").assign(&this->ui_.block);
         user.emplace<QCheckBox>("Ignore highlights")
             .assign(&this->ui_.ignoreHighlights);
-        auto usercard = user.emplace<EffectLabel2>(this);
+        // visibility of this is updated in setData
+
+        auto usercard =
+            user.emplace<EffectLabel2>(this).assign(&this->ui_.usercardLabel);
         usercard->getLabel().setText("Usercard");
         auto mod = user.emplace<Button>(this);
         mod->setPixmap(getResources().buttons.mod);
@@ -739,6 +742,15 @@ void UserInfoPopup::setData(const QString &name,
         this->updateLatestMessages();
     }
     // If we're opening by ID, this will be called as soon as we get the information from twitch
+
+    auto type = this->channel_->getType();
+    if (type == Channel::Type::TwitchLive ||
+        type == Channel::Type::TwitchWhispers || type == Channel::Type::Irc ||
+        type == Channel::Type::Misc)
+    {
+        // not a normal twitch channel, the url opened by the button will be invalid, so hide the button
+        this->ui_.usercardLabel->hide();
+    }
 }
 
 void UserInfoPopup::updateLatestMessages()
diff --git a/src/widgets/dialogs/UserInfoPopup.hpp b/src/widgets/dialogs/UserInfoPopup.hpp
index a233500e9..e22f6d2cf 100644
--- a/src/widgets/dialogs/UserInfoPopup.hpp
+++ b/src/widgets/dialogs/UserInfoPopup.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "widgets/DraggablePopup.hpp"
+#include "widgets/helper/EffectLabel.hpp"
 
 #include <pajlada/signals/scoped-connection.hpp>
 #include <pajlada/signals/signal.hpp>
@@ -80,6 +81,8 @@ private:
 
         Label *noMessagesLabel = nullptr;
         ChannelView *latestMessages = nullptr;
+
+        EffectLabel2 *usercardLabel = nullptr;
     } ui_;
 
     class TimeoutWidget : public BaseWidget

From 13dc3065063317d4dc28a33bc8d300511064c283 Mon Sep 17 00:00:00 2001
From: iProdigy <8106344+iProdigy@users.noreply.github.com>
Date: Sat, 9 Dec 2023 10:46:30 -0800
Subject: [PATCH 09/42] perf: query fewer historical messages on reconnects
 (#5001)

Co-authored-by: Ruben Anders <ruben.anders@robotty.de>
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
---
 CHANGELOG.md                               |   1 +
 src/common/Channel.hpp                     |   2 -
 src/providers/irc/AbstractIrcServer.cpp    |   8 +-
 src/providers/recentmessages/Api.cpp       | 124 +++++++++++----------
 src/providers/recentmessages/Api.hpp       |  14 ++-
 src/providers/recentmessages/Impl.cpp      |  25 ++++-
 src/providers/recentmessages/Impl.hpp      |   7 +-
 src/providers/twitch/IrcMessageHandler.cpp |   1 +
 src/providers/twitch/TwitchChannel.cpp     |  53 +++++++--
 src/providers/twitch/TwitchChannel.hpp     |  13 +++
 10 files changed, 171 insertions(+), 77 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bc065e7e..e13735bc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,6 +85,7 @@
 - Dev: Move `clang-tidy` checker to its own CI job. (#4996)
 - Dev: Refactored the Image Uploader feature. (#4971)
 - Dev: Fixed deadlock and use-after-free in tests. (#4981)
+- Dev: Load less message history upon reconnects. (#5001)
 
 ## 2.4.6
 
diff --git a/src/common/Channel.hpp b/src/common/Channel.hpp
index 4fc686c06..de134b121 100644
--- a/src/common/Channel.hpp
+++ b/src/common/Channel.hpp
@@ -61,8 +61,6 @@ public:
     pajlada::Signals::Signal<const std::vector<MessagePtr> &> filledInMessages;
     pajlada::Signals::NoArgSignal destroyed;
     pajlada::Signals::NoArgSignal displayNameChanged;
-    /// Invoked when AbstractIrcServer::onReadConnected occurs
-    pajlada::Signals::NoArgSignal connected;
 
     Type getType() const;
     const QString &getName() const;
diff --git a/src/providers/irc/AbstractIrcServer.cpp b/src/providers/irc/AbstractIrcServer.cpp
index 58fda00fd..9c30049e7 100644
--- a/src/providers/irc/AbstractIrcServer.cpp
+++ b/src/providers/irc/AbstractIrcServer.cpp
@@ -5,6 +5,7 @@
 #include "messages/LimitedQueueSnapshot.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
 
 #include <QCoreApplication>
 
@@ -331,8 +332,6 @@ void AbstractIrcServer::onReadConnected(IrcConnection *connection)
         {
             chan->addMessage(connectedMsg);
         }
-
-        chan->connected.invoke();
     }
 
     this->falloffCounter_ = 1;
@@ -360,6 +359,11 @@ void AbstractIrcServer::onDisconnected()
         }
 
         chan->addMessage(disconnectedMsg);
+
+        if (auto *channel = dynamic_cast<TwitchChannel *>(chan.get()))
+        {
+            channel->markDisconnectedNow();
+        }
     }
 }
 
diff --git a/src/providers/recentmessages/Api.cpp b/src/providers/recentmessages/Api.cpp
index aad37234e..efce6d333 100644
--- a/src/providers/recentmessages/Api.cpp
+++ b/src/providers/recentmessages/Api.cpp
@@ -18,72 +18,84 @@ namespace chatterino::recentmessages {
 
 using namespace recentmessages::detail;
 
-void load(const QString &channelName, std::weak_ptr<Channel> channelPtr,
-          ResultCallback onLoaded, ErrorCallback onError)
+void load(
+    const QString &channelName, std::weak_ptr<Channel> channelPtr,
+    ResultCallback onLoaded, ErrorCallback onError, const int limit,
+    const std::optional<std::chrono::time_point<std::chrono::system_clock>>
+        after,
+    const std::optional<std::chrono::time_point<std::chrono::system_clock>>
+        before,
+    const bool jitter)
 {
     qCDebug(LOG) << "Loading recent messages for" << channelName;
 
-    const auto url = constructRecentMessagesUrl(channelName);
+    const auto url =
+        constructRecentMessagesUrl(channelName, limit, after, before);
 
-    NetworkRequest(url)
-        .onSuccess([channelPtr, onLoaded](const auto &result) {
-            auto shared = channelPtr.lock();
-            if (!shared)
-            {
-                return;
-            }
-
-            qCDebug(LOG) << "Successfully loaded recent messages for"
-                         << shared->getName();
-
-            auto root = result.parseJson();
-            auto parsedMessages = parseRecentMessages(root);
-
-            // build the Communi messages into chatterino messages
-            auto builtMessages =
-                buildRecentMessages(parsedMessages, shared.get());
-
-            postToThread([shared = std::move(shared), root = std::move(root),
-                          messages = std::move(builtMessages),
-                          onLoaded]() mutable {
-                // Notify user about a possible gap in logs if it returned some messages
-                // but isn't currently joined to a channel
-                const auto errorCode = root.value("error_code").toString();
-                if (!errorCode.isEmpty())
+    const long delayMs = jitter ? std::rand() % 100 : 0;
+    QTimer::singleShot(delayMs, [=] {
+        NetworkRequest(url)
+            .onSuccess([channelPtr, onLoaded](const auto &result) {
+                auto shared = channelPtr.lock();
+                if (!shared)
                 {
-                    qCDebug(LOG)
-                        << QString("Got error from API: error_code=%1, "
-                                   "channel=%2")
-                               .arg(errorCode, shared->getName());
-                    if (errorCode == "channel_not_joined" && !messages.empty())
-                    {
-                        shared->addMessage(makeSystemMessage(
-                            "Message history service recovering, there may "
-                            "be gaps in the message history."));
-                    }
+                    return;
                 }
 
-                onLoaded(messages);
-            });
-        })
-        .onError([channelPtr, onError](const NetworkResult &result) {
-            auto shared = channelPtr.lock();
-            if (!shared)
-            {
-                return;
-            }
+                qCDebug(LOG) << "Successfully loaded recent messages for"
+                             << shared->getName();
 
-            qCDebug(LOG) << "Failed to load recent messages for"
-                         << shared->getName();
+                auto root = result.parseJson();
+                auto parsedMessages = parseRecentMessages(root);
 
-            shared->addMessage(makeSystemMessage(
-                QStringLiteral(
-                    "Message history service unavailable (Error: %1)")
-                    .arg(result.formatError())));
+                // build the Communi messages into chatterino messages
+                auto builtMessages =
+                    buildRecentMessages(parsedMessages, shared.get());
 
-            onError();
-        })
-        .execute();
+                postToThread([shared = std::move(shared),
+                              root = std::move(root),
+                              messages = std::move(builtMessages),
+                              onLoaded]() mutable {
+                    // Notify user about a possible gap in logs if it returned some messages
+                    // but isn't currently joined to a channel
+                    const auto errorCode = root.value("error_code").toString();
+                    if (!errorCode.isEmpty())
+                    {
+                        qCDebug(LOG)
+                            << QString("Got error from API: error_code=%1, "
+                                       "channel=%2")
+                                   .arg(errorCode, shared->getName());
+                        if (errorCode == "channel_not_joined" &&
+                            !messages.empty())
+                        {
+                            shared->addMessage(makeSystemMessage(
+                                "Message history service recovering, there may "
+                                "be gaps in the message history."));
+                        }
+                    }
+
+                    onLoaded(messages);
+                });
+            })
+            .onError([channelPtr, onError](const NetworkResult &result) {
+                auto shared = channelPtr.lock();
+                if (!shared)
+                {
+                    return;
+                }
+
+                qCDebug(LOG) << "Failed to load recent messages for"
+                             << shared->getName();
+
+                shared->addMessage(makeSystemMessage(
+                    QStringLiteral(
+                        "Message history service unavailable (Error: %1)")
+                        .arg(result.formatError())));
+
+                onError();
+            })
+            .execute();
+    });
 }
 
 }  // namespace chatterino::recentmessages
diff --git a/src/providers/recentmessages/Api.hpp b/src/providers/recentmessages/Api.hpp
index 2a558010e..57193be1f 100644
--- a/src/providers/recentmessages/Api.hpp
+++ b/src/providers/recentmessages/Api.hpp
@@ -2,8 +2,10 @@
 
 #include <QString>
 
+#include <chrono>
 #include <functional>
 #include <memory>
+#include <optional>
 #include <vector>
 
 namespace chatterino {
@@ -28,8 +30,16 @@ using ErrorCallback = std::function<void()>;
  * @param channelPtr Weak pointer to Channel to use to build messages
  * @param onLoaded Callback taking the built messages as a const std::vector<MessagePtr> &
  * @param onError Callback called when the network request fails
+ * @param limit Maximum number of messages to query
+ * @param after Only return messages that were received after this timestamp; ignored if `std::nullopt`
+ * @param before Only return messages that were received before this timestamp; ignored if `std::nullopt`
+ * @param jitter Whether to delay the request by a small random duration
  */
-void load(const QString &channelName, std::weak_ptr<Channel> channelPtr,
-          ResultCallback onLoaded, ErrorCallback onError);
+void load(
+    const QString &channelName, std::weak_ptr<Channel> channelPtr,
+    ResultCallback onLoaded, ErrorCallback onError, int limit,
+    std::optional<std::chrono::time_point<std::chrono::system_clock>> after,
+    std::optional<std::chrono::time_point<std::chrono::system_clock>> before,
+    bool jitter);
 
 }  // namespace chatterino::recentmessages
diff --git a/src/providers/recentmessages/Impl.cpp b/src/providers/recentmessages/Impl.cpp
index 36a4b4c99..2f784ef35 100644
--- a/src/providers/recentmessages/Impl.cpp
+++ b/src/providers/recentmessages/Impl.cpp
@@ -5,7 +5,6 @@
 #include "providers/twitch/IrcMessageHandler.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
-#include "singletons/Settings.hpp"
 #include "util/FormatTime.hpp"
 
 #include <QJsonArray>
@@ -94,14 +93,34 @@ std::vector<MessagePtr> buildRecentMessages(
 
 // Returns the URL to be used for querying the Recent Messages API for the
 // given channel.
-QUrl constructRecentMessagesUrl(const QString &name)
+QUrl constructRecentMessagesUrl(
+    const QString &name, const int limit,
+    const std::optional<std::chrono::time_point<std::chrono::system_clock>>
+        after,
+    const std::optional<std::chrono::time_point<std::chrono::system_clock>>
+        before)
 {
     QUrl url(Env::get().recentMessagesApiUrl.arg(name));
     QUrlQuery urlQuery(url);
     if (!urlQuery.hasQueryItem("limit"))
+    {
+        urlQuery.addQueryItem("limit", QString::number(limit));
+    }
+    if (after.has_value())
     {
         urlQuery.addQueryItem(
-            "limit", QString::number(getSettings()->twitchMessageHistoryLimit));
+            "after", QString::number(
+                         std::chrono::duration_cast<std::chrono::milliseconds>(
+                             after->time_since_epoch())
+                             .count()));
+    }
+    if (before.has_value())
+    {
+        urlQuery.addQueryItem(
+            "before", QString::number(
+                          std::chrono::duration_cast<std::chrono::milliseconds>(
+                              before->time_since_epoch())
+                              .count()));
     }
     url.setQuery(urlQuery);
     return url;
diff --git a/src/providers/recentmessages/Impl.hpp b/src/providers/recentmessages/Impl.hpp
index 000d379c8..3c60b6c3d 100644
--- a/src/providers/recentmessages/Impl.hpp
+++ b/src/providers/recentmessages/Impl.hpp
@@ -8,7 +8,9 @@
 #include <QString>
 #include <QUrl>
 
+#include <chrono>
 #include <memory>
+#include <optional>
 #include <vector>
 
 namespace chatterino::recentmessages::detail {
@@ -24,6 +26,9 @@ std::vector<MessagePtr> buildRecentMessages(
 
 // Returns the URL to be used for querying the Recent Messages API for the
 // given channel.
-QUrl constructRecentMessagesUrl(const QString &name);
+QUrl constructRecentMessagesUrl(
+    const QString &name, int limit,
+    std::optional<std::chrono::time_point<std::chrono::system_clock>> after,
+    std::optional<std::chrono::time_point<std::chrono::system_clock>> before);
 
 }  // namespace chatterino::recentmessages::detail
diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
index 0bfef74af..183a483ec 100644
--- a/src/providers/twitch/IrcMessageHandler.cpp
+++ b/src/providers/twitch/IrcMessageHandler.cpp
@@ -1136,6 +1136,7 @@ void IrcMessageHandler::handleJoinMessage(Communi::IrcMessage *message)
         getApp()->accounts->twitch.getCurrent()->getUserName())
     {
         twitchChannel->addMessage(makeSystemMessage("joined channel"));
+        twitchChannel->joined.invoke();
     }
     else if (getSettings()->showJoins.getValue())
     {
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 146707694..e2826fd42 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -103,17 +103,12 @@ TwitchChannel::TwitchChannel(const QString &name)
 
     // We can safely ignore this signal connection this has no external dependencies - once the signal
     // is destroyed, it will no longer be able to fire
-    std::ignore = this->connected.connect([this]() {
-        if (this->roomId().isEmpty())
+    std::ignore = this->joined.connect([this]() {
+        if (this->disconnectedAt_.has_value())
         {
-            // If we get a reconnected event when the room id is not set, we
-            // just connected for the first time. After receiving the first
-            // message from a channel, setRoomId is called and further
-            // invocations of this event will load recent messages.
-            return;
+            this->loadRecentMessagesReconnect();
+            this->disconnectedAt_ = std::nullopt;
         }
-
-        this->loadRecentMessagesReconnect();
     });
 
     // timers
@@ -1111,6 +1106,24 @@ bool TwitchChannel::setLive(bool newLiveStatus)
     return true;
 }
 
+void TwitchChannel::markDisconnectedNow()
+{
+    if (this->roomId().isEmpty())
+    {
+        // we were never joined in the first place
+        return;
+    }
+
+    if (this->disconnectedAt_.has_value())
+    {
+        // don't overwrite prior timestamp since
+        // a reconnection hasn't happened yet
+        return;
+    }
+
+    this->disconnectedAt_ = std::chrono::system_clock::now();
+}
+
 void TwitchChannel::loadRecentMessages()
 {
     if (!getSettings()->loadTwitchMessageHistoryOnConnect)
@@ -1163,7 +1176,9 @@ void TwitchChannel::loadRecentMessages()
                 return;
 
             tc->loadingRecentMessages_.clear();
-        });
+        },
+        getSettings()->twitchMessageHistoryLimit.getValue(), std::nullopt,
+        std::nullopt, false);
 }
 
 void TwitchChannel::loadRecentMessagesReconnect()
@@ -1178,6 +1193,21 @@ void TwitchChannel::loadRecentMessagesReconnect()
         return;  // already loading
     }
 
+    const auto now = std::chrono::system_clock::now();
+    int limit = getSettings()->twitchMessageHistoryLimit.getValue();
+    if (this->disconnectedAt_.has_value())
+    {
+        // calculate how many messages could have occured
+        // while we were not connected to the channel
+        // assuming a maximum of 10 messages per second
+        const auto secondsSinceDisconnect =
+            std::chrono::duration_cast<std::chrono::seconds>(
+                now - this->disconnectedAt_.value())
+                .count();
+        limit =
+            std::min(static_cast<int>(secondsSinceDisconnect + 1) * 10, limit);
+    }
+
     auto weak = weakOf<Channel>(this);
     recentmessages::load(
         this->getName(), weak,
@@ -1203,7 +1233,8 @@ void TwitchChannel::loadRecentMessagesReconnect()
                 return;
 
             tc->loadingRecentMessages_.clear();
-        });
+        },
+        limit, this->disconnectedAt_, now, true);
 }
 
 void TwitchChannel::refreshPubSub()
diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp
index d9e5d3e41..5b1d628a6 100644
--- a/src/providers/twitch/TwitchChannel.hpp
+++ b/src/providers/twitch/TwitchChannel.hpp
@@ -136,6 +136,12 @@ public:
     SharedAccessGuard<const RoomModes> accessRoomModes() const;
     SharedAccessGuard<const StreamStatus> accessStreamStatus() const;
 
+    /**
+     * Records the current timestamp the channel was disconnected.
+     * This can be used to calculate the time spent disconnected after a successful reconnect
+     */
+    void markDisconnectedNow();
+
     // Emotes
     std::optional<EmotePtr> bttvEmote(const EmoteName &name) const;
     std::optional<EmotePtr> ffzEmote(const EmoteName &name) const;
@@ -200,6 +206,11 @@ public:
      */
     std::shared_ptr<MessageThread> getOrCreateThread(const MessagePtr &message);
 
+    /**
+     * This signal fires when the local user has joined the channel
+     **/
+    pajlada::Signals::NoArgSignal joined;
+
     // Only TwitchChannel may invoke this signal
     pajlada::Signals::NoArgSignal userStateChanged;
 
@@ -353,6 +364,8 @@ private:
     int chatterCount_{};
     UniqueAccess<StreamStatus> streamStatus_;
     UniqueAccess<RoomModes> roomModes_;
+    std::optional<std::chrono::time_point<std::chrono::system_clock>>
+        disconnectedAt_{};
     std::atomic_flag loadingRecentMessages_ = ATOMIC_FLAG_INIT;
     std::unordered_map<QString, std::weak_ptr<MessageThread>> threads_;
 

From e4258160cd88f89005228eec70e08ce470b5e61c Mon Sep 17 00:00:00 2001
From: pajlada <rasmus.karlsson@pajlada.com>
Date: Sun, 10 Dec 2023 13:28:31 +0100
Subject: [PATCH 10/42] Fixed "Yes, don't ask again" image uploader prompt not
 working on macOS (#5011)

---
 CHANGELOG.md                 |  1 +
 src/widgets/splits/Split.cpp | 36 +++++++++++++++++++++++++++---------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e13735bc3..dc1805ed6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
 - Bugfix: Fixed lookahead/-behind not working in _Ignores_. (#4965)
 - Bugfix: Fixed Image Uploader accidentally deleting images with some hosts when link resolver was enabled. (#4971)
 - Bugfix: Fixed rare crash with Image Uploader when closing a split right after starting an upload. (#4971)
+- Bugfix: Fixed an issue on macOS where the image uploader would keep prompting the user even after they clicked "Yes, don't ask again". (#5011)
 - Bugfix: Hide the Usercard button in the User Info Popup when in special channels. (#4972)
 - Bugfix: Fixed support for Windows 11 Snap layouts. (#4994)
 - Bugfix: Fixed some windows appearing between screens. (#4797)
diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp
index 90ab8bd46..656aa18e4 100644
--- a/src/widgets/splits/Split.cpp
+++ b/src/widgets/splits/Split.cpp
@@ -381,7 +381,9 @@ Split::Split(QWidget *parent)
     std::ignore = this->input_->ui_.textEdit->imagePasted.connect(
         [this](const QMimeData *source) {
             if (!getSettings()->imageUploaderEnabled)
+            {
                 return;
+            }
 
             if (getSettings()->askOnImageUpload.getValue())
             {
@@ -392,21 +394,37 @@ Split::Split(QWidget *parent)
                     "You are uploading an image to a 3rd party service not in "
                     "control of the Chatterino team. You may not be able to "
                     "remove the image from the site. Are you okay with this?");
-                msgBox.addButton(QMessageBox::Cancel);
-                msgBox.addButton(QMessageBox::Yes);
-                msgBox.addButton("Yes, don't ask again", QMessageBox::YesRole);
+                auto *cancel = msgBox.addButton(QMessageBox::Cancel);
+                auto *yes = msgBox.addButton(QMessageBox::Yes);
+                auto *yesDontAskAgain = msgBox.addButton("Yes, don't ask again",
+                                                         QMessageBox::YesRole);
 
                 msgBox.setDefaultButton(QMessageBox::Yes);
 
-                auto picked = msgBox.exec();
-                if (picked == QMessageBox::Cancel)
-                {
-                    return;
-                }
-                else if (picked == 0)  // don't ask again button
+                msgBox.exec();
+
+                auto *clickedButton = msgBox.clickedButton();
+                if (clickedButton == yesDontAskAgain)
                 {
                     getSettings()->askOnImageUpload.setValue(false);
                 }
+                else if (clickedButton == yes)
+                {
+                    // Continue with image upload
+                }
+                else if (clickedButton == cancel)
+                {
+                    // Not continuing with image upload
+                    return;
+                }
+                else
+                {
+                    // An unknown "button" was pressed - handle it as if cancel was pressed
+                    // cancel is already handled as the "escape" option, so this should never happen
+                    qCWarning(chatterinoImageuploader)
+                        << "Unhandled button pressed:" << clickedButton;
+                    return;
+                }
             }
             QPointer<ResizingTextEdit> edit = this->input_->ui_.textEdit;
             getApp()->imageUploader->upload(source, this->getChannel(), edit);

From fd4cac2c2c1160a64358bcc831c9b4692959e1a7 Mon Sep 17 00:00:00 2001
From: Mm2PL <mm2pl+gh@kotmisia.pl>
Date: Sun, 10 Dec 2023 14:41:05 +0100
Subject: [PATCH 11/42] Add a new completion API for experimental plugins
 feature. (#5000)

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
---
 CHANGELOG.md                                  |   1 +
 docs/chatterino.d.ts                          |  21 ++
 .../completion/TabCompletionModel.cpp         |  19 +-
 .../completion/TabCompletionModel.hpp         |   6 +-
 src/controllers/plugins/LuaAPI.cpp            |  32 ++++
 src/controllers/plugins/LuaAPI.hpp            |  24 ++-
 src/controllers/plugins/LuaUtilities.cpp      |  44 +++++
 src/controllers/plugins/LuaUtilities.hpp      | 180 ++++++++++++++++++
 src/controllers/plugins/Plugin.hpp            |  43 +++++
 src/controllers/plugins/PluginController.cpp  |  72 ++++++-
 src/controllers/plugins/PluginController.hpp  |   7 +-
 src/widgets/helper/ResizingTextEdit.cpp       |   5 +-
 src/widgets/settingspages/PluginsPage.cpp     |  10 +
 13 files changed, 448 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc1805ed6..cd00604d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - Minor: Add an option to use new experimental smarter emote completion. (#4987)
 - Minor: Add `--safe-mode` command line option that can be used for troubleshooting when Chatterino is misbehaving or is misconfigured. It disables hiding the settings button & prevents plugins from loading. (#4985)
 - Minor: Updated the flatpakref link included with nightly builds to point to up-to-date flathub-beta builds. (#5008)
+- Minor: Add a new completion API for experimental plugins feature. (#5000)
 - Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840)
 - Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848)
 - Bugfix: Trimmed custom streamlink paths on all platforms making sure you don't accidentally add spaces at the beginning or end of its path. (#4834)
diff --git a/docs/chatterino.d.ts b/docs/chatterino.d.ts
index c2efdb1ba..aece0988d 100644
--- a/docs/chatterino.d.ts
+++ b/docs/chatterino.d.ts
@@ -19,4 +19,25 @@ declare module c2 {
   ): boolean;
   function send_msg(channel: String, text: String): boolean;
   function system_msg(channel: String, text: String): boolean;
+
+  class CompletionList {
+    values: String[];
+    hide_others: boolean;
+  }
+
+  enum EventType {
+    RegisterCompletions = "RegisterCompletions",
+  }
+
+  type CbFuncCompletionsRequested = (
+    query: string,
+    full_text_content: string,
+    cursor_position: number,
+    is_first_word: boolean
+  ) => CompletionList;
+  type CbFunc<T> = T extends EventType.RegisterCompletions
+    ? CbFuncCompletionsRequested
+    : never;
+
+  function register_callback<T>(type: T, func: CbFunc<T>): void;
 }
diff --git a/src/controllers/completion/TabCompletionModel.cpp b/src/controllers/completion/TabCompletionModel.cpp
index 74e826529..f38fa62ac 100644
--- a/src/controllers/completion/TabCompletionModel.cpp
+++ b/src/controllers/completion/TabCompletionModel.cpp
@@ -1,5 +1,6 @@
 #include "controllers/completion/TabCompletionModel.hpp"
 
+#include "Application.hpp"
 #include "common/Channel.hpp"
 #include "controllers/completion/sources/CommandSource.hpp"
 #include "controllers/completion/sources/EmoteSource.hpp"
@@ -9,6 +10,9 @@
 #include "controllers/completion/strategies/ClassicUserStrategy.hpp"
 #include "controllers/completion/strategies/CommandStrategy.hpp"
 #include "controllers/completion/strategies/SmartEmoteStrategy.hpp"
+#include "controllers/plugins/LuaUtilities.hpp"
+#include "controllers/plugins/Plugin.hpp"
+#include "controllers/plugins/PluginController.hpp"
 #include "singletons/Settings.hpp"
 
 namespace chatterino {
@@ -19,7 +23,9 @@ TabCompletionModel::TabCompletionModel(Channel &channel, QObject *parent)
 {
 }
 
-void TabCompletionModel::updateResults(const QString &query, bool isFirstWord)
+void TabCompletionModel::updateResults(const QString &query,
+                                       const QString &fullTextContent,
+                                       int cursorPosition, bool isFirstWord)
 {
     this->updateSourceFromQuery(query);
 
@@ -29,6 +35,17 @@ void TabCompletionModel::updateResults(const QString &query, bool isFirstWord)
 
         // Copy results to this model
         QStringList results;
+#ifdef CHATTERINO_HAVE_PLUGINS
+        // Try plugins first
+        bool done{};
+        std::tie(done, results) = getApp()->plugins->updateCustomCompletions(
+            query, fullTextContent, cursorPosition, isFirstWord);
+        if (done)
+        {
+            this->setStringList(results);
+            return;
+        }
+#endif
         this->source_->addToStringList(results, 0, isFirstWord);
         this->setStringList(results);
     }
diff --git a/src/controllers/completion/TabCompletionModel.hpp b/src/controllers/completion/TabCompletionModel.hpp
index 21e06e3c9..56cf313ed 100644
--- a/src/controllers/completion/TabCompletionModel.hpp
+++ b/src/controllers/completion/TabCompletionModel.hpp
@@ -26,8 +26,12 @@ public:
 
     /// @brief Updates the model based on the completion query
     /// @param query Completion query
+    /// @param fullTextContent Full text of the input, used by plugins for contextual completion
+    /// @param cursorPosition Number of characters behind the cursor from the
+    /// beginning of fullTextContent, also used by plugins
     /// @param isFirstWord Whether the completion is the first word in the input
-    void updateResults(const QString &query, bool isFirstWord = false);
+    void updateResults(const QString &query, const QString &fullTextContent,
+                       int cursorPosition, bool isFirstWord = false);
 
 private:
     enum class SourceKind {
diff --git a/src/controllers/plugins/LuaAPI.cpp b/src/controllers/plugins/LuaAPI.cpp
index 6ffaf4982..e34e063b4 100644
--- a/src/controllers/plugins/LuaAPI.cpp
+++ b/src/controllers/plugins/LuaAPI.cpp
@@ -94,6 +94,37 @@ int c2_register_command(lua_State *L)
     return 1;
 }
 
+int c2_register_callback(lua_State *L)
+{
+    auto *pl = getApp()->plugins->getPluginByStatePtr(L);
+    if (pl == nullptr)
+    {
+        luaL_error(L, "internal error: no plugin");
+        return 0;
+    }
+    EventType evtType{};
+    if (!lua::peek(L, &evtType, 1))
+    {
+        luaL_error(L, "cannot get event name (1st arg of register_callback, "
+                      "expected a string)");
+        return 0;
+    }
+    if (lua_isnoneornil(L, 2))
+    {
+        luaL_error(L, "missing argument for register_callback: function "
+                      "\"pointer\"");
+        return 0;
+    }
+
+    auto callbackSavedName = QString("c2cb-%1").arg(
+        magic_enum::enum_name<EventType>(evtType).data());
+    lua_setfield(L, LUA_REGISTRYINDEX, callbackSavedName.toStdString().c_str());
+
+    lua_pop(L, 2);
+
+    return 0;
+}
+
 int c2_send_msg(lua_State *L)
 {
     QString text;
@@ -167,6 +198,7 @@ int c2_system_msg(lua_State *L)
         lua::push(L, false);
         return 1;
     }
+
     const auto chn = getApp()->twitch->getChannelOrEmpty(channel);
     if (chn->isEmpty())
     {
diff --git a/src/controllers/plugins/LuaAPI.hpp b/src/controllers/plugins/LuaAPI.hpp
index dfa95447e..95a9bd192 100644
--- a/src/controllers/plugins/LuaAPI.hpp
+++ b/src/controllers/plugins/LuaAPI.hpp
@@ -1,14 +1,18 @@
 #pragma once
 
 #ifdef CHATTERINO_HAVE_PLUGINS
+#    include <QString>
+
+#    include <vector>
 
 struct lua_State;
 namespace chatterino::lua::api {
-// names in this namespace reflect what's visible inside Lua and follow the lua naming scheme
+// function names in this namespace reflect what's visible inside Lua and follow the lua naming scheme
 
 // NOLINTBEGIN(readability-identifier-naming)
 // Following functions are exposed in c2 table.
 int c2_register_command(lua_State *L);
+int c2_register_callback(lua_State *L);
 int c2_send_msg(lua_State *L);
 int c2_system_msg(lua_State *L);
 int c2_log(lua_State *L);
@@ -23,6 +27,24 @@ int g_import(lua_State *L);
 // Represents "calls" to qCDebug, qCInfo ...
 enum class LogLevel { Debug, Info, Warning, Critical };
 
+// Exposed as c2.EventType
+// Represents callbacks c2 can do into lua world
+enum class EventType {
+    CompletionRequested,
+};
+
+/**
+ * This is for custom completion, a registered function returns this type
+ * however in Lua array part (value) and object part (hideOthers) are in the same
+ * table.
+ */
+struct CompletionList {
+    std::vector<QString> values{};
+
+    // exposed as hide_others
+    bool hideOthers{};
+};
+
 }  // namespace chatterino::lua::api
 
 #endif
diff --git a/src/controllers/plugins/LuaUtilities.cpp b/src/controllers/plugins/LuaUtilities.cpp
index 3477e4e38..4807f89f2 100644
--- a/src/controllers/plugins/LuaUtilities.cpp
+++ b/src/controllers/plugins/LuaUtilities.cpp
@@ -4,6 +4,7 @@
 #    include "common/Channel.hpp"
 #    include "common/QLogging.hpp"
 #    include "controllers/commands/CommandContext.hpp"
+#    include "controllers/plugins/LuaAPI.hpp"
 
 #    include <lauxlib.h>
 #    include <lua.h>
@@ -75,6 +76,9 @@ QString humanErrorText(lua_State *L, int errCode)
         case LUA_ERRFILE:
             errName = "(file error)";
             break;
+        case ERROR_BAD_PEEK:
+            errName = "(unable to convert value to c++)";
+            break;
         default:
             errName = "(unknown error type)";
     }
@@ -111,6 +115,7 @@ StackIdx push(lua_State *L, const std::string &str)
 
 StackIdx push(lua_State *L, const CommandContext &ctx)
 {
+    StackGuard guard(L, 1);
     auto outIdx = pushEmptyTable(L, 2);
 
     push(L, ctx.words);
@@ -127,8 +132,27 @@ StackIdx push(lua_State *L, const bool &b)
     return lua_gettop(L);
 }
 
+StackIdx push(lua_State *L, const int &b)
+{
+    lua_pushinteger(L, b);
+    return lua_gettop(L);
+}
+
+bool peek(lua_State *L, bool *out, StackIdx idx)
+{
+    StackGuard guard(L);
+    if (!lua_isboolean(L, idx))
+    {
+        return false;
+    }
+
+    *out = bool(lua_toboolean(L, idx));
+    return true;
+}
+
 bool peek(lua_State *L, double *out, StackIdx idx)
 {
+    StackGuard guard(L);
     int ok{0};
     auto v = lua_tonumberx(L, idx, &ok);
     if (ok != 0)
@@ -140,6 +164,7 @@ bool peek(lua_State *L, double *out, StackIdx idx)
 
 bool peek(lua_State *L, QString *out, StackIdx idx)
 {
+    StackGuard guard(L);
     size_t len{0};
     const char *str = lua_tolstring(L, idx, &len);
     if (str == nullptr)
@@ -156,6 +181,7 @@ bool peek(lua_State *L, QString *out, StackIdx idx)
 
 bool peek(lua_State *L, QByteArray *out, StackIdx idx)
 {
+    StackGuard guard(L);
     size_t len{0};
     const char *str = lua_tolstring(L, idx, &len);
     if (str == nullptr)
@@ -172,6 +198,7 @@ bool peek(lua_State *L, QByteArray *out, StackIdx idx)
 
 bool peek(lua_State *L, std::string *out, StackIdx idx)
 {
+    StackGuard guard(L);
     size_t len{0};
     const char *str = lua_tolstring(L, idx, &len);
     if (str == nullptr)
@@ -186,6 +213,23 @@ bool peek(lua_State *L, std::string *out, StackIdx idx)
     return true;
 }
 
+bool peek(lua_State *L, api::CompletionList *out, StackIdx idx)
+{
+    StackGuard guard(L);
+    int typ = lua_getfield(L, idx, "values");
+    if (typ != LUA_TTABLE)
+    {
+        lua_pop(L, 1);
+        return false;
+    }
+    if (!lua::pop(L, &out->values, -1))
+    {
+        return false;
+    }
+    lua_getfield(L, idx, "hide_others");
+    return lua::pop(L, &out->hideOthers);
+}
+
 QString toString(lua_State *L, StackIdx idx)
 {
     size_t len{};
diff --git a/src/controllers/plugins/LuaUtilities.hpp b/src/controllers/plugins/LuaUtilities.hpp
index f88f2a928..c7bd0270e 100644
--- a/src/controllers/plugins/LuaUtilities.hpp
+++ b/src/controllers/plugins/LuaUtilities.hpp
@@ -2,14 +2,19 @@
 
 #ifdef CHATTERINO_HAVE_PLUGINS
 
+#    include "common/QLogging.hpp"
+
 #    include <lua.h>
 #    include <lualib.h>
 #    include <magic_enum/magic_enum.hpp>
 #    include <QList>
 
+#    include <cassert>
+#    include <optional>
 #    include <string>
 #    include <string_view>
 #    include <type_traits>
+#    include <variant>
 #    include <vector>
 struct lua_State;
 class QJsonObject;
@@ -19,6 +24,12 @@ struct CommandContext;
 
 namespace chatterino::lua {
 
+namespace api {
+    struct CompletionList;
+}  // namespace api
+
+constexpr int ERROR_BAD_PEEK = LUA_OK - 1;
+
 /**
  * @brief Dumps the Lua stack into qCDebug(chatterinoLua)
  *
@@ -52,20 +63,136 @@ StackIdx push(lua_State *L, const CommandContext &ctx);
 StackIdx push(lua_State *L, const QString &str);
 StackIdx push(lua_State *L, const std::string &str);
 StackIdx push(lua_State *L, const bool &b);
+StackIdx push(lua_State *L, const int &b);
 
 // returns OK?
+bool peek(lua_State *L, bool *out, StackIdx idx = -1);
 bool peek(lua_State *L, double *out, StackIdx idx = -1);
 bool peek(lua_State *L, QString *out, StackIdx idx = -1);
 bool peek(lua_State *L, QByteArray *out, StackIdx idx = -1);
 bool peek(lua_State *L, std::string *out, StackIdx idx = -1);
+bool peek(lua_State *L, api::CompletionList *out, StackIdx idx = -1);
 
 /**
  * @brief Converts Lua object at stack index idx to a string.
  */
 QString toString(lua_State *L, StackIdx idx = -1);
 
+// This object ensures that the stack is of expected size when it is destroyed
+class StackGuard
+{
+    int expected;
+    lua_State *L;
+
+public:
+    /**
+     * Use this constructor if you expect the stack size to be the same on the
+     * destruction of the object as its creation
+     */
+    StackGuard(lua_State *L)
+        : expected(lua_gettop(L))
+        , L(L)
+    {
+    }
+
+    /**
+     * Use this if you expect the stack size changing, diff is the expected difference
+     * Ex: diff=3 means three elements added to the stack
+     */
+    StackGuard(lua_State *L, int diff)
+        : expected(lua_gettop(L) + diff)
+        , L(L)
+    {
+    }
+
+    ~StackGuard()
+    {
+        if (expected < 0)
+        {
+            return;
+        }
+        int after = lua_gettop(this->L);
+        if (this->expected != after)
+        {
+            stackDump(this->L, "StackGuard check tripped");
+            // clang-format off
+            // clang format likes to insert a new line which means that some builds won't show this message fully
+            assert(false && "internal error: lua stack was not in an expected state");
+            // clang-format on
+        }
+    }
+
+    // This object isn't meant to be passed around
+    StackGuard operator=(StackGuard &) = delete;
+    StackGuard &operator=(StackGuard &&) = delete;
+    StackGuard(StackGuard &) = delete;
+    StackGuard(StackGuard &&) = delete;
+
+    // This function tells the StackGuard that the stack isn't in an expected state but it was handled
+    void handled()
+    {
+        this->expected = -1;
+    }
+};
+
 /// TEMPLATES
 
+template <typename T>
+bool peek(lua_State *L, std::optional<T> *out, StackIdx idx = -1)
+{
+    if (lua_isnil(L, idx))
+    {
+        *out = std::nullopt;
+        return true;
+    }
+
+    *out = T();
+    return peek(L, out->operator->(), idx);
+}
+
+template <typename T>
+bool peek(lua_State *L, std::vector<T> *vec, StackIdx idx = -1)
+{
+    StackGuard guard(L);
+
+    if (!lua_istable(L, idx))
+    {
+        lua::stackDump(L, "!table");
+        qCDebug(chatterinoLua)
+            << "value is not a table, type is" << lua_type(L, idx);
+        return false;
+    }
+    auto len = lua_rawlen(L, idx);
+    if (len == 0)
+    {
+        qCDebug(chatterinoLua) << "value has 0 length";
+        return true;
+    }
+    if (len > 1'000'000)
+    {
+        qCDebug(chatterinoLua) << "value is too long";
+        return false;
+    }
+    // count like lua
+    for (int i = 1; i <= len; i++)
+    {
+        lua_geti(L, idx, i);
+        std::optional<T> obj;
+        if (!lua::peek(L, &obj))
+        {
+            //lua_seti(L, LUA_REGISTRYINDEX, 1);  // lazy
+            qCDebug(chatterinoLua)
+                << "Failed to convert lua object into c++: at array index " << i
+                << ":";
+            stackDump(L, "bad conversion into string");
+            return false;
+        }
+        lua_pop(L, 1);
+        vec->push_back(obj.value());
+    }
+    return true;
+}
+
 /**
  * @brief Converts object at stack index idx to enum given by template parameter T
  */
@@ -150,6 +277,7 @@ StackIdx push(lua_State *L, T inp)
 template <typename T>
 bool pop(lua_State *L, T *out, StackIdx idx = -1)
 {
+    StackGuard guard(L, -1);
     auto ok = peek(L, out, idx);
     if (ok)
     {
@@ -186,6 +314,58 @@ StackIdx pushEnumTable(lua_State *L)
     return out;
 }
 
+// Represents a Lua function on the stack
+template <typename ReturnType, typename... Args>
+class CallbackFunction
+{
+    StackIdx stackIdx_;
+    lua_State *L;
+
+public:
+    CallbackFunction(lua_State *L, StackIdx stackIdx)
+        : stackIdx_(stackIdx)
+        , L(L)
+    {
+    }
+
+    // this type owns the stackidx, it must not be trivially copiable
+    CallbackFunction operator=(CallbackFunction &) = delete;
+    CallbackFunction(CallbackFunction &) = delete;
+
+    // Permit only move
+    CallbackFunction &operator=(CallbackFunction &&) = default;
+    CallbackFunction(CallbackFunction &&) = default;
+
+    ~CallbackFunction()
+    {
+        lua_remove(L, this->stackIdx_);
+    }
+
+    std::variant<int, ReturnType> operator()(Args... arguments)
+    {
+        lua_pushvalue(this->L, this->stackIdx_);
+        (  // apparently this calls lua::push() for every Arg
+            [this, &arguments] {
+                lua::push(this->L, arguments);
+            }(),
+            ...);
+
+        int res = lua_pcall(L, sizeof...(Args), 1, 0);
+        if (res != LUA_OK)
+        {
+            qCDebug(chatterinoLua) << "error is: " << res;
+            return {res};
+        }
+
+        ReturnType val;
+        if (!lua::pop(L, &val))
+        {
+            return {ERROR_BAD_PEEK};
+        }
+        return {val};
+    }
+};
+
 }  // namespace chatterino::lua
 
 #endif
diff --git a/src/controllers/plugins/Plugin.hpp b/src/controllers/plugins/Plugin.hpp
index 456ac4ff1..7d81609e1 100644
--- a/src/controllers/plugins/Plugin.hpp
+++ b/src/controllers/plugins/Plugin.hpp
@@ -2,6 +2,8 @@
 
 #ifdef CHATTERINO_HAVE_PLUGINS
 #    include "Application.hpp"
+#    include "controllers/plugins/LuaAPI.hpp"
+#    include "controllers/plugins/LuaUtilities.hpp"
 
 #    include <QDir>
 #    include <QString>
@@ -85,10 +87,51 @@ public:
         return this->loadDirectory_;
     }
 
+    // Note: The CallbackFunction object's destructor will remove the function from the lua stack
+    using LuaCompletionCallback =
+        lua::CallbackFunction<lua::api::CompletionList, QString, QString, int,
+                              bool>;
+    std::optional<LuaCompletionCallback> getCompletionCallback()
+    {
+        if (this->state_ == nullptr || !this->error_.isNull())
+        {
+            return {};
+        }
+        // this uses magic enum to help automatic tooling find usages
+        auto typ =
+            lua_getfield(this->state_, LUA_REGISTRYINDEX,
+                         QString("c2cb-%1")
+                             .arg(magic_enum::enum_name<lua::api::EventType>(
+                                      lua::api::EventType::CompletionRequested)
+                                      .data())
+                             .toStdString()
+                             .c_str());
+        if (typ != LUA_TFUNCTION)
+        {
+            lua_pop(this->state_, 1);
+            return {};
+        }
+
+        // move
+        return std::make_optional<lua::CallbackFunction<
+            lua::api::CompletionList, QString, QString, int, bool>>(
+            this->state_, lua_gettop(this->state_));
+    }
+
+    /**
+     * If the plugin crashes while evaluating the main file, this function will return the error
+     */
+    QString error()
+    {
+        return this->error_;
+    }
+
 private:
     QDir loadDirectory_;
     lua_State *state_;
 
+    QString error_;
+
     // maps command name -> function name
     std::unordered_map<QString, QString> ownedCommands;
 
diff --git a/src/controllers/plugins/PluginController.cpp b/src/controllers/plugins/PluginController.cpp
index 9a3356e96..f3829ac26 100644
--- a/src/controllers/plugins/PluginController.cpp
+++ b/src/controllers/plugins/PluginController.cpp
@@ -19,6 +19,7 @@
 
 #    include <memory>
 #    include <utility>
+#    include <variant>
 
 namespace chatterino {
 
@@ -46,15 +47,13 @@ void PluginController::loadPlugins()
     auto dir = QDir(getPaths()->pluginsDirectory);
     qCDebug(chatterinoLua) << "Loading plugins in" << dir.path();
     for (const auto &info :
-         dir.entryInfoList(QDir::NoFilter | QDir::NoDotAndDotDot))
+         dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot))
     {
-        if (info.isDir())
-        {
-            auto pluginDir = QDir(info.absoluteFilePath());
-            this->tryLoadFromDir(pluginDir);
-        }
+        auto pluginDir = QDir(info.absoluteFilePath());
+        this->tryLoadFromDir(pluginDir);
     }
 }
+
 bool PluginController::tryLoadFromDir(const QDir &pluginDir)
 {
     // look for init.lua
@@ -139,6 +138,7 @@ void PluginController::openLibrariesFor(lua_State *L,
     static const luaL_Reg c2Lib[] = {
         {"system_msg", lua::api::c2_system_msg},
         {"register_command", lua::api::c2_register_command},
+        {"register_callback", lua::api::c2_register_callback},
         {"send_msg", lua::api::c2_send_msg},
         {"log", lua::api::c2_log},
         {nullptr, nullptr},
@@ -146,14 +146,17 @@ void PluginController::openLibrariesFor(lua_State *L,
     lua_pushglobaltable(L);
     auto global = lua_gettop(L);
 
-    // count of elements in C2LIB + LogLevel
-    auto c2libIdx = lua::pushEmptyTable(L, 5);
+    // count of elements in C2LIB + LogLevel + EventType
+    auto c2libIdx = lua::pushEmptyTable(L, 8);
 
     luaL_setfuncs(L, c2Lib, 0);
 
     lua::pushEnumTable<lua::api::LogLevel>(L);
     lua_setfield(L, c2libIdx, "LogLevel");
 
+    lua::pushEnumTable<lua::api::EventType>(L);
+    lua_setfield(L, c2libIdx, "EventType");
+
     lua_setfield(L, global, "c2");
 
     // ban functions
@@ -198,6 +201,7 @@ void PluginController::load(const QFileInfo &index, const QDir &pluginDir,
     auto pluginName = pluginDir.dirName();
     lua_State *l = luaL_newstate();
     auto plugin = std::make_unique<Plugin>(pluginName, l, meta, pluginDir);
+    auto *temp = plugin.get();
     this->plugins_.insert({pluginName, std::move(plugin)});
 
     if (getArgs().safeMode)
@@ -220,9 +224,10 @@ void PluginController::load(const QFileInfo &index, const QDir &pluginDir,
     int err = luaL_dofile(l, index.absoluteFilePath().toStdString().c_str());
     if (err != 0)
     {
+        temp->error_ = lua::humanErrorText(l, err);
         qCWarning(chatterinoLua)
             << "Failed to load" << pluginName << "plugin from" << index << ": "
-            << lua::humanErrorText(l, err);
+            << temp->error_;
         return;
     }
     qCInfo(chatterinoLua) << "Loaded" << pluginName << "plugin from" << index;
@@ -307,5 +312,52 @@ const std::map<QString, std::unique_ptr<Plugin>> &PluginController::plugins()
     return this->plugins_;
 }
 
-};  // namespace chatterino
+std::pair<bool, QStringList> PluginController::updateCustomCompletions(
+    const QString &query, const QString &fullTextContent, int cursorPosition,
+    bool isFirstWord) const
+{
+    QStringList results;
+
+    for (const auto &[name, pl] : this->plugins())
+    {
+        if (!pl->error().isNull())
+        {
+            continue;
+        }
+
+        lua::StackGuard guard(pl->state_);
+
+        auto opt = pl->getCompletionCallback();
+        if (opt)
+        {
+            qCDebug(chatterinoLua)
+                << "Processing custom completions from plugin" << name;
+            auto &cb = *opt;
+            auto errOrList =
+                cb(query, fullTextContent, cursorPosition, isFirstWord);
+            if (std::holds_alternative<int>(errOrList))
+            {
+                guard.handled();
+                int err = std::get<int>(errOrList);
+                qCDebug(chatterinoLua)
+                    << "Got error from plugin " << pl->meta.name
+                    << " while refreshing tab completion: "
+                    << lua::humanErrorText(pl->state_, err);
+                continue;
+            }
+
+            auto list = std::get<lua::api::CompletionList>(errOrList);
+            if (list.hideOthers)
+            {
+                results = QStringList(list.values.begin(), list.values.end());
+                return {true, results};
+            }
+            results += QStringList(list.values.begin(), list.values.end());
+        }
+    }
+
+    return {false, results};
+}
+
+}  // namespace chatterino
 #endif
diff --git a/src/controllers/plugins/PluginController.hpp b/src/controllers/plugins/PluginController.hpp
index 9630e889b..bc3eca738 100644
--- a/src/controllers/plugins/PluginController.hpp
+++ b/src/controllers/plugins/PluginController.hpp
@@ -36,6 +36,7 @@ public:
     // This is required to be public because of c functions
     Plugin *getPluginByStatePtr(lua_State *L);
 
+    // TODO: make a function that iterates plugins that aren't errored/enabled
     const std::map<QString, std::unique_ptr<Plugin>> &plugins() const;
 
     /**
@@ -52,6 +53,10 @@ public:
      */
     static bool isPluginEnabled(const QString &id);
 
+    std::pair<bool, QStringList> updateCustomCompletions(
+        const QString &query, const QString &fullTextContent,
+        int cursorPosition, bool isFirstWord) const;
+
 private:
     void loadPlugins();
     void load(const QFileInfo &index, const QDir &pluginDir,
@@ -64,5 +69,5 @@ private:
     std::map<QString, std::unique_ptr<Plugin>> plugins_;
 };
 
-};  // namespace chatterino
+}  // namespace chatterino
 #endif
diff --git a/src/widgets/helper/ResizingTextEdit.cpp b/src/widgets/helper/ResizingTextEdit.cpp
index 8012e1951..904cfba55 100644
--- a/src/widgets/helper/ResizingTextEdit.cpp
+++ b/src/widgets/helper/ResizingTextEdit.cpp
@@ -170,8 +170,9 @@ void ResizingTextEdit::keyPressEvent(QKeyEvent *event)
             // First type pressing tab after modifying a message, we refresh our
             // completion model
             this->completer_->setModel(completionModel);
-            completionModel->updateResults(currentCompletion,
-                                           this->isFirstWord());
+            completionModel->updateResults(
+                currentCompletion, this->toPlainText(),
+                this->textCursor().position(), this->isFirstWord());
             this->completionInProgress_ = true;
             {
                 // this blocks cursor movement events from resetting tab completion
diff --git a/src/widgets/settingspages/PluginsPage.cpp b/src/widgets/settingspages/PluginsPage.cpp
index 87966a81a..d3beaa323 100644
--- a/src/widgets/settingspages/PluginsPage.cpp
+++ b/src/widgets/settingspages/PluginsPage.cpp
@@ -108,6 +108,16 @@ void PluginsPage::rebuildContent()
             warningLabel->setStyleSheet("color: #f00");
             pluginEntry->addRow(warningLabel);
         }
+        if (!plugin->error().isNull())
+        {
+            auto *errorLabel =
+                new QLabel("There was an error while loading this plugin: " +
+                               plugin->error(),
+                           this->dataFrame_);
+            errorLabel->setStyleSheet("color: #f00");
+            errorLabel->setWordWrap(true);
+            pluginEntry->addRow(errorLabel);
+        }
 
         auto *description =
             new QLabel(plugin->meta.description, this->dataFrame_);

From 070c0a092833f2079f941f500dab2608bca9bb09 Mon Sep 17 00:00:00 2001
From: smc <128479338+crazysmc@users.noreply.github.com>
Date: Wed, 13 Dec 2023 13:25:14 +0100
Subject: [PATCH 12/42] Add crazysmc to the contributors list (#5020)

---
 resources/avatars/crazysmc.png | Bin 0 -> 1649 bytes
 resources/contributors.txt     |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 resources/avatars/crazysmc.png

diff --git a/resources/avatars/crazysmc.png b/resources/avatars/crazysmc.png
new file mode 100644
index 0000000000000000000000000000000000000000..433f4e3e9a68c4ef078c4176515b3a902b0e6d3b
GIT binary patch
literal 1649
zcmZwI`Crn99|v$6tCfqTP5T<Qbgk((UBW{xv)1x_q|GbSO)Jy6&9bitSgEVL@W3N1
zR5V1O5D!X3P)s~hM1j05B=Umr!i&HIL^Jo<Z~Ni<emq~V*Prmt_Vqpw(Sz!NKp=>R
zyQ?3tDgR_Q80b|QRtExo=I86_?-m70iH4-c96%usp^!(?V$IWUS!Ud}&b(uTjz57;
zIF*%fCi}0mId>g%?m6e)cYBa{9+TvON&Y!6#p_|J&!e<U*z|z>j9&^e0t+%P7oxA?
zvVw8hAw@Z%#W`WcxxYWggyZvWlsvpicobQRjUwhFNCil8VJsPU=V@^~<#7T9f0tTv
zpGrt9CnQyrCRY$sDv7C;BvchSjYdwVJ<WVZK|e3cuBPVF%OBKKU}`Gz7?lqhm5*v^
z`Ak{?>scY|d0`#BxSsx)%^<v}1(Y^2iH%GWhehVpk(=tCG}Tj@*<~#a)Ycc}tuHEG
zHdX@KI8|*;wDzWF?aj})&Cj_l)g3MLj#fIawTAbS(b)#5?P_OswX^tKK%JnY9w6kg
zg}jDWd`^#`sYlS<D+ILky=n#Y_p}f8atHf5hWdH0`#WC`biNtv5)JZ2Ljuujq4@PH
z@tf|qq8`a`uSDGUPTW887BDa>8615#G&b^Pd{i_sHY^<%%O>6e-b*C_x%8b}HUgM@
zKRP8Jo05-DPfpBC0i-k2(%ESlKr!=PF(X&Z%I9V$=M;dc`MK$Z`I&`<*~JCL(js6^
zxik;>pj-f`J}jy}EU8sXYPE7%{b6Mppjuf`t*)q7SC`k;Rsfo{RgGp<t69@(0h;x7
zfL5mitm`&(8yg#&n}E%a9|0e?wg6jOpSC^$x4pfcd8~;80)a<7T%G(AMwW_xz4En_
zVJ3Pa*VqjsVQMFsVO^5uu$_xW5l2wjuKtcYFYeDWMuoXhs`QPVS=&9m?-s*PVrTIX
z`>UneBM!I1X9zLzl?EuY-T%kliybz4^T~~4(Oey!cGQ+BQR}FISj13Za4_i`?=bt2
zlZDFcat>3V{PkMM<~jUhukwM&apg<vOGByZn|$d?Kq&GJ8R>iJ`|#!4MAdf0E)VP5
zPJsj&!-gi`XXS_OJ#+s?hRXC8M<NflnONhcN45;0SZj3bsN5MlgqN|zkpPD;1Yy(p
z?Ym~z`KAl24coc~W>a-lHy0Wh`RVMFREr1hl%Vdopn0#N!@Du}cX>Namh^o`jSuQF
zRv}yrYY4am!5KcWUSvKH5})Pc3KQEYI`PN=Ose0A23}wcZY{Qgh`RJC2Io2R9?B<N
zJ5JAmDujZ%eDlAia$8^5(f;3U<4W*!xD4vTgV{xv57|MZa3!uuWnB{)KV^@SVv$)n
zKB0uU>$J0;zqNzjU(x*;VdT^J<>6Dg0mIe@`<nGEc&z_SOjTdNiKmNN#-S8=t%38`
z!BQ0tJv4QZwufkda!^F6NIx=?TZGaxux<u)uP0i?wqUswc0%1#`|(aDSxGg4!HIVS
z=r4@j^C5OSp_1LUW~Xm}kIv^y%{4FJZV@sV7V_g>J46y9B*kVv{Z&j)a2b4X($@Fz
z4Vn3I#TWO?D!zf$!C@VEZj4ME3hC_pD@{ckWen${iLyb2$*G^e#5nCcCud(tFq*Zp
zSXu{t6&-7m5~YqGEKu!VBGCg6=ny5bChlOK3F?He_dR<nzi(F!mHTE-I9_&i=By|!
zEw6T8m+e?5GlXX=Xok^X2Q%b@0Lgj#J~zv~c4%8#ZFJLD&KyW*A{zWZqR+PtY2mQ}
z#`=~=rah@U`s0)ijzR-9G{MsU?q}Z}wGkQXSD!|<4gbNlFw#7S>-!zMS+Ar*4Xo($
za=0gM$H1{cv1)8=?syB@p2B&u?JlihhMEWYUTE{I{M7Bvg6xV+M4aSX?T=ZDTS(Tj
z=+b+zYu^6QP$bpmPkQNkISw|??wN{YQuF;x&9L<FgBvT}hsdo(riEpsLk{)bHU_%r
z4Adn-^FCj;X3zK56}JQt5!dU54sQ(|>i_6|nrd)?5%z<^A~wcVjmy(GkibYXcLt$N
zVvDD&F^{aS+vgU?#S5;*@~uxZkLR^my~Iys?$M)(!2BZX%GT+j-;O)!fBtU=DIdY-
XhU&CYmxaI&0f9W+yj^RYLs5SNU_Y9b

literal 0
HcmV?d00001

diff --git a/resources/contributors.txt b/resources/contributors.txt
index b2167359d..9ec7618d9 100644
--- a/resources/contributors.txt
+++ b/resources/contributors.txt
@@ -65,6 +65,7 @@ ZonianMidian | https://github.com/ZonianMidian | :/avatars/zonianmidian.png | Co
 olafyang | https://github.com/olafyang | | Contributor
 chrrs | https://github.com/chrrs | | Contributor
 4rneee | https://github.com/4rneee | | Contributor
+crazysmc | https://github.com/crazysmc | :/avatars/crazysmc.png | Contributor
 
 # If you are a contributor add yourself above this line
 

From 6bf2031c4d218468f735102b7d56160a1f2f723a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 16 Dec 2023 11:43:00 +0100
Subject: [PATCH 13/42] chore(deps): bump actions/upload-artifact from 3 to 4
 (#5025)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build.yml            | 10 +++++-----
 .github/workflows/create-installer.yml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 70a952134..271940402 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -257,14 +257,14 @@ jobs:
 
       - name: Upload artifact (Windows - binary)
         if: startsWith(matrix.os, 'windows') && !matrix.skip-artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: chatterino-windows-x86-64-Qt-${{ matrix.qt-version }}.zip
           path: build/chatterino-windows-x86-64-Qt-${{ matrix.qt-version }}.zip
 
       - name: Upload artifact (Windows - symbols)
         if: startsWith(matrix.os, 'windows') && !matrix.skip-artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: chatterino-windows-x86-64-Qt-${{ matrix.qt-version }}-symbols.pdb.7z
           path: build/bin/chatterino-Qt-${{ matrix.qt-version }}.pdb.7z
@@ -339,14 +339,14 @@ jobs:
 
       - name: Upload artifact - AppImage (Ubuntu)
         if: startsWith(matrix.os, 'ubuntu-20.04') && !matrix.skip-artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Chatterino-x86_64-${{ matrix.qt-version }}.AppImage
           path: build/Chatterino-x86_64.AppImage
 
       - name: Upload artifact - .deb (Ubuntu)
         if: startsWith(matrix.os, 'ubuntu') && !matrix.skip-artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Chatterino-${{ matrix.os }}-Qt-${{ matrix.qt-version }}.deb
           path: build/Chatterino-${{ matrix.os }}-x86_64.deb
@@ -390,7 +390,7 @@ jobs:
 
       - name: Upload artifact (MacOS)
         if: startsWith(matrix.os, 'macos')
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: chatterino-macos-Qt-${{ matrix.qt-version }}.dmg
           path: build/chatterino-macos-Qt-${{ matrix.qt-version }}.dmg
diff --git a/.github/workflows/create-installer.yml b/.github/workflows/create-installer.yml
index 588099375..e9e479d35 100644
--- a/.github/workflows/create-installer.yml
+++ b/.github/workflows/create-installer.yml
@@ -52,7 +52,7 @@ jobs:
         shell: powershell
 
       - name: Upload installer
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: build/${{ steps.build-installer.outputs.C2_INSTALLER_BASE_NAME }}.exe
           name: ${{ steps.build-installer.outputs.C2_INSTALLER_BASE_NAME }}.exe

From 434487750f050e354ee1e2b30a53c58aa473cb68 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 16 Dec 2023 11:01:15 +0000
Subject: [PATCH 14/42] chore(deps): bump actions/download-artifact from 3 to 4
 (#5024)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 271940402..54340bb84 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -404,49 +404,49 @@ jobs:
         with:
           fetch-depth: 0 # allows for tags access
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Ubuntu 22.04 Qt6.2.4 deb
         with:
           name: Chatterino-ubuntu-22.04-Qt-6.2.4.deb
           path: release-artifacts/
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Windows Qt6.5.0
         with:
           name: chatterino-windows-x86-64-Qt-6.5.0.zip
           path: release-artifacts/
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Windows Qt6.5.0 symbols
         with:
           name: chatterino-windows-x86-64-Qt-6.5.0-symbols.pdb.7z
           path: release-artifacts/
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Windows Qt5.15.2
         with:
           name: chatterino-windows-x86-64-Qt-5.15.2.zip
           path: release-artifacts/
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Linux Qt5.12.12 AppImage
         with:
           name: Chatterino-x86_64-5.12.12.AppImage
           path: release-artifacts/
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Ubuntu 20.04 Qt5.12.12 deb
         with:
           name: Chatterino-ubuntu-20.04-Qt-5.12.12.deb
           path: release-artifacts/
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Ubuntu 22.04 Qt5.15.2 deb
         with:
           name: Chatterino-ubuntu-22.04-Qt-5.15.2.deb
           path: release-artifacts/
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: macOS x86_64 Qt5.15.2 dmg
         with:
           name: chatterino-macos-Qt-5.15.2.dmg

From 66f4480371f841e06fbee61a5fe3dbbceba861e4 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Sat, 16 Dec 2023 12:24:28 +0100
Subject: [PATCH 15/42] fix: Fixed some compiler warnings (#5028)

* fix(C4101): unreferenced local variable

* fix(C4189): variable initialized but not referenced

* fix(C4305): narrowing from double to float

* fix(C4457): declaration hiding function parameter

* fix(C4456): shadowing declaration

* fix(C4996): remove deprecations

* chore: add changelog entry

* fix: Remove more unused variables

* fix: removed unused lambda captures

* Update changelog entry

---------

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
---
 CHANGELOG.md                                  |  1 +
 src/CMakeLists.txt                            |  1 -
 src/RunGui.cpp                                |  2 +-
 src/common/Env.cpp                            | 62 +++++++------------
 .../commands/builtin/twitch/Shoutout.cpp      |  2 +-
 .../notifications/NotificationController.cpp  |  8 +--
 src/controllers/sound/MiniaudioBackend.cpp    |  4 +-
 src/providers/irc/AbstractIrcServer.cpp       |  4 --
 src/providers/irc/IrcConnection2.cpp          |  2 +-
 src/providers/twitch/PubSubManager.cpp        |  1 -
 src/providers/twitch/TwitchChannel.cpp        |  1 -
 src/providers/twitch/TwitchMessageBuilder.cpp |  4 +-
 src/singletons/WindowManager.cpp              |  2 +-
 src/util/AttachToConsole.cpp                  |  6 +-
 src/widgets/BaseWindow.cpp                    |  2 +-
 src/widgets/Label.cpp                         |  6 +-
 src/widgets/dialogs/ReplyThreadPopup.cpp      |  6 +-
 src/widgets/dialogs/UserInfoPopup.cpp         | 32 ----------
 src/widgets/helper/ChannelView.cpp            | 10 +--
 src/widgets/helper/NotebookTab.cpp            |  1 -
 src/widgets/listview/GenericListView.cpp      |  1 -
 src/widgets/settingspages/GeneralPageView.hpp |  4 +-
 .../settingspages/KeyboardSettingsPage.cpp    |  5 +-
 src/widgets/settingspages/SettingsPage.cpp    | 28 +++++----
 src/widgets/settingspages/SettingsPage.hpp    |  2 +-
 src/widgets/splits/SplitContainer.cpp         |  6 +-
 src/widgets/splits/SplitHeader.cpp            |  2 -
 27 files changed, 75 insertions(+), 130 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd00604d3..586328d01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@
 - Dev: Refactored the Image Uploader feature. (#4971)
 - Dev: Fixed deadlock and use-after-free in tests. (#4981)
 - Dev: Load less message history upon reconnects. (#5001)
+- Dev: Fixed most compiler warnings. (#5028)
 
 ## 2.4.6
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1c6c3c0a0..53ed53a7b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1067,7 +1067,6 @@ else ()
         -Wno-switch
         -Wno-deprecated-declarations
         -Wno-sign-compare
-        -Wno-unused-variable
 
         # Disabling strict-aliasing warnings for now, although we probably want to re-enable this in the future
         -Wno-strict-aliasing
diff --git a/src/RunGui.cpp b/src/RunGui.cpp
index 62f1d6a43..a495fbef4 100644
--- a/src/RunGui.cpp
+++ b/src/RunGui.cpp
@@ -77,7 +77,7 @@ namespace {
     {
         // set up the QApplication flags
         QApplication::setAttribute(Qt::AA_Use96Dpi, true);
-#ifdef Q_OS_WIN32
+#if defined(Q_OS_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
 #endif
 
diff --git a/src/common/Env.cpp b/src/common/Env.cpp
index 174cae67b..6a7f5dac3 100644
--- a/src/common/Env.cpp
+++ b/src/common/Env.cpp
@@ -3,6 +3,7 @@
 #include "common/QLogging.hpp"
 #include "util/TypeName.hpp"
 
+#include <QtGlobal>
 #include <QVariant>
 
 namespace chatterino {
@@ -10,16 +11,8 @@ namespace chatterino {
 namespace {
 
     template <typename T>
-    void warn(const char *envName, T defaultValue)
+    void warn(const char *envName, const QString &envString, T defaultValue)
     {
-        auto *envString = std::getenv(envName);
-        if (!envString)
-        {
-            // This function is not supposed to be used for non-existant
-            // environment variables.
-            return;
-        }
-
         const auto typeName = QString::fromStdString(
             std::string(type_name<decltype(defaultValue)>()));
 
@@ -33,23 +26,12 @@ namespace {
                    .arg(defaultValue);
     }
 
-    QString readStringEnv(const char *envName, QString defaultValue)
-    {
-        auto envString = std::getenv(envName);
-        if (envString != nullptr)
-        {
-            return QString(envString);
-        }
-
-        return defaultValue;
-    }
-
     std::optional<QString> readOptionalStringEnv(const char *envName)
     {
-        auto envString = std::getenv(envName);
-        if (envString != nullptr)
+        auto envString = qEnvironmentVariable(envName);
+        if (!envString.isEmpty())
         {
-            return QString(envString);
+            return envString;
         }
 
         return std::nullopt;
@@ -57,30 +39,28 @@ namespace {
 
     uint16_t readPortEnv(const char *envName, uint16_t defaultValue)
     {
-        auto envString = std::getenv(envName);
-        if (envString != nullptr)
+        auto envString = qEnvironmentVariable(envName);
+        if (!envString.isEmpty())
         {
-            bool ok;
-            auto val = QString(envString).toUShort(&ok);
+            bool ok = false;
+            auto val = envString.toUShort(&ok);
             if (ok)
             {
                 return val;
             }
-            else
-            {
-                warn(envName, defaultValue);
-            }
+
+            warn(envName, envString, defaultValue);
         }
 
         return defaultValue;
     }
 
-    uint16_t readBoolEnv(const char *envName, bool defaultValue)
+    bool readBoolEnv(const char *envName, bool defaultValue)
     {
-        auto envString = std::getenv(envName);
-        if (envString != nullptr)
+        auto envString = qEnvironmentVariable(envName);
+        if (!envString.isEmpty())
         {
-            return QVariant(QString(envString)).toBool();
+            return QVariant(envString).toBool();
         }
 
         return defaultValue;
@@ -90,14 +70,14 @@ namespace {
 
 Env::Env()
     : recentMessagesApiUrl(
-          readStringEnv("CHATTERINO2_RECENT_MESSAGES_URL",
-                        "https://recent-messages.robotty.de/api/v2/"
-                        "recent-messages/%1"))
-    , linkResolverUrl(readStringEnv(
+          qEnvironmentVariable("CHATTERINO2_RECENT_MESSAGES_URL",
+                               "https://recent-messages.robotty.de/api/v2/"
+                               "recent-messages/%1"))
+    , linkResolverUrl(qEnvironmentVariable(
           "CHATTERINO2_LINK_RESOLVER_URL",
           "https://braize.pajlada.com/chatterino/link_resolver/%1"))
-    , twitchServerHost(
-          readStringEnv("CHATTERINO2_TWITCH_SERVER_HOST", "irc.chat.twitch.tv"))
+    , twitchServerHost(qEnvironmentVariable("CHATTERINO2_TWITCH_SERVER_HOST",
+                                            "irc.chat.twitch.tv"))
     , twitchServerPort(readPortEnv("CHATTERINO2_TWITCH_SERVER_PORT", 443))
     , twitchServerSecure(readBoolEnv("CHATTERINO2_TWITCH_SERVER_SECURE", true))
     , proxyUrl(readOptionalStringEnv("CHATTERINO2_PROXY_URL"))
diff --git a/src/controllers/commands/builtin/twitch/Shoutout.cpp b/src/controllers/commands/builtin/twitch/Shoutout.cpp
index b5077daec..af012cd34 100644
--- a/src/controllers/commands/builtin/twitch/Shoutout.cpp
+++ b/src/controllers/commands/builtin/twitch/Shoutout.cpp
@@ -47,7 +47,7 @@ QString sendShoutout(const CommandContext &ctx)
 
     getHelix()->getUserByName(
         target,
-        [twitchChannel, channel, currentUser, &target](const auto targetUser) {
+        [twitchChannel, channel, currentUser](const auto targetUser) {
             getHelix()->sendShoutout(
                 twitchChannel->roomId(), targetUser.id,
                 currentUser->getUserId(),
diff --git a/src/controllers/notifications/NotificationController.cpp b/src/controllers/notifications/NotificationController.cpp
index 4866bf987..80d13a540 100644
--- a/src/controllers/notifications/NotificationController.cpp
+++ b/src/controllers/notifications/NotificationController.cpp
@@ -208,11 +208,11 @@ void NotificationController::checkStream(bool live, QString channelName)
 
 void NotificationController::removeFakeChannel(const QString channelName)
 {
-    auto i = std::find(fakeTwitchChannels.begin(), fakeTwitchChannels.end(),
-                       channelName);
-    if (i != fakeTwitchChannels.end())
+    auto it = std::find(fakeTwitchChannels.begin(), fakeTwitchChannels.end(),
+                        channelName);
+    if (it != fakeTwitchChannels.end())
     {
-        fakeTwitchChannels.erase(i);
+        fakeTwitchChannels.erase(it);
         // "delete" old 'CHANNEL is live' message
         LimitedQueueSnapshot<MessagePtr> snapshot =
             getApp()->twitch->liveChannel->getMessageSnapshot();
diff --git a/src/controllers/sound/MiniaudioBackend.cpp b/src/controllers/sound/MiniaudioBackend.cpp
index 288dd5085..d9afa6c6c 100644
--- a/src/controllers/sound/MiniaudioBackend.cpp
+++ b/src/controllers/sound/MiniaudioBackend.cpp
@@ -256,8 +256,8 @@ void MiniaudioBackend::play(const QUrl &sound)
         if (sound.isLocalFile())
         {
             auto soundPath = sound.toLocalFile();
-            auto result = ma_engine_play_sound(this->engine.get(),
-                                               qPrintable(soundPath), nullptr);
+            result = ma_engine_play_sound(this->engine.get(),
+                                          qPrintable(soundPath), nullptr);
             if (result != MA_SUCCESS)
             {
                 qCWarning(chatterinoSound) << "Failed to play sound" << sound
diff --git a/src/providers/irc/AbstractIrcServer.cpp b/src/providers/irc/AbstractIrcServer.cpp
index 9c30049e7..b71bf46d3 100644
--- a/src/providers/irc/AbstractIrcServer.cpp
+++ b/src/providers/irc/AbstractIrcServer.cpp
@@ -11,10 +11,6 @@
 
 namespace chatterino {
 
-const int RECONNECT_BASE_INTERVAL = 2000;
-// 60 falloff counter means it will try to reconnect at most every 60*2 seconds
-const int MAX_FALLOFF_COUNTER = 60;
-
 // Ratelimits for joinBucket_
 const int JOIN_RATELIMIT_BUDGET = 18;
 const int JOIN_RATELIMIT_COOLDOWN = 12500;
diff --git a/src/providers/irc/IrcConnection2.cpp b/src/providers/irc/IrcConnection2.cpp
index b06343f84..96619cf82 100644
--- a/src/providers/irc/IrcConnection2.cpp
+++ b/src/providers/irc/IrcConnection2.cpp
@@ -16,7 +16,7 @@ IrcConnection::IrcConnection(QObject *parent)
 {
     // Log connection errors for ease-of-debugging
     QObject::connect(this, &Communi::IrcConnection::socketError, this,
-                     [this](QAbstractSocket::SocketError error) {
+                     [](QAbstractSocket::SocketError error) {
                          qCDebug(chatterinoIrc) << "Connection error:" << error;
                      });
 
diff --git a/src/providers/twitch/PubSubManager.cpp b/src/providers/twitch/PubSubManager.cpp
index cc240d01d..80727ea4b 100644
--- a/src/providers/twitch/PubSubManager.cpp
+++ b/src/providers/twitch/PubSubManager.cpp
@@ -210,7 +210,6 @@ PubSub::PubSub(const QString &host, std::chrono::seconds pingInterval)
         }
 
         action.target.login = args[0].toString();
-        bool ok;
         action.messageText = args[1].toString();
         action.messageId = args[2].toString();
 
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index e2826fd42..4652f44fe 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -56,7 +56,6 @@ namespace {
 #else
     const QString MAGIC_MESSAGE_SUFFIX = QString::fromUtf8(u8" \U000E0000");
 #endif
-    constexpr int TITLE_REFRESH_PERIOD = 10000;
     constexpr int CLIP_CREATION_COOLDOWN = 5000;
     const QString CLIPS_LINK("https://clips.twitch.tv/%1");
     const QString CLIPS_FAILURE_CLIPS_DISABLED_TEXT(
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 00f9bf688..8ef6bcc66 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -1729,7 +1729,7 @@ void TwitchMessageBuilder::listOfUsersSystemMessage(
 MessagePtr TwitchMessageBuilder::buildHypeChatMessage(
     Communi::IrcPrivateMessage *message)
 {
-    auto level = message->tag(u"pinned-chat-paid-level"_s).toString();
+    auto levelID = message->tag(u"pinned-chat-paid-level"_s).toString();
     auto currency = message->tag(u"pinned-chat-paid-currency"_s).toString();
     bool okAmount = false;
     auto amount = message->tag(u"pinned-chat-paid-amount"_s).toInt(&okAmount);
@@ -1743,7 +1743,7 @@ MessagePtr TwitchMessageBuilder::buildHypeChatMessage(
     // additionally, there's `pinned-chat-paid-is-system-message` which isn't used by Chatterino.
 
     QString subtitle;
-    auto levelIt = HYPE_CHAT_PAID_LEVEL.find(level);
+    auto levelIt = HYPE_CHAT_PAID_LEVEL.find(levelID);
     if (levelIt != HYPE_CHAT_PAID_LEVEL.end())
     {
         const auto &level = levelIt->second;
diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp
index 5174f2a33..d8692efda 100644
--- a/src/singletons/WindowManager.cpp
+++ b/src/singletons/WindowManager.cpp
@@ -750,7 +750,7 @@ void WindowManager::applyWindowLayout(const WindowLayout &layout)
             // out of bounds windows
             auto screens = qApp->screens();
             bool outOfBounds =
-                !getenv("I3SOCK") &&
+                !qEnvironmentVariableIsSet("I3SOCK") &&
                 std::none_of(screens.begin(), screens.end(),
                              [&](QScreen *screen) {
                                  return screen->availableGeometry().intersects(
diff --git a/src/util/AttachToConsole.cpp b/src/util/AttachToConsole.cpp
index 5e5ca77ff..41689c699 100644
--- a/src/util/AttachToConsole.cpp
+++ b/src/util/AttachToConsole.cpp
@@ -3,7 +3,7 @@
 #ifdef USEWINSDK
 #    include <Windows.h>
 
-#    include <iostream>
+#    include <tuple>
 #endif
 
 namespace chatterino {
@@ -13,8 +13,8 @@ void attachToConsole()
 #ifdef USEWINSDK
     if (AttachConsole(ATTACH_PARENT_PROCESS))
     {
-        freopen("CONOUT$", "w", stdout);
-        freopen("CONOUT$", "w", stderr);
+        std::ignore = freopen_s(nullptr, "CONOUT$", "w", stdout);
+        std::ignore = freopen_s(nullptr, "CONOUT$", "w", stderr);
     }
 #endif
 }
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index 6fdfe75c7..062f9efc9 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -118,7 +118,7 @@ float BaseWindow::scale() const
 
 float BaseWindow::qtFontScale() const
 {
-    return this->scale() / std::max<float>(0.01, this->nativeScale_);
+    return this->scale() / std::max<float>(0.01F, this->nativeScale_);
 }
 
 void BaseWindow::init()
diff --git a/src/widgets/Label.cpp b/src/widgets/Label.cpp
index 7f5e8a4ce..bcec1d280 100644
--- a/src/widgets/Label.cpp
+++ b/src/widgets/Label.cpp
@@ -95,11 +95,13 @@ void Label::paintEvent(QPaintEvent *)
     QFontMetrics metrics = getFonts()->getFontMetrics(
         this->getFontStyle(),
         this->scale() * 96.f /
-            std::max<float>(0.01, this->logicalDpiX() * deviceDpi));
+            std::max<float>(
+                0.01F, static_cast<float>(this->logicalDpiX() * deviceDpi)));
     painter.setFont(getFonts()->getFont(
         this->getFontStyle(),
         this->scale() * 96.f /
-            std::max<float>(0.02, this->logicalDpiX() * deviceDpi)));
+            std::max<float>(
+                0.02F, static_cast<float>(this->logicalDpiX() * deviceDpi))));
 
     int offset = this->getOffset();
 
diff --git a/src/widgets/dialogs/ReplyThreadPopup.cpp b/src/widgets/dialogs/ReplyThreadPopup.cpp
index eeb0d82b4..a9501ca12 100644
--- a/src/widgets/dialogs/ReplyThreadPopup.cpp
+++ b/src/widgets/dialogs/ReplyThreadPopup.cpp
@@ -238,11 +238,11 @@ void ReplyThreadPopup::addMessagesFromThread()
     this->ui_.threadView->setChannel(this->virtualChannel_);
     this->ui_.threadView->setSourceChannel(sourceChannel);
 
-    auto overrideFlags =
+    auto rootOverrideFlags =
         std::optional<MessageFlags>(this->thread_->root()->flags);
-    overrideFlags->set(MessageFlag::DoNotLog);
+    rootOverrideFlags->set(MessageFlag::DoNotLog);
 
-    this->virtualChannel_->addMessage(this->thread_->root(), overrideFlags);
+    this->virtualChannel_->addMessage(this->thread_->root(), rootOverrideFlags);
     for (const auto &msgRef : this->thread_->replies())
     {
         if (auto msg = msgRef.lock())
diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index e0f1e57f1..5bf44c5e9 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -992,43 +992,11 @@ UserInfoPopup::TimeoutWidget::TimeoutWidget()
                       .setLayoutType<QHBoxLayout>()
                       .withoutMargin();
 
-    QColor color1(255, 255, 255, 80);
-    QColor color2(255, 255, 255, 0);
-
     int buttonWidth = 40;
-    // int buttonWidth = 24;
-    int buttonWidth2 = 32;
     int buttonHeight = 32;
 
     layout->setSpacing(16);
 
-    //auto addButton = [&](Action action, const QString &text,
-    //                     const QPixmap &pixmap) {
-    //    auto vbox = layout.emplace<QVBoxLayout>().withoutMargin();
-    //    {
-    //        auto title = vbox.emplace<QHBoxLayout>().withoutMargin();
-    //        title->addStretch(1);
-    //        auto label = title.emplace<Label>(text);
-    //        label->setHasOffset(false);
-    //        label->setStyleSheet("color: #BBB");
-    //        title->addStretch(1);
-
-    //        auto hbox = vbox.emplace<QHBoxLayout>().withoutMargin();
-    //        hbox->setSpacing(0);
-    //        {
-    //            auto button = hbox.emplace<Button>(nullptr);
-    //            button->setPixmap(pixmap);
-    //            button->setScaleIndependantSize(buttonHeight, buttonHeight);
-    //            button->setBorderColor(QColor(255, 255, 255, 127));
-
-    //            QObject::connect(
-    //                button.getElement(), &Button::leftClicked, [this, action] {
-    //                    this->buttonClicked.invoke(std::make_pair(action, -1));
-    //                });
-    //        }
-    //    }
-    //};
-
     const auto addLayout = [&](const QString &text) {
         auto vbox = layout.emplace<QVBoxLayout>().withoutMargin();
         auto title = vbox.emplace<QHBoxLayout>().withoutMargin();
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 171f05e65..a333e89e1 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -2888,12 +2888,14 @@ void ChannelView::setInputReply(const MessagePtr &message)
     if (!message->replyThread)
     {
         // Message did not already have a thread attached, try to find or create one
-        if (auto *tc =
-                dynamic_cast<TwitchChannel *>(this->underlyingChannel_.get()))
+        auto *tc =
+            dynamic_cast<TwitchChannel *>(this->underlyingChannel_.get());
+        if (!tc)
         {
-            tc->getOrCreateThread(message);
+            tc = dynamic_cast<TwitchChannel *>(this->channel_.get());
         }
-        else if (auto *tc = dynamic_cast<TwitchChannel *>(this->channel_.get()))
+
+        if (tc)
         {
             tc->getOrCreateThread(message);
         }
diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp
index 297ccf19b..1d7ac523d 100644
--- a/src/widgets/helper/NotebookTab.cpp
+++ b/src/widgets/helper/NotebookTab.cpp
@@ -424,7 +424,6 @@ void NotebookTab::paintEvent(QPaintEvent *)
 
     // select the right tab colors
     Theme::TabColors colors;
-    Theme::TabColors regular = this->theme->tabs.regular;
 
     if (this->selected_)
         colors = this->theme->tabs.selected;
diff --git a/src/widgets/listview/GenericListView.cpp b/src/widgets/listview/GenericListView.cpp
index 978229b13..e0b2c35cd 100644
--- a/src/widgets/listview/GenericListView.cpp
+++ b/src/widgets/listview/GenericListView.cpp
@@ -161,7 +161,6 @@ void GenericListView::refreshTheme(const Theme &theme)
 bool GenericListView::acceptCompletion()
 {
     const QModelIndex &curIdx = this->currentIndex();
-    const int curRow = curIdx.row();
     const int count = this->model_->rowCount(curIdx);
     if (count <= 0)
     {
diff --git a/src/widgets/settingspages/GeneralPageView.hpp b/src/widgets/settingspages/GeneralPageView.hpp
index 337855495..61a77fbde 100644
--- a/src/widgets/settingspages/GeneralPageView.hpp
+++ b/src/widgets/settingspages/GeneralPageView.hpp
@@ -256,9 +256,9 @@ public:
     {
         auto *combo = this->addDropdown(text, {}, std::move(toolTipText));
 
-        for (const auto &text : items)
+        for (const auto &item : items)
         {
-            combo->addItem(QString::fromStdString(std::string(text)));
+            combo->addItem(QString::fromStdString(std::string(item)));
         }
 
         if (!defaultValueText.isEmpty())
diff --git a/src/widgets/settingspages/KeyboardSettingsPage.cpp b/src/widgets/settingspages/KeyboardSettingsPage.cpp
index d63c16029..426c356e5 100644
--- a/src/widgets/settingspages/KeyboardSettingsPage.cpp
+++ b/src/widgets/settingspages/KeyboardSettingsPage.cpp
@@ -34,8 +34,7 @@ void tableCellClicked(const QModelIndex &clicked, EditableModelView *view,
     if (wasAccepted)
     {
         auto newHotkey = dialog.data();
-        auto vectorIndex =
-            getApp()->hotkeys->replaceHotkey(hotkey->name(), newHotkey);
+        getApp()->hotkeys->replaceHotkey(hotkey->name(), newHotkey);
         getApp()->hotkeys->save();
     }
 }
@@ -69,7 +68,7 @@ KeyboardSettingsPage::KeyboardSettingsPage()
         if (wasAccepted)
         {
             auto newHotkey = dialog.data();
-            int vectorIndex = getApp()->hotkeys->hotkeys_.append(newHotkey);
+            getApp()->hotkeys->hotkeys_.append(newHotkey);
             getApp()->hotkeys->save();
         }
     });
diff --git a/src/widgets/settingspages/SettingsPage.cpp b/src/widgets/settingspages/SettingsPage.cpp
index bedb52067..8586e997e 100644
--- a/src/widgets/settingspages/SettingsPage.cpp
+++ b/src/widgets/settingspages/SettingsPage.cpp
@@ -21,36 +21,40 @@ bool filterItemsRec(QObject *object, const QString &query)
             widget->update();
         };
 
-        if (auto x = dynamic_cast<SCheckBox *>(child); x)
+        if (auto *checkBox = dynamic_cast<SCheckBox *>(child))
         {
-            setOpacity(x, x->text().contains(query, Qt::CaseInsensitive));
+            setOpacity(checkBox,
+                       checkBox->text().contains(query, Qt::CaseInsensitive));
         }
-        else if (auto x = dynamic_cast<SLabel *>(child); x)
+        else if (auto *lbl = dynamic_cast<SLabel *>(child))
         {
-            setOpacity(x, x->text().contains(query, Qt::CaseInsensitive));
+            setOpacity(lbl, lbl->text().contains(query, Qt::CaseInsensitive));
         }
-        else if (auto x = dynamic_cast<SComboBox *>(child); x)
+        else if (auto *comboBox = dynamic_cast<SComboBox *>(child))
         {
-            setOpacity(x, [=]() {
-                for (int i = 0; i < x->count(); i++)
+            setOpacity(comboBox, [=]() {
+                for (int i = 0; i < comboBox->count(); i++)
                 {
-                    if (x->itemText(i).contains(query, Qt::CaseInsensitive))
+                    if (comboBox->itemText(i).contains(query,
+                                                       Qt::CaseInsensitive))
+                    {
                         return true;
+                    }
                 }
                 return false;
             }());
         }
-        else if (auto x = dynamic_cast<QTabWidget *>(child); x)
+        else if (auto *tabs = dynamic_cast<QTabWidget *>(child))
         {
-            for (int i = 0; i < x->count(); i++)
+            for (int i = 0; i < tabs->count(); i++)
             {
                 bool tabAny{};
 
-                if (x->tabText(i).contains(query, Qt::CaseInsensitive))
+                if (tabs->tabText(i).contains(query, Qt::CaseInsensitive))
                 {
                     tabAny = true;
                 }
-                auto widget = x->widget(i);
+                auto *widget = tabs->widget(i);
                 tabAny |= filterItemsRec(widget, query);
 
                 any |= tabAny;
diff --git a/src/widgets/settingspages/SettingsPage.hpp b/src/widgets/settingspages/SettingsPage.hpp
index 1b69e656c..f982114cb 100644
--- a/src/widgets/settingspages/SettingsPage.hpp
+++ b/src/widgets/settingspages/SettingsPage.hpp
@@ -27,7 +27,7 @@
             {                                          \
                 QPainter painter(this);                \
                 QColor color = QColor("#222222");      \
-                color.setAlphaF(0.7);                  \
+                color.setAlphaF(0.7F);                 \
                 painter.fillRect(this->rect(), color); \
             }                                          \
         }                                              \
diff --git a/src/widgets/splits/SplitContainer.cpp b/src/widgets/splits/SplitContainer.cpp
index d6b08645a..276ab6d2b 100644
--- a/src/widgets/splits/SplitContainer.cpp
+++ b/src/widgets/splits/SplitContainer.cpp
@@ -842,12 +842,12 @@ void SplitContainer::applyFromDescriptorRecursively(
         {
             if (std::holds_alternative<SplitNodeDescriptor>(item))
             {
-                const auto *n = std::get_if<SplitNodeDescriptor>(&item);
-                if (!n)
+                const auto *inner = std::get_if<SplitNodeDescriptor>(&item);
+                if (!inner)
                 {
                     return;
                 }
-                const auto &splitNode = *n;
+                const auto &splitNode = *inner;
                 auto *split = new Split(this);
                 split->setChannel(WindowManager::decodeChannel(splitNode));
                 split->setModerationMode(splitNode.moderationMode_);
diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp
index 58d75b44b..2589b9b25 100644
--- a/src/widgets/splits/SplitHeader.cpp
+++ b/src/widgets/splits/SplitHeader.cpp
@@ -947,8 +947,6 @@ void SplitHeader::enterEvent(QEvent *event)
 {
     if (!this->tooltipText_.isEmpty())
     {
-        auto *channel = this->split_->getChannel().get();
-
         this->tooltipWidget_->setOne({nullptr, this->tooltipText_});
         this->tooltipWidget_->setWordWrap(true);
         this->tooltipWidget_->adjustSize();

From bbf75516ede422a6a2f4c4c3645b75440872d0f0 Mon Sep 17 00:00:00 2001
From: iProdigy <8106344+iProdigy@users.noreply.github.com>
Date: Sat, 16 Dec 2023 05:48:32 -0600
Subject: [PATCH 16/42] fix: show user message on watch streak notice (#5029)

---
 CHANGELOG.md                               |  1 +
 src/providers/twitch/IrcMessageHandler.cpp | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 586328d01..c44ffde02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
 - Bugfix: Fixed support for Windows 11 Snap layouts. (#4994)
 - Bugfix: Fixed some windows appearing between screens. (#4797)
 - Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998)
+- Bugfix: Show user text input within watch streak notices. (#5029)
 - Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978)
 - Dev: Change clang-format from v14 to v16. (#4929)
 - Dev: Fixed UTF16 encoding of `modes` file for the installer. (#4791)
diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
index 183a483ec..373e4f72c 100644
--- a/src/providers/twitch/IrcMessageHandler.cpp
+++ b/src/providers/twitch/IrcMessageHandler.cpp
@@ -44,12 +44,13 @@ using namespace chatterino;
 
 // Message types below are the ones that might contain special user's message on USERNOTICE
 const QSet<QString> SPECIAL_MESSAGE_TYPES{
-    "sub",            //
-    "subgift",        //
-    "resub",          // resub messages
-    "bitsbadgetier",  // bits badge upgrade
-    "ritual",         // new viewer ritual
-    "announcement",   // new mod announcement thing
+    "sub",              //
+    "subgift",          //
+    "resub",            // resub messages
+    "bitsbadgetier",    // bits badge upgrade
+    "ritual",           // new viewer ritual
+    "announcement",     // new mod announcement thing
+    "viewermilestone",  // watch streak, but other categories possible in future
 };
 
 MessagePtr generateBannedMessage(bool confirmedBan)

From 5f8c4c6b66e985a2cc6b26f000c1c7af9cfd0ff7 Mon Sep 17 00:00:00 2001
From: Mm2PL <mm2pl+gh@kotmisia.pl>
Date: Sat, 16 Dec 2023 13:16:54 +0100
Subject: [PATCH 17/42] BREAKING: Replace custom `import()` with normal Lua
 `require()`. (#5014)

* Use require() instead of a custom import()

* Also search relative to the current file

* Update documentation
---
 CHANGELOG.md                                 |   1 +
 docs/wip-plugins.md                          |  21 ++--
 src/controllers/plugins/LuaAPI.cpp           | 113 +++++++++++--------
 src/controllers/plugins/LuaAPI.hpp           |   5 +-
 src/controllers/plugins/PluginController.cpp |  59 +++++++---
 src/controllers/plugins/PluginController.hpp |   3 +-
 6 files changed, 131 insertions(+), 71 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c44ffde02..44a9f740a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,6 +89,7 @@
 - Dev: Refactored the Image Uploader feature. (#4971)
 - Dev: Fixed deadlock and use-after-free in tests. (#4981)
 - Dev: Load less message history upon reconnects. (#5001)
+- Dev: BREAKING: Replace custom `import()` with normal Lua `require()`. (#5014)
 - Dev: Fixed most compiler warnings. (#5028)
 
 ## 2.4.6
diff --git a/docs/wip-plugins.md b/docs/wip-plugins.md
index 8bb0cf61c..9a3ee25ce 100644
--- a/docs/wip-plugins.md
+++ b/docs/wip-plugins.md
@@ -158,18 +158,25 @@ It achieves this by forcing all inputs to be encoded with `UTF-8`.
 
 See [official documentation](https://www.lua.org/manual/5.4/manual.html#pdf-load)
 
-#### `import(filename)`
+#### `require(modname)`
 
-This function mimics Lua's `dofile` however relative paths are relative to your plugin's directory.
-You are restricted to loading files in your plugin's directory. You cannot load files with bytecode inside.
+This is Lua's [`require()`](https://www.lua.org/manual/5.3/manual.html#pdf-require) function.
+However the searcher and load configuration is notably different than default:
+
+- Lua's built-in dynamic library searcher is removed,
+- `package.path` is not used, in its place are two searchers,
+- when `require()` is used, first a file relative to the currently executing
+  file will be checked, then a file relative to the plugin directory,
+- binary chunks are never loaded
+
+As in normal Lua, dots are converted to the path separators (`'/'` on Linux and Mac, `'\'` on Windows).
 
 Example:
 
 ```lua
-import("stuff.lua") -- executes Plugins/name/stuff.lua
-import("./stuff.lua") -- executes Plugins/name/stuff.lua
-import("../stuff.lua") -- tries to load Plugins/stuff.lua and errors
-import("luac.out") -- tried to load Plugins/name/luac.out and errors because it contains non-utf8 data
+require("stuff") -- executes Plugins/name/stuff.lua or $(dirname $CURR_FILE)/stuff.lua
+require("dir.name") -- executes Plugins/name/dir/name.lua or $(dirname $CURR_FILE)/dir/name.lua
+require("binary") -- tried to load Plugins/name/binary.lua and errors because binary is not a text file
 ```
 
 #### `print(Args...)`
diff --git a/src/controllers/plugins/LuaAPI.cpp b/src/controllers/plugins/LuaAPI.cpp
index e34e063b4..d8c1b676c 100644
--- a/src/controllers/plugins/LuaAPI.cpp
+++ b/src/controllers/plugins/LuaAPI.cpp
@@ -15,6 +15,7 @@
 #    include <QFileInfo>
 #    include <QLoggingCategory>
 #    include <QTextCodec>
+#    include <QUrl>
 
 namespace {
 using namespace chatterino;
@@ -282,69 +283,87 @@ int g_load(lua_State *L)
 #    endif
 }
 
-int g_import(lua_State *L)
+int loadfile(lua_State *L, const QString &str)
 {
-    auto countArgs = lua_gettop(L);
-    // Lua allows dofile() which loads from stdin, but this is very useless in our case
-    if (countArgs == 0)
-    {
-        lua_pushnil(L);
-        luaL_error(L, "it is not allowed to call import() without arguments");
-        return 1;
-    }
-
     auto *pl = getApp()->plugins->getPluginByStatePtr(L);
-    QString fname;
-    if (!lua::pop(L, &fname))
+    if (pl == nullptr)
     {
-        lua_pushnil(L);
-        luaL_error(L, "chatterino g_import: expected a string for a filename");
-        return 1;
+        return luaL_error(L, "loadfile: internal error: no plugin?");
     }
     auto dir = QUrl(pl->loadDirectory().canonicalPath() + "/");
-    auto file = dir.resolved(fname);
 
-    qCDebug(chatterinoLua) << "plugin" << pl->id << "is trying to load" << file
-                           << "(its dir is" << dir << ")";
-    if (!dir.isParentOf(file))
+    if (!dir.isParentOf(str))
     {
-        lua_pushnil(L);
-        luaL_error(L, "chatterino g_import: filename must be inside of the "
-                      "plugin directory");
+        // XXX: This intentionally hides the resolved path to not leak it
+        lua::push(
+            L, QString("requested module is outside of the plugin directory"));
+        return 1;
+    }
+    QFileInfo info(str);
+    if (!info.exists())
+    {
+        lua::push(L, QString("no file '%1'").arg(str));
         return 1;
     }
 
-    auto path = file.path(QUrl::FullyDecoded);
-    QFile qf(path);
-    qf.open(QIODevice::ReadOnly);
-    if (qf.size() > 10'000'000)
+    auto temp = str.toStdString();
+    const auto *filename = temp.c_str();
+
+    auto res = luaL_loadfilex(L, filename, "t");
+    // Yoinked from checkload lib/lua/src/loadlib.c
+    if (res == LUA_OK)
     {
-        lua_pushnil(L);
-        luaL_error(L, "chatterino g_import: size limit of 10MB exceeded, what "
-                      "the hell are you doing");
+        lua_pushstring(L, filename);
+        return 2;
+    }
+
+    return luaL_error(L, "error loading module '%s' from file '%s':\n\t%s",
+                      lua_tostring(L, 1), filename, lua_tostring(L, -1));
+}
+
+int searcherAbsolute(lua_State *L)
+{
+    auto name = QString::fromUtf8(luaL_checkstring(L, 1));
+    name = name.replace('.', QDir::separator());
+
+    QString filename;
+    auto *pl = getApp()->plugins->getPluginByStatePtr(L);
+    if (pl == nullptr)
+    {
+        return luaL_error(L, "searcherAbsolute: internal error: no plugin?");
+    }
+
+    QFileInfo file(pl->loadDirectory().filePath(name + ".lua"));
+    return loadfile(L, file.canonicalFilePath());
+}
+
+int searcherRelative(lua_State *L)
+{
+    lua_Debug dbg;
+    lua_getstack(L, 1, &dbg);
+    lua_getinfo(L, "S", &dbg);
+    auto currentFile = QString::fromUtf8(dbg.source, dbg.srclen);
+    if (currentFile.startsWith("@"))
+    {
+        currentFile = currentFile.mid(1);
+    }
+    if (currentFile == "=[C]" || currentFile == "")
+    {
+        lua::push(
+            L,
+            QString(
+                "Unable to load relative to file:caller has no source file"));
         return 1;
     }
 
-    // validate utf-8 to block bytecode exploits
-    auto data = qf.readAll();
-    auto *utf8 = QTextCodec::codecForName("UTF-8");
-    QTextCodec::ConverterState state;
-    utf8->toUnicode(data.constData(), data.size(), &state);
-    if (state.invalidChars != 0)
-    {
-        lua_pushnil(L);
-        luaL_error(L, "invalid utf-8 in import() target (%s) is not allowed",
-                   fname.toStdString().c_str());
-        return 1;
-    }
+    auto parent = QFileInfo(currentFile).dir();
 
-    // fetch dofile and call it
-    lua_getfield(L, LUA_REGISTRYINDEX, "real_dofile");
-    // maybe data race here if symlink was swapped?
-    lua::push(L, path);
-    lua_call(L, 1, LUA_MULTRET);
+    auto name = QString::fromUtf8(luaL_checkstring(L, 1));
+    name = name.replace('.', QDir::separator());
+    QString filename =
+        parent.canonicalPath() + QDir::separator() + name + ".lua";
 
-    return lua_gettop(L);
+    return loadfile(L, filename);
 }
 
 int g_print(lua_State *L)
diff --git a/src/controllers/plugins/LuaAPI.hpp b/src/controllers/plugins/LuaAPI.hpp
index 95a9bd192..155afc707 100644
--- a/src/controllers/plugins/LuaAPI.hpp
+++ b/src/controllers/plugins/LuaAPI.hpp
@@ -20,9 +20,12 @@ int c2_log(lua_State *L);
 // These ones are global
 int g_load(lua_State *L);
 int g_print(lua_State *L);
-int g_import(lua_State *L);
 // NOLINTEND(readability-identifier-naming)
 
+// This is for require() exposed as an element of package.searchers
+int searcherAbsolute(lua_State *L);
+int searcherRelative(lua_State *L);
+
 // Exposed as c2.LogLevel
 // Represents "calls" to qCDebug, qCInfo ...
 enum class LogLevel { Debug, Info, Warning, Critical };
diff --git a/src/controllers/plugins/PluginController.cpp b/src/controllers/plugins/PluginController.cpp
index f3829ac26..55def19ce 100644
--- a/src/controllers/plugins/PluginController.cpp
+++ b/src/controllers/plugins/PluginController.cpp
@@ -103,9 +103,10 @@ bool PluginController::tryLoadFromDir(const QDir &pluginDir)
     return true;
 }
 
-void PluginController::openLibrariesFor(lua_State *L,
-                                        const PluginMeta & /*meta*/)
+void PluginController::openLibrariesFor(lua_State *L, const PluginMeta &meta,
+                                        const QDir &pluginDir)
 {
+    lua::StackGuard guard(L);
     // Stuff to change, remove or hide behind a permission system:
     static const std::vector<luaL_Reg> loadedlibs = {
         luaL_Reg{LUA_GNAME, luaopen_base},
@@ -123,6 +124,7 @@ void PluginController::openLibrariesFor(lua_State *L,
         luaL_Reg{LUA_STRLIBNAME, luaopen_string},
         luaL_Reg{LUA_MATHLIBNAME, luaopen_math},
         luaL_Reg{LUA_UTF8LIBNAME, luaopen_utf8},
+        luaL_Reg{LUA_LOADLIBNAME, luaopen_package},
     };
     // Warning: Do not add debug library to this, it would make the security of
     // this a living nightmare due to stuff like registry access
@@ -144,7 +146,7 @@ void PluginController::openLibrariesFor(lua_State *L,
         {nullptr, nullptr},
     };
     lua_pushglobaltable(L);
-    auto global = lua_gettop(L);
+    auto gtable = lua_gettop(L);
 
     // count of elements in C2LIB + LogLevel + EventType
     auto c2libIdx = lua::pushEmptyTable(L, 8);
@@ -157,14 +159,11 @@ void PluginController::openLibrariesFor(lua_State *L,
     lua::pushEnumTable<lua::api::EventType>(L);
     lua_setfield(L, c2libIdx, "EventType");
 
-    lua_setfield(L, global, "c2");
+    lua_setfield(L, gtable, "c2");
 
     // ban functions
     // Note: this might not be fully secure? some kind of metatable fuckery might come up?
 
-    lua_pushglobaltable(L);
-    auto gtable = lua_gettop(L);
-
     // possibly randomize this name at runtime to prevent some attacks?
 
 #    ifndef NDEBUG
@@ -172,16 +171,10 @@ void PluginController::openLibrariesFor(lua_State *L,
     lua_setfield(L, LUA_REGISTRYINDEX, "real_load");
 #    endif
 
-    lua_getfield(L, gtable, "dofile");
-    lua_setfield(L, LUA_REGISTRYINDEX, "real_dofile");
-
     // NOLINTNEXTLINE(*-avoid-c-arrays)
     static const luaL_Reg replacementFuncs[] = {
         {"load", lua::api::g_load},
         {"print", lua::api::g_print},
-
-        // This function replaces both `dofile` and `require`, see docs/wip-plugins.md for more info
-        {"import", lua::api::g_import},
         {nullptr, nullptr},
     };
     luaL_setfuncs(L, replacementFuncs, 0);
@@ -192,7 +185,43 @@ void PluginController::openLibrariesFor(lua_State *L,
     lua_pushnil(L);
     lua_setfield(L, gtable, "dofile");
 
-    lua_pop(L, 1);
+    // set up package lib
+    lua_getfield(L, gtable, "package");
+
+    auto package = lua_gettop(L);
+    lua_pushstring(L, "");
+    lua_setfield(L, package, "cpath");
+
+    // we don't use path
+    lua_pushstring(L, "");
+    lua_setfield(L, package, "path");
+
+    {
+        lua_getfield(L, gtable, "table");
+        auto table = lua_gettop(L);
+        lua_getfield(L, -1, "remove");
+        lua_remove(L, table);
+    }
+    auto remove = lua_gettop(L);
+
+    // remove searcher_Croot, searcher_C and searcher_Lua leaving only searcher_preload
+    for (int i = 0; i < 3; i++)
+    {
+        lua_pushvalue(L, remove);
+        lua_getfield(L, package, "searchers");
+        lua_pcall(L, 1, 0, 0);
+    }
+    lua_pop(L, 1);  // get rid of remove
+
+    lua_getfield(L, package, "searchers");
+    lua_pushcclosure(L, lua::api::searcherRelative, 0);
+    lua_seti(L, -2, 2);
+
+    lua::push(L, QString(pluginDir.absolutePath()));
+    lua_pushcclosure(L, lua::api::searcherAbsolute, 1);
+    lua_seti(L, -2, 3);
+
+    lua_pop(L, 3);  // remove gtable, package, package.searchers
 }
 
 void PluginController::load(const QFileInfo &index, const QDir &pluginDir,
@@ -211,7 +240,7 @@ void PluginController::load(const QFileInfo &index, const QDir &pluginDir,
                                  << " because safe mode is enabled.";
         return;
     }
-    PluginController::openLibrariesFor(l, meta);
+    PluginController::openLibrariesFor(l, meta, pluginDir);
 
     if (!PluginController::isPluginEnabled(pluginName) ||
         !getSettings()->pluginsEnabled)
diff --git a/src/controllers/plugins/PluginController.hpp b/src/controllers/plugins/PluginController.hpp
index bc3eca738..8dc698b40 100644
--- a/src/controllers/plugins/PluginController.hpp
+++ b/src/controllers/plugins/PluginController.hpp
@@ -63,7 +63,8 @@ private:
               const PluginMeta &meta);
 
     // This function adds lua standard libraries into the state
-    static void openLibrariesFor(lua_State *L, const PluginMeta & /*meta*/);
+    static void openLibrariesFor(lua_State *L, const PluginMeta & /*meta*/,
+                                 const QDir &pluginDir);
     static void loadChatterinoLib(lua_State *l);
     bool tryLoadFromDir(const QDir &pluginDir);
     std::map<QString, std::unique_ptr<Plugin>> plugins_;

From e75ce5db54b4bc61087cb65f9e8a37f21780125d Mon Sep 17 00:00:00 2001
From: iProdigy <8106344+iProdigy@users.noreply.github.com>
Date: Sat, 16 Dec 2023 06:38:35 -0600
Subject: [PATCH 18/42] fix: request more historical messages on wake (#5018)

---
 CHANGELOG.md                             |  1 +
 src/providers/irc/AbstractIrcServer.cpp  | 15 ++++++++++-
 src/providers/irc/AbstractIrcServer.hpp  |  1 +
 src/providers/irc/IrcConnection2.cpp     |  1 +
 src/providers/irc/IrcConnection2.hpp     |  3 +++
 src/providers/twitch/TwitchChannel.cpp   | 32 +++++++++++++-----------
 src/providers/twitch/TwitchChannel.hpp   | 13 +++++++---
 src/providers/twitch/TwitchIrcServer.cpp |  1 +
 8 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44a9f740a..439dbda1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@
 - Dev: Move `clang-tidy` checker to its own CI job. (#4996)
 - Dev: Refactored the Image Uploader feature. (#4971)
 - Dev: Fixed deadlock and use-after-free in tests. (#4981)
+- Dev: Load less message history upon reconnects. (#5001, #5018)
 - Dev: Load less message history upon reconnects. (#5001)
 - Dev: BREAKING: Replace custom `import()` with normal Lua `require()`. (#5014)
 - Dev: Fixed most compiler warnings. (#5028)
diff --git a/src/providers/irc/AbstractIrcServer.cpp b/src/providers/irc/AbstractIrcServer.cpp
index b71bf46d3..f1b069cc4 100644
--- a/src/providers/irc/AbstractIrcServer.cpp
+++ b/src/providers/irc/AbstractIrcServer.cpp
@@ -85,6 +85,9 @@ AbstractIrcServer::AbstractIrcServer()
             }
             this->readConnection_->smartReconnect();
         });
+    this->connections_.managedConnect(this->readConnection_->heartbeat, [this] {
+        this->markChannelsConnected();
+    });
 }
 
 void AbstractIrcServer::initializeIrc()
@@ -358,11 +361,21 @@ void AbstractIrcServer::onDisconnected()
 
         if (auto *channel = dynamic_cast<TwitchChannel *>(chan.get()))
         {
-            channel->markDisconnectedNow();
+            channel->markDisconnected();
         }
     }
 }
 
+void AbstractIrcServer::markChannelsConnected()
+{
+    this->forEachChannel([](const ChannelPtr &chan) {
+        if (auto *channel = dynamic_cast<TwitchChannel *>(chan.get()))
+        {
+            channel->markConnected();
+        }
+    });
+}
+
 std::shared_ptr<Channel> AbstractIrcServer::getCustomChannel(
     const QString &channelName)
 {
diff --git a/src/providers/irc/AbstractIrcServer.hpp b/src/providers/irc/AbstractIrcServer.hpp
index 2b29ae43d..10bba1860 100644
--- a/src/providers/irc/AbstractIrcServer.hpp
+++ b/src/providers/irc/AbstractIrcServer.hpp
@@ -73,6 +73,7 @@ protected:
     virtual void onReadConnected(IrcConnection *connection);
     virtual void onWriteConnected(IrcConnection *connection);
     virtual void onDisconnected();
+    void markChannelsConnected();
 
     virtual std::shared_ptr<Channel> getCustomChannel(
         const QString &channelName);
diff --git a/src/providers/irc/IrcConnection2.cpp b/src/providers/irc/IrcConnection2.cpp
index 96619cf82..9f97e6db6 100644
--- a/src/providers/irc/IrcConnection2.cpp
+++ b/src/providers/irc/IrcConnection2.cpp
@@ -64,6 +64,7 @@ IrcConnection::IrcConnection(QObject *parent)
                 // If we're still receiving messages, all is well
                 this->recentlyReceivedMessage_ = false;
                 this->waitingForPong_ = false;
+                this->heartbeat.invoke();
                 return;
             }
 
diff --git a/src/providers/irc/IrcConnection2.hpp b/src/providers/irc/IrcConnection2.hpp
index 4c76161b8..150793ec8 100644
--- a/src/providers/irc/IrcConnection2.hpp
+++ b/src/providers/irc/IrcConnection2.hpp
@@ -19,6 +19,9 @@ public:
     // receiver to trigger a reconnect, if desired
     pajlada::Signals::Signal<bool> connectionLost;
 
+    // Signal to indicate the connection is still healthy
+    pajlada::Signals::NoArgSignal heartbeat;
+
     // Request a reconnect with a minimum interval between attempts.
     // This won't violate RECONNECT_MIN_INTERVAL
     void smartReconnect();
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 4652f44fe..ba25e6f79 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -103,10 +103,11 @@ TwitchChannel::TwitchChannel(const QString &name)
     // We can safely ignore this signal connection this has no external dependencies - once the signal
     // is destroyed, it will no longer be able to fire
     std::ignore = this->joined.connect([this]() {
-        if (this->disconnectedAt_.has_value())
+        if (this->disconnected_)
         {
             this->loadRecentMessagesReconnect();
-            this->disconnectedAt_ = std::nullopt;
+            this->lastConnectedAt_ = std::chrono::system_clock::now();
+            this->disconnected_ = false;
         }
     });
 
@@ -731,6 +732,8 @@ void TwitchChannel::setRoomId(const QString &id)
         *this->roomID_.access() = id;
         this->roomIdChanged();
         this->loadRecentMessages();
+        this->disconnected_ = false;
+        this->lastConnectedAt_ = std::chrono::system_clock::now();
     }
 }
 
@@ -1105,7 +1108,15 @@ bool TwitchChannel::setLive(bool newLiveStatus)
     return true;
 }
 
-void TwitchChannel::markDisconnectedNow()
+void TwitchChannel::markConnected()
+{
+    if (this->lastConnectedAt_.has_value() && !this->disconnected_)
+    {
+        this->lastConnectedAt_ = std::chrono::system_clock::now();
+    }
+}
+
+void TwitchChannel::markDisconnected()
 {
     if (this->roomId().isEmpty())
     {
@@ -1113,14 +1124,7 @@ void TwitchChannel::markDisconnectedNow()
         return;
     }
 
-    if (this->disconnectedAt_.has_value())
-    {
-        // don't overwrite prior timestamp since
-        // a reconnection hasn't happened yet
-        return;
-    }
-
-    this->disconnectedAt_ = std::chrono::system_clock::now();
+    this->disconnected_ = true;
 }
 
 void TwitchChannel::loadRecentMessages()
@@ -1194,14 +1198,14 @@ void TwitchChannel::loadRecentMessagesReconnect()
 
     const auto now = std::chrono::system_clock::now();
     int limit = getSettings()->twitchMessageHistoryLimit.getValue();
-    if (this->disconnectedAt_.has_value())
+    if (this->lastConnectedAt_.has_value())
     {
         // calculate how many messages could have occured
         // while we were not connected to the channel
         // assuming a maximum of 10 messages per second
         const auto secondsSinceDisconnect =
             std::chrono::duration_cast<std::chrono::seconds>(
-                now - this->disconnectedAt_.value())
+                now - this->lastConnectedAt_.value())
                 .count();
         limit =
             std::min(static_cast<int>(secondsSinceDisconnect + 1) * 10, limit);
@@ -1233,7 +1237,7 @@ void TwitchChannel::loadRecentMessagesReconnect()
 
             tc->loadingRecentMessages_.clear();
         },
-        limit, this->disconnectedAt_, now, true);
+        limit, this->lastConnectedAt_, now, true);
 }
 
 void TwitchChannel::refreshPubSub()
diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp
index 5b1d628a6..772ec5f62 100644
--- a/src/providers/twitch/TwitchChannel.hpp
+++ b/src/providers/twitch/TwitchChannel.hpp
@@ -137,10 +137,14 @@ public:
     SharedAccessGuard<const StreamStatus> accessStreamStatus() const;
 
     /**
-     * Records the current timestamp the channel was disconnected.
-     * This can be used to calculate the time spent disconnected after a successful reconnect
+     * Records that the channel is no longer joined.
      */
-    void markDisconnectedNow();
+    void markDisconnected();
+
+    /**
+     * Records that the channel's read connection is healthy.
+     */
+    void markConnected();
 
     // Emotes
     std::optional<EmotePtr> bttvEmote(const EmoteName &name) const;
@@ -364,8 +368,9 @@ private:
     int chatterCount_{};
     UniqueAccess<StreamStatus> streamStatus_;
     UniqueAccess<RoomModes> roomModes_;
+    bool disconnected_{};
     std::optional<std::chrono::time_point<std::chrono::system_clock>>
-        disconnectedAt_{};
+        lastConnectedAt_{};
     std::atomic_flag loadingRecentMessages_ = ATOMIC_FLAG_INIT;
     std::unordered_map<QString, std::weak_ptr<MessageThread>> threads_;
 
diff --git a/src/providers/twitch/TwitchIrcServer.cpp b/src/providers/twitch/TwitchIrcServer.cpp
index 5982b893d..84be99831 100644
--- a/src/providers/twitch/TwitchIrcServer.cpp
+++ b/src/providers/twitch/TwitchIrcServer.cpp
@@ -220,6 +220,7 @@ void TwitchIrcServer::readConnectionMessageReceived(
     {
         this->addGlobalSystemMessage(
             "Twitch Servers requested us to reconnect, reconnecting");
+        this->markChannelsConnected();
         this->connect();
     }
     else if (command == "GLOBALUSERSTATE")

From 918b8ca4bd6d80801ade960c6dd27903d912853c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 16 Dec 2023 13:09:06 +0000
Subject: [PATCH 19/42] chore(deps): bump dawidd6/action-download-artifact from
 2 to 3 (#5021)

Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 2 to 3.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](https://github.com/dawidd6/action-download-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
---
 .github/workflows/create-installer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/create-installer.yml b/.github/workflows/create-installer.yml
index e9e479d35..c6087f4f1 100644
--- a/.github/workflows/create-installer.yml
+++ b/.github/workflows/create-installer.yml
@@ -25,7 +25,7 @@ jobs:
           fetch-depth: 0 # allows for tags access
 
       - name: Download artifact
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           workflow: build.yml
           name: chatterino-windows-x86-64-Qt-${{ matrix.qt-version }}.zip

From b78b57b45409298ce59346ead7bb81a52d6dbf03 Mon Sep 17 00:00:00 2001
From: Herman Stornes <hermanstornes@gmail.com>
Date: Sat, 16 Dec 2023 14:40:05 +0100
Subject: [PATCH 20/42] Fixes to ctrl+backspace behavior (#5013)

---
 CHANGELOG.md                                |  1 +
 src/widgets/dialogs/EmotePopup.cpp          | 16 ++++++++++++++++
 src/widgets/dialogs/EmotePopup.hpp          |  1 +
 src/widgets/dialogs/SelectChannelDialog.cpp |  6 ++++++
 src/widgets/dialogs/SettingsDialog.cpp      | 16 ++++++++++++++++
 src/widgets/dialogs/SettingsDialog.hpp      |  1 +
 src/widgets/helper/SearchPopup.cpp          |  7 +++----
 7 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 439dbda1c..f9ecf7543 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
 - Bugfix: Fixed support for Windows 11 Snap layouts. (#4994)
 - Bugfix: Fixed some windows appearing between screens. (#4797)
 - Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998)
+- Bugfix: Fixes to section deletion in text input fields. (#5013)
 - Bugfix: Show user text input within watch streak notices. (#5029)
 - Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978)
 - Dev: Change clang-format from v14 to v16. (#4929)
diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp
index 97251a287..0c9aebe30 100644
--- a/src/widgets/dialogs/EmotePopup.cpp
+++ b/src/widgets/dialogs/EmotePopup.cpp
@@ -227,6 +227,7 @@ EmotePopup::EmotePopup(QWidget *parent)
     this->search_->setClearButtonEnabled(true);
     this->search_->findChild<QAbstractButton *>()->setIcon(
         QPixmap(":/buttons/clearSearch.png"));
+    this->search_->installEventFilter(this);
     layout2->addWidget(this->search_);
 
     layout->addLayout(layout2);
@@ -448,6 +449,21 @@ void EmotePopup::loadChannel(ChannelPtr channel)
     }
 }
 
+bool EmotePopup::eventFilter(QObject *object, QEvent *event)
+{
+    if (object == this->search_ && event->type() == QEvent::KeyPress)
+    {
+        auto *keyEvent = dynamic_cast<QKeyEvent *>(event);
+        if (keyEvent == QKeySequence::DeleteStartOfWord &&
+            this->search_->selectionLength() > 0)
+        {
+            this->search_->backspace();
+            return true;
+        }
+    }
+    return false;
+}
+
 void EmotePopup::filterTwitchEmotes(std::shared_ptr<Channel> searchChannel,
                                     const QString &searchText)
 {
diff --git a/src/widgets/dialogs/EmotePopup.hpp b/src/widgets/dialogs/EmotePopup.hpp
index 71a20a0a8..43dbb45c6 100644
--- a/src/widgets/dialogs/EmotePopup.hpp
+++ b/src/widgets/dialogs/EmotePopup.hpp
@@ -46,6 +46,7 @@ private:
                             const QString &searchText);
     void filterEmotes(const QString &text);
     void addShortcuts() override;
+    bool eventFilter(QObject *object, QEvent *event) override;
 };
 
 }  // namespace chatterino
diff --git a/src/widgets/dialogs/SelectChannelDialog.cpp b/src/widgets/dialogs/SelectChannelDialog.cpp
index 391c85457..65aefe8aa 100644
--- a/src/widgets/dialogs/SelectChannelDialog.cpp
+++ b/src/widgets/dialogs/SelectChannelDialog.cpp
@@ -497,6 +497,12 @@ bool SelectChannelDialog::EventFilter::eventFilter(QObject *watched,
             widget->previousInFocusChain()->setFocus();
             return true;
         }
+        else if (event_key == QKeySequence::DeleteStartOfWord &&
+                 this->dialog->ui_.twitch.channelName->selectionLength() > 0)
+        {
+            this->dialog->ui_.twitch.channelName->backspace();
+            return true;
+        }
         else
         {
             return false;
diff --git a/src/widgets/dialogs/SettingsDialog.cpp b/src/widgets/dialogs/SettingsDialog.cpp
index 2fcfa3166..9d98913e8 100644
--- a/src/widgets/dialogs/SettingsDialog.cpp
+++ b/src/widgets/dialogs/SettingsDialog.cpp
@@ -113,6 +113,7 @@ void SettingsDialog::initUi()
     edit->setClearButtonEnabled(true);
     edit->findChild<QAbstractButton *>()->setIcon(
         QPixmap(":/buttons/clearSearch.png"));
+    this->ui_.search->installEventFilter(this);
 
     QObject::connect(edit.getElement(), &QLineEdit::textChanged, this,
                      &SettingsDialog::filterElements);
@@ -206,6 +207,21 @@ void SettingsDialog::setElementFilter(const QString &query)
     this->ui_.search->setText(query);
 }
 
+bool SettingsDialog::eventFilter(QObject *object, QEvent *event)
+{
+    if (object == this->ui_.search && event->type() == QEvent::KeyPress)
+    {
+        auto *keyEvent = dynamic_cast<QKeyEvent *>(event);
+        if (keyEvent == QKeySequence::DeleteStartOfWord &&
+            this->ui_.search->selectionLength() > 0)
+        {
+            this->ui_.search->backspace();
+            return true;
+        }
+    }
+    return false;
+}
+
 void SettingsDialog::addTabs()
 {
     this->ui_.tabContainer->setSpacing(0);
diff --git a/src/widgets/dialogs/SettingsDialog.hpp b/src/widgets/dialogs/SettingsDialog.hpp
index 38b113d26..9e574b688 100644
--- a/src/widgets/dialogs/SettingsDialog.hpp
+++ b/src/widgets/dialogs/SettingsDialog.hpp
@@ -59,6 +59,7 @@ private:
     void selectTab(SettingsTabId id);
     void filterElements(const QString &query);
     void setElementFilter(const QString &query);
+    bool eventFilter(QObject *object, QEvent *event) override;
 
     void onOkClicked();
     void onCancelClicked();
diff --git a/src/widgets/helper/SearchPopup.cpp b/src/widgets/helper/SearchPopup.cpp
index b34469308..2ca8b41bc 100644
--- a/src/widgets/helper/SearchPopup.cpp
+++ b/src/widgets/helper/SearchPopup.cpp
@@ -202,11 +202,10 @@ bool SearchPopup::eventFilter(QObject *object, QEvent *event)
     if (object == this->searchInput_ && event->type() == QEvent::KeyPress)
     {
         QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
-        if (keyEvent->key() == Qt::Key_Backspace &&
-            keyEvent->modifiers() == Qt::ControlModifier &&
-            this->searchInput_->text() == this->searchInput_->selectedText())
+        if (keyEvent == QKeySequence::DeleteStartOfWord &&
+            this->searchInput_->selectionLength() > 0)
         {
-            this->searchInput_->clear();
+            this->searchInput_->backspace();
             return true;
         }
     }

From d016a162693add3efda89c6d1ff9f9cf951735e5 Mon Sep 17 00:00:00 2001
From: Wissididom <30803034+Wissididom@users.noreply.github.com>
Date: Sun, 17 Dec 2023 11:32:40 +0100
Subject: [PATCH 21/42] Migrate tests on macOS to the same way tests are run on
 windows (#5032)

---
 .github/workflows/test-macos.yml | 37 ++++++++++++++++++--------------
 CHANGELOG.md                     |  2 +-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 4d9b8c55a..530f1169b 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -7,7 +7,7 @@ on:
   merge_group:
 
 env:
-  TWITCH_PUBSUB_SERVER_IMAGE: ghcr.io/chatterino/twitch-pubsub-server-test:v1.0.6
+  TWITCH_PUBSUB_SERVER_TAG: v1.0.7
   QT_QPA_PLATFORM: minimal
 
 concurrency:
@@ -54,11 +54,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew install boost openssl rapidjson p7zip create-dmg cmake tree docker colima
-
-      - name: Setup Colima
-        run: |
-          colima start
+          brew install boost openssl rapidjson p7zip create-dmg cmake
 
       - name: Build
         run: |
@@ -74,18 +70,27 @@ jobs:
               ..
           make -j"$(sysctl -n hw.logicalcpu)"
 
+      - name: Download and extract Twitch PubSub Server Test
+        run: |
+          mkdir pubsub-server-test
+          curl -L -o pubsub-server.tar.gz "https://github.com/Chatterino/twitch-pubsub-server-test/releases/download/${{ env.TWITCH_PUBSUB_SERVER_TAG }}/server-${{ env.TWITCH_PUBSUB_SERVER_TAG }}-darwin-amd64.tar.gz"
+          tar -xzf pubsub-server.tar.gz -C pubsub-server-test
+          rm pubsub-server.tar.gz
+          cd pubsub-server-test
+          curl -L -o server.crt "https://github.com/Chatterino/twitch-pubsub-server-test/raw/${{ env.TWITCH_PUBSUB_SERVER_TAG }}/cmd/server/server.crt"
+          curl -L -o server.key "https://github.com/Chatterino/twitch-pubsub-server-test/raw/${{ env.TWITCH_PUBSUB_SERVER_TAG }}/cmd/server/server.key"
+          cd ..
+
+      - name: Cargo Install httpbox
+        run: |
+          cargo install --git https://github.com/kevinastone/httpbox --rev 89b971f
+
       - name: Test
         timeout-minutes: 30
         run: |
-          docker pull kennethreitz/httpbin
-          docker pull ${{ env.TWITCH_PUBSUB_SERVER_IMAGE }}
-          docker run --network=host --detach ${{ env.TWITCH_PUBSUB_SERVER_IMAGE }}
-          docker run -p 9051:80 --detach kennethreitz/httpbin
+          httpbox --port 9051 &
+          cd ../pubsub-server-test
+          ./server 127.0.0.1:9050 &
+          cd ../build-test
           ctest --repeat until-pass:4 --output-on-failure --exclude-regex ClassicEmoteNameFiltering
         working-directory: build-test
-
-      - name: Post Setup Colima
-        if: always()
-        run: |
-          colima stop
-        working-directory: build-test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9ecf7543..8ef6f073a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,7 +85,7 @@
 - Dev: Refactor `IrcMessageHandler`, removing a bunch of clang-tidy warnings & changing its public API. (#4927)
 - Dev: `Details` file properties tab is now populated on Windows. (#4912)
 - Dev: Removed `Outcome` from network requests. (#4959)
-- Dev: Added Tests for Windows and MacOS in CI. (#4970)
+- Dev: Added Tests for Windows and MacOS in CI. (#4970, #5032)
 - Dev: Move `clang-tidy` checker to its own CI job. (#4996)
 - Dev: Refactored the Image Uploader feature. (#4971)
 - Dev: Fixed deadlock and use-after-free in tests. (#4981)

From aa11a241639094818f43898c9ad8910e689c1d8b Mon Sep 17 00:00:00 2001
From: pajlada <rasmus.karlsson@pajlada.com>
Date: Sun, 17 Dec 2023 12:53:06 +0100
Subject: [PATCH 22/42] fix: UserInfoPopup now requires a split as its parent
 (#5034)

Co-authored-by: Nerixyz <nerixdev@outlook.de>
---
 CHANGELOG.md                              | 1 +
 src/controllers/commands/builtin/Misc.cpp | 6 ++----
 src/widgets/dialogs/UserInfoPopup.cpp     | 7 +++----
 src/widgets/dialogs/UserInfoPopup.hpp     | 7 +++++--
 src/widgets/helper/ChannelView.cpp        | 7 +++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ef6f073a..dc91a19d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@
 - Bugfix: Hide the Usercard button in the User Info Popup when in special channels. (#4972)
 - Bugfix: Fixed support for Windows 11 Snap layouts. (#4994)
 - Bugfix: Fixed some windows appearing between screens. (#4797)
+- Bugfix: Fixed a crash that could occur when using certain features in a Usercard after closing the split from which it was created. (#5034)
 - Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998)
 - Bugfix: Fixes to section deletion in text input fields. (#5013)
 - Bugfix: Show user text input within watch streak notices. (#5029)
diff --git a/src/controllers/commands/builtin/Misc.cpp b/src/controllers/commands/builtin/Misc.cpp
index 7100e7776..870e5b342 100644
--- a/src/controllers/commands/builtin/Misc.cpp
+++ b/src/controllers/commands/builtin/Misc.cpp
@@ -616,10 +616,8 @@ QString openUsercard(const CommandContext &ctx)
                "should be open.");
     }
 
-    auto *userPopup = new UserInfoPopup(
-        getSettings()->autoCloseUserPopup,
-        static_cast<QWidget *>(&(getApp()->windows->getMainWindow())),
-        currentSplit);
+    auto *userPopup =
+        new UserInfoPopup(getSettings()->autoCloseUserPopup, currentSplit);
     userPopup->setData(userName, channel);
     userPopup->moveTo(QCursor::pos(), widgets::BoundsChecking::CursorPosition);
     userPopup->show();
diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index 5bf44c5e9..79fd11c8e 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -1,4 +1,4 @@
-#include "UserInfoPopup.hpp"
+#include "widgets/dialogs/UserInfoPopup.hpp"
 
 #include "Application.hpp"
 #include "common/Channel.hpp"
@@ -134,9 +134,8 @@ namespace {
 
 }  // namespace
 
-UserInfoPopup::UserInfoPopup(bool closeAutomatically, QWidget *parent,
-                             Split *split)
-    : DraggablePopup(closeAutomatically, parent)
+UserInfoPopup::UserInfoPopup(bool closeAutomatically, Split *split)
+    : DraggablePopup(closeAutomatically, split)
     , split_(split)
     , closeAutomatically_(closeAutomatically)
 {
diff --git a/src/widgets/dialogs/UserInfoPopup.hpp b/src/widgets/dialogs/UserInfoPopup.hpp
index e22f6d2cf..cff57fdaf 100644
--- a/src/widgets/dialogs/UserInfoPopup.hpp
+++ b/src/widgets/dialogs/UserInfoPopup.hpp
@@ -23,8 +23,11 @@ class UserInfoPopup final : public DraggablePopup
     Q_OBJECT
 
 public:
-    UserInfoPopup(bool closeAutomatically, QWidget *parent,
-                  Split *split = nullptr);
+    /**
+     * @param closeAutomatically Decides whether the popup should close when it loses focus
+     * @param split Will be used as the popup's parent. Must not be null
+     */
+    UserInfoPopup(bool closeAutomatically, Split *split);
 
     void setData(const QString &name, const ChannelPtr &channel);
     void setData(const QString &name, const ChannelPtr &contextChannel,
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index a333e89e1..cd55d8df7 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -2580,10 +2580,9 @@ void ChannelView::hideEvent(QHideEvent * /*event*/)
 void ChannelView::showUserInfoPopup(const QString &userName,
                                     QString alternativePopoutChannel)
 {
-    auto *userCardParent =
-        static_cast<QWidget *>(&(getApp()->windows->getMainWindow()));
-    auto *userPopup = new UserInfoPopup(getSettings()->autoCloseUserPopup,
-                                        userCardParent, this->split_);
+    assert(this->split_ != nullptr);
+    auto *userPopup =
+        new UserInfoPopup(getSettings()->autoCloseUserPopup, this->split_);
 
     auto contextChannel =
         getApp()->twitch->getChannelOrEmpty(alternativePopoutChannel);

From 5dd8c1c88a638ce74f74b69a019dabe3282764fa Mon Sep 17 00:00:00 2001
From: pajlada <rasmus.karlsson@pajlada.com>
Date: Sun, 17 Dec 2023 13:37:30 +0100
Subject: [PATCH 23/42] dev: Rename `tools` directory to `scripts` (#5035)

---
 .github/workflows/check-formatting.yml                       | 2 +-
 CHANGELOG.md                                                 | 1 +
 scripts/README.md                                            | 3 +++
 {tools => scripts}/build-docker-images.sh                    | 0
 {tools => scripts}/check-format.sh                           | 0
 {tools => scripts}/check-line-endings.sh                     | 0
 {tools => scripts}/clang-format-all.sh                       | 0
 {tools => scripts}/get-tlds-update.sh                        | 0
 {tools => scripts}/update-emoji-data.sh                      | 0
 {tools => scripts}/windows-fix-directory-case-sensitivity.sh | 0
 10 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 scripts/README.md
 rename {tools => scripts}/build-docker-images.sh (100%)
 rename {tools => scripts}/check-format.sh (100%)
 rename {tools => scripts}/check-line-endings.sh (100%)
 rename {tools => scripts}/clang-format-all.sh (100%)
 rename {tools => scripts}/get-tlds-update.sh (100%)
 mode change 100644 => 100755
 rename {tools => scripts}/update-emoji-data.sh (100%)
 rename {tools => scripts}/windows-fix-directory-case-sensitivity.sh (100%)
 mode change 100644 => 100755

diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml
index ca8789627..9a3a36685 100644
--- a/.github/workflows/check-formatting.yml
+++ b/.github/workflows/check-formatting.yml
@@ -33,4 +33,4 @@ jobs:
           clangFormatVersion: 16
 
       - name: Check line-endings
-        run: ./tools/check-line-endings.sh
+        run: ./scripts/check-line-endings.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc91a19d6..409c4b3f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,6 +82,7 @@
 - Dev: Refactor `DebugCount` and add copy button to debug popup. (#4921)
 - Dev: Refactor `common/Credentials`. (#4979)
 - Dev: Changed lifetime of context menus. (#4924)
+- Dev: Renamed `tools` directory to `scripts`. (#5035)
 - Dev: Refactor `ChannelView`, removing a bunch of clang-tidy warnings. (#4926)
 - Dev: Refactor `IrcMessageHandler`, removing a bunch of clang-tidy warnings & changing its public API. (#4927)
 - Dev: `Details` file properties tab is now populated on Windows. (#4912)
diff --git a/scripts/README.md b/scripts/README.md
new file mode 100644
index 000000000..92192ef35
--- /dev/null
+++ b/scripts/README.md
@@ -0,0 +1,3 @@
+# scripts
+
+This directory contains scripts that may be useful for a contributor to run while working on Chatterino
diff --git a/tools/build-docker-images.sh b/scripts/build-docker-images.sh
similarity index 100%
rename from tools/build-docker-images.sh
rename to scripts/build-docker-images.sh
diff --git a/tools/check-format.sh b/scripts/check-format.sh
similarity index 100%
rename from tools/check-format.sh
rename to scripts/check-format.sh
diff --git a/tools/check-line-endings.sh b/scripts/check-line-endings.sh
similarity index 100%
rename from tools/check-line-endings.sh
rename to scripts/check-line-endings.sh
diff --git a/tools/clang-format-all.sh b/scripts/clang-format-all.sh
similarity index 100%
rename from tools/clang-format-all.sh
rename to scripts/clang-format-all.sh
diff --git a/tools/get-tlds-update.sh b/scripts/get-tlds-update.sh
old mode 100644
new mode 100755
similarity index 100%
rename from tools/get-tlds-update.sh
rename to scripts/get-tlds-update.sh
diff --git a/tools/update-emoji-data.sh b/scripts/update-emoji-data.sh
similarity index 100%
rename from tools/update-emoji-data.sh
rename to scripts/update-emoji-data.sh
diff --git a/tools/windows-fix-directory-case-sensitivity.sh b/scripts/windows-fix-directory-case-sensitivity.sh
old mode 100644
new mode 100755
similarity index 100%
rename from tools/windows-fix-directory-case-sensitivity.sh
rename to scripts/windows-fix-directory-case-sensitivity.sh

From 0395b692e42cf8a09026dbfda96899d7b6f98bcd Mon Sep 17 00:00:00 2001
From: pajlada <rasmus.karlsson@pajlada.com>
Date: Sun, 17 Dec 2023 14:16:40 +0100
Subject: [PATCH 24/42] fix: ReplyThreadPopup now requires a split as its
 parent (#5036)

Co-authored-by: Nerixyz <nerixdev@outlook.de>
---
 CHANGELOG.md                             | 1 +
 src/widgets/dialogs/ReplyThreadPopup.cpp | 7 ++++---
 src/widgets/dialogs/ReplyThreadPopup.hpp | 6 +++++-
 src/widgets/helper/ChannelView.cpp       | 6 ++----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 409c4b3f4..d79d963b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
 - Bugfix: Fixed support for Windows 11 Snap layouts. (#4994)
 - Bugfix: Fixed some windows appearing between screens. (#4797)
 - Bugfix: Fixed a crash that could occur when using certain features in a Usercard after closing the split from which it was created. (#5034)
+- Bugfix: Fixed a crash that could occur when using certain features in a Reply popup after closing the split from which it was created. (#5036)
 - Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998)
 - Bugfix: Fixes to section deletion in text input fields. (#5013)
 - Bugfix: Show user text input within watch streak notices. (#5029)
diff --git a/src/widgets/dialogs/ReplyThreadPopup.cpp b/src/widgets/dialogs/ReplyThreadPopup.cpp
index a9501ca12..708b8f0a2 100644
--- a/src/widgets/dialogs/ReplyThreadPopup.cpp
+++ b/src/widgets/dialogs/ReplyThreadPopup.cpp
@@ -24,11 +24,12 @@ const QString TEXT_TITLE("Reply Thread - @%1 in #%2");
 
 namespace chatterino {
 
-ReplyThreadPopup::ReplyThreadPopup(bool closeAutomatically, QWidget *parent,
-                                   Split *split)
-    : DraggablePopup(closeAutomatically, parent)
+ReplyThreadPopup::ReplyThreadPopup(bool closeAutomatically, Split *split)
+    : DraggablePopup(closeAutomatically, split)
     , split_(split)
 {
+    assert(split != nullptr);
+
     this->setWindowTitle(QStringLiteral("Reply Thread"));
 
     HotkeyController::HotkeyMap actions{
diff --git a/src/widgets/dialogs/ReplyThreadPopup.hpp b/src/widgets/dialogs/ReplyThreadPopup.hpp
index 567812ce0..80c3a3dfe 100644
--- a/src/widgets/dialogs/ReplyThreadPopup.hpp
+++ b/src/widgets/dialogs/ReplyThreadPopup.hpp
@@ -20,7 +20,11 @@ class ReplyThreadPopup final : public DraggablePopup
     Q_OBJECT
 
 public:
-    ReplyThreadPopup(bool closeAutomatically, QWidget *parent, Split *split);
+    /**
+     * @param closeAutomatically Decides whether the popup should close when it loses focus
+     * @param split Will be used as the popup's parent. Must not be null
+     */
+    explicit ReplyThreadPopup(bool closeAutomatically, Split *split);
 
     void setThread(std::shared_ptr<MessageThread> thread);
     void giveFocus(Qt::FocusReason reason);
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index cd55d8df7..da3d3367f 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -2917,10 +2917,8 @@ void ChannelView::showReplyThreadPopup(const MessagePtr &message)
         return;
     }
 
-    auto *popupParent =
-        static_cast<QWidget *>(&(getApp()->windows->getMainWindow()));
-    auto *popup = new ReplyThreadPopup(getSettings()->autoCloseThreadPopup,
-                                       popupParent, this->split_);
+    auto *popup =
+        new ReplyThreadPopup(getSettings()->autoCloseThreadPopup, this->split_);
 
     popup->setThread(message->replyThread);
 

From 269e7a07b4db438df7d665e545ad6039a6f1075e Mon Sep 17 00:00:00 2001
From: pajlada <rasmus.karlsson@pajlada.com>
Date: Sun, 17 Dec 2023 14:50:42 +0100
Subject: [PATCH 25/42] chore: Unify `.clang-format` file (#5037)

* chore: Unify all .clang-format files in the root dir

* Update `scripts/check-format.sh` to include all source dirs

* Add changelog entry
---
 benchmarks/.clang-format => .clang-format |  0
 CHANGELOG.md                              |  1 +
 mocks/.clang-format                       | 52 -----------------------
 scripts/check-format.sh                   |  2 +-
 src/.clang-format                         | 52 -----------------------
 tests/.clang-format                       | 52 -----------------------
 6 files changed, 2 insertions(+), 157 deletions(-)
 rename benchmarks/.clang-format => .clang-format (100%)
 delete mode 100644 mocks/.clang-format
 delete mode 100644 src/.clang-format
 delete mode 100644 tests/.clang-format

diff --git a/benchmarks/.clang-format b/.clang-format
similarity index 100%
rename from benchmarks/.clang-format
rename to .clang-format
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d79d963b1..f2bc1ea2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -92,6 +92,7 @@
 - Dev: Move `clang-tidy` checker to its own CI job. (#4996)
 - Dev: Refactored the Image Uploader feature. (#4971)
 - Dev: Fixed deadlock and use-after-free in tests. (#4981)
+- Dev: Moved all `.clang-format` files to the root directory. (#5037)
 - Dev: Load less message history upon reconnects. (#5001, #5018)
 - Dev: Load less message history upon reconnects. (#5001)
 - Dev: BREAKING: Replace custom `import()` with normal Lua `require()`. (#5014)
diff --git a/mocks/.clang-format b/mocks/.clang-format
deleted file mode 100644
index 0feaad9dc..000000000
--- a/mocks/.clang-format
+++ /dev/null
@@ -1,52 +0,0 @@
-Language: Cpp
-
-AccessModifierOffset: -4
-AlignEscapedNewlinesLeft: true
-AllowShortFunctionsOnASingleLine: false
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLambdasOnASingleLine: Empty
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: false
-AlwaysBreakBeforeMultilineStrings: false
-BasedOnStyle: Google
-BraceWrapping:
-  AfterClass: "true"
-  AfterControlStatement: "true"
-  AfterFunction: "true"
-  AfterNamespace: "false"
-  BeforeCatch: "true"
-  BeforeElse: "true"
-BreakBeforeBraces: Custom
-BreakConstructorInitializersBeforeComma: true
-ColumnLimit: 80
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-DerivePointerBinding: false
-FixNamespaceComments: true
-IndentCaseLabels: true
-IndentWidth: 4
-IndentWrappedFunctionNames: true
-IndentPPDirectives: AfterHash
-SortIncludes: CaseInsensitive
-IncludeBlocks: Regroup
-IncludeCategories:
-  # Project includes
-  - Regex: '^"[a-zA-Z\._-]+(/[a-zA-Z0-9\._-]+)*"$'
-    Priority: 1
-  # Qt includes
-  - Regex: '^<Q[a-zA-Z0-9\._\/-]+>$'
-    Priority: 3
-    CaseSensitive: true
-  # LibCommuni includes
-  - Regex: "^<Irc[a-zA-Z]+>$"
-    Priority: 3
-  # Standard library includes
-  - Regex: "^<[a-zA-Z_]+>$"
-    Priority: 4
-  # Third party library includes
-  - Regex: "^<([a-zA-Z_0-9-]+/)*[a-zA-Z_0-9-]+.h(pp)?>$"
-    Priority: 3
-NamespaceIndentation: Inner
-PointerBindsToType: false
-SpacesBeforeTrailingComments: 2
-Standard: Auto
-ReflowComments: false
diff --git a/scripts/check-format.sh b/scripts/check-format.sh
index e7722ed6f..1d786901c 100755
--- a/scripts/check-format.sh
+++ b/scripts/check-format.sh
@@ -11,7 +11,7 @@ while read -r file; do
         echo "$file differs!!!!!!!"
         fail="1"
     fi
-done < <(find src/ -type f \( -iname "*.hpp" -o -iname "*.cpp" \))
+done < <(find src/ tests/src benchmarks/src mocks/include -type f \( -iname "*.hpp" -o -iname "*.cpp" \))
 
 if [ "$fail" = "1" ]; then
     echo "At least one file is poorly formatted - check the output above"
diff --git a/src/.clang-format b/src/.clang-format
deleted file mode 100644
index 0feaad9dc..000000000
--- a/src/.clang-format
+++ /dev/null
@@ -1,52 +0,0 @@
-Language: Cpp
-
-AccessModifierOffset: -4
-AlignEscapedNewlinesLeft: true
-AllowShortFunctionsOnASingleLine: false
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLambdasOnASingleLine: Empty
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: false
-AlwaysBreakBeforeMultilineStrings: false
-BasedOnStyle: Google
-BraceWrapping:
-  AfterClass: "true"
-  AfterControlStatement: "true"
-  AfterFunction: "true"
-  AfterNamespace: "false"
-  BeforeCatch: "true"
-  BeforeElse: "true"
-BreakBeforeBraces: Custom
-BreakConstructorInitializersBeforeComma: true
-ColumnLimit: 80
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-DerivePointerBinding: false
-FixNamespaceComments: true
-IndentCaseLabels: true
-IndentWidth: 4
-IndentWrappedFunctionNames: true
-IndentPPDirectives: AfterHash
-SortIncludes: CaseInsensitive
-IncludeBlocks: Regroup
-IncludeCategories:
-  # Project includes
-  - Regex: '^"[a-zA-Z\._-]+(/[a-zA-Z0-9\._-]+)*"$'
-    Priority: 1
-  # Qt includes
-  - Regex: '^<Q[a-zA-Z0-9\._\/-]+>$'
-    Priority: 3
-    CaseSensitive: true
-  # LibCommuni includes
-  - Regex: "^<Irc[a-zA-Z]+>$"
-    Priority: 3
-  # Standard library includes
-  - Regex: "^<[a-zA-Z_]+>$"
-    Priority: 4
-  # Third party library includes
-  - Regex: "^<([a-zA-Z_0-9-]+/)*[a-zA-Z_0-9-]+.h(pp)?>$"
-    Priority: 3
-NamespaceIndentation: Inner
-PointerBindsToType: false
-SpacesBeforeTrailingComments: 2
-Standard: Auto
-ReflowComments: false
diff --git a/tests/.clang-format b/tests/.clang-format
deleted file mode 100644
index 0feaad9dc..000000000
--- a/tests/.clang-format
+++ /dev/null
@@ -1,52 +0,0 @@
-Language: Cpp
-
-AccessModifierOffset: -4
-AlignEscapedNewlinesLeft: true
-AllowShortFunctionsOnASingleLine: false
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLambdasOnASingleLine: Empty
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: false
-AlwaysBreakBeforeMultilineStrings: false
-BasedOnStyle: Google
-BraceWrapping:
-  AfterClass: "true"
-  AfterControlStatement: "true"
-  AfterFunction: "true"
-  AfterNamespace: "false"
-  BeforeCatch: "true"
-  BeforeElse: "true"
-BreakBeforeBraces: Custom
-BreakConstructorInitializersBeforeComma: true
-ColumnLimit: 80
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-DerivePointerBinding: false
-FixNamespaceComments: true
-IndentCaseLabels: true
-IndentWidth: 4
-IndentWrappedFunctionNames: true
-IndentPPDirectives: AfterHash
-SortIncludes: CaseInsensitive
-IncludeBlocks: Regroup
-IncludeCategories:
-  # Project includes
-  - Regex: '^"[a-zA-Z\._-]+(/[a-zA-Z0-9\._-]+)*"$'
-    Priority: 1
-  # Qt includes
-  - Regex: '^<Q[a-zA-Z0-9\._\/-]+>$'
-    Priority: 3
-    CaseSensitive: true
-  # LibCommuni includes
-  - Regex: "^<Irc[a-zA-Z]+>$"
-    Priority: 3
-  # Standard library includes
-  - Regex: "^<[a-zA-Z_]+>$"
-    Priority: 4
-  # Third party library includes
-  - Regex: "^<([a-zA-Z_0-9-]+/)*[a-zA-Z_0-9-]+.h(pp)?>$"
-    Priority: 3
-NamespaceIndentation: Inner
-PointerBindsToType: false
-SpacesBeforeTrailingComments: 2
-Standard: Auto
-ReflowComments: false

From d105a68dba52a84c50738418296f70483a672ca1 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Sun, 17 Dec 2023 21:49:37 +0100
Subject: [PATCH 26/42] Allow `ChannelView`s without a `Split` (#4747)

---
 CHANGELOG.md                       |  1 +
 src/widgets/dialogs/EmotePopup.cpp |  2 +-
 src/widgets/helper/ChannelView.cpp | 49 ++++++++++++++++++++++++++----
 src/widgets/helper/ChannelView.hpp | 26 ++++++++++++++--
 4 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2bc1ea2d..e21c44a4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -97,6 +97,7 @@
 - Dev: Load less message history upon reconnects. (#5001)
 - Dev: BREAKING: Replace custom `import()` with normal Lua `require()`. (#5014)
 - Dev: Fixed most compiler warnings. (#5028)
+- Dev: Added the ability to show `ChannelView`s without a `Split`. (#4747)
 
 ## 2.4.6
 
diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp
index 0c9aebe30..6e8983927 100644
--- a/src/widgets/dialogs/EmotePopup.cpp
+++ b/src/widgets/dialogs/EmotePopup.cpp
@@ -240,7 +240,7 @@ EmotePopup::EmotePopup(QWidget *parent)
     };
 
     auto makeView = [&](QString tabTitle, bool addToNotebook = true) {
-        auto *view = new ChannelView();
+        auto *view = new ChannelView(nullptr);
 
         view->setOverrideFlags(MessageElementFlags{
             MessageElementFlag::Default, MessageElementFlag::AlwaysShow,
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index da3d3367f..474ff55c3 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -277,8 +277,22 @@ std::pair<int, int> getWordBounds(MessageLayout *layout,
 
 namespace chatterino {
 
-ChannelView::ChannelView(BaseWidget *parent, Split *split, Context context,
+ChannelView::ChannelView(QWidget *parent, Context context, size_t messagesLimit)
+    : ChannelView(InternalCtor{}, parent, nullptr, context, messagesLimit)
+{
+}
+
+ChannelView::ChannelView(QWidget *parent, Split *split, Context context,
                          size_t messagesLimit)
+    : ChannelView(InternalCtor{}, parent, split, context, messagesLimit)
+{
+    assert(parent != nullptr && split != nullptr &&
+           "This constructor should only be used with non-null values (see "
+           "documentation)");
+}
+
+ChannelView::ChannelView(InternalCtor /*tag*/, QWidget *parent, Split *split,
+                         Context context, size_t messagesLimit)
     : BaseWidget(parent)
     , split_(split)
     , scrollBar_(new Scrollbar(messagesLimit, this))
@@ -1347,7 +1361,10 @@ bool ChannelView::scrollToMessage(const MessagePtr &message)
     }
 
     this->scrollToMessageLayout(messagesSnapshot[messageIdx].get(), messageIdx);
-    getApp()->windows->select(this->split_);
+    if (this->split_)
+    {
+        getApp()->windows->select(this->split_);
+    }
     return true;
 }
 
@@ -1376,7 +1393,10 @@ bool ChannelView::scrollToMessageId(const QString &messageId)
     }
 
     this->scrollToMessageLayout(messagesSnapshot[messageIdx].get(), messageIdx);
-    getApp()->windows->select(this->split_);
+    if (this->split_)
+    {
+        getApp()->windows->select(this->split_);
+    }
     return true;
 }
 
@@ -2349,7 +2369,7 @@ void ChannelView::addMessageContextMenuItems(QMenu *menu,
     bool isSearch = this->context_ == Context::Search;
     bool isReplyOrUserCard = (this->context_ == Context::ReplyThread ||
                               this->context_ == Context::UserCard) &&
-                             this->split_;
+                             this->split_ != nullptr;
     bool isMentions =
         this->channel()->getType() == Channel::Type::TwitchMentions;
     bool isAutomod = this->channel()->getType() == Channel::Type::TwitchAutomod;
@@ -2580,7 +2600,14 @@ void ChannelView::hideEvent(QHideEvent * /*event*/)
 void ChannelView::showUserInfoPopup(const QString &userName,
                                     QString alternativePopoutChannel)
 {
-    assert(this->split_ != nullptr);
+    if (!this->split_)
+    {
+        qCWarning(chatterinoCommon)
+            << "Tried to show user info for" << userName
+            << "but the channel view doesn't belong to a split.";
+        return;
+    }
+
     auto *userPopup =
         new UserInfoPopup(getSettings()->autoCloseUserPopup, this->split_);
 
@@ -2879,7 +2906,9 @@ void ChannelView::scrollUpdateRequested()
 
 void ChannelView::setInputReply(const MessagePtr &message)
 {
-    if (message == nullptr)
+    assertInGuiThread();
+
+    if (message == nullptr || this->split_ == nullptr)
     {
         return;
     }
@@ -2917,6 +2946,14 @@ void ChannelView::showReplyThreadPopup(const MessagePtr &message)
         return;
     }
 
+    if (!this->split_)
+    {
+        qCWarning(chatterinoCommon)
+            << "Tried to show reply thread popup but the "
+               "channel view doesn't belong to a split.";
+        return;
+    }
+
     auto *popup =
         new ReplyThreadPopup(getSettings()->autoCloseThreadPopup, this->split_);
 
diff --git a/src/widgets/helper/ChannelView.hpp b/src/widgets/helper/ChannelView.hpp
index 08da3ae06..71b439540 100644
--- a/src/widgets/helper/ChannelView.hpp
+++ b/src/widgets/helper/ChannelView.hpp
@@ -75,7 +75,23 @@ public:
         Search,
     };
 
-    explicit ChannelView(BaseWidget *parent = nullptr, Split *split = nullptr,
+    /// Creates a channel view without a split.
+    /// In such a view, usercards and reply-threads can't be opened.
+    ///
+    /// @param parent The parent of this widget. Can be `nullptr`.
+    /// @param context The context in which this view is shown (e.g. as a usercard).
+    /// @param messagesLimit The maximum amount of messages this view will display.
+    explicit ChannelView(QWidget *parent, Context context = Context::None,
+                         size_t messagesLimit = 1000);
+
+    /// Creates a channel view in a split.
+    ///
+    /// @param parent The parent of this widget.
+    /// @param split The split containing this widget.
+    ///              @a split must be in the widget tree of @a parent.
+    /// @param context The context in which this view is shown (e.g. as a usercard).
+    /// @param messagesLimit The maximum amount of messages this view will display.
+    explicit ChannelView(QWidget *parent, Split *split,
                          Context context = Context::None,
                          size_t messagesLimit = 1000);
 
@@ -192,6 +208,12 @@ protected:
                          QPoint &relativePos, int &index);
 
 private:
+    struct InternalCtor {
+    };
+
+    ChannelView(InternalCtor tag, QWidget *parent, Split *split,
+                Context context, size_t messagesLimit);
+
     void initializeLayout();
     void initializeScrollbar();
     void initializeSignals();
@@ -270,7 +292,7 @@ private:
     ChannelPtr channel_ = nullptr;
     ChannelPtr underlyingChannel_ = nullptr;
     ChannelPtr sourceChannel_ = nullptr;
-    Split *split_ = nullptr;
+    Split *split_;
 
     Scrollbar *scrollBar_;
     EffectLabel *goToBottom_{};

From 2cb965d35271548168a2afa4f15e0823e7a64b54 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Sat, 23 Dec 2023 11:39:53 +0100
Subject: [PATCH 27/42] docs: cleanup/polish Markdown files (#5038)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    Fixed some language ✨stuff✨.
    Added alternative to httpbin.
    Updated expected space requirement on Windows.
    Removed unused VS component on Windows.
    Moved Qt Creator formatting to Windows docs.
    Updated nativs link to Qt 6.
    Added missing language to code blocks.
    Removed # Description from PR template and added instructions to fix a GitHub issue.

Co-authored-by: Wissididom <30803034+Wissididom@users.noreply.github.com>
Co-authored-by: pajlada <rasmus.karlsson+github@pajlada.com>
---
 .docker/README.md                 |  2 +-
 .github/pull_request_template.md  |  8 +--
 BUILDING_ON_LINUX.md              | 10 ++--
 BUILDING_ON_MAC.md                |  2 +-
 BUILDING_ON_WINDOWS.md            | 86 ++++++++++++++++++-------------
 BUILDING_ON_WINDOWS_WITH_VCPKG.md | 40 ++++++++------
 CONTRIBUTING.md                   |  2 +-
 README.md                         | 37 ++++---------
 docs/make-release.md              |  2 +-
 docs/test-and-benchmark.md        |  2 +-
 docs/wip-plugins.md               |  4 +-
 lib/README.md                     |  2 +-
 tests/README.md                   |  4 +-
 13 files changed, 105 insertions(+), 96 deletions(-)

diff --git a/.docker/README.md b/.docker/README.md
index 6d8b1f0c3..08fc9261b 100644
--- a/.docker/README.md
+++ b/.docker/README.md
@@ -36,7 +36,7 @@ NOTE: The AppImage from Ubuntu 22.04 is broken. Approach with caution
 
 #### Testing
 
-1. Build a docker image builds the chatterino tests  
+1. Build a docker image builds the Chatterino tests  
    `docker buildx build -t chatterino-ubuntu-22.04-test -f .docker/Dockerfile-ubuntu-22.04-test .`
 1. Run the tests  
    `docker run --rm --network=host chatterino-ubuntu-22.04-test`
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 9880f2ce1..2c20ec100 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,3 +1,5 @@
-# Description
-
-<!-- If applicable, please include a summary of what you've changed and what issue is fixed. In the case of a bug fix, please include steps to reproduce the bug so the pull request can be tested -->
+<!--
+    Please include a summary of what you've changed and what issue is fixed.
+    In the case of a bug fix, please include steps to reproduce the bug so the pull request can be tested.
+    If this PR fixes an issue on GitHub, mention this here to automatically close it: "Fixes #1234.".
+-->
diff --git a/BUILDING_ON_LINUX.md b/BUILDING_ON_LINUX.md
index 7c0625d40..67ae8fe79 100644
--- a/BUILDING_ON_LINUX.md
+++ b/BUILDING_ON_LINUX.md
@@ -6,13 +6,13 @@ Note on Qt version compatibility: If you are installing Qt from a package manage
 
 ### Ubuntu 20.04
 
-_Most likely works the same for other Debian-like distros_
+_Most likely works the same for other Debian-like distros._
 
-Install all of the dependencies using `sudo apt install qttools5-dev qt5-image-formats-plugins libqt5svg5-dev libboost-dev libssl-dev libboost-system-dev libboost-filesystem-dev cmake g++ libsecret-1-dev`
+Install all the dependencies using `sudo apt install qttools5-dev qt5-image-formats-plugins libqt5svg5-dev libboost-dev libssl-dev libboost-system-dev libboost-filesystem-dev cmake g++ libsecret-1-dev`
 
 ### Arch Linux
 
-Install all of the dependencies using `sudo pacman -S --needed qt5-base qt5-imageformats qt5-svg qt5-tools boost rapidjson pkgconf openssl cmake`
+Install all the dependencies using `sudo pacman -S --needed qt5-base qt5-imageformats qt5-svg qt5-tools boost rapidjson pkgconf openssl cmake`
 
 Alternatively you can use the [chatterino2-git](https://aur.archlinux.org/packages/chatterino2-git/) package to build and install Chatterino for you.
 
@@ -20,11 +20,11 @@ Alternatively you can use the [chatterino2-git](https://aur.archlinux.org/packag
 
 _Most likely works the same for other Red Hat-like distros. Substitute `dnf` with `yum`._
 
-Install all of the dependencies using `sudo dnf install qt5-qtbase-devel qt5-qtimageformats qt5-qtsvg-devel qt5-linguist libsecret-devel openssl-devel boost-devel cmake`
+Install all the dependencies using `sudo dnf install qt5-qtbase-devel qt5-qtimageformats qt5-qtsvg-devel qt5-linguist libsecret-devel openssl-devel boost-devel cmake`
 
 ### NixOS 18.09+
 
-Enter the development environment with all of the dependencies: `nix-shell -p openssl boost qt5.full pkg-config cmake`
+Enter the development environment with all the dependencies: `nix-shell -p openssl boost qt5.full pkg-config cmake`
 
 ## Compile
 
diff --git a/BUILDING_ON_MAC.md b/BUILDING_ON_MAC.md
index 53e29cac6..78f94c7e9 100644
--- a/BUILDING_ON_MAC.md
+++ b/BUILDING_ON_MAC.md
@@ -20,7 +20,7 @@ Local dev machines for testing are available on Apple Silicon on macOS 13.
 1. Go to the project directory where you cloned Chatterino2 & its submodules
 1. Create a build directory and go into it:  
    `mkdir build && cd build`
-1. Run cmake:  
+1. Run CMake:  
    `cmake -DCMAKE_PREFIX_PATH=/opt/homebrew/opt/qt@5 -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl@1.1 ..`
 1. Build:  
    `make`
diff --git a/BUILDING_ON_WINDOWS.md b/BUILDING_ON_WINDOWS.md
index 94c9a226d..1ddbfbd54 100644
--- a/BUILDING_ON_WINDOWS.md
+++ b/BUILDING_ON_WINDOWS.md
@@ -1,18 +1,18 @@
 # Building on Windows
 
-**Note that installing all of the development prerequisites and libraries will require about 40 GB of free disk space. Please ensure this space is available on your `C:` drive before proceeding.**
+**Note that installing all the development prerequisites and libraries will require about 12 GB of free disk space. Please ensure this space is available on your `C:` drive before proceeding.**
 
 This guide assumes you are on a 64-bit system. You might need to manually search out alternate download links should you desire to build Chatterino on a 32-bit system.
 
-## Installing prerequisites
+## Prerequisites
 
 ### Visual Studio
 
-Download and install [Visual Studio 2022 Community](https://visualstudio.microsoft.com/downloads/). In the installer, select "Desktop development with C++" and "Universal Windows Platform development".
+Download and install [Visual Studio 2022 Community](https://visualstudio.microsoft.com/downloads/). In the installer, select "Desktop development with C++".
 
 Notes:
 
-- This installation will take about 21 GB of disk space
+- This installation will take about 8 GB of disk space
 - You do not need to sign in with a Microsoft account after setup completes. You may simply exit the login dialog.
 
 ### Qt
@@ -26,7 +26,9 @@ Notes:
 
 - Installing the latest **stable** Qt version is advised for new installations, but if you want to use your existing installation please ensure you are running **Qt 5.12 or later**.
 
-#### When prompted which components to install:
+#### Components
+
+When prompted which components to install, do the following:
 
 1. Unfold the tree element that says "Qt"
 2. Unfold the top most tree element (latest stable Qt version, e.g. `Qt 6.5.3`)
@@ -43,7 +45,7 @@ Once Qt is done installing, make sure you add its bin directory to your `PATH` (
 
 <details>
    <summary>How to add Qt to PATH</summary>
-   
+
 1. Type "path" in the Windows start menu and click `Edit the system environment variables`.
 2. Click the `Environment Variables...` button bottom right.
 3. In the `User variables` (scoped to the current user) or `System variables` (system-wide) section, scroll down until you find `Path` and double click it.
@@ -78,7 +80,7 @@ Note: This installation will take about 2.1 GB of disk space.
 <details>
 <summary>OpenSSL</summary>
 
-### For our websocket library, we need OpenSSL 1.1
+For our websocket library, we need OpenSSL 1.1.
 
 1. Download OpenSSL for windows, version `1.1.1s`: **[Download](https://web.archive.org/web/20221101204129/https://slproweb.com/download/Win64OpenSSL-1_1_1s.exe)**
 2. When prompted, install OpenSSL to `C:\local\openssl`
@@ -120,57 +122,69 @@ Then in a terminal, configure conan to use `NMake Makefiles` as its generator:
 
 Open up your terminal with the Visual Studio environment variables (e.g. `x64 Native Tools Command Prompt for VS 2022`), cd to the cloned chatterino2 directory and run the following commands:
 
-1. `mkdir build`
-1. `cd build`
-1. `conan install .. -s build_type=Release -c tools.cmake.cmaketoolchain:generator="NMake Makefiles" --build=missing --output-folder=.`
-1. `cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_PREFIX_PATH="C:\Qt\6.5.3\msvc2019_64" ..`
-1. `nmake`
+```cmd
+mkdir build
+cd build
+conan install .. -s build_type=Release -c tools.cmake.cmaketoolchain:generator="NMake Makefiles" --build=missing --output-folder=.
+cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_PREFIX_PATH="C:\Qt\6.5.3\msvc2019_64" ..
+nmake
+```
 
 To build a debug build, you'll also need to add the `-s compiler.runtime_type=Debug` flag to the `conan install` invocation. See [this StackOverflow post](https://stackoverflow.com/questions/59828611/windeployqt-doesnt-deploy-qwindowsd-dll-for-a-debug-application/75607313#75607313)
 
-#### Ensure DLLs are available
+#### Deploying Qt libraries
 
 Once Chatterino has finished building, to ensure all .dll's are available you can run this from the build directory:  
 `windeployqt bin/chatterino.exe --release --no-compiler-runtime --no-translations --no-opengl-sw --dir bin/`
 
 Can't find windeployqt? You forgot to add your Qt bin directory (e.g. `C:\Qt\6.5.3\msvc2019_64\bin`) to your `PATH`
 
-### Run the build in Qt Creator
+### Developing in Qt Creator
 
 1. Open the `CMakeLists.txt` file by double-clicking it, or by opening it via Qt Creator.
 2. You will be presented with a screen that is titled "Configure Project". In this screen, you should have at least one option present ready to be configured, like this:
    ![Qt Create Configure Project screenshot](https://user-images.githubusercontent.com/69117321/169887645-2ae0871a-fe8a-4eb9-98db-7b996dea3a54.png)
 3. Select the profile(s) you want to build with and click "Configure Project".
 
-#### How to run and produce builds
+#### Building and running
 
 - In the main screen, click the green "play symbol" on the bottom left to run the project directly.
 - Click the hammer on the bottom left to generate a build (does not run the build though).
 
 Build results will be placed in a folder at the same level as the "chatterino2" project folder (e.g. if your sources are at `C:\Users\example\src\chatterino2`, then the build will be placed in an automatically generated folder under `C:\Users\example\src`, e.g. `C:\Users\example\src\build-chatterino-Desktop_Qt_6.5.3_MSVC2019_64bit-Release`.)
 
-- Note that if you are building chatterino purely for usage, not for development, it is recommended that you click the "PC" icon above the play icon and select "Release" instead of "Debug".
+- Note that if you are building Chatterino purely for usage, not for development, it is recommended that you click the "PC" icon above the play icon and select "Release" instead of "Debug".
 - Output and error messages produced by the compiler can be seen under the "4 Compile Output" tab in Qt Creator.
 
 #### Producing standalone builds
 
-If you build chatterino, the result directories will contain a `chatterino.exe` file in the `$OUTPUTDIR\release\` directory. This `.exe` file will not directly run on any given target system, because it will be lacking various Qt runtimes.
+If you build Chatterino, the result directories will contain a `chatterino.exe` file in the `$OUTPUTDIR\release\` directory. This `.exe` file will not directly run on any given target system, because it will be lacking various Qt runtimes.
 
 To produce a standalone package, you need to generate all required files using the tool `windeployqt`. This tool can be found in the `bin` directory of your Qt installation, e.g. at `C:\Qt\6.5.3\msvc2019_64\bin\windeployqt.exe`.
 
 To produce all supplement files for a standalone build, follow these steps (adjust paths as required):
 
-1.  Navigate to your build output directory with Windows Explorer, e.g. `C:\Users\example\src\build-chatterino-Desktop_Qt_6.5.3_MSVC2019_64bit-Release`
-2.  Enter the `release` directory
-3.  Delete all files except the `chatterino.exe` file. You should be left with a directory only containing `chatterino.exe`.
-4.  Open a command prompt and execute:
+1. Navigate to your build output directory with Windows Explorer, e.g. `C:\Users\example\src\build-chatterino-Desktop_Qt_6.5.3_MSVC2019_64bit-Release`
+2. Enter the `release` directory
+3. Delete all files except the `chatterino.exe` file. You should be left with a directory only containing `chatterino.exe`.
+4. Open a command prompt and execute:
+   ```cmd
+   cd C:\Users\example\src\build-chatterino-Desktop_Qt_6.5.3_MSVC2019_64bit-Release\release
+   windeployqt bin/chatterino.exe --release --no-compiler-runtime --no-translations --no-opengl-sw --dir bin/
+   ```
+5. The `releases` directory will now be populated with all the required files to make the Chatterino build standalone.
 
-        cd C:\Users\example\src\build-chatterino-Desktop_Qt_6.5.3_MSVC2019_64bit-Release\release
-        C:\Qt\6.5.3\msvc2019_64\bin\windeployqt.exe chatterino.exe
+You can now create a zip archive of all the contents in `releases` and distribute the program as is, without requiring any development tools to be present on the target system. (However, the CRT must be present, as usual - see the [README](README.md)).
 
-5.  The `releases` directory will now be populated with all the required files to make the chatterino build standalone.
+#### Formatting
 
-You can now create a zip archive of all the contents in `releases` and distribute the program as is, without requiring any development tools to be present on the target system. (However, the vcredist package must be present, as usual - see the [README](README.md)).
+To automatically format your code, do the following:
+
+1. Download [LLVM 16.0.6](https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/LLVM-16.0.6-win64.exe)
+2. During the installation, make sure to add it to your path
+3. In Qt Creator, Select `Tools` > `Options` > `Beautifier`
+4. Under `General` select `Tool: ClangFormat` and enable `Automatic Formatting on File Save`
+5. Under `Clang Format` select `Use predefined style: File` and `Fallback style: None`
 
 ### Building on MSVC with AddressSanitizer
 
@@ -183,7 +197,7 @@ copy the file found in `<VisualStudio-installation-path>\VC\Tools\MSVC\<version>
 
 To learn more about AddressSanitizer and MSVC, visit the [Microsoft Docs](https://learn.microsoft.com/en-us/cpp/sanitizers/asan).
 
-### Building/Running in CLion
+### Developing in CLion
 
 _Note:_ We're using `build` instead of the CLion default `cmake-build-debug` folder.
 
@@ -196,7 +210,7 @@ Clone the repository as described in the readme. Open a terminal in the cloned f
 
 Now open the project in CLion. You will be greeted with the _Open Project Wizard_. Set the _CMake Options_ to
 
-```
+```text
 -DCMAKE_PREFIX_PATH=C:\Qt\6.5.3\msvc2019_64\lib\cmake\Qt6
 -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake"
 ```
@@ -227,9 +241,9 @@ Select the `CMake Applications > chatterino` configuration and add a new _Run Ex
 </details>
 
 <details>
-<summary>Screenshot of chatterino configuration</summary>
+<summary>Screenshot of Chatterino configuration</summary>
 
-![Screenshot of chatterino configuration](https://user-images.githubusercontent.com/41973452/160240843-dc0c603c-227f-4f56-98ca-57f03989dfb4.png)
+![Screenshot of Chatterino configuration](https://user-images.githubusercontent.com/41973452/160240843-dc0c603c-227f-4f56-98ca-57f03989dfb4.png)
 
 </details>
 
@@ -240,26 +254,24 @@ write `portable` into it.
 
 #### Debugging
 
-To visualize QT types like `QString`, you need to inform CLion and LLDB
+To visualize Qt types like `QString`, you need to inform CLion and LLDB
 about these types.
 
 1. Set `Enable NatVis renderers for LLDB option`
    in `Settings | Build, Execution, Deployment | Debugger | Data Views | C/C++` (should be enabled by default).
-2. Use the official NatVis file for QT from [`qt-labs/vstools`](https://github.com/qt-labs/vstools) by saving them to
+2. Use the official NatVis file for Qt from [`qt-labs/vstools`](https://github.com/qt-labs/vstools) by saving them to
    the project root using PowerShell:
 
 <!--
-When switching to QT6 these need to be updated to qt6.natvis.xml.
-We need to do the replacement as the QT tools:
-https://github.com/qt-labs/vstools/blob/0769d945f8d0040917d654d9731e6b65951e102c/QtVsTools.Package/QtVsToolsPackage.cs#L390-L393
+We can't use Invoke-RestMethod here, because it will automatically convert the body to an xml document.
 -->
 
 ```powershell
-(irm "https://github.com/qt-labs/vstools/raw/dev/QtVsTools.Package/qt5.natvis.xml").Replace('##NAMESPACE##::', '') | Out-File qt5.natvis
+(iwr "https://github.com/qt-labs/vstools/raw/dev/QtVsTools.Package/qt6.natvis.xml").Content.Replace('##NAMESPACE##::', '') | Out-File qt6.natvis
 # [OR] using the permalink
-(irm "https://github.com/qt-labs/vstools/raw/0769d945f8d0040917d654d9731e6b65951e102c/QtVsTools.Package/qt5.natvis.xml").Replace('##NAMESPACE##::', '') | Out-File qt5.natvis
+(iwr "https://github.com/qt-labs/vstools/raw/1c8ba533bd88d935be3724667e0087fd0796102c/QtVsTools.Package/qt6.natvis.xml").Content.Replace('##NAMESPACE##::', '') | Out-File qt6.natvis
 ```
 
-Now you can debug the application and see QT types rendered correctly.
+Now you can debug the application and see Qt types rendered correctly.
 If this didn't work for you, try following
 the [tutorial from JetBrains](https://www.jetbrains.com/help/clion/qt-tutorial.html#debug-renderers).
diff --git a/BUILDING_ON_WINDOWS_WITH_VCPKG.md b/BUILDING_ON_WINDOWS_WITH_VCPKG.md
index eea127ac3..b99809431 100644
--- a/BUILDING_ON_WINDOWS_WITH_VCPKG.md
+++ b/BUILDING_ON_WINDOWS_WITH_VCPKG.md
@@ -8,12 +8,16 @@ This will require more than 30GB of free space on your hard drive.
 1. Install [CMake](https://cmake.org/)
 1. Install [git](https://git-scm.com/)
 1. Install [vcpkg](https://vcpkg.io/)
-   - `git clone https://github.com/Microsoft/vcpkg.git`
-   - `cd .\vcpkg\`
-   - `.\bootstrap-vcpkg.bat`
-   - `.\vcpkg integrate install`
-   - `.\vcpkg integrate powershell`
-   - `cd ..`
+
+   ```shell
+   git clone https://github.com/Microsoft/vcpkg.git
+   cd vcpkg
+   .\bootstrap-vcpkg.bat
+   .\vcpkg integrate install
+   .\vcpkg integrate powershell
+   cd ..
+   ```
+
 1. Configure the environment variables for vcpkg.  
     Check [this document](https://gist.github.com/mitchmindtree/92c8e37fa80c8dddee5b94fc88d1288b#setting-an-environment-variable-on-windows) for more information for how to set environment variables on Windows.
    - Ensure your dependencies are built as 64-bit  
@@ -31,15 +35,19 @@ This will require more than 30GB of free space on your hard drive.
 ## Building
 
 1. Clone
-   - `git clone --recurse-submodules https://github.com/Chatterino/chatterino2.git`
+   ```shell
+   git clone --recurse-submodules https://github.com/Chatterino/chatterino2.git
+   ```
 1. Install dependencies
-   - `cd .\chatterino2\`
-   - `vcpkg install`
+   ```powershell
+   cd .\chatterino2\
+   vcpkg install
+   ```
 1. Build
-   - `mkdir .\build\`
-   - `cd .\build\`
-   - (cmd) `cmake .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%/scripts/buildsystems/vcpkg.cmake`
-   - (ps1) `cmake .. -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"`
-   - `cmake --build . --parallel <threads> --config Release`
-1. Run
-   - `.\bin\chatterino2.exe`
+   ```powershell
+   cmake -B build -DCMAKE_TOOLCHAIN_FILE="$Env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
+   cd build
+   cmake --build . --parallel <threads> --config Release
+   ```
+   When using CMD, use `-DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%/scripts/buildsystems/vcpkg.cmake` to specify the toolchain.
+1. Run `.\bin\chatterino2.exe`
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 18ba8dd93..52bdd8f49 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,7 +35,7 @@ int compare(const QString &a, const QString &b);
 
 ```cpp
 /*
- * Matches a link and returns boost::none if it failed and a
+ * Matches a link and returns std::nullopt if it failed and a
  * QRegularExpressionMatch on success.
  * ^^^ This comment just repeats the function signature!!!
  *
diff --git a/README.md b/README.md
index 61c28ae72..0a046198d 100644
--- a/README.md
+++ b/README.md
@@ -22,34 +22,29 @@ If you still receive an error about `MSVCR120.dll missing`, then you should inst
 
 To get source code with required submodules run:
 
-```
+```shell
 git clone --recurse-submodules https://github.com/Chatterino/chatterino2.git
 ```
 
 or
 
-```
+```shell
 git clone https://github.com/Chatterino/chatterino2.git
 cd chatterino2
 git submodule update --init --recursive
 ```
 
-[Building on Windows](../master/BUILDING_ON_WINDOWS.md)
-
-[Building on Windows with vcpkg](../master/BUILDING_ON_WINDOWS_WITH_VCPKG.md)
-
-[Building on Linux](../master/BUILDING_ON_LINUX.md)
-
-[Building on Mac](../master/BUILDING_ON_MAC.md)
-
-[Building on FreeBSD](../master/BUILDING_ON_FREEBSD.md)
+- [Building on Windows](../master/BUILDING_ON_WINDOWS.md)
+- [Building on Windows with vcpkg](../master/BUILDING_ON_WINDOWS_WITH_VCPKG.md)
+- [Building on Linux](../master/BUILDING_ON_LINUX.md)
+- [Building on macOS](../master/BUILDING_ON_MAC.md)
+- [Building on FreeBSD](../master/BUILDING_ON_FREEBSD.md)
 
 ## Git blame
 
-This project has big commits in the history which for example update all line
-endings. To improve the output of git-blame, consider setting:
+This project has big commits in the history which touch most files while only doing stylistic changes. To improve the output of git-blame, consider setting:
 
-```
+```shell
 git config blame.ignoreRevsFile .git-blame-ignore-revs
 ```
 
@@ -58,19 +53,9 @@ file](./.git-blame-ignore-revs). GitHub does this by default.
 
 ## Code style
 
-The code is formatted using clang format in Qt Creator. [.clang-format](src/.clang-format) contains the style file for clang format.
+The code is formatted using [clang-format](https://clang.llvm.org/docs/ClangFormat.html). Our configuration is found in the [.clang-format](.clang-format) file in the repository root directory.
 
-### Get it automated with QT Creator + Beautifier + Clang Format
-
-1. Download LLVM: https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/LLVM-16.0.6-win64.exe
-2. During the installation, make sure to add it to your path
-3. In QT Creator, select `Help` > `About Plugins` > `C++` > `Beautifier` to enable the plugin
-4. Restart QT Creator
-5. Select `Tools` > `Options` > `Beautifier`
-6. Under `General` select `Tool: ClangFormat` and enable `Automatic Formatting on File Save`
-7. Under `Clang Format` select `Use predefined style: File` and `Fallback style: None`
-
-Qt creator should now format the documents when saving it.
+For more contribution guidelines, take a look at [the wiki](https://wiki.chatterino.com/Contributing%20for%20Developers/).
 
 ## Doxygen
 
diff --git a/docs/make-release.md b/docs/make-release.md
index 4fa0993eb..c28dead6b 100644
--- a/docs/make-release.md
+++ b/docs/make-release.md
@@ -5,7 +5,7 @@
 - [ ] Updated version code in `src/common/Version.hpp`
 - [ ] Updated version code in `CMakeLists.txt`  
        This can only be "whole versions", so if you're releasing `2.4.0-beta` you'll need to condense it to `2.4.0`
-- [ ] Add a new release at the top of of the `releases` key in `resources/com.chatterino.chatterino.appdata.xml`  
+- [ ] Add a new release at the top of the `releases` key in `resources/com.chatterino.chatterino.appdata.xml`  
        This cannot use dash to denote a pre-release identifier, you have to use a tilde instead.
 
 - [ ] Updated version code in `.CI/chatterino-installer.iss`
diff --git a/docs/test-and-benchmark.md b/docs/test-and-benchmark.md
index e881db6be..7e42ab56b 100644
--- a/docs/test-and-benchmark.md
+++ b/docs/test-and-benchmark.md
@@ -1,6 +1,6 @@
 # Test and Benchmark
 
-Chatterino includes a set of unit tests and benchmarks. These can be built using cmake by adding the `-DBUILD_TESTS=On` and `-DBUILD_BENCHMARKS=On` flags respectively.
+Chatterino includes a set of unit tests and benchmarks. These can be built using CMake by adding the `-DBUILD_TESTS=On` and `-DBUILD_BENCHMARKS=On` flags respectively.
 
 ## Adding your own test
 
diff --git a/docs/wip-plugins.md b/docs/wip-plugins.md
index 9a3ee25ce..b77bf2b4d 100644
--- a/docs/wip-plugins.md
+++ b/docs/wip-plugins.md
@@ -45,7 +45,7 @@ An example plugin is available at [https://github.com/Mm2PL/Chatterino-test-plug
 
 If you prefer, you may use [TypescriptToLua](https://typescripttolua.github.io)
 to typecheck your plugins. There is a `chatterino.d.ts` file describing the API
-in this directory. However this has several drawbacks like harder debugging at
+in this directory. However, this has several drawbacks like harder debugging at
 runtime.
 
 ## API
@@ -161,7 +161,7 @@ See [official documentation](https://www.lua.org/manual/5.4/manual.html#pdf-load
 #### `require(modname)`
 
 This is Lua's [`require()`](https://www.lua.org/manual/5.3/manual.html#pdf-require) function.
-However the searcher and load configuration is notably different than default:
+However, the searcher and load configuration is notably different from the default:
 
 - Lua's built-in dynamic library searcher is removed,
 - `package.path` is not used, in its place are two searchers,
diff --git a/lib/README.md b/lib/README.md
index 40d2acf17..ea37d0b63 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -1,3 +1,3 @@
-Third party libraries are stored here
+Third party libraries are stored here.
 
 Fetched via `git submodule update --init --recursive`
diff --git a/tests/README.md b/tests/README.md
index 449e59013..f9bc5798a 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,4 +1,4 @@
-To run tests all tests you will need to run the `kennethreitz/httpbin` and `ghcr.io/chatterino/twitch-pubsub-server-test:latest` docker images
+To run all tests you will need to run the `kennethreitz/httpbin` and `ghcr.io/chatterino/twitch-pubsub-server-test:latest` docker images.
 
 For example:
 
@@ -6,3 +6,5 @@ For example:
 docker run --network=host --detach ghcr.io/chatterino/twitch-pubsub-server-test:latest
 docker run -p 9051:80 --detach kennethreitz/httpbin
 ```
+
+If you're unable to use docker, you can use [httpbox](github.com/kevinastone/httpbox) (`httpbox --port 9051`) and [Chatterino/twitch-pubsub-server-test](https://github.com/Chatterino/twitch-pubsub-server-test/releases/latest) manually.

From 25add89b14824faf41e754d9761a4612fb4cde60 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Sun, 24 Dec 2023 15:38:58 +0100
Subject: [PATCH 28/42] feat: Add crash recovery on Windows (#5012)

---
 .clang-tidy                                   |   1 +
 .github/workflows/build.yml                   |   4 +-
 .github/workflows/clang-tidy.yml              |   2 +-
 .gitmodules                                   |   6 +-
 CHANGELOG.md                                  |   1 +
 CMakeLists.txt                                |   2 +-
 lib/crashpad                                  |   1 -
 mocks/include/mocks/EmptyApplication.hpp      |   5 +
 src/Application.cpp                           |   7 +-
 src/Application.hpp                           |   7 +
 src/CMakeLists.txt                            |   5 +-
 src/RunGui.cpp                                |  53 +---
 src/common/Args.cpp                           | 124 ++++++++--
 src/common/Args.hpp                           |  28 +++
 src/common/FlagsEnum.hpp                      |   5 +
 src/common/QLogging.cpp                       |   2 +
 src/common/QLogging.hpp                       |   1 +
 src/main.cpp                                  |   2 +-
 src/providers/Crashpad.cpp                    |  95 --------
 src/providers/Crashpad.hpp                    |  14 --
 src/singletons/CrashHandler.cpp               | 230 ++++++++++++++++++
 src/singletons/CrashHandler.hpp               |  36 +++
 src/singletons/Settings.hpp                   |   1 -
 src/widgets/dialogs/LastRunCrashDialog.cpp    | 146 ++++++-----
 src/widgets/dialogs/LastRunCrashDialog.hpp    |   4 -
 src/widgets/settingspages/GeneralPage.cpp     |  11 +-
 src/widgets/settingspages/GeneralPageView.cpp |  22 ++
 src/widgets/settingspages/GeneralPageView.hpp |   5 +
 tools/crash-handler                           |   1 +
 29 files changed, 563 insertions(+), 258 deletions(-)
 delete mode 160000 lib/crashpad
 delete mode 100644 src/providers/Crashpad.cpp
 delete mode 100644 src/providers/Crashpad.hpp
 create mode 100644 src/singletons/CrashHandler.cpp
 create mode 100644 src/singletons/CrashHandler.hpp
 create mode 160000 tools/crash-handler

diff --git a/.clang-tidy b/.clang-tidy
index 658f66139..32bd6b420 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -29,6 +29,7 @@ Checks: "-*,
   -readability-function-cognitive-complexity,
   -bugprone-easily-swappable-parameters,
   -cert-err58-cpp,
+  -modernize-avoid-c-arrays
   "
 CheckOptions:
   - key: readability-identifier-naming.ClassCase
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 54340bb84..7f9cdd097 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -230,9 +230,9 @@ jobs:
         run: |
           cd build
           set cl=/MP
-          nmake /S /NOLOGO crashpad_handler
+          nmake /S /NOLOGO chatterino-crash-handler
           mkdir Chatterino2/crashpad
-          cp bin/crashpad/crashpad_handler.exe Chatterino2/crashpad/crashpad_handler.exe
+          cp bin/crashpad/crashpad-handler.exe Chatterino2/crashpad/crashpad-handler.exe
           7z a bin/chatterino-Qt-${{ matrix.qt-version }}.pdb.7z bin/chatterino.pdb
 
       - name: Prepare build dir (windows)
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 96468c137..95a832a7f 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -124,7 +124,7 @@ jobs:
           build_dir: build-clang-tidy
           config_file: ".clang-tidy"
           split_workflow: true
-          exclude: "lib/*"
+          exclude: "lib/*,tools/crash-handler/*"
           cmake_command: >-
             cmake -S. -Bbuild-clang-tidy 
             -DCMAKE_BUILD_TYPE=Release 
diff --git a/.gitmodules b/.gitmodules
index 571cc0f44..cb1235a85 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -38,6 +38,6 @@
 [submodule "lib/lua/src"]
 	path = lib/lua/src
 	url = https://github.com/lua/lua
-[submodule "lib/crashpad"]
-	path = lib/crashpad
-	url = https://github.com/getsentry/crashpad
+[submodule "tools/crash-handler"]
+	path = tools/crash-handler
+	url = https://github.com/Chatterino/crash-handler
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e21c44a4f..0f9599002 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Minor: Add `--safe-mode` command line option that can be used for troubleshooting when Chatterino is misbehaving or is misconfigured. It disables hiding the settings button & prevents plugins from loading. (#4985)
 - Minor: Updated the flatpakref link included with nightly builds to point to up-to-date flathub-beta builds. (#5008)
 - Minor: Add a new completion API for experimental plugins feature. (#5000)
+- Minor: Re-enabled _Restart on crash_ option on Windows. (#5012)
 - Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840)
 - Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848)
 - Bugfix: Trimmed custom streamlink paths on all platforms making sure you don't accidentally add spaces at the beginning or end of its path. (#4834)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e74581b6..f6b8281e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,7 +210,7 @@ if (CHATTERINO_PLUGINS)
 endif()
 
 if (BUILD_WITH_CRASHPAD)
-    add_subdirectory("${CMAKE_SOURCE_DIR}/lib/crashpad" EXCLUDE_FROM_ALL)
+    add_subdirectory("${CMAKE_SOURCE_DIR}/tools/crash-handler")
 endif()
 
 # Used to provide a date of build in the About page (for nightly builds). Getting the actual time of
diff --git a/lib/crashpad b/lib/crashpad
deleted file mode 160000
index 89991e991..000000000
--- a/lib/crashpad
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 89991e9910bc4c0893e45c8cfad0bdd31cc25a5c
diff --git a/mocks/include/mocks/EmptyApplication.hpp b/mocks/include/mocks/EmptyApplication.hpp
index 87deafa8a..424c1d25b 100644
--- a/mocks/include/mocks/EmptyApplication.hpp
+++ b/mocks/include/mocks/EmptyApplication.hpp
@@ -44,6 +44,11 @@ public:
         return nullptr;
     }
 
+    CrashHandler *getCrashHandler() override
+    {
+        return nullptr;
+    }
+
     CommandController *getCommands() override
     {
         return nullptr;
diff --git a/src/Application.cpp b/src/Application.cpp
index d8a7a5754..7cfef3e34 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -38,6 +38,7 @@
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
+#include "singletons/CrashHandler.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Fonts.hpp"
 #include "singletons/helper/LoggingChannel.hpp"
@@ -113,6 +114,7 @@ Application::Application(Settings &_settings, Paths &_paths)
     , toasts(&this->emplace<Toasts>())
     , imageUploader(&this->emplace<ImageUploader>())
     , seventvAPI(&this->emplace<SeventvAPI>())
+    , crashHandler(&this->emplace<CrashHandler>())
 
     , commands(&this->emplace<CommandController>())
     , notifications(&this->emplace<NotificationController>())
@@ -174,7 +176,9 @@ void Application::initialize(Settings &settings, Paths &paths)
         singleton->initialize(settings, paths);
     }
 
-    // add crash message
+    // Show crash message.
+    // On Windows, the crash message was already shown.
+#ifndef Q_OS_WIN
     if (!getArgs().isFramelessEmbed && getArgs().crashRecovery)
     {
         if (auto selected =
@@ -195,6 +199,7 @@ void Application::initialize(Settings &settings, Paths &paths)
             }
         }
     }
+#endif
 
     this->windows->updateWordTypeMask();
 
diff --git a/src/Application.hpp b/src/Application.hpp
index 5dec1e906..75d8bf373 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -44,6 +44,7 @@ class FfzBadges;
 class SeventvBadges;
 class ImageUploader;
 class SeventvAPI;
+class CrashHandler;
 
 class IApplication
 {
@@ -60,6 +61,7 @@ public:
     virtual HotkeyController *getHotkeys() = 0;
     virtual WindowManager *getWindows() = 0;
     virtual Toasts *getToasts() = 0;
+    virtual CrashHandler *getCrashHandler() = 0;
     virtual CommandController *getCommands() = 0;
     virtual HighlightController *getHighlights() = 0;
     virtual NotificationController *getNotifications() = 0;
@@ -102,6 +104,7 @@ public:
     Toasts *const toasts{};
     ImageUploader *const imageUploader{};
     SeventvAPI *const seventvAPI{};
+    CrashHandler *const crashHandler{};
 
     CommandController *const commands{};
     NotificationController *const notifications{};
@@ -148,6 +151,10 @@ public:
     {
         return this->toasts;
     }
+    CrashHandler *getCrashHandler() override
+    {
+        return this->crashHandler;
+    }
     CommandController *getCommands() override
     {
         return this->commands;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 53ed53a7b..f16ea09cf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -289,8 +289,6 @@ set(SOURCE_FILES
         messages/search/SubtierPredicate.cpp
         messages/search/SubtierPredicate.hpp
 
-        providers/Crashpad.cpp
-        providers/Crashpad.hpp
         providers/IvrApi.cpp
         providers/IvrApi.hpp
         providers/LinkResolver.cpp
@@ -425,6 +423,8 @@ set(SOURCE_FILES
 
         singletons/Badges.cpp
         singletons/Badges.hpp
+        singletons/CrashHandler.cpp
+        singletons/CrashHandler.hpp
         singletons/Emotes.cpp
         singletons/Emotes.hpp
         singletons/Fonts.cpp
@@ -1007,7 +1007,6 @@ endif ()
 if (BUILD_WITH_CRASHPAD)
     target_compile_definitions(${LIBRARY_PROJECT} PUBLIC CHATTERINO_WITH_CRASHPAD)
     target_link_libraries(${LIBRARY_PROJECT} PUBLIC crashpad::client)
-    set_target_directory_hierarchy(crashpad_handler crashpad)
 endif()
 
 # Configure compiler warnings
diff --git a/src/RunGui.cpp b/src/RunGui.cpp
index a495fbef4..00b4b7497 100644
--- a/src/RunGui.cpp
+++ b/src/RunGui.cpp
@@ -5,6 +5,7 @@
 #include "common/Modes.hpp"
 #include "common/NetworkManager.hpp"
 #include "common/QLogging.hpp"
+#include "singletons/CrashHandler.hpp"
 #include "singletons/Paths.hpp"
 #include "singletons/Resources.hpp"
 #include "singletons/Settings.hpp"
@@ -99,21 +100,10 @@ namespace {
 
     void showLastCrashDialog()
     {
-        //#ifndef C_DISABLE_CRASH_DIALOG
-        //        LastRunCrashDialog dialog;
-
-        //        switch (dialog.exec())
-        //        {
-        //            case QDialog::Accepted:
-        //            {
-        //            };
-        //            break;
-        //            default:
-        //            {
-        //                _exit(0);
-        //            }
-        //        }
-        //#endif
+        auto *dialog = new LastRunCrashDialog;
+        // Use exec() over open() to block the app from being loaded
+        // and to be able to set the safe mode.
+        dialog->exec();
     }
 
     void createRunningFile(const QString &path)
@@ -131,14 +121,13 @@ namespace {
     }
 
     std::chrono::steady_clock::time_point signalsInitTime;
-    bool restartOnSignal = false;
 
     [[noreturn]] void handleSignal(int signum)
     {
         using namespace std::chrono_literals;
 
-        if (restartOnSignal &&
-            std::chrono::steady_clock::now() - signalsInitTime > 30s)
+        if (std::chrono::steady_clock::now() - signalsInitTime > 30s &&
+            getIApp()->getCrashHandler()->shouldRecover())
         {
             QProcess proc;
 
@@ -240,9 +229,12 @@ void runGui(QApplication &a, Paths &paths, Settings &settings)
     initResources();
     initSignalHandler();
 
-    settings.restartOnCrash.connect([](const bool &value) {
-        restartOnSignal = value;
-    });
+#ifdef Q_OS_WIN
+    if (getArgs().crashRecovery)
+    {
+        showLastCrashDialog();
+    }
+#endif
 
     auto thread = std::thread([dir = paths.miscDirectory] {
         {
@@ -279,30 +271,11 @@ void runGui(QApplication &a, Paths &paths, Settings &settings)
     chatterino::NetworkManager::init();
     chatterino::Updates::instance().checkForUpdates();
 
-#ifdef C_USE_BREAKPAD
-    QBreakpadInstance.setDumpPath(getPaths()->settingsFolderPath + "/Crashes");
-#endif
-
-    // Running file
-    auto runningPath =
-        paths.miscDirectory + "/running_" + paths.applicationFilePathHash;
-
-    if (QFile::exists(runningPath))
-    {
-        showLastCrashDialog();
-    }
-    else
-    {
-        createRunningFile(runningPath);
-    }
-
     Application app(settings, paths);
     app.initialize(settings, paths);
     app.run(a);
     app.save();
 
-    removeRunningFile(runningPath);
-
     if (!getArgs().dontSaveSettings)
     {
         pajlada::Settings::SettingManager::gSave();
diff --git a/src/common/Args.cpp b/src/common/Args.cpp
index 7bc48573c..1096372cd 100644
--- a/src/common/Args.cpp
+++ b/src/common/Args.cpp
@@ -1,6 +1,7 @@
 #include "Args.hpp"
 
 #include "common/QLogging.hpp"
+#include "debug/AssertInGuiThread.hpp"
 #include "singletons/Paths.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/AttachToConsole.hpp"
@@ -14,6 +15,55 @@
 #include <QStringList>
 #include <QUuid>
 
+namespace {
+
+template <class... Args>
+QCommandLineOption hiddenOption(Args... args)
+{
+    QCommandLineOption opt(args...);
+    opt.setFlags(QCommandLineOption::HiddenFromHelp);
+    return opt;
+}
+
+QStringList extractCommandLine(
+    const QCommandLineParser &parser,
+    std::initializer_list<QCommandLineOption> options)
+{
+    QStringList args;
+    for (const auto &option : options)
+    {
+        if (parser.isSet(option))
+        {
+            auto optionName = option.names().first();
+            if (optionName.length() == 1)
+            {
+                optionName.prepend(u'-');
+            }
+            else
+            {
+                optionName.prepend("--");
+            }
+
+            auto values = parser.values(option);
+            if (values.empty())
+            {
+                args += optionName;
+            }
+            else
+            {
+                for (const auto &value : values)
+                {
+                    args += optionName;
+                    args += value;
+                }
+            }
+        }
+    }
+    return args;
+}
+
+}  // namespace
+
 namespace chatterino {
 
 Args::Args(const QApplication &app)
@@ -23,39 +73,44 @@ Args::Args(const QApplication &app)
     parser.addHelpOption();
 
     // Used internally by app to restart after unexpected crashes
-    QCommandLineOption crashRecoveryOption("crash-recovery");
-    crashRecoveryOption.setFlags(QCommandLineOption::HiddenFromHelp);
+    auto crashRecoveryOption = hiddenOption("crash-recovery");
+    auto exceptionCodeOption = hiddenOption("cr-exception-code", "", "code");
+    auto exceptionMessageOption =
+        hiddenOption("cr-exception-message", "", "message");
 
     // Added to ignore the parent-window option passed during native messaging
-    QCommandLineOption parentWindowOption("parent-window");
-    parentWindowOption.setFlags(QCommandLineOption::HiddenFromHelp);
-    QCommandLineOption parentWindowIdOption("x-attach-split-to-window", "",
-                                            "window-id");
-    parentWindowIdOption.setFlags(QCommandLineOption::HiddenFromHelp);
+    auto parentWindowOption = hiddenOption("parent-window");
+    auto parentWindowIdOption =
+        hiddenOption("x-attach-split-to-window", "", "window-id");
 
     // Verbose
-    QCommandLineOption verboseOption({{"v", "verbose"},
-                                      "Attaches to the Console on windows, "
-                                      "allowing you to see debug output."});
-    crashRecoveryOption.setFlags(QCommandLineOption::HiddenFromHelp);
+    auto verboseOption = QCommandLineOption(
+        QStringList{"v", "verbose"}, "Attaches to the Console on windows, "
+                                     "allowing you to see debug output.");
+    // Safe mode
     QCommandLineOption safeModeOption(
         "safe-mode", "Starts Chatterino without loading Plugins and always "
                      "show the settings button.");
 
-    parser.addOptions({
-        {{"V", "version"}, "Displays version information."},
-        crashRecoveryOption,
-        parentWindowOption,
-        parentWindowIdOption,
-        verboseOption,
-        safeModeOption,
-    });
-    parser.addOption(QCommandLineOption(
+    // Channel layout
+    auto channelLayout = QCommandLineOption(
         {"c", "channels"},
         "Joins only supplied channels on startup. Use letters with colons to "
         "specify platform. Only Twitch channels are supported at the moment.\n"
         "If platform isn't specified, default is Twitch.",
-        "t:channel1;t:channel2;..."));
+        "t:channel1;t:channel2;...");
+
+    parser.addOptions({
+        {{"V", "version"}, "Displays version information."},
+        crashRecoveryOption,
+        exceptionCodeOption,
+        exceptionMessageOption,
+        parentWindowOption,
+        parentWindowIdOption,
+        verboseOption,
+        safeModeOption,
+        channelLayout,
+    });
 
     if (!parser.parse(app.arguments()))
     {
@@ -75,15 +130,25 @@ Args::Args(const QApplication &app)
         (args.size() > 0 && (args[0].startsWith("chrome-extension://") ||
                              args[0].endsWith(".json")));
 
-    if (parser.isSet("c"))
+    if (parser.isSet(channelLayout))
     {
-        this->applyCustomChannelLayout(parser.value("c"));
+        this->applyCustomChannelLayout(parser.value(channelLayout));
     }
 
     this->verbose = parser.isSet(verboseOption);
 
     this->printVersion = parser.isSet("V");
-    this->crashRecovery = parser.isSet("crash-recovery");
+
+    this->crashRecovery = parser.isSet(crashRecoveryOption);
+    if (parser.isSet(exceptionCodeOption))
+    {
+        this->exceptionCode =
+            static_cast<uint32_t>(parser.value(exceptionCodeOption).toULong());
+    }
+    if (parser.isSet(exceptionMessageOption))
+    {
+        this->exceptionMessage = parser.value(exceptionMessageOption);
+    }
 
     if (parser.isSet(parentWindowIdOption))
     {
@@ -97,6 +162,17 @@ Args::Args(const QApplication &app)
     {
         this->safeMode = true;
     }
+
+    this->currentArguments_ = extractCommandLine(parser, {
+                                                             verboseOption,
+                                                             safeModeOption,
+                                                             channelLayout,
+                                                         });
+}
+
+QStringList Args::currentArguments() const
+{
+    return this->currentArguments_;
 }
 
 void Args::applyCustomChannelLayout(const QString &argValue)
diff --git a/src/common/Args.hpp b/src/common/Args.hpp
index 73144b7da..39b7d627b 100644
--- a/src/common/Args.hpp
+++ b/src/common/Args.hpp
@@ -9,13 +9,37 @@
 namespace chatterino {
 
 /// Command line arguments passed to Chatterino.
+///
+/// All accepted arguments:
+///
+/// Crash recovery:
+///   --crash-recovery
+///   --cr-exception-code code
+///   --cr-exception-message message
+///
+/// Native messaging:
+///   --parent-window
+///   --x-attach-split-to-window=window-id
+///
+/// -v, --verbose
+/// -V, --version
+/// -c, --channels=t:channel1;t:channel2;...
+///     --safe-mode
+///
+/// See documentation on `QGuiApplication` for documentation on Qt arguments like -platform.
 class Args
 {
 public:
     Args(const QApplication &app);
 
     bool printVersion{};
+
     bool crashRecovery{};
+    /// Native, platform-specific exception code from crashpad
+    std::optional<uint32_t> exceptionCode{};
+    /// Text version of the exception code. Potentially contains more context.
+    std::optional<QString> exceptionMessage{};
+
     bool shouldRunBrowserExtensionHost{};
     // Shows a single chat. Used on windows to embed in another application.
     bool isFramelessEmbed{};
@@ -28,8 +52,12 @@ public:
     bool verbose{};
     bool safeMode{};
 
+    QStringList currentArguments() const;
+
 private:
     void applyCustomChannelLayout(const QString &argValue);
+
+    QStringList currentArguments_;
 };
 
 void initArgs(const QApplication &app);
diff --git a/src/common/FlagsEnum.hpp b/src/common/FlagsEnum.hpp
index 07d672751..f83b820a1 100644
--- a/src/common/FlagsEnum.hpp
+++ b/src/common/FlagsEnum.hpp
@@ -97,6 +97,11 @@ public:
         return !this->hasAny(flags);
     }
 
+    T value() const
+    {
+        return this->value_;
+    }
+
 private:
     T value_{};
 };
diff --git a/src/common/QLogging.cpp b/src/common/QLogging.cpp
index 31c035d85..de4ef056c 100644
--- a/src/common/QLogging.cpp
+++ b/src/common/QLogging.cpp
@@ -12,6 +12,8 @@ Q_LOGGING_CATEGORY(chatterinoBenchmark, "chatterino.benchmark", logThreshold);
 Q_LOGGING_CATEGORY(chatterinoBttv, "chatterino.bttv", logThreshold);
 Q_LOGGING_CATEGORY(chatterinoCache, "chatterino.cache", logThreshold);
 Q_LOGGING_CATEGORY(chatterinoCommon, "chatterino.common", logThreshold);
+Q_LOGGING_CATEGORY(chatterinoCrashhandler, "chatterino.crashhandler",
+                   logThreshold);
 Q_LOGGING_CATEGORY(chatterinoEmoji, "chatterino.emoji", logThreshold);
 Q_LOGGING_CATEGORY(chatterinoEnv, "chatterino.env", logThreshold);
 Q_LOGGING_CATEGORY(chatterinoFfzemotes, "chatterino.ffzemotes", logThreshold);
diff --git a/src/common/QLogging.hpp b/src/common/QLogging.hpp
index 01500f1da..36daa0e1e 100644
--- a/src/common/QLogging.hpp
+++ b/src/common/QLogging.hpp
@@ -8,6 +8,7 @@ Q_DECLARE_LOGGING_CATEGORY(chatterinoBenchmark);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoBttv);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoCache);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoCommon);
+Q_DECLARE_LOGGING_CATEGORY(chatterinoCrashhandler);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoEmoji);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoEnv);
 Q_DECLARE_LOGGING_CATEGORY(chatterinoFfzemotes);
diff --git a/src/main.cpp b/src/main.cpp
index 9dce310a0..1366ae5cb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,11 +4,11 @@
 #include "common/Modes.hpp"
 #include "common/QLogging.hpp"
 #include "common/Version.hpp"
-#include "providers/Crashpad.hpp"
 #include "providers/IvrApi.hpp"
 #include "providers/NetworkConfigurationProvider.hpp"
 #include "providers/twitch/api/Helix.hpp"
 #include "RunGui.hpp"
+#include "singletons/CrashHandler.hpp"
 #include "singletons/Paths.hpp"
 #include "singletons/Settings.hpp"
 #include "util/AttachToConsole.hpp"
diff --git a/src/providers/Crashpad.cpp b/src/providers/Crashpad.cpp
deleted file mode 100644
index f81cbe071..000000000
--- a/src/providers/Crashpad.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifdef CHATTERINO_WITH_CRASHPAD
-#    include "providers/Crashpad.hpp"
-
-#    include "common/QLogging.hpp"
-#    include "singletons/Paths.hpp"
-
-#    include <QApplication>
-#    include <QDir>
-#    include <QString>
-
-#    include <memory>
-#    include <string>
-
-namespace {
-
-/// The name of the crashpad handler executable.
-/// This varies across platforms
-#    if defined(Q_OS_UNIX)
-const QString CRASHPAD_EXECUTABLE_NAME = QStringLiteral("crashpad_handler");
-#    elif defined(Q_OS_WINDOWS)
-const QString CRASHPAD_EXECUTABLE_NAME = QStringLiteral("crashpad_handler.exe");
-#    else
-#        error Unsupported platform
-#    endif
-
-/// Converts a QString into the platform string representation.
-#    if defined(Q_OS_UNIX)
-std::string nativeString(const QString &s)
-{
-    return s.toStdString();
-}
-#    elif defined(Q_OS_WINDOWS)
-std::wstring nativeString(const QString &s)
-{
-    return s.toStdWString();
-}
-#    else
-#        error Unsupported platform
-#    endif
-
-}  // namespace
-
-namespace chatterino {
-
-std::unique_ptr<crashpad::CrashpadClient> installCrashHandler()
-{
-    // Currently, the following directory layout is assumed:
-    // [applicationDirPath]
-    //  │
-    //  ├─chatterino
-    //  │
-    //  ╰─[crashpad]
-    //     │
-    //     ╰─crashpad_handler
-    // TODO: The location of the binary might vary across platforms
-    auto crashpadBinDir = QDir(QApplication::applicationDirPath());
-
-    if (!crashpadBinDir.cd("crashpad"))
-    {
-        qCDebug(chatterinoApp) << "Cannot find crashpad directory";
-        return nullptr;
-    }
-    if (!crashpadBinDir.exists(CRASHPAD_EXECUTABLE_NAME))
-    {
-        qCDebug(chatterinoApp) << "Cannot find crashpad handler executable";
-        return nullptr;
-    }
-
-    const auto handlerPath = base::FilePath(nativeString(
-        crashpadBinDir.absoluteFilePath(CRASHPAD_EXECUTABLE_NAME)));
-
-    // Argument passed in --database
-    // > Crash reports are written to this database, and if uploads are enabled,
-    //   uploaded from this database to a crash report collection server.
-    const auto databaseDir =
-        base::FilePath(nativeString(getPaths()->crashdumpDirectory));
-
-    auto client = std::make_unique<crashpad::CrashpadClient>();
-
-    // See https://chromium.googlesource.com/crashpad/crashpad/+/HEAD/handler/crashpad_handler.md
-    // for documentation on available options.
-    if (!client->StartHandler(handlerPath, databaseDir, {}, {}, {}, {}, {},
-                              true, false))
-    {
-        qCDebug(chatterinoApp) << "Failed to start crashpad handler";
-        return nullptr;
-    }
-
-    qCDebug(chatterinoApp) << "Started crashpad handler";
-    return client;
-}
-
-}  // namespace chatterino
-
-#endif
diff --git a/src/providers/Crashpad.hpp b/src/providers/Crashpad.hpp
deleted file mode 100644
index d15f3fcb7..000000000
--- a/src/providers/Crashpad.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#ifdef CHATTERINO_WITH_CRASHPAD
-#    include <client/crashpad_client.h>
-
-#    include <memory>
-
-namespace chatterino {
-
-std::unique_ptr<crashpad::CrashpadClient> installCrashHandler();
-
-}  // namespace chatterino
-
-#endif
diff --git a/src/singletons/CrashHandler.cpp b/src/singletons/CrashHandler.cpp
new file mode 100644
index 000000000..76518e909
--- /dev/null
+++ b/src/singletons/CrashHandler.cpp
@@ -0,0 +1,230 @@
+#include "singletons/CrashHandler.hpp"
+
+#include "common/Args.hpp"
+#include "common/Literals.hpp"
+#include "common/QLogging.hpp"
+#include "singletons/Paths.hpp"
+
+#include <QDir>
+#include <QFile>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QString>
+
+#ifdef CHATTERINO_WITH_CRASHPAD
+#    include <QApplication>
+
+#    include <memory>
+#    include <string>
+#endif
+
+namespace {
+
+using namespace chatterino;
+using namespace literals;
+
+/// The name of the crashpad handler executable.
+/// This varies across platforms
+#if defined(Q_OS_UNIX)
+const QString CRASHPAD_EXECUTABLE_NAME = QStringLiteral("crashpad-handler");
+#elif defined(Q_OS_WINDOWS)
+const QString CRASHPAD_EXECUTABLE_NAME = QStringLiteral("crashpad-handler.exe");
+#else
+#    error Unsupported platform
+#endif
+
+/// Converts a QString into the platform string representation.
+#if defined(Q_OS_UNIX)
+std::string nativeString(const QString &s)
+{
+    return s.toStdString();
+}
+#elif defined(Q_OS_WINDOWS)
+std::wstring nativeString(const QString &s)
+{
+    return s.toStdWString();
+}
+#else
+#    error Unsupported platform
+#endif
+
+const QString RECOVERY_FILE = u"chatterino-recovery.json"_s;
+
+/// The recovery options are saved outside the settings
+/// to be able to read them without loading the settings.
+///
+/// The flags are saved in the `RECOVERY_FILE` as JSON.
+std::optional<bool> readRecoverySettings(const Paths &paths)
+{
+    QFile file(QDir(paths.crashdumpDirectory).filePath(RECOVERY_FILE));
+    if (!file.open(QFile::ReadOnly))
+    {
+        return std::nullopt;
+    }
+
+    QJsonParseError error{};
+    auto doc = QJsonDocument::fromJson(file.readAll(), &error);
+    if (error.error != QJsonParseError::NoError)
+    {
+        qCWarning(chatterinoCrashhandler)
+            << "Failed to parse recovery settings" << error.errorString();
+        return std::nullopt;
+    }
+
+    const auto obj = doc.object();
+    auto shouldRecover = obj["shouldRecover"_L1];
+    if (!shouldRecover.isBool())
+    {
+        return std::nullopt;
+    }
+
+    return shouldRecover.toBool();
+}
+
+bool canRestart(const Paths &paths)
+{
+#ifdef NDEBUG
+    const auto &args = chatterino::getArgs();
+    if (args.isFramelessEmbed || args.shouldRunBrowserExtensionHost)
+    {
+        return false;
+    }
+
+    auto settings = readRecoverySettings(paths);
+    if (!settings)
+    {
+        return false;  // default, no settings found
+    }
+    return *settings;
+#else
+    (void)paths;
+    return false;
+#endif
+}
+
+/// This encodes the arguments into a single string.
+///
+/// The command line arguments are joined by '+'. A plus is escaped by an
+/// additional plus ('++' -> '+').
+///
+/// The decoding happens in crash-handler/src/CommandLine.cpp
+std::string encodeArguments()
+{
+    std::string args;
+    for (auto arg : getArgs().currentArguments())
+    {
+        if (!args.empty())
+        {
+            args.push_back('+');
+        }
+        args += arg.replace(u'+', u"++"_s).toStdString();
+    }
+    return args;
+}
+
+}  // namespace
+
+namespace chatterino {
+
+using namespace std::string_literals;
+
+void CrashHandler::initialize(Settings & /*settings*/, Paths &paths)
+{
+    auto optSettings = readRecoverySettings(paths);
+    if (optSettings)
+    {
+        this->shouldRecover_ = *optSettings;
+    }
+    else
+    {
+        // By default, we don't restart after a crash.
+        this->saveShouldRecover(false);
+    }
+}
+
+void CrashHandler::saveShouldRecover(bool value)
+{
+    this->shouldRecover_ = value;
+
+    QFile file(QDir(getPaths()->crashdumpDirectory).filePath(RECOVERY_FILE));
+    if (!file.open(QFile::WriteOnly | QFile::Truncate))
+    {
+        qCWarning(chatterinoCrashhandler)
+            << "Failed to open" << file.fileName();
+        return;
+    }
+    file.write(QJsonDocument(QJsonObject{
+                                 {"shouldRecover"_L1, value},
+                             })
+                   .toJson(QJsonDocument::Compact));
+}
+
+#ifdef CHATTERINO_WITH_CRASHPAD
+std::unique_ptr<crashpad::CrashpadClient> installCrashHandler()
+{
+    // Currently, the following directory layout is assumed:
+    // [applicationDirPath]
+    //  ├─chatterino(.exe)
+    //  ╰─[crashpad]
+    //     ╰─crashpad-handler(.exe)
+    // TODO: The location of the binary might vary across platforms
+    auto crashpadBinDir = QDir(QApplication::applicationDirPath());
+
+    if (!crashpadBinDir.cd("crashpad"))
+    {
+        qCDebug(chatterinoCrashhandler) << "Cannot find crashpad directory";
+        return nullptr;
+    }
+    if (!crashpadBinDir.exists(CRASHPAD_EXECUTABLE_NAME))
+    {
+        qCDebug(chatterinoCrashhandler)
+            << "Cannot find crashpad handler executable";
+        return nullptr;
+    }
+
+    auto handlerPath = base::FilePath(nativeString(
+        crashpadBinDir.absoluteFilePath(CRASHPAD_EXECUTABLE_NAME)));
+
+    // Argument passed in --database
+    // > Crash reports are written to this database, and if uploads are enabled,
+    //   uploaded from this database to a crash report collection server.
+    auto databaseDir =
+        base::FilePath(nativeString(getPaths()->crashdumpDirectory));
+
+    auto client = std::make_unique<crashpad::CrashpadClient>();
+
+    std::map<std::string, std::string> annotations{
+        {
+            "canRestart"s,
+            canRestart(*getPaths()) ? "true"s : "false"s,
+        },
+        {
+            "exePath"s,
+            QApplication::applicationFilePath().toStdString(),
+        },
+        {
+            "startedAt"s,
+            QDateTime::currentDateTimeUtc().toString(Qt::ISODate).toStdString(),
+        },
+        {
+            "exeArguments"s,
+            encodeArguments(),
+        },
+    };
+
+    // See https://chromium.googlesource.com/crashpad/crashpad/+/HEAD/handler/crashpad_handler.md
+    // for documentation on available options.
+    if (!client->StartHandler(handlerPath, databaseDir, {}, {}, {}, annotations,
+                              {}, true, false))
+    {
+        qCDebug(chatterinoCrashhandler) << "Failed to start crashpad handler";
+        return nullptr;
+    }
+
+    qCDebug(chatterinoCrashhandler) << "Started crashpad handler";
+    return client;
+}
+#endif
+
+}  // namespace chatterino
diff --git a/src/singletons/CrashHandler.hpp b/src/singletons/CrashHandler.hpp
new file mode 100644
index 000000000..7f47708a0
--- /dev/null
+++ b/src/singletons/CrashHandler.hpp
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "common/Singleton.hpp"
+
+#include <QtGlobal>
+
+#ifdef CHATTERINO_WITH_CRASHPAD
+#    include <client/crashpad_client.h>
+
+#    include <memory>
+#endif
+
+namespace chatterino {
+
+class CrashHandler : public Singleton
+{
+public:
+    bool shouldRecover() const
+    {
+        return this->shouldRecover_;
+    }
+
+    /// Sets and saves whether Chatterino should restart on a crash
+    void saveShouldRecover(bool value);
+
+    void initialize(Settings &settings, Paths &paths) override;
+
+private:
+    bool shouldRecover_ = false;
+};
+
+#ifdef CHATTERINO_WITH_CRASHPAD
+std::unique_ptr<crashpad::CrashpadClient> installCrashHandler();
+#endif
+
+}  // namespace chatterino
diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 8e650de87..612f8ebef 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -510,7 +510,6 @@ public:
         ThumbnailPreviewMode::AlwaysShow,
     };
     QStringSetting cachePath = {"/cache/path", ""};
-    BoolSetting restartOnCrash = {"/misc/restartOnCrash", false};
     BoolSetting attachExtensionToAnyProcess = {
         "/misc/attachExtensionToAnyProcess", false};
     BoolSetting askOnImageUpload = {"/misc/askOnImageUpload", true};
diff --git a/src/widgets/dialogs/LastRunCrashDialog.cpp b/src/widgets/dialogs/LastRunCrashDialog.cpp
index f3dc77921..f038b03f6 100644
--- a/src/widgets/dialogs/LastRunCrashDialog.cpp
+++ b/src/widgets/dialogs/LastRunCrashDialog.cpp
@@ -1,93 +1,109 @@
-#include "LastRunCrashDialog.hpp"
+#include "widgets/dialogs/LastRunCrashDialog.hpp"
 
-#include "singletons/Updates.hpp"
+#include "common/Args.hpp"
+#include "common/Literals.hpp"
+#include "common/Modes.hpp"
+#include "singletons/Paths.hpp"
 #include "util/LayoutCreator.hpp"
-#include "util/PostToThread.hpp"
 
+#include <QDesktopServices>
 #include <QDialogButtonBox>
+#include <QDir>
 #include <QLabel>
+#include <QMessageBox>
+#include <QProcess>
 #include <QPushButton>
+#include <QRandomGenerator>
+#include <QStringBuilder>
 #include <QVBoxLayout>
 
+namespace {
+
+using namespace chatterino::literals;
+
+const std::initializer_list<QString> MESSAGES = {
+    u"Oops..."_s,        u"NotLikeThis"_s,
+    u"NOOOOOO"_s,        u"I'm sorry"_s,
+    u"We're sorry"_s,    u"My bad"_s,
+    u"FailFish"_s,       u"O_o"_s,
+    u"Sorry :("_s,       u"I blame cosmic rays"_s,
+    u"I blame TMI"_s,    u"I blame Helix"_s,
+    u"Oopsie woopsie"_s,
+};
+
+QString randomMessage()
+{
+    return *(MESSAGES.begin() +
+             (QRandomGenerator::global()->generate64() % MESSAGES.size()));
+}
+
+}  // namespace
+
 namespace chatterino {
 
+using namespace literals;
+
 LastRunCrashDialog::LastRunCrashDialog()
 {
     this->setWindowFlag(Qt::WindowContextHelpButtonHint, false);
-    this->setWindowTitle("Chatterino");
+    this->setWindowTitle(u"Chatterino - " % randomMessage());
 
     auto layout =
         LayoutCreator<LastRunCrashDialog>(this).setLayoutType<QVBoxLayout>();
 
-    layout.emplace<QLabel>("The application wasn't terminated properly the "
-                           "last time it was executed.");
+    QString text =
+        u"Chatterino unexpectedly crashed and restarted. "_s
+        "<i>You can disable automatic restarts in the settings.</i><br><br>";
+
+#ifdef CHATTERINO_WITH_CRASHPAD
+    auto reportsDir =
+        QDir(getPaths()->crashdumpDirectory).filePath(u"reports"_s);
+    text += u"A <b>crash report</b> has been saved to "
+            "<a href=\"file:///" %
+            reportsDir % u"\">" % reportsDir % u"</a>.<br>";
+
+    if (getArgs().exceptionCode)
+    {
+        text += u"The last run crashed with code <code>0x" %
+                QString::number(*getArgs().exceptionCode, 16) % u"</code>";
+
+        if (getArgs().exceptionMessage)
+        {
+            text += u" (" % *getArgs().exceptionMessage % u")";
+        }
+
+        text += u".<br>"_s;
+    }
+
+    text +=
+        "Crash reports are <b>only stored locally</b> and never uploaded.<br>"
+        "<br>Please <a "
+        "href=\"https://github.com/Chatterino/chatterino2/issues/new\">report "
+        "the crash</a> "
+        u"so it can be prevented in the future."_s;
+
+    if (Modes::instance().isNightly)
+    {
+        text += u" Make sure you're using the latest nightly version!"_s;
+    }
+
+    text +=
+        u"<br>For more information, <a href=\"https://wiki.chatterino.com/Crash%20Analysis/\">consult the wiki</a>."_s;
+#endif
+
+    auto label = layout.emplace<QLabel>(text);
+    label->setTextInteractionFlags(Qt::TextBrowserInteraction);
+    label->setOpenExternalLinks(true);
+    label->setWordWrap(true);
 
     layout->addSpacing(16);
 
-    //    auto update = layout.emplace<QLabel>();
     auto buttons = layout.emplace<QDialogButtonBox>();
 
-    //    auto *installUpdateButton = buttons->addButton("Install Update",
-    //    QDialogButtonBox::NoRole); installUpdateButton->setEnabled(false);
-    //    QObject::connect(installUpdateButton, &QPushButton::clicked, [this,
-    //    update]() mutable {
-    //        auto &updateManager = UpdateManager::instance();
-
-    //        updateManager.installUpdates();
-    //        this->setEnabled(false);
-    //        update->setText("Downloading updates...");
-    //    });
-
-    auto *okButton =
-        buttons->addButton("Ignore", QDialogButtonBox::ButtonRole::NoRole);
+    auto *okButton = buttons->addButton(u"Ok"_s, QDialogButtonBox::AcceptRole);
     QObject::connect(okButton, &QPushButton::clicked, [this] {
         this->accept();
     });
-
-    // Updates
-    //    auto updateUpdateLabel = [update]() mutable {
-    //        auto &updateManager = UpdateManager::instance();
-
-    //        switch (updateManager.getStatus()) {
-    //            case UpdateManager::None: {
-    //                update->setText("Not checking for updates.");
-    //            } break;
-    //            case UpdateManager::Searching: {
-    //                update->setText("Checking for updates...");
-    //            } break;
-    //            case UpdateManager::UpdateAvailable: {
-    //                update->setText("Update available.");
-    //            } break;
-    //            case UpdateManager::NoUpdateAvailable: {
-    //                update->setText("No update abailable.");
-    //            } break;
-    //            case UpdateManager::SearchFailed: {
-    //                update->setText("Error while searching for update.\nEither
-    //                the update service is "
-    //                                "temporarily down or there is an issue
-    //                                with your installation.");
-    //            } break;
-    //            case UpdateManager::Downloading: {
-    //                update->setText(
-    //                    "Downloading the update. Chatterino will close once
-    //                    the download is done.");
-    //            } break;
-    //            case UpdateManager::DownloadFailed: {
-    //                update->setText("Download failed.");
-    //            } break;
-    //            case UpdateManager::WriteFileFailed: {
-    //                update->setText("Writing the update file to the hard drive
-    //                failed.");
-    //            } break;
-    //        }
-    //    };
-
-    //    updateUpdateLabel();
-    //    this->signalHolder_.managedConnect(updateManager.statusUpdated,
-    //    [updateUpdateLabel](auto) mutable {
-    //        postToThread([updateUpdateLabel]() mutable { updateUpdateLabel();
-    //        });
-    //    });
 }
 
 }  // namespace chatterino
diff --git a/src/widgets/dialogs/LastRunCrashDialog.hpp b/src/widgets/dialogs/LastRunCrashDialog.hpp
index ebd1e3a4c..a4aa75ef7 100644
--- a/src/widgets/dialogs/LastRunCrashDialog.hpp
+++ b/src/widgets/dialogs/LastRunCrashDialog.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <pajlada/signals/signalholder.hpp>
 #include <QDialog>
 
 namespace chatterino {
@@ -9,9 +8,6 @@ class LastRunCrashDialog : public QDialog
 {
 public:
     LastRunCrashDialog();
-
-private:
-    pajlada::Signals::SignalHolder signalHolder_;
 };
 
 }  // namespace chatterino
diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
index 338219976..8498b904c 100644
--- a/src/widgets/settingspages/GeneralPage.cpp
+++ b/src/widgets/settingspages/GeneralPage.cpp
@@ -8,6 +8,7 @@
 #include "controllers/sound/ISoundController.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
+#include "singletons/CrashHandler.hpp"
 #include "singletons/Fonts.hpp"
 #include "singletons/NativeMessaging.hpp"
 #include "singletons/Paths.hpp"
@@ -875,8 +876,14 @@ void GeneralPage::initLayout(GeneralPageView &layout)
                            s.openLinksIncognito);
     }
 
-    layout.addCheckbox(
-        "Restart on crash", s.restartOnCrash, false,
+    layout.addCustomCheckbox(
+        "Restart on crash (requires restart)",
+        [] {
+            return getApp()->crashHandler->shouldRecover();
+        },
+        [](bool on) {
+            return getApp()->crashHandler->saveShouldRecover(on);
+        },
         "When possible, restart Chatterino if the program crashes");
 
 #if defined(Q_OS_LINUX) && !defined(NO_QTKEYCHAIN)
diff --git a/src/widgets/settingspages/GeneralPageView.cpp b/src/widgets/settingspages/GeneralPageView.cpp
index b063c6177..95a0d42fc 100644
--- a/src/widgets/settingspages/GeneralPageView.cpp
+++ b/src/widgets/settingspages/GeneralPageView.cpp
@@ -125,6 +125,28 @@ QCheckBox *GeneralPageView::addCheckbox(const QString &text,
     return check;
 }
 
+QCheckBox *GeneralPageView::addCustomCheckbox(const QString &text,
+                                              const std::function<bool()> &load,
+                                              std::function<void(bool)> save,
+                                              const QString &toolTipText)
+{
+    auto *check = new QCheckBox(text);
+    this->addToolTip(*check, toolTipText);
+
+    check->setChecked(load());
+
+    QObject::connect(check, &QCheckBox::toggled, this,
+                     [save = std::move(save)](bool state) {
+                         save(state);
+                     });
+
+    this->addWidget(check);
+
+    this->groups_.back().widgets.push_back({check, {text}});
+
+    return check;
+}
+
 ComboBox *GeneralPageView::addDropdown(const QString &text,
                                        const QStringList &list,
                                        QString toolTipText)
diff --git a/src/widgets/settingspages/GeneralPageView.hpp b/src/widgets/settingspages/GeneralPageView.hpp
index 61a77fbde..382680dad 100644
--- a/src/widgets/settingspages/GeneralPageView.hpp
+++ b/src/widgets/settingspages/GeneralPageView.hpp
@@ -103,6 +103,11 @@ public:
     /// @param inverse Inverses true to false and vice versa
     QCheckBox *addCheckbox(const QString &text, BoolSetting &setting,
                            bool inverse = false, QString toolTipText = {});
+    QCheckBox *addCustomCheckbox(const QString &text,
+                                 const std::function<bool()> &load,
+                                 std::function<void(bool)> save,
+                                 const QString &toolTipText = {});
+
     ComboBox *addDropdown(const QString &text, const QStringList &items,
                           QString toolTipText = {});
     ComboBox *addDropdown(const QString &text, const QStringList &items,
diff --git a/tools/crash-handler b/tools/crash-handler
new file mode 160000
index 000000000..9753fe802
--- /dev/null
+++ b/tools/crash-handler
@@ -0,0 +1 @@
+Subproject commit 9753fe802710b2df00f2287ec2e1ca78c251d085

From 485fc5cdb4c474274ea0fcb6184d38a092628539 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Mon, 25 Dec 2023 18:17:25 +0100
Subject: [PATCH 29/42] fix: Tooltip parenting on Windows (#5040)

Fixes #5019
---
 CHANGELOG.md                  |  2 +-
 src/widgets/TooltipWidget.cpp | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f9599002..b8a047e7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,7 +54,7 @@
 - Bugfix: Fixed some windows appearing between screens. (#4797)
 - Bugfix: Fixed a crash that could occur when using certain features in a Usercard after closing the split from which it was created. (#5034)
 - Bugfix: Fixed a crash that could occur when using certain features in a Reply popup after closing the split from which it was created. (#5036)
-- Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998)
+- Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998, #5040)
 - Bugfix: Fixes to section deletion in text input fields. (#5013)
 - Bugfix: Show user text input within watch streak notices. (#5029)
 - Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978)
diff --git a/src/widgets/TooltipWidget.cpp b/src/widgets/TooltipWidget.cpp
index aa4894a8f..7738d3eae 100644
--- a/src/widgets/TooltipWidget.cpp
+++ b/src/widgets/TooltipWidget.cpp
@@ -10,13 +10,34 @@
 // number of columns in grid mode
 #define GRID_NUM_COLS 3
 
+namespace {
+
+#ifdef Q_OS_WIN
+template <typename T>
+inline constexpr T *tooltipParentFor(T * /*desiredParent*/)
+{
+    return nullptr;
+}
+#else
+template <typename T>
+inline constexpr T *tooltipParentFor(T *desiredParent)
+{
+    return desiredParent;
+}
+#endif
+
+}  // namespace
+
 namespace chatterino {
 
 TooltipWidget::TooltipWidget(BaseWidget *parent)
     : BaseWindow({BaseWindow::TopMost, BaseWindow::DontFocus,
                   BaseWindow::DisableLayoutSave},
-                 parent)
+                 tooltipParentFor(parent))
 {
+    assert(parent != nullptr);
+    QObject::connect(parent, &QObject::destroyed, this, &QObject::deleteLater);
+
     this->setStyleSheet("color: #fff; background: rgba(11, 11, 11, 0.8)");
     this->setAttribute(Qt::WA_TranslucentBackground);
     this->setWindowFlag(Qt::WindowStaysOnTopHint, true);

From 1006bf955a9b85a6067dad1449fe2da0750333d2 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Mon, 25 Dec 2023 20:04:46 +0100
Subject: [PATCH 30/42] perf: skip update from GIF timer if no animated
 elements are shown (#5042)

---
 CHANGELOG.md                                  |  1 +
 src/messages/layouts/MessageLayout.cpp        |  9 +++++++--
 src/messages/layouts/MessageLayout.hpp        |  6 +++++-
 .../layouts/MessageLayoutContainer.cpp        |  6 ++++--
 .../layouts/MessageLayoutContainer.hpp        |  3 ++-
 src/messages/layouts/MessageLayoutElement.cpp | 20 +++++++++++++------
 src/messages/layouts/MessageLayoutElement.hpp | 13 ++++++------
 src/widgets/helper/ChannelView.cpp            | 10 ++++++++--
 src/widgets/helper/ChannelView.hpp            |  3 +++
 9 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8a047e7c..18753a26f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -99,6 +99,7 @@
 - Dev: BREAKING: Replace custom `import()` with normal Lua `require()`. (#5014)
 - Dev: Fixed most compiler warnings. (#5028)
 - Dev: Added the ability to show `ChannelView`s without a `Split`. (#4747)
+- Dev: Channels without any animated elements on screen will skip updates from the GIF timer. (#5042)
 
 ## 2.4.6
 
diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp
index d80eba7d5..160ea51ca 100644
--- a/src/messages/layouts/MessageLayout.cpp
+++ b/src/messages/layouts/MessageLayout.cpp
@@ -196,8 +196,10 @@ void MessageLayout::actuallyLayout(int width, MessageElementFlags flags)
 }
 
 // Painting
-void MessageLayout::paint(const MessagePaintContext &ctx)
+MessagePaintResult MessageLayout::paint(const MessagePaintContext &ctx)
 {
+    MessagePaintResult result;
+
     QPixmap *pixmap = this->ensureBuffer(ctx.painter, ctx.canvasWidth);
 
     if (!this->bufferValid_)
@@ -209,7 +211,8 @@ void MessageLayout::paint(const MessagePaintContext &ctx)
     ctx.painter.drawPixmap(0, ctx.y, *pixmap);
 
     // draw gif emotes
-    this->container_.paintAnimatedElements(ctx.painter, ctx.y);
+    result.hasAnimatedElements =
+        this->container_.paintAnimatedElements(ctx.painter, ctx.y);
 
     // draw disabled
     if (this->message_->flags.has(MessageFlag::Disabled))
@@ -270,6 +273,8 @@ void MessageLayout::paint(const MessagePaintContext &ctx)
     }
 
     this->bufferValid_ = true;
+
+    return result;
 }
 
 QPixmap *MessageLayout::ensureBuffer(QPainter &painter, int width)
diff --git a/src/messages/layouts/MessageLayout.hpp b/src/messages/layouts/MessageLayout.hpp
index d87a526b2..40275ff22 100644
--- a/src/messages/layouts/MessageLayout.hpp
+++ b/src/messages/layouts/MessageLayout.hpp
@@ -32,6 +32,10 @@ enum class MessageLayoutFlag : uint8_t {
 };
 using MessageLayoutFlags = FlagsEnum<MessageLayoutFlag>;
 
+struct MessagePaintResult {
+    bool hasAnimatedElements = false;
+};
+
 class MessageLayout
 {
 public:
@@ -55,7 +59,7 @@ public:
     bool layout(int width, float scale_, MessageElementFlags flags);
 
     // Painting
-    void paint(const MessagePaintContext &ctx);
+    MessagePaintResult paint(const MessagePaintContext &ctx);
     void invalidateBuffer();
     void deleteBuffer();
     void deleteCache();
diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp
index 0b2b729b8..aa3135a00 100644
--- a/src/messages/layouts/MessageLayoutContainer.cpp
+++ b/src/messages/layouts/MessageLayoutContainer.cpp
@@ -235,13 +235,15 @@ void MessageLayoutContainer::paintElements(QPainter &painter,
     }
 }
 
-void MessageLayoutContainer::paintAnimatedElements(QPainter &painter,
+bool MessageLayoutContainer::paintAnimatedElements(QPainter &painter,
                                                    int yOffset) const
 {
+    bool anyAnimatedElement = false;
     for (const auto &element : this->elements_)
     {
-        element->paintAnimated(painter, yOffset);
+        anyAnimatedElement |= element->paintAnimated(painter, yOffset);
     }
+    return anyAnimatedElement;
 }
 
 void MessageLayoutContainer::paintSelection(QPainter &painter,
diff --git a/src/messages/layouts/MessageLayoutContainer.hpp b/src/messages/layouts/MessageLayoutContainer.hpp
index 5887295fb..be765da85 100644
--- a/src/messages/layouts/MessageLayoutContainer.hpp
+++ b/src/messages/layouts/MessageLayoutContainer.hpp
@@ -64,8 +64,9 @@ struct MessageLayoutContainer {
 
     /**
      * Paint the animated elements in this message
+     * @returns true if this container contains at least one animated element
      */
-    void paintAnimatedElements(QPainter &painter, int yOffset) const;
+    bool paintAnimatedElements(QPainter &painter, int yOffset) const;
 
     /**
      * Paint the selection for this container
diff --git a/src/messages/layouts/MessageLayoutElement.cpp b/src/messages/layouts/MessageLayoutElement.cpp
index 523a6b145..11139ea39 100644
--- a/src/messages/layouts/MessageLayoutElement.cpp
+++ b/src/messages/layouts/MessageLayoutElement.cpp
@@ -153,11 +153,11 @@ void ImageLayoutElement::paint(QPainter &painter,
     }
 }
 
-void ImageLayoutElement::paintAnimated(QPainter &painter, int yOffset)
+bool ImageLayoutElement::paintAnimated(QPainter &painter, int yOffset)
 {
     if (this->image_ == nullptr)
     {
-        return;
+        return false;
     }
 
     if (this->image_->animated())
@@ -167,8 +167,10 @@ void ImageLayoutElement::paintAnimated(QPainter &painter, int yOffset)
             auto rect = this->getRect();
             rect.moveTop(rect.y() + yOffset);
             painter.drawPixmap(QRectF(rect), *pixmap, QRectF());
+            return true;
         }
     }
+    return false;
 }
 
 int ImageLayoutElement::getMouseOverIndex(const QPoint &abs) const
@@ -265,7 +267,7 @@ void LayeredImageLayoutElement::paint(QPainter &painter,
     }
 }
 
-void LayeredImageLayoutElement::paintAnimated(QPainter &painter, int yOffset)
+bool LayeredImageLayoutElement::paintAnimated(QPainter &painter, int yOffset)
 {
     auto fullRect = QRectF(this->getRect());
     fullRect.moveTop(fullRect.y() + yOffset);
@@ -297,6 +299,7 @@ void LayeredImageLayoutElement::paintAnimated(QPainter &painter, int yOffset)
             }
         }
     }
+    return animatedFlag;
 }
 
 int LayeredImageLayoutElement::getMouseOverIndex(const QPoint &abs) const
@@ -446,8 +449,9 @@ void TextLayoutElement::paint(QPainter &painter,
         QTextOption(Qt::AlignLeft | Qt::AlignTop));
 }
 
-void TextLayoutElement::paintAnimated(QPainter &, int)
+bool TextLayoutElement::paintAnimated(QPainter & /*painter*/, int /*yOffset*/)
 {
+    return false;
 }
 
 int TextLayoutElement::getMouseOverIndex(const QPoint &abs) const
@@ -567,8 +571,10 @@ void TextIconLayoutElement::paint(QPainter &painter,
     }
 }
 
-void TextIconLayoutElement::paintAnimated(QPainter &painter, int yOffset)
+bool TextIconLayoutElement::paintAnimated(QPainter & /*painter*/,
+                                          int /*yOffset*/)
 {
+    return false;
 }
 
 int TextIconLayoutElement::getMouseOverIndex(const QPoint &abs) const
@@ -640,8 +646,10 @@ void ReplyCurveLayoutElement::paint(QPainter &painter,
     painter.drawPath(path);
 }
 
-void ReplyCurveLayoutElement::paintAnimated(QPainter &painter, int yOffset)
+bool ReplyCurveLayoutElement::paintAnimated(QPainter & /*painter*/,
+                                            int /*yOffset*/)
 {
+    return false;
 }
 
 int ReplyCurveLayoutElement::getMouseOverIndex(const QPoint &abs) const
diff --git a/src/messages/layouts/MessageLayoutElement.hpp b/src/messages/layouts/MessageLayoutElement.hpp
index df42d1c9c..894a5829d 100644
--- a/src/messages/layouts/MessageLayoutElement.hpp
+++ b/src/messages/layouts/MessageLayoutElement.hpp
@@ -52,7 +52,8 @@ public:
     virtual size_t getSelectionIndexCount() const = 0;
     virtual void paint(QPainter &painter,
                        const MessageColors &messageColors) = 0;
-    virtual void paintAnimated(QPainter &painter, int yOffset) = 0;
+    /// @returns true if anything was painted
+    virtual bool paintAnimated(QPainter &painter, int yOffset) = 0;
     virtual int getMouseOverIndex(const QPoint &abs) const = 0;
     virtual int getXFromIndex(size_t index) = 0;
 
@@ -86,7 +87,7 @@ protected:
                              uint32_t to = UINT32_MAX) const override;
     size_t getSelectionIndexCount() const override;
     void paint(QPainter &painter, const MessageColors &messageColors) override;
-    void paintAnimated(QPainter &painter, int yOffset) override;
+    bool paintAnimated(QPainter &painter, int yOffset) override;
     int getMouseOverIndex(const QPoint &abs) const override;
     int getXFromIndex(size_t index) override;
 
@@ -105,7 +106,7 @@ protected:
                              uint32_t to = UINT32_MAX) const override;
     size_t getSelectionIndexCount() const override;
     void paint(QPainter &painter, const MessageColors &messageColors) override;
-    void paintAnimated(QPainter &painter, int yOffset) override;
+    bool paintAnimated(QPainter &painter, int yOffset) override;
     int getMouseOverIndex(const QPoint &abs) const override;
     int getXFromIndex(size_t index) override;
 
@@ -158,7 +159,7 @@ protected:
                              uint32_t to = UINT32_MAX) const override;
     size_t getSelectionIndexCount() const override;
     void paint(QPainter &painter, const MessageColors &messageColors) override;
-    void paintAnimated(QPainter &painter, int yOffset) override;
+    bool paintAnimated(QPainter &painter, int yOffset) override;
     int getMouseOverIndex(const QPoint &abs) const override;
     int getXFromIndex(size_t index) override;
 
@@ -182,7 +183,7 @@ protected:
                              uint32_t to = UINT32_MAX) const override;
     size_t getSelectionIndexCount() const override;
     void paint(QPainter &painter, const MessageColors &messageColors) override;
-    void paintAnimated(QPainter &painter, int yOffset) override;
+    bool paintAnimated(QPainter &painter, int yOffset) override;
     int getMouseOverIndex(const QPoint &abs) const override;
     int getXFromIndex(size_t index) override;
 
@@ -200,7 +201,7 @@ public:
 
 protected:
     void paint(QPainter &painter, const MessageColors &messageColors) override;
-    void paintAnimated(QPainter &painter, int yOffset) override;
+    bool paintAnimated(QPainter &painter, int yOffset) override;
     int getMouseOverIndex(const QPoint &abs) const override;
     int getXFromIndex(size_t index) override;
     void addCopyTextToString(QString &str, uint32_t from = 0,
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 474ff55c3..748220b7d 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -406,7 +406,10 @@ void ChannelView::initializeSignals()
 
     this->signalHolder_.managedConnect(getApp()->windows->gifRepaintRequested,
                                        [&] {
-                                           this->queueUpdate();
+                                           if (this->anyAnimationShown_)
+                                           {
+                                               this->queueUpdate();
+                                           }
                                        });
 
     this->signalHolder_.managedConnect(
@@ -1470,6 +1473,8 @@ void ChannelView::drawMessages(QPainter &painter)
     };
     bool showLastMessageIndicator = getSettings()->showLastMessageIndicator;
 
+    bool anyAnimation = false;
+
     for (; ctx.messageIndex < messagesSnapshot.size(); ++ctx.messageIndex)
     {
         MessageLayout *layout = messagesSnapshot[ctx.messageIndex].get();
@@ -1483,7 +1488,7 @@ void ChannelView::drawMessages(QPainter &painter)
             ctx.isLastReadMessage = false;
         }
 
-        layout->paint(ctx);
+        anyAnimation |= layout->paint(ctx).hasAnimatedElements;
 
         if (this->highlightedMessage_ == layout)
         {
@@ -1504,6 +1509,7 @@ void ChannelView::drawMessages(QPainter &painter)
             break;
         }
     }
+    this->anyAnimationShown_ = anyAnimation;
 
     if (end == nullptr)
     {
diff --git a/src/widgets/helper/ChannelView.hpp b/src/widgets/helper/ChannelView.hpp
index 71b439540..522f33532 100644
--- a/src/widgets/helper/ChannelView.hpp
+++ b/src/widgets/helper/ChannelView.hpp
@@ -273,6 +273,9 @@ private:
     bool lastMessageHasAlternateBackground_ = false;
     bool lastMessageHasAlternateBackgroundReverse_ = true;
 
+    /// Tracks if this view has painted any animated element in the last #paintEvent().
+    bool anyAnimationShown_ = false;
+
     bool pausable_ = false;
     QTimer pauseTimer_;
     std::unordered_map<PauseReason, std::optional<SteadyClock::time_point>>

From eb12cfa50b0a75b5f3d045b3469d31a5f112e359 Mon Sep 17 00:00:00 2001
From: iProdigy <8106344+iProdigy@users.noreply.github.com>
Date: Mon, 25 Dec 2023 17:17:44 -0600
Subject: [PATCH 31/42] feat: add sound and flash alert for automod caught
 messages (#5026)

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
---
 CHANGELOG.md                                  |   2 +-
 src/Application.cpp                           |   9 +-
 .../highlights/HighlightController.cpp        |  40 +++++
 src/controllers/highlights/HighlightModel.cpp |  44 +++++
 src/controllers/highlights/HighlightModel.hpp |   1 +
 src/messages/Message.hpp                      |   2 +
 src/messages/MessageBuilder.cpp               | 153 ----------------
 src/messages/MessageBuilder.hpp               |   3 -
 src/messages/SharedMessageBuilder.cpp         |  44 +++--
 src/messages/SharedMessageBuilder.hpp         |   8 +-
 src/messages/layouts/MessageLayout.cpp        |  10 +-
 src/messages/layouts/MessageLayoutContext.cpp |   6 +
 src/messages/layouts/MessageLayoutContext.hpp |   1 +
 src/providers/twitch/TwitchMessageBuilder.cpp | 168 ++++++++++++++++++
 src/providers/twitch/TwitchMessageBuilder.hpp |   4 +
 src/singletons/Settings.hpp                   |  17 ++
 src/widgets/helper/ChannelView.cpp            |  13 +-
 src/widgets/helper/ScrollbarHighlight.cpp     |   1 +
 .../settingspages/HighlightingPage.cpp        |  15 +-
 19 files changed, 348 insertions(+), 193 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18753a26f..e61597219 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## Unversioned
 
 - Major: Allow use of Twitch follower emotes in other channels if subscribed. (#4922)
-- Major: Add `/automod` split to track automod caught messages across all open channels the user moderates. (#4986)
+- Major: Add `/automod` split to track automod caught messages across all open channels the user moderates. (#4986, #5026)
 - Minor: Migrate to the new Get Channel Followers Helix endpoint, fixing follower count not showing up in usercards. (#4809)
 - Minor: The account switcher is now styled to match your theme. (#4817)
 - Minor: Add an invisible resize handle to the bottom of frameless user info popups and reply thread popups. (#4795)
diff --git a/src/Application.cpp b/src/Application.cpp
index 7cfef3e34..c28e36c62 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -552,7 +552,8 @@ void Application::initPubSub()
                                 senderDisplayName, senderColor};
                             postToThread([chan, action] {
                                 const auto p =
-                                    makeAutomodMessage(action, chan->getName());
+                                    TwitchMessageBuilder::makeAutomodMessage(
+                                        action, chan->getName());
                                 chan->addMessage(p.first);
                                 chan->addMessage(p.second);
 
@@ -584,7 +585,8 @@ void Application::initPubSub()
                 }
 
                 postToThread([chan, action] {
-                    const auto p = makeAutomodMessage(action, chan->getName());
+                    const auto p = TwitchMessageBuilder::makeAutomodMessage(
+                        action, chan->getName());
                     chan->addMessage(p.first);
                     chan->addMessage(p.second);
                 });
@@ -626,7 +628,8 @@ void Application::initPubSub()
                 }
 
                 postToThread([chan, action] {
-                    const auto p = makeAutomodInfoMessage(action);
+                    const auto p =
+                        TwitchMessageBuilder::makeAutomodInfoMessage(action);
                     chan->addMessage(p);
                 });
             });
diff --git a/src/controllers/highlights/HighlightController.cpp b/src/controllers/highlights/HighlightController.cpp
index 6e91f706b..9dee55047 100644
--- a/src/controllers/highlights/HighlightController.cpp
+++ b/src/controllers/highlights/HighlightController.cpp
@@ -204,6 +204,41 @@ void rebuildMessageHighlights(Settings &settings,
     {
         checks.emplace_back(highlightPhraseCheck(highlight));
     }
+
+    if (settings.enableAutomodHighlight)
+    {
+        const auto highlightSound =
+            settings.enableAutomodHighlightSound.getValue();
+        const auto highlightAlert =
+            settings.enableAutomodHighlightTaskbar.getValue();
+        const auto highlightSoundUrlValue =
+            settings.automodHighlightSoundUrl.getValue();
+
+        checks.emplace_back(HighlightCheck{
+            [=](const auto & /*args*/, const auto & /*badges*/,
+                const auto & /*senderName*/, const auto & /*originalMessage*/,
+                const auto &flags,
+                const auto /*self*/) -> std::optional<HighlightResult> {
+                if (!flags.has(MessageFlag::AutoModOffendingMessage))
+                {
+                    return std::nullopt;
+                }
+
+                std::optional<QUrl> highlightSoundUrl;
+                if (!highlightSoundUrlValue.isEmpty())
+                {
+                    highlightSoundUrl = highlightSoundUrlValue;
+                }
+
+                return HighlightResult{
+                    highlightAlert,     // alert
+                    highlightSound,     // playSound
+                    highlightSoundUrl,  // customSoundUrl
+                    nullptr,            // color
+                    false,              // showInMentions
+                };
+            }});
+    }
 }
 
 void rebuildUserHighlights(Settings &settings,
@@ -434,6 +469,11 @@ void HighlightController::initialize(Settings &settings, Paths & /*paths*/)
     this->rebuildListener_.addSetting(settings.threadHighlightSoundUrl);
     this->rebuildListener_.addSetting(settings.showThreadHighlightInMentions);
 
+    this->rebuildListener_.addSetting(settings.enableAutomodHighlight);
+    this->rebuildListener_.addSetting(settings.enableAutomodHighlightSound);
+    this->rebuildListener_.addSetting(settings.enableAutomodHighlightTaskbar);
+    this->rebuildListener_.addSetting(settings.automodHighlightSoundUrl);
+
     this->rebuildListener_.setCB([this, &settings] {
         qCDebug(chatterinoHighlights)
             << "Rebuild checks because a setting changed";
diff --git a/src/controllers/highlights/HighlightModel.cpp b/src/controllers/highlights/HighlightModel.cpp
index 7c7b08e9b..d7b76adf3 100644
--- a/src/controllers/highlights/HighlightModel.cpp
+++ b/src/controllers/highlights/HighlightModel.cpp
@@ -234,6 +234,30 @@ void HighlightModel::afterInit()
 
     this->insertCustomRow(threadMessageRow,
                           HighlightRowIndexes::ThreadMessageRow);
+
+    // Highlight settings for automod caught messages
+    const std::vector<QStandardItem *> automodRow = this->createRow();
+    setBoolItem(automodRow[Column::Pattern],
+                getSettings()->enableAutomodHighlight.getValue(), true, false);
+    automodRow[Column::Pattern]->setData("AutoMod Caught Messages",
+                                         Qt::DisplayRole);
+    automodRow[Column::ShowInMentions]->setFlags({});
+    setBoolItem(automodRow[Column::FlashTaskbar],
+                getSettings()->enableAutomodHighlightTaskbar.getValue(), true,
+                false);
+    setBoolItem(automodRow[Column::PlaySound],
+                getSettings()->enableAutomodHighlightSound.getValue(), true,
+                false);
+    automodRow[Column::UseRegex]->setFlags({});
+    automodRow[Column::CaseSensitive]->setFlags({});
+
+    const auto automodSound =
+        QUrl(getSettings()->automodHighlightSoundUrl.getValue());
+    setFilePathItem(automodRow[Column::SoundPath], automodSound, false);
+
+    automodRow[Column::Color]->setFlags(Qt::ItemFlag::NoItemFlags);
+
+    this->insertCustomRow(automodRow, HighlightRowIndexes::AutomodRow);
 }
 
 void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
@@ -278,6 +302,11 @@ void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
                     getSettings()->enableThreadHighlight.setValue(
                         value.toBool());
                 }
+                else if (rowIndex == HighlightRowIndexes::AutomodRow)
+                {
+                    getSettings()->enableAutomodHighlight.setValue(
+                        value.toBool());
+                }
             }
         }
         break;
@@ -336,6 +365,11 @@ void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
                     getSettings()->enableThreadHighlightTaskbar.setValue(
                         value.toBool());
                 }
+                else if (rowIndex == HighlightRowIndexes::AutomodRow)
+                {
+                    getSettings()->enableAutomodHighlightTaskbar.setValue(
+                        value.toBool());
+                }
             }
         }
         break;
@@ -377,6 +411,11 @@ void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
                     getSettings()->enableThreadHighlightSound.setValue(
                         value.toBool());
                 }
+                else if (rowIndex == HighlightRowIndexes::AutomodRow)
+                {
+                    getSettings()->enableAutomodHighlightSound.setValue(
+                        value.toBool());
+                }
             }
         }
         break;
@@ -412,6 +451,11 @@ void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
                     getSettings()->threadHighlightSoundUrl.setValue(
                         value.toString());
                 }
+                else if (rowIndex == HighlightRowIndexes::AutomodRow)
+                {
+                    getSettings()->automodHighlightSoundUrl.setValue(
+                        value.toString());
+                }
             }
         }
         break;
diff --git a/src/controllers/highlights/HighlightModel.hpp b/src/controllers/highlights/HighlightModel.hpp
index 0ee5192cf..be807d33e 100644
--- a/src/controllers/highlights/HighlightModel.hpp
+++ b/src/controllers/highlights/HighlightModel.hpp
@@ -34,6 +34,7 @@ public:
         FirstMessageRow = 4,
         ElevatedMessageRow = 5,
         ThreadMessageRow = 6,
+        AutomodRow = 7,
     };
 
     enum UserHighlightRowIndexes {
diff --git a/src/messages/Message.hpp b/src/messages/Message.hpp
index a503ea275..88d0d0934 100644
--- a/src/messages/Message.hpp
+++ b/src/messages/Message.hpp
@@ -50,6 +50,8 @@ enum class MessageFlag : int64_t {
     LiveUpdatesAdd = (1LL << 28),
     LiveUpdatesRemove = (1LL << 29),
     LiveUpdatesUpdate = (1LL << 30),
+    /// The message caught by AutoMod containing the user who sent the message & its contents
+    AutoModOffendingMessage = (1LL << 31),
 };
 using MessageFlags = FlagsEnum<MessageFlag>;
 
diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp
index b605544b9..d5ba0ff79 100644
--- a/src/messages/MessageBuilder.cpp
+++ b/src/messages/MessageBuilder.cpp
@@ -78,159 +78,6 @@ MessagePtr makeSystemMessage(const QString &text, const QTime &time)
     return MessageBuilder(systemMessage, text, time).release();
 }
 
-EmotePtr makeAutoModBadge()
-{
-    return std::make_shared<Emote>(Emote{
-        EmoteName{},
-        ImageSet{Image::fromResourcePixmap(getResources().twitch.automod)},
-        Tooltip{"AutoMod"},
-        Url{"https://dashboard.twitch.tv/settings/moderation/automod"}});
-}
-
-MessagePtr makeAutomodInfoMessage(const AutomodInfoAction &action)
-{
-    auto builder = MessageBuilder();
-    QString text("AutoMod: ");
-
-    builder.emplace<TimestampElement>();
-    builder.message().flags.set(MessageFlag::PubSub);
-
-    // AutoMod shield badge
-    builder.emplace<BadgeElement>(makeAutoModBadge(),
-                                  MessageElementFlag::BadgeChannelAuthority);
-    // AutoMod "username"
-    builder.emplace<TextElement>("AutoMod:", MessageElementFlag::BoldUsername,
-                                 MessageColor(QColor("blue")),
-                                 FontStyle::ChatMediumBold);
-    builder.emplace<TextElement>(
-        "AutoMod:", MessageElementFlag::NonBoldUsername,
-        MessageColor(QColor("blue")));
-    switch (action.type)
-    {
-        case AutomodInfoAction::OnHold: {
-            QString info("Hey! Your message is being checked "
-                         "by mods and has not been sent.");
-            text += info;
-            builder.emplace<TextElement>(info, MessageElementFlag::Text,
-                                         MessageColor::Text);
-        }
-        break;
-        case AutomodInfoAction::Denied: {
-            QString info("Mods have removed your message.");
-            text += info;
-            builder.emplace<TextElement>(info, MessageElementFlag::Text,
-                                         MessageColor::Text);
-        }
-        break;
-        case AutomodInfoAction::Approved: {
-            QString info("Mods have accepted your message.");
-            text += info;
-            builder.emplace<TextElement>(info, MessageElementFlag::Text,
-                                         MessageColor::Text);
-        }
-        break;
-    }
-
-    builder.message().flags.set(MessageFlag::AutoMod);
-    builder.message().messageText = text;
-    builder.message().searchText = text;
-
-    auto message = builder.release();
-
-    return message;
-}
-
-std::pair<MessagePtr, MessagePtr> makeAutomodMessage(
-    const AutomodAction &action, const QString &channelName)
-{
-    MessageBuilder builder, builder2;
-
-    //
-    // Builder for AutoMod message with explanation
-    builder.message().loginName = "automod";
-    builder.message().channelName = channelName;
-    builder.message().flags.set(MessageFlag::PubSub);
-    builder.message().flags.set(MessageFlag::Timeout);
-    builder.message().flags.set(MessageFlag::AutoMod);
-
-    // AutoMod shield badge
-    builder.emplace<BadgeElement>(makeAutoModBadge(),
-                                  MessageElementFlag::BadgeChannelAuthority);
-    // AutoMod "username"
-    builder.emplace<TextElement>("AutoMod:", MessageElementFlag::BoldUsername,
-                                 MessageColor(QColor("blue")),
-                                 FontStyle::ChatMediumBold);
-    builder.emplace<TextElement>(
-        "AutoMod:", MessageElementFlag::NonBoldUsername,
-        MessageColor(QColor("blue")));
-    // AutoMod header message
-    builder.emplace<TextElement>(
-        ("Held a message for reason: " + action.reason +
-         ". Allow will post it in chat. "),
-        MessageElementFlag::Text, MessageColor::Text);
-    // Allow link button
-    builder
-        .emplace<TextElement>("Allow", MessageElementFlag::Text,
-                              MessageColor(QColor("green")),
-                              FontStyle::ChatMediumBold)
-        ->setLink({Link::AutoModAllow, action.msgID});
-    // Deny link button
-    builder
-        .emplace<TextElement>(" Deny", MessageElementFlag::Text,
-                              MessageColor(QColor("red")),
-                              FontStyle::ChatMediumBold)
-        ->setLink({Link::AutoModDeny, action.msgID});
-    // ID of message caught by AutoMod
-    //    builder.emplace<TextElement>(action.msgID, MessageElementFlag::Text,
-    //                                 MessageColor::Text);
-    auto text1 =
-        QString("AutoMod: Held a message for reason: %1. Allow will post "
-                "it in chat. Allow Deny")
-            .arg(action.reason);
-    builder.message().messageText = text1;
-    builder.message().searchText = text1;
-
-    auto message1 = builder.release();
-
-    //
-    // Builder for offender's message
-    builder2.message().channelName = channelName;
-    builder2
-        .emplace<TextElement>("#" + channelName,
-                              MessageElementFlag::ChannelName,
-                              MessageColor::System)
-        ->setLink({Link::JumpToChannel, channelName});
-    builder2.emplace<TimestampElement>();
-    builder2.emplace<TwitchModerationElement>();
-    builder2.message().loginName = action.target.login;
-    builder2.message().flags.set(MessageFlag::PubSub);
-    builder2.message().flags.set(MessageFlag::Timeout);
-    builder2.message().flags.set(MessageFlag::AutoMod);
-
-    // sender username
-    builder2
-        .emplace<TextElement>(
-            action.target.displayName + ":", MessageElementFlag::BoldUsername,
-            MessageColor(action.target.color), FontStyle::ChatMediumBold)
-        ->setLink({Link::UserInfo, action.target.login});
-    builder2
-        .emplace<TextElement>(action.target.displayName + ":",
-                              MessageElementFlag::NonBoldUsername,
-                              MessageColor(action.target.color))
-        ->setLink({Link::UserInfo, action.target.login});
-    // sender's message caught by AutoMod
-    builder2.emplace<TextElement>(action.message, MessageElementFlag::Text,
-                                  MessageColor::Text);
-    auto text2 =
-        QString("%1: %2").arg(action.target.displayName, action.message);
-    builder2.message().messageText = text2;
-    builder2.message().searchText = text2;
-
-    auto message2 = builder2.release();
-
-    return std::make_pair(message1, message2);
-}
-
 MessageBuilder::MessageBuilder()
     : message_(std::make_shared<Message>())
 {
diff --git a/src/messages/MessageBuilder.hpp b/src/messages/MessageBuilder.hpp
index 333d23469..c7277997a 100644
--- a/src/messages/MessageBuilder.hpp
+++ b/src/messages/MessageBuilder.hpp
@@ -53,9 +53,6 @@ const ImageUploaderResultTag imageUploaderResultMessage{};
 
 MessagePtr makeSystemMessage(const QString &text);
 MessagePtr makeSystemMessage(const QString &text, const QTime &time);
-std::pair<MessagePtr, MessagePtr> makeAutomodMessage(
-    const AutomodAction &action, const QString &channelName);
-MessagePtr makeAutomodInfoMessage(const AutomodInfoAction &action);
 
 struct MessageParseArgs {
     bool disablePingSounds = false;
diff --git a/src/messages/SharedMessageBuilder.cpp b/src/messages/SharedMessageBuilder.cpp
index 719ec1bed..addeb05b8 100644
--- a/src/messages/SharedMessageBuilder.cpp
+++ b/src/messages/SharedMessageBuilder.cpp
@@ -18,6 +18,8 @@
 
 #include <QFileInfo>
 
+#include <optional>
+
 namespace {
 
 using namespace chatterino;
@@ -170,18 +172,10 @@ void SharedMessageBuilder::parseHighlights()
     this->highlightAlert_ = highlightResult.alert;
 
     this->highlightSound_ = highlightResult.playSound;
+    this->highlightSoundCustomUrl_ = highlightResult.customSoundUrl;
 
     this->message().highlightColor = highlightResult.color;
 
-    if (highlightResult.customSoundUrl)
-    {
-        this->highlightSoundUrl_ = *highlightResult.customSoundUrl;
-    }
-    else
-    {
-        this->highlightSoundUrl_ = getFallbackHighlightSound();
-    }
-
     if (highlightResult.showInMentions)
     {
         this->message().flags.set(MessageFlag::ShowInMentions);
@@ -199,6 +193,15 @@ void SharedMessageBuilder::appendChannelName()
 }
 
 void SharedMessageBuilder::triggerHighlights()
+{
+    SharedMessageBuilder::triggerHighlights(
+        this->channel->getName(), this->highlightSound_,
+        this->highlightSoundCustomUrl_, this->highlightAlert_);
+}
+
+void SharedMessageBuilder::triggerHighlights(
+    const QString &channelName, bool playSound,
+    const std::optional<QUrl> &customSoundUrl, bool windowAlert)
 {
     if (isInStreamerMode() && getSettings()->streamerModeMuteMentions)
     {
@@ -206,21 +209,32 @@ void SharedMessageBuilder::triggerHighlights()
         return;
     }
 
-    if (getSettings()->isMutedChannel(this->channel->getName()))
+    if (getSettings()->isMutedChannel(channelName))
     {
         // Do nothing. Pings are muted in this channel.
         return;
     }
 
-    bool hasFocus = (QApplication::focusWidget() != nullptr);
-    bool resolveFocus = !hasFocus || getSettings()->highlightAlwaysPlaySound;
+    const bool hasFocus = (QApplication::focusWidget() != nullptr);
+    const bool resolveFocus =
+        !hasFocus || getSettings()->highlightAlwaysPlaySound;
 
-    if (this->highlightSound_ && resolveFocus)
+    if (playSound && resolveFocus)
     {
-        getIApp()->getSound()->play(this->highlightSoundUrl_);
+        // TODO(C++23): optional or_else
+        QUrl soundUrl;
+        if (customSoundUrl)
+        {
+            soundUrl = *customSoundUrl;
+        }
+        else
+        {
+            soundUrl = getFallbackHighlightSound();
+        }
+        getIApp()->getSound()->play(soundUrl);
     }
 
-    if (this->highlightAlert_)
+    if (windowAlert)
     {
         getApp()->windows->sendAlert();
     }
diff --git a/src/messages/SharedMessageBuilder.hpp b/src/messages/SharedMessageBuilder.hpp
index 5dce1ad9f..b6e99e61b 100644
--- a/src/messages/SharedMessageBuilder.hpp
+++ b/src/messages/SharedMessageBuilder.hpp
@@ -8,6 +8,8 @@
 #include <QColor>
 #include <QUrl>
 
+#include <optional>
+
 namespace chatterino {
 
 class Badge;
@@ -57,6 +59,9 @@ protected:
 
     // parseHighlights only updates the visual state of the message, but leaves the playing of alerts and sounds to the triggerHighlights function
     virtual void parseHighlights();
+    static void triggerHighlights(const QString &channelName, bool playSound,
+                                  const std::optional<QUrl> &customSoundUrl,
+                                  bool windowAlert);
 
     void appendChannelName();
 
@@ -72,8 +77,7 @@ protected:
 
     bool highlightAlert_ = false;
     bool highlightSound_ = false;
-
-    QUrl highlightSoundUrl_;
+    std::optional<QUrl> highlightSoundCustomUrl_{};
 };
 
 }  // namespace chatterino
diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp
index 160ea51ca..0e8228485 100644
--- a/src/messages/layouts/MessageLayout.cpp
+++ b/src/messages/layouts/MessageLayout.cpp
@@ -342,9 +342,13 @@ void MessageLayout::updateBuffer(QPixmap *buffer,
               this->message_->flags.has(MessageFlag::HighlightedWhisper)) &&
              !this->flags.has(MessageLayoutFlag::IgnoreHighlights))
     {
-        // Blend highlight color with usual background color
-        backgroundColor =
-            blendColors(backgroundColor, *this->message_->highlightColor);
+        assert(this->message_->highlightColor);
+        if (this->message_->highlightColor)
+        {
+            // Blend highlight color with usual background color
+            backgroundColor =
+                blendColors(backgroundColor, *this->message_->highlightColor);
+        }
     }
     else if (this->message_->flags.has(MessageFlag::Subscription) &&
              ctx.preferences.enableSubHighlight)
diff --git a/src/messages/layouts/MessageLayoutContext.cpp b/src/messages/layouts/MessageLayoutContext.cpp
index 82b158485..98c963919 100644
--- a/src/messages/layouts/MessageLayoutContext.cpp
+++ b/src/messages/layouts/MessageLayoutContext.cpp
@@ -47,6 +47,12 @@ void MessagePreferences::connectSettings(Settings *settings,
         },
         holder);
 
+    settings->enableAutomodHighlight.connect(
+        [this](const auto &newValue) {
+            this->enableAutomodHighlight = newValue;
+        },
+        holder);
+
     settings->alternateMessages.connect(
         [this](const auto &newValue) {
             this->alternateMessages = newValue;
diff --git a/src/messages/layouts/MessageLayoutContext.hpp b/src/messages/layouts/MessageLayoutContext.hpp
index a64d98bb4..d8f08ab3a 100644
--- a/src/messages/layouts/MessageLayoutContext.hpp
+++ b/src/messages/layouts/MessageLayoutContext.hpp
@@ -39,6 +39,7 @@ struct MessagePreferences {
     bool enableElevatedMessageHighlight{};
     bool enableFirstMessageHighlight{};
     bool enableSubHighlight{};
+    bool enableAutomodHighlight{};
 
     bool alternateMessages{};
     bool separateMessages{};
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 8ef6bcc66..e5f003a05 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -5,6 +5,7 @@
 #include "common/Literals.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/accounts/AccountController.hpp"
+#include "controllers/highlights/HighlightController.hpp"
 #include "controllers/ignores/IgnoreController.hpp"
 #include "controllers/ignores/IgnorePhrase.hpp"
 #include "controllers/userdata/UserDataController.hpp"
@@ -1765,6 +1766,173 @@ MessagePtr TwitchMessageBuilder::buildHypeChatMessage(
     return builder.release();
 }
 
+EmotePtr makeAutoModBadge()
+{
+    return std::make_shared<Emote>(Emote{
+        EmoteName{},
+        ImageSet{Image::fromResourcePixmap(getResources().twitch.automod)},
+        Tooltip{"AutoMod"},
+        Url{"https://dashboard.twitch.tv/settings/moderation/automod"}});
+}
+
+MessagePtr TwitchMessageBuilder::makeAutomodInfoMessage(
+    const AutomodInfoAction &action)
+{
+    auto builder = MessageBuilder();
+    QString text("AutoMod: ");
+
+    builder.emplace<TimestampElement>();
+    builder.message().flags.set(MessageFlag::PubSub);
+
+    // AutoMod shield badge
+    builder.emplace<BadgeElement>(makeAutoModBadge(),
+                                  MessageElementFlag::BadgeChannelAuthority);
+    // AutoMod "username"
+    builder.emplace<TextElement>("AutoMod:", MessageElementFlag::BoldUsername,
+                                 MessageColor(QColor("blue")),
+                                 FontStyle::ChatMediumBold);
+    builder.emplace<TextElement>(
+        "AutoMod:", MessageElementFlag::NonBoldUsername,
+        MessageColor(QColor("blue")));
+    switch (action.type)
+    {
+        case AutomodInfoAction::OnHold: {
+            QString info("Hey! Your message is being checked "
+                         "by mods and has not been sent.");
+            text += info;
+            builder.emplace<TextElement>(info, MessageElementFlag::Text,
+                                         MessageColor::Text);
+        }
+        break;
+        case AutomodInfoAction::Denied: {
+            QString info("Mods have removed your message.");
+            text += info;
+            builder.emplace<TextElement>(info, MessageElementFlag::Text,
+                                         MessageColor::Text);
+        }
+        break;
+        case AutomodInfoAction::Approved: {
+            QString info("Mods have accepted your message.");
+            text += info;
+            builder.emplace<TextElement>(info, MessageElementFlag::Text,
+                                         MessageColor::Text);
+        }
+        break;
+    }
+
+    builder.message().flags.set(MessageFlag::AutoMod);
+    builder.message().messageText = text;
+    builder.message().searchText = text;
+
+    auto message = builder.release();
+
+    return message;
+}
+
+std::pair<MessagePtr, MessagePtr> TwitchMessageBuilder::makeAutomodMessage(
+    const AutomodAction &action, const QString &channelName)
+{
+    MessageBuilder builder, builder2;
+
+    //
+    // Builder for AutoMod message with explanation
+    builder.message().loginName = "automod";
+    builder.message().channelName = channelName;
+    builder.message().flags.set(MessageFlag::PubSub);
+    builder.message().flags.set(MessageFlag::Timeout);
+    builder.message().flags.set(MessageFlag::AutoMod);
+
+    // AutoMod shield badge
+    builder.emplace<BadgeElement>(makeAutoModBadge(),
+                                  MessageElementFlag::BadgeChannelAuthority);
+    // AutoMod "username"
+    builder.emplace<TextElement>("AutoMod:", MessageElementFlag::BoldUsername,
+                                 MessageColor(QColor("blue")),
+                                 FontStyle::ChatMediumBold);
+    builder.emplace<TextElement>(
+        "AutoMod:", MessageElementFlag::NonBoldUsername,
+        MessageColor(QColor("blue")));
+    // AutoMod header message
+    builder.emplace<TextElement>(
+        ("Held a message for reason: " + action.reason +
+         ". Allow will post it in chat. "),
+        MessageElementFlag::Text, MessageColor::Text);
+    // Allow link button
+    builder
+        .emplace<TextElement>("Allow", MessageElementFlag::Text,
+                              MessageColor(QColor("green")),
+                              FontStyle::ChatMediumBold)
+        ->setLink({Link::AutoModAllow, action.msgID});
+    // Deny link button
+    builder
+        .emplace<TextElement>(" Deny", MessageElementFlag::Text,
+                              MessageColor(QColor("red")),
+                              FontStyle::ChatMediumBold)
+        ->setLink({Link::AutoModDeny, action.msgID});
+    // ID of message caught by AutoMod
+    //    builder.emplace<TextElement>(action.msgID, MessageElementFlag::Text,
+    //                                 MessageColor::Text);
+    auto text1 =
+        QString("AutoMod: Held a message for reason: %1. Allow will post "
+                "it in chat. Allow Deny")
+            .arg(action.reason);
+    builder.message().messageText = text1;
+    builder.message().searchText = text1;
+
+    auto message1 = builder.release();
+
+    //
+    // Builder for offender's message
+    builder2.message().channelName = channelName;
+    builder2
+        .emplace<TextElement>("#" + channelName,
+                              MessageElementFlag::ChannelName,
+                              MessageColor::System)
+        ->setLink({Link::JumpToChannel, channelName});
+    builder2.emplace<TimestampElement>();
+    builder2.emplace<TwitchModerationElement>();
+    builder2.message().loginName = action.target.login;
+    builder2.message().flags.set(MessageFlag::PubSub);
+    builder2.message().flags.set(MessageFlag::Timeout);
+    builder2.message().flags.set(MessageFlag::AutoMod);
+    builder2.message().flags.set(MessageFlag::AutoModOffendingMessage);
+
+    // sender username
+    builder2
+        .emplace<TextElement>(
+            action.target.displayName + ":", MessageElementFlag::BoldUsername,
+            MessageColor(action.target.color), FontStyle::ChatMediumBold)
+        ->setLink({Link::UserInfo, action.target.login});
+    builder2
+        .emplace<TextElement>(action.target.displayName + ":",
+                              MessageElementFlag::NonBoldUsername,
+                              MessageColor(action.target.color))
+        ->setLink({Link::UserInfo, action.target.login});
+    // sender's message caught by AutoMod
+    builder2.emplace<TextElement>(action.message, MessageElementFlag::Text,
+                                  MessageColor::Text);
+    auto text2 =
+        QString("%1: %2").arg(action.target.displayName, action.message);
+    builder2.message().messageText = text2;
+    builder2.message().searchText = text2;
+
+    auto message2 = builder2.release();
+
+    // Normally highlights would be checked & triggered during the builder parse steps
+    // and when the message is added to the channel
+    // We do this a bit weird since the message comes in from PubSub and not the normal message route
+    auto [highlighted, highlightResult] = getIApp()->getHighlights()->check(
+        {}, {}, action.target.login, action.message, message2->flags);
+    if (highlighted)
+    {
+        SharedMessageBuilder::triggerHighlights(
+            channelName, highlightResult.playSound,
+            highlightResult.customSoundUrl, highlightResult.alert);
+    }
+
+    return std::make_pair(message1, message2);
+}
+
 void TwitchMessageBuilder::setThread(std::shared_ptr<MessageThread> thread)
 {
     this->thread_ = std::move(thread);
diff --git a/src/providers/twitch/TwitchMessageBuilder.hpp b/src/providers/twitch/TwitchMessageBuilder.hpp
index cc1681acb..92f4dc3fc 100644
--- a/src/providers/twitch/TwitchMessageBuilder.hpp
+++ b/src/providers/twitch/TwitchMessageBuilder.hpp
@@ -89,6 +89,10 @@ public:
 
     static MessagePtr buildHypeChatMessage(Communi::IrcPrivateMessage *message);
 
+    static std::pair<MessagePtr, MessagePtr> makeAutomodMessage(
+        const AutomodAction &action, const QString &channelName);
+    static MessagePtr makeAutomodInfoMessage(const AutomodInfoAction &action);
+
     // Shares some common logic from SharedMessageBuilder::parseBadgeTag
     static std::unordered_map<QString, QString> parseBadgeInfoTag(
         const QVariantMap &tags);
diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 612f8ebef..c66fcb218 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -375,6 +375,23 @@ public:
                                            ""};
     QStringSetting subHighlightColor = {"/highlighting/subHighlightColor", ""};
 
+    BoolSetting enableAutomodHighlight = {
+        "/highlighting/automod/enabled",
+        true,
+    };
+    BoolSetting enableAutomodHighlightSound = {
+        "/highlighting/automod/enableSound",
+        false,
+    };
+    BoolSetting enableAutomodHighlightTaskbar = {
+        "/highlighting/automod/enableTaskbarFlashing",
+        false,
+    };
+    QStringSetting automodHighlightSoundUrl = {
+        "/highlighting/automod/soundUrl",
+        "",
+    };
+
     BoolSetting enableThreadHighlight = {
         "/highlighting/thread/nameIsHighlightKeyword", true};
     BoolSetting showThreadHighlightInMentions = {
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 748220b7d..fa5e1bb94 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -1093,12 +1093,13 @@ void ChannelView::messageAppended(MessagePtr &message,
 
     if (!messageFlags->has(MessageFlag::DoNotTriggerNotification))
     {
-        if (messageFlags->has(MessageFlag::Highlighted) &&
-            messageFlags->has(MessageFlag::ShowInMentions) &&
-            !messageFlags->has(MessageFlag::Subscription) &&
-            (getSettings()->highlightMentions ||
-             this->channel_->getType() != Channel::Type::TwitchMentions))
-
+        if ((messageFlags->has(MessageFlag::Highlighted) &&
+             messageFlags->has(MessageFlag::ShowInMentions) &&
+             !messageFlags->has(MessageFlag::Subscription) &&
+             (getSettings()->highlightMentions ||
+              this->channel_->getType() != Channel::Type::TwitchMentions)) ||
+            (this->channel_->getType() == Channel::Type::TwitchAutomod &&
+             getSettings()->enableAutomodHighlight))
         {
             this->tabHighlightRequested.invoke(HighlightState::Highlighted);
         }
diff --git a/src/widgets/helper/ScrollbarHighlight.cpp b/src/widgets/helper/ScrollbarHighlight.cpp
index efd50e43d..5216f2d66 100644
--- a/src/widgets/helper/ScrollbarHighlight.cpp
+++ b/src/widgets/helper/ScrollbarHighlight.cpp
@@ -26,6 +26,7 @@ ScrollbarHighlight::ScrollbarHighlight(const std::shared_ptr<QColor> color,
 
 QColor ScrollbarHighlight::getColor() const
 {
+    assert(this->color_);
     return *this->color_;
 }
 
diff --git a/src/widgets/settingspages/HighlightingPage.cpp b/src/widgets/settingspages/HighlightingPage.cpp
index 1b6e61f73..fbad47561 100644
--- a/src/widgets/settingspages/HighlightingPage.cpp
+++ b/src/widgets/settingspages/HighlightingPage.cpp
@@ -370,21 +370,22 @@ void HighlightingPage::tableCellClicked(const QModelIndex &clicked,
                                         EditableModelView *view,
                                         HighlightTab tab)
 {
+    if (!clicked.flags().testFlag(Qt::ItemIsEnabled))
+    {
+        return;
+    }
+
     switch (tab)
     {
         case HighlightTab::Messages:
         case HighlightTab::Users: {
             using Column = HighlightModel::Column;
-            bool restrictColorRow =
-                (tab == HighlightTab::Messages &&
-                 clicked.row() ==
-                     HighlightModel::HighlightRowIndexes::WhisperRow);
-            if (clicked.column() == Column::SoundPath &&
-                clicked.flags().testFlag(Qt::ItemIsEnabled))
+
+            if (clicked.column() == Column::SoundPath)
             {
                 this->openSoundDialog(clicked, view, Column::SoundPath);
             }
-            else if (clicked.column() == Column::Color && !restrictColorRow)
+            else if (clicked.column() == Column::Color)
             {
                 this->openColorDialog(clicked, view, tab);
             }

From 9612eac9663c6a95a632b55648b6d2e6ec0d4fb2 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Wed, 27 Dec 2023 01:12:14 +0100
Subject: [PATCH 32/42] perf: Only update regions with animated elements
 (#5043)

---
 CHANGELOG.md                       |  2 +-
 src/widgets/helper/ChannelView.cpp | 86 +++++++++++++++++++++++-------
 src/widgets/helper/ChannelView.hpp |  8 +--
 3 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e61597219..151ac9593 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -99,7 +99,7 @@
 - Dev: BREAKING: Replace custom `import()` with normal Lua `require()`. (#5014)
 - Dev: Fixed most compiler warnings. (#5028)
 - Dev: Added the ability to show `ChannelView`s without a `Split`. (#4747)
-- Dev: Channels without any animated elements on screen will skip updates from the GIF timer. (#5042)
+- Dev: Channels without any animated elements on screen will skip updates from the GIF timer. (#5042, #5043)
 
 ## 2.4.6
 
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index fa5e1bb94..6978e361c 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -350,6 +350,10 @@ ChannelView::ChannelView(InternalCtor /*tag*/, QWidget *parent, Split *split,
     auto curve = QEasingCurve();
     curve.setCustomType(highlightEasingFunction);
     this->highlightAnimation_.setEasingCurve(curve);
+    QObject::connect(&this->highlightAnimation_,
+                     &QVariantAnimation::valueChanged, this, [this] {
+                         this->queueUpdate();
+                     });
 
     this->messageColors_.applyTheme(getTheme());
     this->messagePreferences_.connectSettings(getSettings(),
@@ -404,13 +408,13 @@ void ChannelView::initializeSignals()
         },
         this->signalHolder_);
 
-    this->signalHolder_.managedConnect(getApp()->windows->gifRepaintRequested,
-                                       [&] {
-                                           if (this->anyAnimationShown_)
-                                           {
-                                               this->queueUpdate();
-                                           }
-                                       });
+    this->signalHolder_.managedConnect(
+        getApp()->windows->gifRepaintRequested, [&] {
+            if (!this->animationArea_.isEmpty())
+            {
+                this->queueUpdate(this->animationArea_);
+            }
+        });
 
     this->signalHolder_.managedConnect(
         getApp()->windows->layoutRequested, [&](Channel *channel) {
@@ -580,6 +584,11 @@ void ChannelView::queueUpdate()
     this->update();
 }
 
+void ChannelView::queueUpdate(const QRect &area)
+{
+    this->update(area);
+}
+
 void ChannelView::queueLayout()
 {
     if (this->isVisible())
@@ -1418,7 +1427,7 @@ void ChannelView::scrollToMessageLayout(MessageLayout *layout,
     }
 }
 
-void ChannelView::paintEvent(QPaintEvent * /*event*/)
+void ChannelView::paintEvent(QPaintEvent *event)
 {
     //    BenchmarkGuard benchmark("paint");
 
@@ -1427,7 +1436,7 @@ void ChannelView::paintEvent(QPaintEvent * /*event*/)
     painter.fillRect(rect(), this->theme->splits.background);
 
     // draw messages
-    this->drawMessages(painter);
+    this->drawMessages(painter, event->rect());
 
     // draw paused sign
     if (this->paused())
@@ -1441,7 +1450,7 @@ void ChannelView::paintEvent(QPaintEvent * /*event*/)
 
 // if overlays is false then it draws the message, if true then it draws things
 // such as the grey overlay when a message is disabled
-void ChannelView::drawMessages(QPainter &painter)
+void ChannelView::drawMessages(QPainter &painter, const QRect &area)
 {
     auto &messagesSnapshot = this->getMessagesSnapshot();
 
@@ -1474,7 +1483,10 @@ void ChannelView::drawMessages(QPainter &painter)
     };
     bool showLastMessageIndicator = getSettings()->showLastMessageIndicator;
 
-    bool anyAnimation = false;
+    QRect animationArea;
+    auto areaContainsY = [&area](auto y) {
+        return y >= area.y() && y < area.y() + area.height();
+    };
 
     for (; ctx.messageIndex < messagesSnapshot.size(); ++ctx.messageIndex)
     {
@@ -1489,16 +1501,34 @@ void ChannelView::drawMessages(QPainter &painter)
             ctx.isLastReadMessage = false;
         }
 
-        anyAnimation |= layout->paint(ctx).hasAnimatedElements;
-
-        if (this->highlightedMessage_ == layout)
+        if (areaContainsY(ctx.y) || areaContainsY(ctx.y + layout->getHeight()))
         {
-            painter.fillRect(
-                0, ctx.y, layout->getWidth(), layout->getHeight(),
-                this->highlightAnimation_.currentValue().value<QColor>());
-            if (this->highlightAnimation_.state() == QVariantAnimation::Stopped)
+            auto paintResult = layout->paint(ctx);
+            if (paintResult.hasAnimatedElements)
             {
-                this->highlightedMessage_ = nullptr;
+                if (animationArea.isNull())
+                {
+                    animationArea = QRect{0, ctx.y, layout->getWidth(),
+                                          layout->getHeight()};
+                }
+                else
+                {
+                    animationArea.setBottom(ctx.y + layout->getHeight());
+                    animationArea.setWidth(
+                        std::max(layout->getWidth(), animationArea.width()));
+                }
+            }
+
+            if (this->highlightedMessage_ == layout)
+            {
+                painter.fillRect(
+                    0, ctx.y, layout->getWidth(), layout->getHeight(),
+                    this->highlightAnimation_.currentValue().value<QColor>());
+                if (this->highlightAnimation_.state() ==
+                    QVariantAnimation::Stopped)
+                {
+                    this->highlightedMessage_ = nullptr;
+                }
             }
         }
 
@@ -1510,7 +1540,23 @@ void ChannelView::drawMessages(QPainter &painter)
             break;
         }
     }
-    this->anyAnimationShown_ = anyAnimation;
+
+    // Only update on a full repaint as some messages with animated elements
+    // might get left out in partial repaints.
+    // This happens for example when hovering over the go-to-bottom button.
+    if (this->height() <= area.height())
+    {
+        this->animationArea_ = animationArea;
+    }
+#ifdef FOURTF
+    else
+    {
+        // shows the updated area on partial repaints
+        painter.setPen(Qt::red);
+        painter.drawRect(area.x(), area.y(), area.width() - 1,
+                         area.height() - 1);
+    }
+#endif
 
     if (end == nullptr)
     {
diff --git a/src/widgets/helper/ChannelView.hpp b/src/widgets/helper/ChannelView.hpp
index 522f33532..f1956cf9c 100644
--- a/src/widgets/helper/ChannelView.hpp
+++ b/src/widgets/helper/ChannelView.hpp
@@ -96,6 +96,7 @@ public:
                          size_t messagesLimit = 1000);
 
     void queueUpdate();
+    void queueUpdate(const QRect &area);
     Scrollbar &getScrollBar();
 
     QString getSelectedText();
@@ -232,7 +233,7 @@ private:
     void updateScrollbar(const LimitedQueueSnapshot<MessageLayoutPtr> &messages,
                          bool causedByScrollbar, bool causedByShow);
 
-    void drawMessages(QPainter &painter);
+    void drawMessages(QPainter &painter, const QRect &area);
     void setSelection(const SelectionItem &start, const SelectionItem &end);
     void setSelection(const Selection &newSelection);
     void selectWholeMessage(MessageLayout *layout, int &messageIndex);
@@ -273,8 +274,9 @@ private:
     bool lastMessageHasAlternateBackground_ = false;
     bool lastMessageHasAlternateBackgroundReverse_ = true;
 
-    /// Tracks if this view has painted any animated element in the last #paintEvent().
-    bool anyAnimationShown_ = false;
+    /// Tracks the area of animated elements in the last full repaint.
+    /// If this is empty (QRect::isEmpty()), no animated element is shown.
+    QRect animationArea_;
 
     bool pausable_ = false;
     QTimer pauseTimer_;

From d0d240136ed1c09c80361d11f2472252768a8a22 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Wed, 27 Dec 2023 16:50:04 +0100
Subject: [PATCH 33/42] fix: Add check for tall messages (#5045)

---
 CHANGELOG.md                       | 2 +-
 src/widgets/helper/ChannelView.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 151ac9593..0c2bd123b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -99,7 +99,7 @@
 - Dev: BREAKING: Replace custom `import()` with normal Lua `require()`. (#5014)
 - Dev: Fixed most compiler warnings. (#5028)
 - Dev: Added the ability to show `ChannelView`s without a `Split`. (#4747)
-- Dev: Channels without any animated elements on screen will skip updates from the GIF timer. (#5042, #5043)
+- Dev: Channels without any animated elements on screen will skip updates from the GIF timer. (#5042, #5043, #5045)
 
 ## 2.4.6
 
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 6978e361c..003fae9f1 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -1501,7 +1501,9 @@ void ChannelView::drawMessages(QPainter &painter, const QRect &area)
             ctx.isLastReadMessage = false;
         }
 
-        if (areaContainsY(ctx.y) || areaContainsY(ctx.y + layout->getHeight()))
+        if (areaContainsY(ctx.y) ||
+            areaContainsY(ctx.y + layout->getHeight()) ||
+            (ctx.y < area.y() && layout->getHeight() > area.height()))
         {
             auto paintResult = layout->paint(ctx);
             if (paintResult.hasAnimatedElements)

From 04a46f60dc26bc0ef56a2318624fae754cff4765 Mon Sep 17 00:00:00 2001
From: SputNikPlop <100245448+SputNikPlop@users.noreply.github.com>
Date: Thu, 28 Dec 2023 08:28:01 -0800
Subject: [PATCH 34/42] chore: add SputNikPlop to the contributors list (#5046)

---
 resources/contributors.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/contributors.txt b/resources/contributors.txt
index 9ec7618d9..258380b75 100644
--- a/resources/contributors.txt
+++ b/resources/contributors.txt
@@ -66,6 +66,7 @@ olafyang | https://github.com/olafyang | | Contributor
 chrrs | https://github.com/chrrs | | Contributor
 4rneee | https://github.com/4rneee | | Contributor
 crazysmc | https://github.com/crazysmc | :/avatars/crazysmc.png | Contributor
+SputNikPlop | https://github.com/SputNikPlop | | Contributor
 
 # If you are a contributor add yourself above this line
 

From d84779f12767085421b4859b1afd183ad64a0e9d Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Fri, 29 Dec 2023 14:20:07 +0100
Subject: [PATCH 35/42] fix: some buttons triggering when releasing mouse
 outside (#5052)

Examples of buttons fixed with this: Usercard profile picture & split header mod mode button
---
 CHANGELOG.md                  |  1 +
 src/widgets/helper/Button.cpp | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c2bd123b..646d43713 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@
 - Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998, #5040)
 - Bugfix: Fixes to section deletion in text input fields. (#5013)
 - Bugfix: Show user text input within watch streak notices. (#5029)
+- Bugfix: Fixed avatar in usercard and moderation button triggering when releasing the mouse outside their area. (#5052)
 - Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978)
 - Dev: Change clang-format from v14 to v16. (#4929)
 - Dev: Fixed UTF16 encoding of `modes` file for the installer. (#4791)
diff --git a/src/widgets/helper/Button.cpp b/src/widgets/helper/Button.cpp
index a6fa3ba6f..9b0a99abe 100644
--- a/src/widgets/helper/Button.cpp
+++ b/src/widgets/helper/Button.cpp
@@ -261,17 +261,26 @@ void Button::mousePressEvent(QMouseEvent *event)
 void Button::mouseReleaseEvent(QMouseEvent *event)
 {
     if (!this->enabled_)
+    {
         return;
+    }
+
+    bool isInside = this->rect().contains(event->pos());
 
     if (event->button() == Qt::LeftButton)
     {
         this->mouseDown_ = false;
 
-        if (this->rect().contains(event->pos()))
+        if (isInside)
+        {
             emit leftClicked();
+        }
     }
 
-    emit clicked(event->button());
+    if (isInside)
+    {
+        emit clicked(event->button());
+    }
 }
 
 void Button::mouseMoveEvent(QMouseEvent *event)

From c65ebd26bd851055d0a8d7b178b04e89cd02f734 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Fri, 29 Dec 2023 15:10:56 +0100
Subject: [PATCH 36/42] fix: non-native drag on Windows (#5051)

---
 CHANGELOG.md                             | 4 ++--
 src/widgets/BaseWindow.cpp               | 5 +++++
 src/widgets/dialogs/ReplyThreadPopup.cpp | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 646d43713..5d00a7257 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,8 +52,8 @@
 - Bugfix: Hide the Usercard button in the User Info Popup when in special channels. (#4972)
 - Bugfix: Fixed support for Windows 11 Snap layouts. (#4994)
 - Bugfix: Fixed some windows appearing between screens. (#4797)
-- Bugfix: Fixed a crash that could occur when using certain features in a Usercard after closing the split from which it was created. (#5034)
-- Bugfix: Fixed a crash that could occur when using certain features in a Reply popup after closing the split from which it was created. (#5036)
+- Bugfix: Fixed a crash that could occur when using certain features in a Usercard after closing the split from which it was created. (#5034, #5051)
+- Bugfix: Fixed a crash that could occur when using certain features in a Reply popup after closing the split from which it was created. (#5036, #5051)
 - Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998, #5040)
 - Bugfix: Fixes to section deletion in text input fields. (#5013)
 - Bugfix: Show user text input within watch streak notices. (#5029)
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index 062f9efc9..d65490cea 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -1091,6 +1091,11 @@ bool BaseWindow::handleNCHITTEST(MSG *msg, long *result)
                     return true;
                 }
 
+                if (widget == this)
+                {
+                    return false;
+                }
+
                 return recursiveCheckMouseTracking(widget->parentWidget());
             };
 
diff --git a/src/widgets/dialogs/ReplyThreadPopup.cpp b/src/widgets/dialogs/ReplyThreadPopup.cpp
index 708b8f0a2..1d84e1a40 100644
--- a/src/widgets/dialogs/ReplyThreadPopup.cpp
+++ b/src/widgets/dialogs/ReplyThreadPopup.cpp
@@ -159,7 +159,8 @@ ReplyThreadPopup::ReplyThreadPopup(bool closeAutomatically, Split *split)
                                      this->thread_->markUnsubscribed();
                                  }
                              });
-            hbox->addWidget(this->ui_.notificationCheckbox, 1);
+            hbox->addWidget(this->ui_.notificationCheckbox);
+            hbox->addStretch(1);
             this->ui_.notificationCheckbox->setFocusPolicy(Qt::NoFocus);
         }
 

From d085ab578f053f8ae0a07e4527d395497f1d539c Mon Sep 17 00:00:00 2001
From: pajlada <rasmus.karlsson@pajlada.com>
Date: Fri, 29 Dec 2023 15:40:31 +0100
Subject: [PATCH 37/42] refactor: Make `Args` less of a singleton (#5041)

This means it's no longer a singleton, and its lifetime is bound to our application.
This felt like a good small experiment to see how its changes would look
if we did this.
As a shortcut, `getApp` that is already a mega singleton keeps a
reference to Args, this means places that are a bit more difficult to
inject into call `getApp()->getArgs()` just like other things are
accessed.
---
 CHANGELOG.md                                 |  1 +
 mocks/include/mocks/EmptyApplication.hpp     |  9 +++++++++
 src/Application.cpp                          | 15 ++++++++-------
 src/Application.hpp                          |  9 ++++++++-
 src/RunGui.cpp                               | 14 +++++++-------
 src/RunGui.hpp                               |  6 +++++-
 src/common/Args.cpp                          | 16 +---------------
 src/common/Args.hpp                          |  4 +---
 src/controllers/plugins/PluginController.cpp |  2 +-
 src/main.cpp                                 | 12 ++++++------
 src/singletons/CrashHandler.cpp              | 13 ++++++-------
 src/singletons/CrashHandler.hpp              |  4 +++-
 src/singletons/WindowManager.cpp             | 14 +++++++-------
 src/widgets/FramelessEmbedWindow.cpp         |  4 ++--
 src/widgets/Notebook.cpp                     |  2 +-
 src/widgets/Window.cpp                       |  2 +-
 src/widgets/dialogs/LastRunCrashDialog.cpp   | 10 +++++-----
 src/widgets/dialogs/LastRunCrashDialog.hpp   |  4 +++-
 src/widgets/dialogs/SettingsDialog.cpp       |  2 +-
 src/widgets/settingspages/PluginsPage.cpp    |  4 ++--
 20 files changed, 78 insertions(+), 69 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d00a7257..a65e2cf27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -100,6 +100,7 @@
 - Dev: BREAKING: Replace custom `import()` with normal Lua `require()`. (#5014)
 - Dev: Fixed most compiler warnings. (#5028)
 - Dev: Added the ability to show `ChannelView`s without a `Split`. (#4747)
+- Dev: Refactor Args to be less of a singleton. (#5041)
 - Dev: Channels without any animated elements on screen will skip updates from the GIF timer. (#5042, #5043, #5045)
 
 ## 2.4.6
diff --git a/mocks/include/mocks/EmptyApplication.hpp b/mocks/include/mocks/EmptyApplication.hpp
index 424c1d25b..5917172b2 100644
--- a/mocks/include/mocks/EmptyApplication.hpp
+++ b/mocks/include/mocks/EmptyApplication.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Application.hpp"
+#include "common/Args.hpp"
 
 namespace chatterino::mock {
 
@@ -9,6 +10,11 @@ class EmptyApplication : public IApplication
 public:
     virtual ~EmptyApplication() = default;
 
+    const Args &getArgs() override
+    {
+        return this->args_;
+    }
+
     Theme *getThemes() override
     {
         return nullptr;
@@ -110,6 +116,9 @@ public:
     {
         return nullptr;
     }
+
+private:
+    Args args_;
 };
 
 }  // namespace chatterino::mock
diff --git a/src/Application.cpp b/src/Application.cpp
index c28e36c62..cfb28f13d 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -104,8 +104,9 @@ IApplication::IApplication()
 // It will create the instances of the major classes, and connect their signals
 // to each other
 
-Application::Application(Settings &_settings, Paths &_paths)
-    : themes(&this->emplace<Theme>())
+Application::Application(Settings &_settings, Paths &_paths, const Args &_args)
+    : args_(_args)
+    , themes(&this->emplace<Theme>())
     , fonts(&this->emplace<Fonts>())
     , emotes(&this->emplace<Emotes>())
     , accounts(&this->emplace<AccountController>())
@@ -146,7 +147,7 @@ void Application::initialize(Settings &settings, Paths &paths)
     isAppInitialized = true;
 
     // Show changelog
-    if (!getArgs().isFramelessEmbed &&
+    if (!this->args_.isFramelessEmbed &&
         getSettings()->currentVersion.getValue() != "" &&
         getSettings()->currentVersion.getValue() != CHATTERINO_VERSION)
     {
@@ -161,7 +162,7 @@ void Application::initialize(Settings &settings, Paths &paths)
         }
     }
 
-    if (!getArgs().isFramelessEmbed)
+    if (!this->args_.isFramelessEmbed)
     {
         getSettings()->currentVersion.setValue(CHATTERINO_VERSION);
 
@@ -179,7 +180,7 @@ void Application::initialize(Settings &settings, Paths &paths)
     // Show crash message.
     // On Windows, the crash message was already shown.
 #ifndef Q_OS_WIN
-    if (!getArgs().isFramelessEmbed && getArgs().crashRecovery)
+    if (!this->args_.isFramelessEmbed && this->args_.crashRecovery)
     {
         if (auto selected =
                 this->windows->getMainWindow().getNotebook().getSelectedPage())
@@ -203,7 +204,7 @@ void Application::initialize(Settings &settings, Paths &paths)
 
     this->windows->updateWordTypeMask();
 
-    if (!getArgs().isFramelessEmbed)
+    if (!this->args_.isFramelessEmbed)
     {
         this->initNm(paths);
     }
@@ -219,7 +220,7 @@ int Application::run(QApplication &qtApp)
 
     this->twitch->connect();
 
-    if (!getArgs().isFramelessEmbed)
+    if (!this->args_.isFramelessEmbed)
     {
         this->windows->getMainWindow().show();
     }
diff --git a/src/Application.hpp b/src/Application.hpp
index 75d8bf373..656c0510b 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -11,6 +11,7 @@
 
 namespace chatterino {
 
+class Args;
 class TwitchIrcServer;
 class ITwitchIrcServer;
 class PubSub;
@@ -54,6 +55,7 @@ public:
 
     static IApplication *instance;
 
+    virtual const Args &getArgs() = 0;
     virtual Theme *getThemes() = 0;
     virtual Fonts *getFonts() = 0;
     virtual IEmotes *getEmotes() = 0;
@@ -78,6 +80,7 @@ public:
 
 class Application : public IApplication
 {
+    const Args &args_;
     std::vector<std::unique_ptr<Singleton>> singletons_;
     int argc_{};
     char **argv_{};
@@ -85,7 +88,7 @@ class Application : public IApplication
 public:
     static Application *instance;
 
-    Application(Settings &settings, Paths &paths);
+    Application(Settings &_settings, Paths &_paths, const Args &_args);
 
     void initialize(Settings &settings, Paths &paths);
     void load();
@@ -126,6 +129,10 @@ public:
 
     /*[[deprecated]]*/ Logging *const logging{};
 
+    const Args &getArgs() override
+    {
+        return this->args_;
+    }
     Theme *getThemes() override
     {
         return this->themes;
diff --git a/src/RunGui.cpp b/src/RunGui.cpp
index 00b4b7497..39bed5594 100644
--- a/src/RunGui.cpp
+++ b/src/RunGui.cpp
@@ -98,9 +98,9 @@ namespace {
         installCustomPalette();
     }
 
-    void showLastCrashDialog()
+    void showLastCrashDialog(const Args &args)
     {
-        auto *dialog = new LastRunCrashDialog;
+        auto *dialog = new LastRunCrashDialog(args);
         // Use exec() over open() to block the app from being loaded
         // and to be able to set the safe mode.
         dialog->exec();
@@ -223,16 +223,16 @@ namespace {
     }
 }  // namespace
 
-void runGui(QApplication &a, Paths &paths, Settings &settings)
+void runGui(QApplication &a, Paths &paths, Settings &settings, const Args &args)
 {
     initQt();
     initResources();
     initSignalHandler();
 
 #ifdef Q_OS_WIN
-    if (getArgs().crashRecovery)
+    if (args.crashRecovery)
     {
-        showLastCrashDialog();
+        showLastCrashDialog(args);
     }
 #endif
 
@@ -271,12 +271,12 @@ void runGui(QApplication &a, Paths &paths, Settings &settings)
     chatterino::NetworkManager::init();
     chatterino::Updates::instance().checkForUpdates();
 
-    Application app(settings, paths);
+    Application app(settings, paths, args);
     app.initialize(settings, paths);
     app.run(a);
     app.save();
 
-    if (!getArgs().dontSaveSettings)
+    if (!args.dontSaveSettings)
     {
         pajlada::Settings::SettingManager::gSave();
     }
diff --git a/src/RunGui.hpp b/src/RunGui.hpp
index 338164404..61bd41f0b 100644
--- a/src/RunGui.hpp
+++ b/src/RunGui.hpp
@@ -3,8 +3,12 @@
 class QApplication;
 
 namespace chatterino {
+
+class Args;
 class Paths;
 class Settings;
 
-void runGui(QApplication &a, Paths &paths, Settings &settings);
+void runGui(QApplication &a, Paths &paths, Settings &settings,
+            const Args &args);
+
 }  // namespace chatterino
diff --git a/src/common/Args.cpp b/src/common/Args.cpp
index 1096372cd..c480f71b8 100644
--- a/src/common/Args.cpp
+++ b/src/common/Args.cpp
@@ -1,4 +1,4 @@
-#include "Args.hpp"
+#include "common/Args.hpp"
 
 #include "common/QLogging.hpp"
 #include "debug/AssertInGuiThread.hpp"
@@ -248,18 +248,4 @@ void Args::applyCustomChannelLayout(const QString &argValue)
     }
 }
 
-static Args *instance = nullptr;
-
-void initArgs(const QApplication &app)
-{
-    instance = new Args(app);
-}
-
-const Args &getArgs()
-{
-    assert(instance);
-
-    return *instance;
-}
-
 }  // namespace chatterino
diff --git a/src/common/Args.hpp b/src/common/Args.hpp
index 39b7d627b..a60e988fc 100644
--- a/src/common/Args.hpp
+++ b/src/common/Args.hpp
@@ -30,6 +30,7 @@ namespace chatterino {
 class Args
 {
 public:
+    Args() = default;
     Args(const QApplication &app);
 
     bool printVersion{};
@@ -60,7 +61,4 @@ private:
     QStringList currentArguments_;
 };
 
-void initArgs(const QApplication &app);
-const Args &getArgs();
-
 }  // namespace chatterino
diff --git a/src/controllers/plugins/PluginController.cpp b/src/controllers/plugins/PluginController.cpp
index 55def19ce..8566c9e24 100644
--- a/src/controllers/plugins/PluginController.cpp
+++ b/src/controllers/plugins/PluginController.cpp
@@ -233,7 +233,7 @@ void PluginController::load(const QFileInfo &index, const QDir &pluginDir,
     auto *temp = plugin.get();
     this->plugins_.insert({pluginName, std::move(plugin)});
 
-    if (getArgs().safeMode)
+    if (getApp()->getArgs().safeMode)
     {
         // This isn't done earlier to ensure the user can disable a misbehaving plugin
         qCWarning(chatterinoLua) << "Skipping loading plugin " << meta.name
diff --git a/src/main.cpp b/src/main.cpp
index 1366ae5cb..bbd955814 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -62,18 +62,18 @@ int main(int argc, char **argv)
         return 1;
     }
 
-    initArgs(a);
+    const Args args(a);
 
 #ifdef CHATTERINO_WITH_CRASHPAD
-    const auto crashpadHandler = installCrashHandler();
+    const auto crashpadHandler = installCrashHandler(args);
 #endif
 
     // run in gui mode or browser extension host mode
-    if (getArgs().shouldRunBrowserExtensionHost)
+    if (args.shouldRunBrowserExtensionHost)
     {
         runBrowserExtensionHost();
     }
-    else if (getArgs().printVersion)
+    else if (args.printVersion)
     {
         attachToConsole();
 
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
     }
     else
     {
-        if (getArgs().verbose)
+        if (args.verbose)
         {
             attachToConsole();
         }
@@ -99,7 +99,7 @@ int main(int argc, char **argv)
 
         Settings settings(paths->settingsDirectory);
 
-        runGui(a, *paths, settings);
+        runGui(a, *paths, settings, args);
     }
     return 0;
 }
diff --git a/src/singletons/CrashHandler.cpp b/src/singletons/CrashHandler.cpp
index 76518e909..ea77b09a1 100644
--- a/src/singletons/CrashHandler.cpp
+++ b/src/singletons/CrashHandler.cpp
@@ -82,10 +82,9 @@ std::optional<bool> readRecoverySettings(const Paths &paths)
     return shouldRecover.toBool();
 }
 
-bool canRestart(const Paths &paths)
+bool canRestart(const Paths &paths, const Args &args)
 {
 #ifdef NDEBUG
-    const auto &args = chatterino::getArgs();
     if (args.isFramelessEmbed || args.shouldRunBrowserExtensionHost)
     {
         return false;
@@ -109,10 +108,10 @@ bool canRestart(const Paths &paths)
 /// additional plus ('++' -> '+').
 ///
 /// The decoding happens in crash-handler/src/CommandLine.cpp
-std::string encodeArguments()
+std::string encodeArguments(const Args &appArgs)
 {
     std::string args;
-    for (auto arg : getArgs().currentArguments())
+    for (auto arg : appArgs.currentArguments())
     {
         if (!args.empty())
         {
@@ -161,7 +160,7 @@ void CrashHandler::saveShouldRecover(bool value)
 }
 
 #ifdef CHATTERINO_WITH_CRASHPAD
-std::unique_ptr<crashpad::CrashpadClient> installCrashHandler()
+std::unique_ptr<crashpad::CrashpadClient> installCrashHandler(const Args &args)
 {
     // Currently, the following directory layout is assumed:
     // [applicationDirPath]
@@ -197,7 +196,7 @@ std::unique_ptr<crashpad::CrashpadClient> installCrashHandler()
     std::map<std::string, std::string> annotations{
         {
             "canRestart"s,
-            canRestart(*getPaths()) ? "true"s : "false"s,
+            canRestart(*getPaths(), args) ? "true"s : "false"s,
         },
         {
             "exePath"s,
@@ -209,7 +208,7 @@ std::unique_ptr<crashpad::CrashpadClient> installCrashHandler()
         },
         {
             "exeArguments"s,
-            encodeArguments(),
+            encodeArguments(args),
         },
     };
 
diff --git a/src/singletons/CrashHandler.hpp b/src/singletons/CrashHandler.hpp
index 7f47708a0..058e46aed 100644
--- a/src/singletons/CrashHandler.hpp
+++ b/src/singletons/CrashHandler.hpp
@@ -12,6 +12,8 @@
 
 namespace chatterino {
 
+class Args;
+
 class CrashHandler : public Singleton
 {
 public:
@@ -30,7 +32,7 @@ private:
 };
 
 #ifdef CHATTERINO_WITH_CRASHPAD
-std::unique_ptr<crashpad::CrashpadClient> installCrashHandler();
+std::unique_ptr<crashpad::CrashpadClient> installCrashHandler(const Args &args);
 #endif
 
 }  // namespace chatterino
diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp
index d8692efda..d2f8295bb 100644
--- a/src/singletons/WindowManager.cpp
+++ b/src/singletons/WindowManager.cpp
@@ -55,7 +55,7 @@ using SplitDirection = SplitContainer::Direction;
 void WindowManager::showSettingsDialog(QWidget *parent,
                                        SettingsDialogPreference preference)
 {
-    if (getArgs().dontSaveSettings)
+    if (getApp()->getArgs().dontSaveSettings)
     {
         QMessageBox::critical(parent, "Chatterino - Editing Settings Forbidden",
                               "Settings cannot be edited when running with\n"
@@ -356,9 +356,9 @@ void WindowManager::initialize(Settings &settings, Paths &paths)
     {
         WindowLayout windowLayout;
 
-        if (getArgs().customChannelLayout)
+        if (getApp()->getArgs().customChannelLayout)
         {
-            windowLayout = getArgs().customChannelLayout.value();
+            windowLayout = getApp()->getArgs().customChannelLayout.value();
         }
         else
         {
@@ -370,7 +370,7 @@ void WindowManager::initialize(Settings &settings, Paths &paths)
         this->applyWindowLayout(windowLayout);
     }
 
-    if (getArgs().isFramelessEmbed)
+    if (getApp()->getArgs().isFramelessEmbed)
     {
         this->framelessEmbedWindow_.reset(new FramelessEmbedWindow);
         this->framelessEmbedWindow_->show();
@@ -383,7 +383,7 @@ void WindowManager::initialize(Settings &settings, Paths &paths)
         this->mainWindow_->getNotebook().addPage(true);
 
         // TODO: don't create main window if it's a frameless embed
-        if (getArgs().isFramelessEmbed)
+        if (getApp()->getArgs().isFramelessEmbed)
         {
             this->mainWindow_->hide();
         }
@@ -418,7 +418,7 @@ void WindowManager::initialize(Settings &settings, Paths &paths)
 
 void WindowManager::save()
 {
-    if (getArgs().dontSaveSettings)
+    if (getApp()->getArgs().dontSaveSettings)
     {
         return;
     }
@@ -724,7 +724,7 @@ WindowLayout WindowManager::loadWindowLayoutFromFile() const
 
 void WindowManager::applyWindowLayout(const WindowLayout &layout)
 {
-    if (getArgs().dontLoadMainWindow)
+    if (getApp()->getArgs().dontLoadMainWindow)
     {
         return;
     }
diff --git a/src/widgets/FramelessEmbedWindow.cpp b/src/widgets/FramelessEmbedWindow.cpp
index d9e5479d8..c07b869c2 100644
--- a/src/widgets/FramelessEmbedWindow.cpp
+++ b/src/widgets/FramelessEmbedWindow.cpp
@@ -64,13 +64,13 @@ bool FramelessEmbedWindow::nativeEvent(const QByteArray &eventType,
 
 void FramelessEmbedWindow::showEvent(QShowEvent *)
 {
-    if (!getArgs().parentWindowId)
+    if (!getApp()->getArgs().parentWindowId)
     {
         return;
     }
 
     if (auto parentHwnd =
-            reinterpret_cast<HWND>(getArgs().parentWindowId.value()))
+            reinterpret_cast<HWND>(getApp()->getArgs().parentWindowId.value()))
     {
         auto handle = reinterpret_cast<HWND>(this->winId());
         if (!::SetParent(handle, parentHwnd))
diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp
index adb427ac3..b85b50b45 100644
--- a/src/widgets/Notebook.cpp
+++ b/src/widgets/Notebook.cpp
@@ -1347,7 +1347,7 @@ void SplitNotebook::addCustomButtons()
     auto settingsBtn = this->addCustomButton();
 
     // This is to ensure you can't lock yourself out of the settings
-    if (getArgs().safeMode)
+    if (getApp()->getArgs().safeMode)
     {
         settingsBtn->setVisible(true);
     }
diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp
index be9f7f7ff..fa4b6c8a6 100644
--- a/src/widgets/Window.cpp
+++ b/src/widgets/Window.cpp
@@ -737,7 +737,7 @@ void Window::onAccountSelected()
     }
 #endif
 
-    if (getArgs().safeMode)
+    if (getApp()->getArgs().safeMode)
     {
         windowTitle += " (safe mode)";
     }
diff --git a/src/widgets/dialogs/LastRunCrashDialog.cpp b/src/widgets/dialogs/LastRunCrashDialog.cpp
index f038b03f6..6de4daba9 100644
--- a/src/widgets/dialogs/LastRunCrashDialog.cpp
+++ b/src/widgets/dialogs/LastRunCrashDialog.cpp
@@ -43,7 +43,7 @@ namespace chatterino {
 
 using namespace literals;
 
-LastRunCrashDialog::LastRunCrashDialog()
+LastRunCrashDialog::LastRunCrashDialog(const Args &args)
 {
     this->setWindowFlag(Qt::WindowContextHelpButtonHint, false);
     this->setWindowTitle(u"Chatterino - " % randomMessage());
@@ -62,14 +62,14 @@ LastRunCrashDialog::LastRunCrashDialog()
             "<a href=\"file:///" %
             reportsDir % u"\">" % reportsDir % u"</a>.<br>";
 
-    if (getArgs().exceptionCode)
+    if (args.exceptionCode)
     {
         text += u"The last run crashed with code <code>0x" %
-                QString::number(*getArgs().exceptionCode, 16) % u"</code>";
+                QString::number(*args.exceptionCode, 16) % u"</code>";
 
-        if (getArgs().exceptionMessage)
+        if (args.exceptionMessage)
         {
-            text += u" (" % *getArgs().exceptionMessage % u")";
+            text += u" (" % *args.exceptionMessage % u")";
         }
 
         text += u".<br>"_s;
diff --git a/src/widgets/dialogs/LastRunCrashDialog.hpp b/src/widgets/dialogs/LastRunCrashDialog.hpp
index a4aa75ef7..1f31c51f7 100644
--- a/src/widgets/dialogs/LastRunCrashDialog.hpp
+++ b/src/widgets/dialogs/LastRunCrashDialog.hpp
@@ -4,10 +4,12 @@
 
 namespace chatterino {
 
+class Args;
+
 class LastRunCrashDialog : public QDialog
 {
 public:
-    LastRunCrashDialog();
+    explicit LastRunCrashDialog(const Args &args);
 };
 
 }  // namespace chatterino
diff --git a/src/widgets/dialogs/SettingsDialog.cpp b/src/widgets/dialogs/SettingsDialog.cpp
index 9d98913e8..591bfe93a 100644
--- a/src/widgets/dialogs/SettingsDialog.cpp
+++ b/src/widgets/dialogs/SettingsDialog.cpp
@@ -411,7 +411,7 @@ void SettingsDialog::showEvent(QShowEvent *e)
 ///// Widget creation helpers
 void SettingsDialog::onOkClicked()
 {
-    if (!getArgs().dontSaveSettings)
+    if (!getApp()->getArgs().dontSaveSettings)
     {
         getApp()->commands->save();
         pajlada::Settings::SettingManager::gSave();
diff --git a/src/widgets/settingspages/PluginsPage.cpp b/src/widgets/settingspages/PluginsPage.cpp
index d3beaa323..00fe5a791 100644
--- a/src/widgets/settingspages/PluginsPage.cpp
+++ b/src/widgets/settingspages/PluginsPage.cpp
@@ -53,7 +53,7 @@ PluginsPage::PluginsPage()
             this->rebuildContent();
         });
         groupLayout->addRow(box);
-        if (getArgs().safeMode)
+        if (getApp()->getArgs().safeMode)
         {
             box->setEnabled(false);
             auto *disabledLabel = new QLabel(this);
@@ -197,7 +197,7 @@ void PluginsPage::rebuildContent()
                              this->rebuildContent();
                          });
         pluginEntry->addRow(reloadButton);
-        if (getArgs().safeMode)
+        if (getApp()->getArgs().safeMode)
         {
             reloadButton->setEnabled(false);
         }

From 60d79ef57efc01ae04538fc4da5fa7325a746e90 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Fri, 29 Dec 2023 18:12:50 +0100
Subject: [PATCH 38/42] Improve docs/supplemental files for plugins (#5047)

Co-authored-by: Mm2PL <mm2pl+gh@kotmisia.pl>
---
 CHANGELOG.md                 |  2 +-
 docs/chatterino.d.ts         |  4 +--
 docs/plugin-info.schema.json |  3 ++-
 docs/plugin-meta.lua         | 50 ++++++++++++++++++++++++++++++++++++
 docs/wip-plugins.md          | 36 ++++++++++++++++++++++++++
 5 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 docs/plugin-meta.lua

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a65e2cf27..478ae83e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@
 - Minor: Add an option to use new experimental smarter emote completion. (#4987)
 - Minor: Add `--safe-mode` command line option that can be used for troubleshooting when Chatterino is misbehaving or is misconfigured. It disables hiding the settings button & prevents plugins from loading. (#4985)
 - Minor: Updated the flatpakref link included with nightly builds to point to up-to-date flathub-beta builds. (#5008)
-- Minor: Add a new completion API for experimental plugins feature. (#5000)
+- Minor: Add a new completion API for experimental plugins feature. (#5000, #5047)
 - Minor: Re-enabled _Restart on crash_ option on Windows. (#5012)
 - Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840)
 - Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848)
diff --git a/docs/chatterino.d.ts b/docs/chatterino.d.ts
index aece0988d..23cbdc2bb 100644
--- a/docs/chatterino.d.ts
+++ b/docs/chatterino.d.ts
@@ -26,7 +26,7 @@ declare module c2 {
   }
 
   enum EventType {
-    RegisterCompletions = "RegisterCompletions",
+    CompletionRequested = "CompletionRequested",
   }
 
   type CbFuncCompletionsRequested = (
@@ -35,7 +35,7 @@ declare module c2 {
     cursor_position: number,
     is_first_word: boolean
   ) => CompletionList;
-  type CbFunc<T> = T extends EventType.RegisterCompletions
+  type CbFunc<T> = T extends EventType.CompletionRequested
     ? CbFuncCompletionsRequested
     : never;
 
diff --git a/docs/plugin-info.schema.json b/docs/plugin-info.schema.json
index da4750c1a..2b5203ef6 100644
--- a/docs/plugin-info.schema.json
+++ b/docs/plugin-info.schema.json
@@ -43,7 +43,8 @@
       "type": "string",
       "description": "A small description of your license.",
       "examples": ["MIT", "GPL-2.0-or-later"]
-    }
+    },
+    "$schema": { "type": "string" }
   },
   "required": ["name", "description", "authors", "version", "license"]
 }
diff --git a/docs/plugin-meta.lua b/docs/plugin-meta.lua
new file mode 100644
index 000000000..c24647490
--- /dev/null
+++ b/docs/plugin-meta.lua
@@ -0,0 +1,50 @@
+---@meta Chatterino2
+
+-- This file is intended to be used with LuaLS (https://luals.github.io/).
+-- Add the folder this file is in to "Lua.workspace.library".
+
+---@alias LogLevel integer
+
+---@class CommandContext
+---@field words string[] The words typed when executing the command. For example `/foo bar baz` will result in `{"/foo", "bar", "baz"}`.
+---@field channel_name string The name of the channel the command was executed in.
+
+---@class CompletionList
+---@field values string[] The completions
+---@field hide_others boolean Whether other completions from Chatterino should be hidden/ignored.
+
+c2 = {}
+
+---@type { Debug: LogLevel, Info: LogLevel, Warning: LogLevel, Critical: LogLevel }
+c2.LogLevel = {}
+
+--- Writes a message to the Chatterino log.
+---@param level LogLevel The desired level.
+---@param ... any Values to log. Should be convertible to a string with `tostring()`.
+function c2.log(level, ...) end
+
+--- Registers a new command called `name` which when executed will call `handler`.
+---@param name string The name of the command.
+---@param handler fun(ctx: CommandContext) The handler to be invoked when the command gets executed.
+---@return boolean ok  Returns `true` if everything went ok, `false` if a command with this name exists.
+function c2.register_command(name, handler) end
+
+--- Sends a message to `channel` with the specified text. Also executes commands.
+---
+--- **Warning**: It is possible to trigger your own Lua command with this causing a potentially infinite loop.
+---
+---@param channel string The name of the Twitch channel
+---@param text string The text to be sent
+---@return boolean ok
+function c2.send_msg(channel, text) end
+
+--- Creates a system message (gray message) and adds it to the Twitch channel specified by `channel`.
+---@param channel string
+---@param text string
+---@return boolean ok
+function c2.system_msg(channel, text) end
+
+--- Registers a callback to be invoked when completions for a term are requested.
+---@param type "CompletionRequested"
+---@param func fun(query: string, full_text_content: string, cursor_position: integer, is_first_word: boolean): CompletionList The callback to be invoked.
+function c2.register_callback(type, func) end
diff --git a/docs/wip-plugins.md b/docs/wip-plugins.md
index b77bf2b4d..2e3284350 100644
--- a/docs/wip-plugins.md
+++ b/docs/wip-plugins.md
@@ -113,6 +113,42 @@ Limitations/known issues:
   rebuilding the window content caused by reloading another plugin will solve this.
 - Spaces in command names aren't handled very well (https://github.com/Chatterino/chatterino2/issues/1517).
 
+#### `register_callback("CompletionRequested", handler)`
+
+Registers a callback (`handler`) to process completions. The callback gets the following parameters:
+
+- `query`: The queried word.
+- `full_text_content`: The whole input.
+- `cursor_position`: The position of the cursor in the input.
+- `is_first_word`: Flag whether `query` is the first word in the input.
+
+Example:
+
+| Input      | `query` | `full_text_content` | `cursor_position` | `is_first_word` |
+| ---------- | ------- | ------------------- | ----------------- | --------------- |
+| `foo│`     | `foo`   | `foo`               | 3                 | `true`          |
+| `fo│o`     | `fo`    | `foo`               | 2                 | `true`          |
+| `foo bar│` | `bar`   | `foo bar`           | 7                 | `false`         |
+| `foo │bar` | `foo`   | `foo bar`           | 4                 | `false`         |
+
+```lua
+function string.startswith(s, other)
+    return string.sub(s, 1, string.len(other)) == other
+end
+
+c2.register_callback(
+    "CompletionRequested",
+    function(query, full_text_content, cursor_position, is_first_word)
+        if ("!join"):startswith(query) then
+            ---@type CompletionList
+            return { hide_others = true, values = { "!join" } }
+        end
+        ---@type CompletionList
+        return { hide_others = false, values = {} }
+    end
+)
+```
+
 #### `send_msg(channel, text)`
 
 Sends a message to `channel` with the specified text. Also executes commands.

From 9a2c27d25820d3639b5452324d4f7bcbc47a9851 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Fri, 29 Dec 2023 21:52:35 +0100
Subject: [PATCH 39/42] Allow customization of whisper colors in settings
 (#5053)

---
 CHANGELOG.md                                  |  1 +
 src/controllers/highlights/HighlightModel.cpp | 54 +++++++++----------
 .../settingspages/HighlightingPage.cpp        | 22 --------
 3 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 478ae83e5..0447c8348 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Minor: Updated the flatpakref link included with nightly builds to point to up-to-date flathub-beta builds. (#5008)
 - Minor: Add a new completion API for experimental plugins feature. (#5000, #5047)
 - Minor: Re-enabled _Restart on crash_ option on Windows. (#5012)
+- Minor: The whisper highlight color can now be configured through the settings. (#5053)
 - Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840)
 - Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848)
 - Bugfix: Trimmed custom streamlink paths on all platforms making sure you don't accidentally add spaces at the beginning or end of its path. (#4834)
diff --git a/src/controllers/highlights/HighlightModel.cpp b/src/controllers/highlights/HighlightModel.cpp
index d7b76adf3..73c046b37 100644
--- a/src/controllers/highlights/HighlightModel.cpp
+++ b/src/controllers/highlights/HighlightModel.cpp
@@ -98,9 +98,8 @@ void HighlightModel::afterInit()
         QUrl(getSettings()->whisperHighlightSoundUrl.getValue());
     setFilePathItem(whisperRow[Column::SoundPath], whisperSound, false);
 
-    //    auto whisperColor = ColorProvider::instance().color(ColorType::Whisper);
-    //    setColorItem(whisperRow[Column::Color], *whisperColor, false);
-    whisperRow[Column::Color]->setFlags(Qt::ItemFlag::NoItemFlags);
+    auto whisperColor = ColorProvider::instance().color(ColorType::Whisper);
+    setColorItem(whisperRow[Column::Color], *whisperColor, false);
 
     this->insertCustomRow(whisperRow, HighlightRowIndexes::WhisperRow);
 
@@ -463,48 +462,47 @@ void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
             // Custom color
             if (role == Qt::DecorationRole)
             {
-                auto colorName = value.value<QColor>().name(QColor::HexArgb);
+                const auto setColor = [&](auto &setting, ColorType ty) {
+                    auto color = value.value<QColor>();
+                    setting.setValue(color.name(QColor::HexArgb));
+                    const_cast<ColorProvider &>(ColorProvider::instance())
+                        .updateColor(ty, color);
+                };
+
                 if (rowIndex == HighlightRowIndexes::SelfHighlightRow)
                 {
-                    getSettings()->selfHighlightColor.setValue(colorName);
+                    setColor(getSettings()->selfHighlightColor,
+                             ColorType::SelfHighlight);
+                }
+                else if (rowIndex == HighlightRowIndexes::WhisperRow)
+                {
+                    setColor(getSettings()->whisperHighlightColor,
+                             ColorType::Whisper);
                 }
-                //                else if (rowIndex == HighlightRowIndexes::WhisperRow)
-                //                {
-                //                    getSettings()->whisperHighlightColor.setValue(colorName);
-                //                }
                 else if (rowIndex == HighlightRowIndexes::SubRow)
                 {
-                    getSettings()->subHighlightColor.setValue(colorName);
+                    setColor(getSettings()->subHighlightColor,
+                             ColorType::Subscription);
                 }
                 else if (rowIndex == HighlightRowIndexes::RedeemedRow)
                 {
-                    getSettings()->redeemedHighlightColor.setValue(colorName);
-                    const_cast<ColorProvider &>(ColorProvider::instance())
-                        .updateColor(ColorType::RedeemedHighlight,
-                                     QColor(colorName));
+                    setColor(getSettings()->redeemedHighlightColor,
+                             ColorType::RedeemedHighlight);
                 }
                 else if (rowIndex == HighlightRowIndexes::FirstMessageRow)
                 {
-                    getSettings()->firstMessageHighlightColor.setValue(
-                        colorName);
-                    const_cast<ColorProvider &>(ColorProvider::instance())
-                        .updateColor(ColorType::FirstMessageHighlight,
-                                     QColor(colorName));
+                    setColor(getSettings()->firstMessageHighlightColor,
+                             ColorType::FirstMessageHighlight);
                 }
                 else if (rowIndex == HighlightRowIndexes::ElevatedMessageRow)
                 {
-                    getSettings()->elevatedMessageHighlightColor.setValue(
-                        colorName);
-                    const_cast<ColorProvider &>(ColorProvider::instance())
-                        .updateColor(ColorType::ElevatedMessageHighlight,
-                                     QColor(colorName));
+                    setColor(getSettings()->elevatedMessageHighlightColor,
+                             ColorType::ElevatedMessageHighlight);
                 }
                 else if (rowIndex == HighlightRowIndexes::ThreadMessageRow)
                 {
-                    getSettings()->threadHighlightColor.setValue(colorName);
-                    const_cast<ColorProvider &>(ColorProvider::instance())
-                        .updateColor(ColorType::ThreadMessageHighlight,
-                                     QColor(colorName));
+                    setColor(getSettings()->threadHighlightColor,
+                             ColorType::ThreadMessageHighlight);
                 }
             }
         }
diff --git a/src/widgets/settingspages/HighlightingPage.cpp b/src/widgets/settingspages/HighlightingPage.cpp
index fbad47561..61f87b587 100644
--- a/src/widgets/settingspages/HighlightingPage.cpp
+++ b/src/widgets/settingspages/HighlightingPage.cpp
@@ -340,28 +340,6 @@ void HighlightingPage::openColorDialog(const QModelIndex &clicked,
         if (selected.isValid())
         {
             view->getModel()->setData(clicked, selected, Qt::DecorationRole);
-
-            if (tab == HighlightTab::Messages)
-            {
-                /*
-                 * For preset highlights in the "Messages" tab, we need to
-                 * manually update the color map.
-                 */
-                auto instance = ColorProvider::instance();
-                switch (clicked.row())
-                {
-                    case 0:
-                        instance.updateColor(ColorType::SelfHighlight,
-                                             selected);
-                        break;
-                    case 1:
-                        instance.updateColor(ColorType::Whisper, selected);
-                        break;
-                    case 2:
-                        instance.updateColor(ColorType::Subscription, selected);
-                        break;
-                }
-            }
         }
     });
 }

From 69a54d944d972a6f110ec12717aa62f62bd58ad0 Mon Sep 17 00:00:00 2001
From: Mm2PL <mm2pl+gh@kotmisia.pl>
Date: Sat, 30 Dec 2023 10:26:19 +0000
Subject: [PATCH 40/42] Autogenerate docs/plugin-meta.lua (#5055)

---
 CHANGELOG.md                       |   1 +
 docs/plugin-meta.lua               |  38 +++++---
 scripts/make_luals_meta.py         | 142 +++++++++++++++++++++++++++++
 src/controllers/plugins/LuaAPI.hpp | 103 ++++++++++++++++-----
 4 files changed, 247 insertions(+), 37 deletions(-)
 create mode 100644 scripts/make_luals_meta.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0447c8348..d1c04e5e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,6 +103,7 @@
 - Dev: Added the ability to show `ChannelView`s without a `Split`. (#4747)
 - Dev: Refactor Args to be less of a singleton. (#5041)
 - Dev: Channels without any animated elements on screen will skip updates from the GIF timer. (#5042, #5043, #5045)
+- Dev: Autogenerate docs/plugin-meta.lua. (#5055)
 
 ## 2.4.6
 
diff --git a/docs/plugin-meta.lua b/docs/plugin-meta.lua
index c24647490..78bdf759b 100644
--- a/docs/plugin-meta.lua
+++ b/docs/plugin-meta.lua
@@ -1,10 +1,18 @@
 ---@meta Chatterino2
 
+-- This file is automatically generated from src/controllers/plugins/LuaAPI.hpp by the scripts/make_luals_meta.py script
 -- This file is intended to be used with LuaLS (https://luals.github.io/).
 -- Add the folder this file is in to "Lua.workspace.library".
 
----@alias LogLevel integer
+c2 = {}
 
+---@alias LogLevel integer
+---@type { Debug: LogLevel, Info: LogLevel, Warning: LogLevel, Critical: LogLevel }
+c2.LogLevel = {}
+
+---@alias EventType integer
+---@type { CompletionRequested: EventType }
+c2.EventType = {}
 ---@class CommandContext
 ---@field words string[] The words typed when executing the command. For example `/foo bar baz` will result in `{"/foo", "bar", "baz"}`.
 ---@field channel_name string The name of the channel the command was executed in.
@@ -13,22 +21,19 @@
 ---@field values string[] The completions
 ---@field hide_others boolean Whether other completions from Chatterino should be hidden/ignored.
 
-c2 = {}
-
----@type { Debug: LogLevel, Info: LogLevel, Warning: LogLevel, Critical: LogLevel }
-c2.LogLevel = {}
-
---- Writes a message to the Chatterino log.
----@param level LogLevel The desired level.
----@param ... any Values to log. Should be convertible to a string with `tostring()`.
-function c2.log(level, ...) end
-
 --- Registers a new command called `name` which when executed will call `handler`.
+---
 ---@param name string The name of the command.
 ---@param handler fun(ctx: CommandContext) The handler to be invoked when the command gets executed.
 ---@return boolean ok  Returns `true` if everything went ok, `false` if a command with this name exists.
 function c2.register_command(name, handler) end
 
+--- Registers a callback to be invoked when completions for a term are requested.
+---
+---@param type "CompletionRequested"
+---@param func fun(query: string, full_text_content: string, cursor_position: integer, is_first_word: boolean): CompletionList The callback to be invoked.
+function c2.register_callback(type, func) end
+
 --- Sends a message to `channel` with the specified text. Also executes commands.
 ---
 --- **Warning**: It is possible to trigger your own Lua command with this causing a potentially infinite loop.
@@ -39,12 +44,15 @@ function c2.register_command(name, handler) end
 function c2.send_msg(channel, text) end
 
 --- Creates a system message (gray message) and adds it to the Twitch channel specified by `channel`.
+---
 ---@param channel string
 ---@param text string
 ---@return boolean ok
 function c2.system_msg(channel, text) end
 
---- Registers a callback to be invoked when completions for a term are requested.
----@param type "CompletionRequested"
----@param func fun(query: string, full_text_content: string, cursor_position: integer, is_first_word: boolean): CompletionList The callback to be invoked.
-function c2.register_callback(type, func) end
+--- Writes a message to the Chatterino log.
+---
+---@param level LogLevel The desired level.
+---@param ... any Values to log. Should be convertible to a string with `tostring()`.
+function c2.log(level, ...) end
+
diff --git a/scripts/make_luals_meta.py b/scripts/make_luals_meta.py
new file mode 100644
index 000000000..6afa3c5e3
--- /dev/null
+++ b/scripts/make_luals_meta.py
@@ -0,0 +1,142 @@
+"""
+This script generates docs/plugin-meta.lua. It accepts no arguments
+
+It assumes comments look like:
+/**
+ * Thing
+ *
+ * @lua@param thing boolean
+ * @lua@returns boolean
+ * @exposed name
+ */
+- Do not have any useful info on '/**' and '*/' lines.
+- Class members are not allowed to have non-@command lines and commands different from @lua@field
+
+Valid commands are:
+1. @exposeenum [dotted.name.in_lua.last_part]
+    Define a table with keys of the enum. Values behind those keys aren't
+    written on purpose.
+    This generates three lines:
+     - An type alias of [last_part] to integer,
+     - A type description that describes available values of the enum,
+     - A global table definition for the num
+2. @lua[@command]
+    Writes [@command] to the file as a comment, usually this is @class, @param, @return, ...
+    @lua@class and @lua@field have special treatment when it comes to generation of spacing new lines
+3. @exposed [c2.name]
+    Generates a function definition line from the last `@lua@param`s.
+
+Non-command lines of comments are written with a space after '---'
+"""
+from pathlib import Path
+
+BOILERPLATE = """
+---@meta Chatterino2
+
+-- This file is automatically generated from src/controllers/plugins/LuaAPI.hpp by the scripts/make_luals_meta.py script
+-- This file is intended to be used with LuaLS (https://luals.github.io/).
+-- Add the folder this file is in to "Lua.workspace.library".
+
+c2 = {}
+"""
+
+repo_root = Path(__file__).parent.parent
+lua_api_file = repo_root / "src" / "controllers" / "plugins" / "LuaAPI.hpp"
+lua_meta = repo_root / "docs" / "plugin-meta.lua"
+
+print("Reading from", lua_api_file.relative_to(repo_root))
+print("Writing to", lua_meta.relative_to(repo_root))
+with lua_api_file.open("r") as f:
+    lines = f.read().splitlines()
+
+# Are we in a doc comment?
+comment: bool = False
+
+# Last `@lua@param`s seen - for @exposed generation
+last_params_names: list[str] = []
+# Are we in a `@lua@class` definition? - makes newlines around @lua@class and @lua@field prettier
+is_class = False
+
+# The name of the next enum in lua world
+expose_next_enum_as: str | None = None
+# Name of the current enum in c++ world, used to generate internal typenames for
+current_enum_name: str | None = None
+
+with lua_meta.open("w") as out:
+    out.write(BOILERPLATE[1:])  # skip the newline after triple quote
+
+    for line in lines:
+        line = line.strip()
+        if line.startswith("enum class "):
+            line = line.removeprefix("enum class ")
+            temp = line.split(" ", 2)
+            current_enum_name = temp[0]
+            if not expose_next_enum_as:
+                print(
+                    f"Skipping enum {current_enum_name}, there wasn't a @exposeenum command"
+                )
+                current_enum_name = None
+                continue
+            current_enum_name = expose_next_enum_as.split(".", 1)[-1]
+            out.write("---@alias " + current_enum_name + " integer\n")
+            out.write("---@type { ")
+            # temp[1] is '{'
+            if len(temp) == 2:  # no values on this line
+                continue
+            line = temp[2]
+
+        if current_enum_name is not None:
+            for i, tok in enumerate(line.split(" ")):
+                if tok == "};":
+                    break
+                entry = tok.removesuffix(",")
+                if i != 0:
+                    out.write(", ")
+                out.write(entry + ": " + current_enum_name)
+            out.write(" }\n" f"{expose_next_enum_as} = {{}}\n")
+            print(f"Wrote enum {expose_next_enum_as} => {current_enum_name}")
+            current_enum_name = None
+            expose_next_enum_as = None
+            continue
+
+        if line.startswith("/**"):
+            comment = True
+            continue
+        elif "*/" in line:
+            comment = False
+            if not is_class:
+                out.write("\n")
+            continue
+        if not comment:
+            continue
+        line = line.replace("*", "", 1).lstrip()
+        if line == "":
+            out.write("---\n")
+        elif line.startswith("@exposeenum "):
+            expose_next_enum_as = line.split(" ", 1)[1]
+        elif line.startswith("@exposed "):
+            exp = line.replace("@exposed ", "", 1)
+            params = ", ".join(last_params_names)
+            out.write(f"function {exp}({params}) end\n")
+            print(f"Wrote function {exp}(...)")
+            last_params_names = []
+        elif line.startswith("@lua"):
+            command = line.replace("@lua", "", 1)
+            if command.startswith("@param"):
+                last_params_names.append(command.split(" ", 2)[1])
+            elif command.startswith("@class"):
+                print(f"Writing {command}")
+                if is_class:
+                    out.write("\n")
+                is_class = True
+            elif not command.startswith("@field"):
+                is_class = False
+
+            out.write("---" + command + "\n")
+        else:
+            if is_class:
+                is_class = False
+                out.write("\n")
+
+            # note the space difference from the branch above
+            out.write("--- " + line + "\n")
diff --git a/src/controllers/plugins/LuaAPI.hpp b/src/controllers/plugins/LuaAPI.hpp
index 155afc707..95a998f79 100644
--- a/src/controllers/plugins/LuaAPI.hpp
+++ b/src/controllers/plugins/LuaAPI.hpp
@@ -11,10 +11,91 @@ namespace chatterino::lua::api {
 
 // NOLINTBEGIN(readability-identifier-naming)
 // Following functions are exposed in c2 table.
+
+// Comments in this file are special, the docs/plugin-meta.lua file is generated from them
+// All multiline comments will be added into that file. See scripts/make_luals_meta.py script for more info.
+
+/**
+ * @exposeenum c2.LogLevel
+ */
+// Represents "calls" to qCDebug, qCInfo ...
+enum class LogLevel { Debug, Info, Warning, Critical };
+
+/**
+ * @exposeenum c2.EventType
+ */
+enum class EventType {
+    CompletionRequested,
+};
+
+/**
+ * @lua@class CommandContext
+ * @lua@field words string[] The words typed when executing the command. For example `/foo bar baz` will result in `{"/foo", "bar", "baz"}`.
+ * @lua@field channel_name string The name of the channel the command was executed in.
+ */
+
+/**
+ * @lua@class CompletionList
+ */
+struct CompletionList {
+    /**
+     * @lua@field values string[] The completions
+     */
+    std::vector<QString> values{};
+
+    /**
+     * @lua@field hide_others boolean Whether other completions from Chatterino should be hidden/ignored.
+     */
+    bool hideOthers{};
+};
+
+/**
+ * Registers a new command called `name` which when executed will call `handler`.
+ *
+ * @lua@param name string The name of the command.
+ * @lua@param handler fun(ctx: CommandContext) The handler to be invoked when the command gets executed.
+ * @lua@return boolean ok  Returns `true` if everything went ok, `false` if a command with this name exists.
+ * @exposed c2.register_command
+ */
 int c2_register_command(lua_State *L);
+
+/**
+ * Registers a callback to be invoked when completions for a term are requested.
+ *
+ * @lua@param type "CompletionRequested"
+ * @lua@param func fun(query: string, full_text_content: string, cursor_position: integer, is_first_word: boolean): CompletionList The callback to be invoked.
+ * @exposed c2.register_callback
+ */
 int c2_register_callback(lua_State *L);
+
+/**
+ * Sends a message to `channel` with the specified text. Also executes commands.
+ *
+ * **Warning**: It is possible to trigger your own Lua command with this causing a potentially infinite loop.
+ *
+ * @lua@param channel string The name of the Twitch channel
+ * @lua@param text string The text to be sent
+ * @lua@return boolean ok
+ * @exposed c2.send_msg
+ */
 int c2_send_msg(lua_State *L);
+/**
+ * Creates a system message (gray message) and adds it to the Twitch channel specified by `channel`.
+ *
+ * @lua@param channel string
+ * @lua@param text string
+ * @lua@return boolean ok
+ * @exposed c2.system_msg
+ */
 int c2_system_msg(lua_State *L);
+
+/**
+ * Writes a message to the Chatterino log.
+ *
+ * @lua@param level LogLevel The desired level.
+ * @lua@param ... any Values to log. Should be convertible to a string with `tostring()`.
+ * @exposed c2.log
+ */
 int c2_log(lua_State *L);
 
 // These ones are global
@@ -26,28 +107,6 @@ int g_print(lua_State *L);
 int searcherAbsolute(lua_State *L);
 int searcherRelative(lua_State *L);
 
-// Exposed as c2.LogLevel
-// Represents "calls" to qCDebug, qCInfo ...
-enum class LogLevel { Debug, Info, Warning, Critical };
-
-// Exposed as c2.EventType
-// Represents callbacks c2 can do into lua world
-enum class EventType {
-    CompletionRequested,
-};
-
-/**
- * This is for custom completion, a registered function returns this type
- * however in Lua array part (value) and object part (hideOthers) are in the same
- * table.
- */
-struct CompletionList {
-    std::vector<QString> values{};
-
-    // exposed as hide_others
-    bool hideOthers{};
-};
-
 }  // namespace chatterino::lua::api
 
 #endif

From 036a5f3f215f3b1bc16ddbc3668b392e84c160ef Mon Sep 17 00:00:00 2001
From: iProdigy <8106344+iProdigy@users.noreply.github.com>
Date: Sun, 31 Dec 2023 04:44:55 -0600
Subject: [PATCH 41/42] feat: show restricted chats and suspicious treatment
 updates (#5056)

Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
---
 CHANGELOG.md                                  |   2 +
 src/Application.cpp                           |  83 ++++++
 src/CMakeLists.txt                            |   2 +
 src/common/Channel.cpp                        |   1 -
 src/messages/Message.hpp                      |   1 +
 src/messages/layouts/MessageLayout.cpp        |   3 +-
 src/providers/twitch/PubSubManager.cpp        |  76 ++++++
 src/providers/twitch/PubSubManager.hpp        |  51 +++-
 src/providers/twitch/TwitchChannel.cpp        |   6 +-
 src/providers/twitch/TwitchIrcServer.cpp      |   7 +-
 src/providers/twitch/TwitchIrcServer.hpp      |   1 +
 src/providers/twitch/TwitchMessageBuilder.cpp | 182 +++++++++++++
 src/providers/twitch/TwitchMessageBuilder.hpp |   6 +
 .../twitch/pubsubmessages/LowTrustUsers.cpp   | 104 +++++++
 .../twitch/pubsubmessages/LowTrustUsers.hpp   | 255 ++++++++++++++++++
 15 files changed, 769 insertions(+), 11 deletions(-)
 create mode 100644 src/providers/twitch/pubsubmessages/LowTrustUsers.cpp
 create mode 100644 src/providers/twitch/pubsubmessages/LowTrustUsers.hpp

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1c04e5e7..aedf2db88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Major: Allow use of Twitch follower emotes in other channels if subscribed. (#4922)
 - Major: Add `/automod` split to track automod caught messages across all open channels the user moderates. (#4986, #5026)
+- Major: Show restricted chat messages and suspicious treatment updates. (#5056)
 - Minor: Migrate to the new Get Channel Followers Helix endpoint, fixing follower count not showing up in usercards. (#4809)
 - Minor: The account switcher is now styled to match your theme. (#4817)
 - Minor: Add an invisible resize handle to the bottom of frameless user info popups and reply thread popups. (#4795)
@@ -59,6 +60,7 @@
 - Bugfix: Fixes to section deletion in text input fields. (#5013)
 - Bugfix: Show user text input within watch streak notices. (#5029)
 - Bugfix: Fixed avatar in usercard and moderation button triggering when releasing the mouse outside their area. (#5052)
+- Bugfix: Fixed moderator-only topics being subscribed to for non-moderators. (#5056)
 - Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978)
 - Dev: Change clang-format from v14 to v16. (#4929)
 - Dev: Fixed UTF16 encoding of `modes` file for the installer. (#4791)
diff --git a/src/Application.cpp b/src/Application.cpp
index cfb28f13d..5d6e4c63d 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -35,6 +35,7 @@
 #include "providers/twitch/PubSubActions.hpp"
 #include "providers/twitch/PubSubManager.hpp"
 #include "providers/twitch/PubSubMessages.hpp"
+#include "providers/twitch/pubsubmessages/LowTrustUsers.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
@@ -473,6 +474,87 @@ void Application::initPubSub()
                 });
             });
 
+    std::ignore =
+        this->twitch->pubsub->signals_.moderation.suspiciousMessageReceived
+            .connect([&](const auto &action) {
+                if (action.treatment ==
+                    PubSubLowTrustUsersMessage::Treatment::INVALID)
+                {
+                    qCWarning(chatterinoTwitch)
+                        << "Received suspicious message with unknown "
+                           "treatment:"
+                        << action.treatmentString;
+                    return;
+                }
+
+                // monitored chats are received over irc; in the future, we will use pubsub instead
+                if (action.treatment !=
+                    PubSubLowTrustUsersMessage::Treatment::Restricted)
+                {
+                    return;
+                }
+
+                if (getSettings()->streamerModeHideModActions &&
+                    isInStreamerMode())
+                {
+                    return;
+                }
+
+                auto chan =
+                    this->twitch->getChannelOrEmptyByID(action.channelID);
+
+                if (chan->isEmpty())
+                {
+                    return;
+                }
+
+                postToThread([chan, action] {
+                    const auto p =
+                        TwitchMessageBuilder::makeLowTrustUserMessage(
+                            action, chan->getName());
+                    chan->addMessage(p.first);
+                    chan->addMessage(p.second);
+                });
+            });
+
+    std::ignore =
+        this->twitch->pubsub->signals_.moderation.suspiciousTreatmentUpdated
+            .connect([&](const auto &action) {
+                if (action.treatment ==
+                    PubSubLowTrustUsersMessage::Treatment::INVALID)
+                {
+                    qCWarning(chatterinoTwitch)
+                        << "Received suspicious user update with unknown "
+                           "treatment:"
+                        << action.treatmentString;
+                    return;
+                }
+
+                if (action.updatedByUserLogin.isEmpty())
+                {
+                    return;
+                }
+
+                if (getSettings()->streamerModeHideModActions &&
+                    isInStreamerMode())
+                {
+                    return;
+                }
+
+                auto chan =
+                    this->twitch->getChannelOrEmptyByID(action.channelID);
+                if (chan->isEmpty())
+                {
+                    return;
+                }
+
+                postToThread([chan, action] {
+                    auto msg =
+                        TwitchMessageBuilder::makeLowTrustUpdateMessage(action);
+                    chan->addMessage(msg);
+                });
+            });
+
     std::ignore =
         this->twitch->pubsub->signals_.moderation.autoModMessageCaught.connect(
             [&](const auto &msg, const QString &channelID) {
@@ -672,6 +754,7 @@ void Application::initPubSub()
         [this] {
             this->twitch->pubsub->unlistenAllModerationActions();
             this->twitch->pubsub->unlistenAutomod();
+            this->twitch->pubsub->unlistenLowTrustUsers();
             this->twitch->pubsub->unlistenWhispers();
         },
         boost::signals2::at_front);
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f16ea09cf..74a936ec1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -412,6 +412,8 @@ set(SOURCE_FILES
         providers/twitch/pubsubmessages/ChatModeratorAction.hpp
         providers/twitch/pubsubmessages/Listen.cpp
         providers/twitch/pubsubmessages/Listen.hpp
+        providers/twitch/pubsubmessages/LowTrustUsers.cpp
+        providers/twitch/pubsubmessages/LowTrustUsers.hpp
         providers/twitch/pubsubmessages/Message.hpp
         providers/twitch/pubsubmessages/Unlisten.cpp
         providers/twitch/pubsubmessages/Unlisten.hpp
diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index 47ae99c1c..cd275c14a 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -315,7 +315,6 @@ bool Channel::isBroadcaster() const
 
 bool Channel::hasModRights() const
 {
-    // fourtf: check if staff
     return this->isMod() || this->isBroadcaster();
 }
 
diff --git a/src/messages/Message.hpp b/src/messages/Message.hpp
index 88d0d0934..30c1308a4 100644
--- a/src/messages/Message.hpp
+++ b/src/messages/Message.hpp
@@ -52,6 +52,7 @@ enum class MessageFlag : int64_t {
     LiveUpdatesUpdate = (1LL << 30),
     /// The message caught by AutoMod containing the user who sent the message & its contents
     AutoModOffendingMessage = (1LL << 31),
+    LowTrustUsers = (1LL << 32),
 };
 using MessageFlags = FlagsEnum<MessageFlag>;
 
diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp
index 0e8228485..c2e8d1886 100644
--- a/src/messages/layouts/MessageLayout.cpp
+++ b/src/messages/layouts/MessageLayout.cpp
@@ -367,7 +367,8 @@ void MessageLayout::updateBuffer(QPixmap *buffer,
             blendColors(backgroundColor,
                         *ctx.colorProvider.color(ColorType::RedeemedHighlight));
     }
-    else if (this->message_->flags.has(MessageFlag::AutoMod))
+    else if (this->message_->flags.has(MessageFlag::AutoMod) ||
+             this->message_->flags.has(MessageFlag::LowTrustUsers))
     {
         backgroundColor = QColor("#404040");
     }
diff --git a/src/providers/twitch/PubSubManager.cpp b/src/providers/twitch/PubSubManager.cpp
index 80727ea4b..1dbe41392 100644
--- a/src/providers/twitch/PubSubManager.cpp
+++ b/src/providers/twitch/PubSubManager.cpp
@@ -7,6 +7,7 @@
 #include "providers/twitch/PubSubHelpers.hpp"
 #include "providers/twitch/PubSubMessages.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
+#include "pubsubmessages/LowTrustUsers.hpp"
 #include "util/DebugCount.hpp"
 #include "util/Helpers.hpp"
 #include "util/RapidjsonHelpers.hpp"
@@ -585,6 +586,25 @@ void PubSub::unlistenAutomod()
     }
 }
 
+void PubSub::unlistenLowTrustUsers()
+{
+    for (const auto &p : this->clients)
+    {
+        const auto &client = p.second;
+        if (const auto &[topics, nonce] =
+                client->unlistenPrefix("low-trust-users.");
+            !topics.empty())
+        {
+            this->registerNonce(nonce, {
+                                           client,
+                                           "UNLISTEN",
+                                           topics,
+                                           topics.size(),
+                                       });
+        }
+    }
+}
+
 void PubSub::unlistenWhispers()
 {
     for (const auto &p : this->clients)
@@ -670,6 +690,30 @@ void PubSub::listenToAutomod(const QString &channelID)
     this->listenToTopic(topic);
 }
 
+void PubSub::listenToLowTrustUsers(const QString &channelID)
+{
+    if (this->userID_.isEmpty())
+    {
+        qCDebug(chatterinoPubSub)
+            << "Unable to listen to low trust users topic, no user logged in";
+        return;
+    }
+
+    static const QString topicFormat("low-trust-users.%1.%2");
+    assert(!channelID.isEmpty());
+
+    auto topic = topicFormat.arg(this->userID_, channelID);
+
+    if (this->isListeningToTopic(topic))
+    {
+        return;
+    }
+
+    qCDebug(chatterinoPubSub) << "Listen to topic" << topic;
+
+    this->listenToTopic(topic);
+}
+
 void PubSub::listenToChannelPointRewards(const QString &channelID)
 {
     static const QString topicFormat("community-points-channel-v1.%1");
@@ -1169,6 +1213,38 @@ void PubSub::handleMessageResponse(const PubSubMessageMessage &message)
         this->signals_.moderation.autoModMessageCaught.invoke(innerMessage,
                                                               channelID);
     }
+    else if (topic.startsWith("low-trust-users."))
+    {
+        auto oInnerMessage = message.toInner<PubSubLowTrustUsersMessage>();
+        if (!oInnerMessage)
+        {
+            return;
+        }
+
+        auto innerMessage = *oInnerMessage;
+
+        switch (innerMessage.type)
+        {
+            case PubSubLowTrustUsersMessage::Type::UserMessage: {
+                this->signals_.moderation.suspiciousMessageReceived.invoke(
+                    innerMessage);
+            }
+            break;
+
+            case PubSubLowTrustUsersMessage::Type::TreatmentUpdate: {
+                this->signals_.moderation.suspiciousTreatmentUpdated.invoke(
+                    innerMessage);
+            }
+            break;
+
+            case PubSubLowTrustUsersMessage::Type::INVALID: {
+                qCWarning(chatterinoPubSub)
+                    << "Invalid low trust users event type:"
+                    << innerMessage.typeString;
+            }
+            break;
+        }
+    }
     else
     {
         qCDebug(chatterinoPubSub) << "Unknown topic:" << topic;
diff --git a/src/providers/twitch/PubSubManager.hpp b/src/providers/twitch/PubSubManager.hpp
index f300bb5d3..f0701101f 100644
--- a/src/providers/twitch/PubSubManager.hpp
+++ b/src/providers/twitch/PubSubManager.hpp
@@ -34,6 +34,7 @@ struct PubSubAutoModQueueMessage;
 struct AutomodAction;
 struct AutomodUserAction;
 struct AutomodInfoAction;
+struct PubSubLowTrustUsersMessage;
 struct PubSubWhisperMessage;
 
 struct PubSubListenMessage;
@@ -67,9 +68,6 @@ class PubSub
     QString userID_;
 
 public:
-    // The max amount of connections we may open
-    static constexpr int maxConnections = 10;
-
     PubSub(const QString &host,
            std::chrono::seconds pingInterval = std::chrono::seconds(15));
 
@@ -100,6 +98,9 @@ public:
             Signal<BanAction> userBanned;
             Signal<UnbanAction> userUnbanned;
 
+            Signal<PubSubLowTrustUsersMessage> suspiciousMessageReceived;
+            Signal<PubSubLowTrustUsersMessage> suspiciousTreatmentUpdated;
+
             // Message caught by automod
             //                                channelID
             pajlada::Signals::Signal<PubSubAutoModQueueMessage, QString>
@@ -126,12 +127,56 @@ public:
 
     void unlistenAllModerationActions();
     void unlistenAutomod();
+    void unlistenLowTrustUsers();
     void unlistenWhispers();
 
+    /**
+     * Listen to incoming whispers for the currently logged in user.
+     * This topic is relevant for everyone.
+     *
+     * PubSub topic: whispers.{currentUserID}
+     */
     bool listenToWhispers();
+
+    /**
+     * Listen to moderation actions in the given channel.
+     * This topic is relevant for everyone.
+     * For moderators, this topic includes blocked/permitted terms updates,
+     * roomstate changes, general mod/vip updates, all bans/timeouts/deletions.
+     * For normal users, this topic includes moderation actions that are targetted at the local user:
+     * automod catching a user's sent message, a moderator approving or denying their caught messages,
+     * the user gaining/losing mod/vip, the user receiving a ban/timeout/deletion.
+     *
+     * PubSub topic: chat_moderator_actions.{currentUserID}.{channelID}
+     */
     void listenToChannelModerationActions(const QString &channelID);
+
+    /**
+     * Listen to Automod events in the given channel.
+     * This topic is only relevant for moderators.
+     * This will send events about incoming messages that
+     * are caught by Automod.
+     *
+     * PubSub topic: automod-queue.{currentUserID}.{channelID}
+     */
     void listenToAutomod(const QString &channelID);
 
+    /**
+     * Listen to Low Trust events in the given channel.
+     * This topic is only relevant for moderators.
+     * This will fire events about suspicious treatment updates
+     * and messages sent by restricted/monitored users.
+     *
+     * PubSub topic: low-trust-users.{currentUserID}.{channelID}
+     */
+    void listenToLowTrustUsers(const QString &channelID);
+
+    /**
+     * Listen to incoming channel point redemptions in the given channel.
+     * This topic is relevant for everyone.
+     *
+     * PubSub topic: community-points-channel-v1.{channelID}
+     */
     void listenToChannelPointRewards(const QString &channelID);
 
     std::vector<QString> requests;
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index ba25e6f79..8ee4ebbaf 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -1253,7 +1253,11 @@ void TwitchChannel::refreshPubSub()
     getApp()->twitch->pubsub->setAccount(currentAccount);
 
     getApp()->twitch->pubsub->listenToChannelModerationActions(roomId);
-    getApp()->twitch->pubsub->listenToAutomod(roomId);
+    if (this->hasModRights())
+    {
+        getApp()->twitch->pubsub->listenToAutomod(roomId);
+        getApp()->twitch->pubsub->listenToLowTrustUsers(roomId);
+    }
     getApp()->twitch->pubsub->listenToChannelPointRewards(roomId);
 }
 
diff --git a/src/providers/twitch/TwitchIrcServer.cpp b/src/providers/twitch/TwitchIrcServer.cpp
index 84be99831..9602ce976 100644
--- a/src/providers/twitch/TwitchIrcServer.cpp
+++ b/src/providers/twitch/TwitchIrcServer.cpp
@@ -25,13 +25,11 @@
 
 #include <cassert>
 
-// using namespace Communi;
 using namespace std::chrono_literals;
 
-#define TWITCH_PUBSUB_URL "wss://pubsub-edge.twitch.tv"
-
 namespace {
 
+const QString TWITCH_PUBSUB_URL = "wss://pubsub-edge.twitch.tv";
 const QString BTTV_LIVE_UPDATES_URL = "wss://sockets.betterttv.net/ws";
 const QString SEVENTV_EVENTAPI_URL = "wss://events.7tv.io/v3";
 
@@ -45,11 +43,10 @@ TwitchIrcServer::TwitchIrcServer()
     , liveChannel(new Channel("/live", Channel::Type::TwitchLive))
     , automodChannel(new Channel("/automod", Channel::Type::TwitchAutomod))
     , watchingChannel(Channel::getEmpty(), Channel::Type::TwitchWatching)
+    , pubsub(new PubSub(TWITCH_PUBSUB_URL))
 {
     this->initializeIrc();
 
-    this->pubsub = new PubSub(TWITCH_PUBSUB_URL);
-
     if (getSettings()->enableBTTVLiveUpdates &&
         getSettings()->enableBTTVChannelEmotes)
     {
diff --git a/src/providers/twitch/TwitchIrcServer.hpp b/src/providers/twitch/TwitchIrcServer.hpp
index 61fe8ddb3..f7f047de7 100644
--- a/src/providers/twitch/TwitchIrcServer.hpp
+++ b/src/providers/twitch/TwitchIrcServer.hpp
@@ -80,6 +80,7 @@ public:
     const ChannelPtr automodChannel;
     IndirectChannel watchingChannel;
 
+    // NOTE: We currently leak this
     PubSub *pubsub;
     std::unique_ptr<BttvLiveUpdates> bttvLiveUpdates;
     std::unique_ptr<SeventvEventAPI> seventvEventAPI;
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index e5f003a05..0035f52c3 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -1933,6 +1933,188 @@ std::pair<MessagePtr, MessagePtr> TwitchMessageBuilder::makeAutomodMessage(
     return std::make_pair(message1, message2);
 }
 
+MessagePtr TwitchMessageBuilder::makeLowTrustUpdateMessage(
+    const PubSubLowTrustUsersMessage &action)
+{
+    MessageBuilder builder;
+    builder.emplace<TimestampElement>();
+    builder.message().flags.set(MessageFlag::System);
+    builder.message().flags.set(MessageFlag::PubSub);
+    builder.message().flags.set(MessageFlag::DoNotTriggerNotification);
+
+    builder
+        .emplace<TextElement>(action.updatedByUserDisplayName,
+                              MessageElementFlag::Username,
+                              MessageColor::System, FontStyle::ChatMediumBold)
+        ->setLink({Link::UserInfo, action.updatedByUserLogin});
+
+    assert(action.treatment != PubSubLowTrustUsersMessage::Treatment::INVALID);
+    switch (action.treatment)
+    {
+        case PubSubLowTrustUsersMessage::Treatment::NoTreatment: {
+            builder.emplace<TextElement>("removed", MessageElementFlag::Text,
+                                         MessageColor::System);
+            builder
+                .emplace<TextElement>(action.suspiciousUserDisplayName,
+                                      MessageElementFlag::Username,
+                                      MessageColor::System,
+                                      FontStyle::ChatMediumBold)
+                ->setLink({Link::UserInfo, action.suspiciousUserLogin});
+            builder.emplace<TextElement>("from the suspicious user list.",
+                                         MessageElementFlag::Text,
+                                         MessageColor::System);
+        }
+        break;
+
+        case PubSubLowTrustUsersMessage::Treatment::ActiveMonitoring: {
+            builder.emplace<TextElement>("added", MessageElementFlag::Text,
+                                         MessageColor::System);
+            builder
+                .emplace<TextElement>(action.suspiciousUserDisplayName,
+                                      MessageElementFlag::Username,
+                                      MessageColor::System,
+                                      FontStyle::ChatMediumBold)
+                ->setLink({Link::UserInfo, action.suspiciousUserLogin});
+            builder.emplace<TextElement>("as a monitored suspicious chatter.",
+                                         MessageElementFlag::Text,
+                                         MessageColor::System);
+        }
+        break;
+
+        case PubSubLowTrustUsersMessage::Treatment::Restricted: {
+            builder.emplace<TextElement>("added", MessageElementFlag::Text,
+                                         MessageColor::System);
+            builder
+                .emplace<TextElement>(action.suspiciousUserDisplayName,
+                                      MessageElementFlag::Username,
+                                      MessageColor::System,
+                                      FontStyle::ChatMediumBold)
+                ->setLink({Link::UserInfo, action.suspiciousUserLogin});
+            builder.emplace<TextElement>("as a restricted suspicious chatter.",
+                                         MessageElementFlag::Text,
+                                         MessageColor::System);
+        }
+        break;
+
+        default:
+            qCDebug(chatterinoTwitch) << "Unexpected suspicious treatment: "
+                                      << action.treatmentString;
+            break;
+    }
+
+    return builder.release();
+}
+
+std::pair<MessagePtr, MessagePtr> TwitchMessageBuilder::makeLowTrustUserMessage(
+    const PubSubLowTrustUsersMessage &action, const QString &channelName)
+{
+    MessageBuilder builder, builder2;
+
+    // Builder for low trust user message with explanation
+    builder.message().channelName = channelName;
+    builder.message().flags.set(MessageFlag::PubSub);
+    builder.message().flags.set(MessageFlag::LowTrustUsers);
+
+    // AutoMod shield badge
+    builder.emplace<BadgeElement>(makeAutoModBadge(),
+                                  MessageElementFlag::BadgeChannelAuthority);
+
+    // Suspicious user header message
+    QString prefix = "Suspicious User:";
+    builder.emplace<TextElement>(prefix, MessageElementFlag::Text,
+                                 MessageColor(QColor("blue")),
+                                 FontStyle::ChatMediumBold);
+
+    QString headerMessage;
+    if (action.treatment == PubSubLowTrustUsersMessage::Treatment::Restricted)
+    {
+        headerMessage = "Restricted";
+    }
+    else
+    {
+        headerMessage = "Monitored";
+    }
+
+    if (action.restrictionTypes.has(
+            PubSubLowTrustUsersMessage::RestrictionType::ManuallyAdded))
+    {
+        headerMessage += " by " + action.updatedByUserLogin;
+    }
+
+    headerMessage += " at " + action.updatedAt;
+
+    if (action.restrictionTypes.has(
+            PubSubLowTrustUsersMessage::RestrictionType::DetectedBanEvader))
+    {
+        QString evader;
+        if (action.evasionEvaluation ==
+            PubSubLowTrustUsersMessage::EvasionEvaluation::LikelyEvader)
+        {
+            evader = "likely";
+        }
+        else
+        {
+            evader = "possible";
+        }
+
+        headerMessage += ". Detected as " + evader + " ban evader";
+    }
+
+    if (action.restrictionTypes.has(
+            PubSubLowTrustUsersMessage::RestrictionType::BannedInSharedChannel))
+    {
+        headerMessage += ". Banned in " +
+                         QString::number(action.sharedBanChannelIDs.size()) +
+                         " shared channels";
+    }
+
+    builder.emplace<TextElement>(headerMessage, MessageElementFlag::Text,
+                                 MessageColor::Text);
+    builder.message().messageText = prefix + " " + headerMessage;
+    builder.message().searchText = prefix + " " + headerMessage;
+
+    auto message1 = builder.release();
+
+    //
+    // Builder for offender's message
+    builder2.message().channelName = channelName;
+    builder2
+        .emplace<TextElement>("#" + channelName,
+                              MessageElementFlag::ChannelName,
+                              MessageColor::System)
+        ->setLink({Link::JumpToChannel, channelName});
+    builder2.emplace<TimestampElement>();
+    builder2.emplace<TwitchModerationElement>();
+    builder2.message().loginName = action.suspiciousUserLogin;
+    builder2.message().flags.set(MessageFlag::PubSub);
+    builder2.message().flags.set(MessageFlag::LowTrustUsers);
+
+    // sender username
+    builder2
+        .emplace<TextElement>(action.suspiciousUserDisplayName + ":",
+                              MessageElementFlag::BoldUsername,
+                              MessageColor(action.suspiciousUserColor),
+                              FontStyle::ChatMediumBold)
+        ->setLink({Link::UserInfo, action.suspiciousUserLogin});
+    builder2
+        .emplace<TextElement>(action.suspiciousUserDisplayName + ":",
+                              MessageElementFlag::NonBoldUsername,
+                              MessageColor(action.suspiciousUserColor))
+        ->setLink({Link::UserInfo, action.suspiciousUserLogin});
+
+    // sender's message caught by AutoMod
+    builder2.emplace<TextElement>(action.text, MessageElementFlag::Text,
+                                  MessageColor::Text);
+    auto text =
+        QString("%1: %2").arg(action.suspiciousUserDisplayName, action.text);
+    builder2.message().messageText = text;
+    builder2.message().searchText = text;
+
+    auto message2 = builder2.release();
+
+    return std::make_pair(message1, message2);
+}
+
 void TwitchMessageBuilder::setThread(std::shared_ptr<MessageThread> thread)
 {
     this->thread_ = std::move(thread);
diff --git a/src/providers/twitch/TwitchMessageBuilder.hpp b/src/providers/twitch/TwitchMessageBuilder.hpp
index 92f4dc3fc..9bffd8f7a 100644
--- a/src/providers/twitch/TwitchMessageBuilder.hpp
+++ b/src/providers/twitch/TwitchMessageBuilder.hpp
@@ -3,6 +3,7 @@
 #include "common/Aliases.hpp"
 #include "common/Outcome.hpp"
 #include "messages/SharedMessageBuilder.hpp"
+#include "pubsubmessages/LowTrustUsers.hpp"
 
 #include <IrcMessage>
 #include <QString>
@@ -93,6 +94,11 @@ public:
         const AutomodAction &action, const QString &channelName);
     static MessagePtr makeAutomodInfoMessage(const AutomodInfoAction &action);
 
+    static std::pair<MessagePtr, MessagePtr> makeLowTrustUserMessage(
+        const PubSubLowTrustUsersMessage &action, const QString &channelName);
+    static MessagePtr makeLowTrustUpdateMessage(
+        const PubSubLowTrustUsersMessage &action);
+
     // Shares some common logic from SharedMessageBuilder::parseBadgeTag
     static std::unordered_map<QString, QString> parseBadgeInfoTag(
         const QVariantMap &tags);
diff --git a/src/providers/twitch/pubsubmessages/LowTrustUsers.cpp b/src/providers/twitch/pubsubmessages/LowTrustUsers.cpp
new file mode 100644
index 000000000..630558944
--- /dev/null
+++ b/src/providers/twitch/pubsubmessages/LowTrustUsers.cpp
@@ -0,0 +1,104 @@
+#include "providers/twitch/pubsubmessages/LowTrustUsers.hpp"
+
+#include <QDateTime>
+#include <QJsonArray>
+
+namespace chatterino {
+
+PubSubLowTrustUsersMessage::PubSubLowTrustUsersMessage(const QJsonObject &root)
+    : typeString(root.value("type").toString())
+{
+    if (const auto oType =
+            magic_enum::enum_cast<Type>(this->typeString.toStdString());
+        oType.has_value())
+    {
+        this->type = oType.value();
+    }
+
+    auto data = root.value("data").toObject();
+
+    if (this->type == Type::UserMessage)
+    {
+        this->msgID = data.value("message_id").toString();
+        this->sentAt = data.value("sent_at").toString();
+        this->text =
+            data.value("message_content").toObject().value("text").toString();
+
+        // the rest of the data is within a nested object
+        data = data.value("low_trust_user").toObject();
+
+        const auto sender = data.value("sender").toObject();
+        this->suspiciousUserID = sender.value("user_id").toString();
+        this->suspiciousUserLogin = sender.value("login").toString();
+        this->suspiciousUserDisplayName =
+            sender.value("display_name").toString();
+        this->suspiciousUserColor =
+            QColor(sender.value("chat_color").toString());
+
+        std::vector<LowTrustUserChatBadge> badges;
+        for (const auto &badge : sender.value("badges").toArray())
+        {
+            badges.emplace_back(badge.toObject());
+        }
+        this->senderBadges = badges;
+
+        const auto sharedValue = data.value("shared_ban_channel_ids");
+        std::vector<QString> sharedIDs;
+        if (!sharedValue.isNull())
+        {
+            for (const auto &id : sharedValue.toArray())
+            {
+                sharedIDs.emplace_back(id.toString());
+            }
+        }
+        this->sharedBanChannelIDs = sharedIDs;
+    }
+    else
+    {
+        this->suspiciousUserID = data.value("target_user_id").toString();
+        this->suspiciousUserLogin = data.value("target_user").toString();
+        this->suspiciousUserDisplayName = this->suspiciousUserLogin;
+    }
+
+    this->channelID = data.value("channel_id").toString();
+    this->updatedAtString = data.value("updated_at").toString();
+    this->updatedAt = QDateTime::fromString(this->updatedAtString, Qt::ISODate)
+                          .toLocalTime()
+                          .toString("MMM d yyyy, h:mm ap");
+
+    const auto updatedBy = data.value("updated_by").toObject();
+    this->updatedByUserID = updatedBy.value("id").toString();
+    this->updatedByUserLogin = updatedBy.value("login").toString();
+    this->updatedByUserDisplayName = updatedBy.value("display_name").toString();
+
+    this->treatmentString = data.value("treatment").toString();
+    if (const auto oTreatment = magic_enum::enum_cast<Treatment>(
+            this->treatmentString.toStdString());
+        oTreatment.has_value())
+    {
+        this->treatment = oTreatment.value();
+    }
+
+    this->evasionEvaluationString =
+        data.value("ban_evasion_evaluation").toString();
+    if (const auto oEvaluation = magic_enum::enum_cast<EvasionEvaluation>(
+            this->evasionEvaluationString.toStdString());
+        oEvaluation.has_value())
+    {
+        this->evasionEvaluation = oEvaluation.value();
+    }
+
+    FlagsEnum<RestrictionType> restrictions;
+    for (const auto &rType : data.value("types").toArray())
+    {
+        if (const auto oRestriction = magic_enum::enum_cast<RestrictionType>(
+                rType.toString().toStdString());
+            oRestriction.has_value())
+        {
+            restrictions.set(oRestriction.value());
+        }
+    }
+    this->restrictionTypes = restrictions;
+}
+
+}  // namespace chatterino
diff --git a/src/providers/twitch/pubsubmessages/LowTrustUsers.hpp b/src/providers/twitch/pubsubmessages/LowTrustUsers.hpp
new file mode 100644
index 000000000..84ca577d7
--- /dev/null
+++ b/src/providers/twitch/pubsubmessages/LowTrustUsers.hpp
@@ -0,0 +1,255 @@
+#pragma once
+
+#include <common/FlagsEnum.hpp>
+#include <magic_enum/magic_enum.hpp>
+#include <QColor>
+#include <QJsonObject>
+#include <QString>
+
+namespace chatterino {
+
+struct LowTrustUserChatBadge {
+    QString id;
+    QString version;
+
+    explicit LowTrustUserChatBadge(const QJsonObject &obj)
+        : id(obj.value("id").toString())
+        , version(obj.value("version").toString())
+    {
+    }
+};
+
+struct PubSubLowTrustUsersMessage {
+    /**
+     * The type of low trust message update
+     */
+    enum class Type {
+        /**
+         * An incoming message from someone marked as low trust
+         */
+        UserMessage,
+
+        /**
+         * An incoming update about a user's low trust status
+         */
+        TreatmentUpdate,
+
+        INVALID,
+    };
+
+    /**
+     * The treatment set for the suspicious user
+     */
+    enum class Treatment {
+        NoTreatment,
+        ActiveMonitoring,
+        Restricted,
+
+        INVALID,
+    };
+
+    /**
+     * A ban evasion likelihood value (if any) that has been applied to the user
+     * automatically by Twitch
+     */
+    enum class EvasionEvaluation {
+        UnknownEvader,
+        UnlikelyEvader,
+        LikelyEvader,
+        PossibleEvader,
+
+        INVALID,
+    };
+
+    /**
+     * Restriction type (if any) that apply to the suspicious user
+     */
+    enum class RestrictionType : uint8_t {
+        UnknownType = 1 << 0,
+        ManuallyAdded = 1 << 1,
+        DetectedBanEvader = 1 << 2,
+        BannedInSharedChannel = 1 << 3,
+
+        INVALID = 1 << 4,
+    };
+
+    Type type = Type::INVALID;
+
+    Treatment treatment = Treatment::INVALID;
+
+    EvasionEvaluation evasionEvaluation = EvasionEvaluation::INVALID;
+
+    FlagsEnum<RestrictionType> restrictionTypes;
+
+    QString channelID;
+
+    QString suspiciousUserID;
+    QString suspiciousUserLogin;
+    QString suspiciousUserDisplayName;
+
+    QString updatedByUserID;
+    QString updatedByUserLogin;
+    QString updatedByUserDisplayName;
+
+    /**
+     * Formatted timestamp of when the treatment was last updated for the suspicious user
+     */
+    QString updatedAt;
+
+    /**
+     * Plain text of the message sent.
+     * Only used for the UserMessage type.
+     */
+    QString text;
+
+    /**
+     * ID of the message.
+     * Only used for the UserMessage type.
+     */
+    QString msgID;
+
+    /**
+     * RFC3339 timestamp of when the message was sent.
+     * Only used for the UserMessage type.
+     */
+    QString sentAt;
+
+    /**
+     * Color of the user who sent the message.
+     * Only used for the UserMessage type.
+     */
+    QColor suspiciousUserColor;
+
+    /**
+     * A list of channel IDs where the suspicious user is also banned.
+     * Only used for the UserMessage type.
+     */
+    std::vector<QString> sharedBanChannelIDs;
+
+    /**
+     * A list of badges of the user who sent the message.
+     * Only used for the UserMessage type.
+     */
+    std::vector<LowTrustUserChatBadge> senderBadges;
+
+    /**
+     * Stores the string value of `type`
+     * Useful in case type shows up as invalid after being parsed
+     */
+    QString typeString;
+
+    /**
+     * Stores the string value of `treatment`
+     * Useful in case treatment shows up as invalid after being parsed
+     */
+    QString treatmentString;
+
+    /**
+     * Stores the string value of `ban_evasion_evaluation`
+     * Useful in case evasionEvaluation shows up as invalid after being parsed
+     */
+    QString evasionEvaluationString;
+
+    /**
+     * Stores the string value of `updated_at`
+     * Useful in case formattedUpdatedAt doesn't parse correctly
+     */
+    QString updatedAtString;
+
+    PubSubLowTrustUsersMessage() = default;
+    explicit PubSubLowTrustUsersMessage(const QJsonObject &root);
+};
+
+}  // namespace chatterino
+
+template <>
+constexpr magic_enum::customize::customize_t magic_enum::customize::enum_name<
+    chatterino::PubSubLowTrustUsersMessage::Type>(
+    chatterino::PubSubLowTrustUsersMessage::Type value) noexcept
+{
+    switch (value)
+    {
+        case chatterino::PubSubLowTrustUsersMessage::Type::UserMessage:
+            return "low_trust_user_new_message";
+
+        case chatterino::PubSubLowTrustUsersMessage::Type::TreatmentUpdate:
+            return "low_trust_user_treatment_update";
+
+        default:
+            return default_tag;
+    }
+}
+
+template <>
+constexpr magic_enum::customize::customize_t magic_enum::customize::enum_name<
+    chatterino::PubSubLowTrustUsersMessage::Treatment>(
+    chatterino::PubSubLowTrustUsersMessage::Treatment value) noexcept
+{
+    using Treatment = chatterino::PubSubLowTrustUsersMessage::Treatment;
+    switch (value)
+    {
+        case Treatment::NoTreatment:
+            return "NO_TREATMENT";
+
+        case Treatment::ActiveMonitoring:
+            return "ACTIVE_MONITORING";
+
+        case Treatment::Restricted:
+            return "RESTRICTED";
+
+        default:
+            return default_tag;
+    }
+}
+
+template <>
+constexpr magic_enum::customize::customize_t magic_enum::customize::enum_name<
+    chatterino::PubSubLowTrustUsersMessage::EvasionEvaluation>(
+    chatterino::PubSubLowTrustUsersMessage::EvasionEvaluation value) noexcept
+{
+    using EvasionEvaluation =
+        chatterino::PubSubLowTrustUsersMessage::EvasionEvaluation;
+    switch (value)
+    {
+        case EvasionEvaluation::UnknownEvader:
+            return "UNKNOWN_EVADER";
+
+        case EvasionEvaluation::UnlikelyEvader:
+            return "UNLIKELY_EVADER";
+
+        case EvasionEvaluation::LikelyEvader:
+            return "LIKELY_EVADER";
+
+        case EvasionEvaluation::PossibleEvader:
+            return "POSSIBLE_EVADER";
+
+        default:
+            return default_tag;
+    }
+}
+
+template <>
+constexpr magic_enum::customize::customize_t magic_enum::customize::enum_name<
+    chatterino::PubSubLowTrustUsersMessage::RestrictionType>(
+    chatterino::PubSubLowTrustUsersMessage::RestrictionType value) noexcept
+{
+    using RestrictionType =
+        chatterino::PubSubLowTrustUsersMessage::RestrictionType;
+    switch (value)
+    {
+        case RestrictionType::UnknownType:
+            return "UNKNOWN_TYPE";
+
+        case RestrictionType::ManuallyAdded:
+            return "MANUALLY_ADDED";
+
+        case RestrictionType::DetectedBanEvader:
+            return "DETECTED_BAN_EVADER";
+
+        case RestrictionType::BannedInSharedChannel:
+            return "BANNED_IN_SHARED_CHANNEL";
+
+        default:
+            return default_tag;
+    }
+}

From 65b1ed312c288a9400cb968bcdf450e0d9e7e1c9 Mon Sep 17 00:00:00 2001
From: pajlada <rasmus.karlsson@pajlada.com>
Date: Sun, 31 Dec 2023 13:51:40 +0100
Subject: [PATCH 42/42] refactor: Logging (chat logger) (#5058)

It's no longer a singleton

It's now a unique_ptr that dies together with the Application

* Add getChatLogger to EmptyApplication

* unrelated change: Access Application::instance statically

* fix logging init order

* Add changelog entry
---
 CHANGELOG.md                             |  1 +
 mocks/include/mocks/EmptyApplication.hpp |  6 ++++++
 src/Application.cpp                      | 11 +++++++++--
 src/Application.hpp                      | 11 +++++++++--
 src/common/Channel.cpp                   |  3 ++-
 src/singletons/Logging.cpp               |  2 +-
 src/singletons/Logging.hpp               | 11 +++--------
 7 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aedf2db88..717cc71f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,7 @@
 - Dev: Refactor `Emoji`'s EmojiMap into a vector. (#4980)
 - Dev: Refactor `DebugCount` and add copy button to debug popup. (#4921)
 - Dev: Refactor `common/Credentials`. (#4979)
+- Dev: Refactor chat logger. (#5058)
 - Dev: Changed lifetime of context menus. (#4924)
 - Dev: Renamed `tools` directory to `scripts`. (#5035)
 - Dev: Refactor `ChannelView`, removing a bunch of clang-tidy warnings. (#4926)
diff --git a/mocks/include/mocks/EmptyApplication.hpp b/mocks/include/mocks/EmptyApplication.hpp
index 5917172b2..b1957898d 100644
--- a/mocks/include/mocks/EmptyApplication.hpp
+++ b/mocks/include/mocks/EmptyApplication.hpp
@@ -75,6 +75,12 @@ public:
         return nullptr;
     }
 
+    Logging *getChatLogger() override
+    {
+        assert(!"getChatLogger was called without being initialized");
+        return nullptr;
+    }
+
     ChatterinoBadges *getChatterinoBadges() override
     {
         return nullptr;
diff --git a/src/Application.cpp b/src/Application.cpp
index 5d6e4c63d..37ba100cd 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -128,12 +128,12 @@ Application::Application(Settings &_settings, Paths &_paths, const Args &_args)
     , userData(&this->emplace<UserDataController>())
     , sound(&this->emplace<ISoundController>(makeSoundController(_settings)))
     , twitchLiveController(&this->emplace<TwitchLiveController>())
+    , logging(new Logging(_settings))
 #ifdef CHATTERINO_HAVE_PLUGINS
     , plugins(&this->emplace<PluginController>())
 #endif
-    , logging(&this->emplace<Logging>())
 {
-    this->instance = this;
+    Application::instance = this;
 
     // We can safely ignore this signal's connection since the Application will always
     // be destroyed after fonts
@@ -142,6 +142,8 @@ Application::Application(Settings &_settings, Paths &_paths, const Args &_args)
     });
 }
 
+Application::~Application() = default;
+
 void Application::initialize(Settings &settings, Paths &paths)
 {
     assert(isAppInitialized == false);
@@ -312,6 +314,11 @@ ITwitchIrcServer *Application::getTwitch()
     return this->twitch;
 }
 
+Logging *Application::getChatLogger()
+{
+    return this->logging.get();
+}
+
 void Application::save()
 {
     for (auto &singleton : this->singletons_)
diff --git a/src/Application.hpp b/src/Application.hpp
index 656c0510b..249f2acd0 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -68,6 +68,7 @@ public:
     virtual HighlightController *getHighlights() = 0;
     virtual NotificationController *getNotifications() = 0;
     virtual ITwitchIrcServer *getTwitch() = 0;
+    virtual Logging *getChatLogger() = 0;
     virtual ChatterinoBadges *getChatterinoBadges() = 0;
     virtual FfzBadges *getFfzBadges() = 0;
     virtual SeventvBadges *getSeventvBadges() = 0;
@@ -89,6 +90,12 @@ public:
     static Application *instance;
 
     Application(Settings &_settings, Paths &_paths, const Args &_args);
+    ~Application() override;
+
+    Application(const Application &) = delete;
+    Application(Application &&) = delete;
+    Application &operator=(const Application &) = delete;
+    Application &operator=(Application &&) = delete;
 
     void initialize(Settings &settings, Paths &paths);
     void load();
@@ -121,14 +128,13 @@ public:
 
 private:
     TwitchLiveController *const twitchLiveController{};
+    const std::unique_ptr<Logging> logging;
 
 public:
 #ifdef CHATTERINO_HAVE_PLUGINS
     PluginController *const plugins{};
 #endif
 
-    /*[[deprecated]]*/ Logging *const logging{};
-
     const Args &getArgs() override
     {
         return this->args_;
@@ -175,6 +181,7 @@ public:
         return this->highlights;
     }
     ITwitchIrcServer *getTwitch() override;
+    Logging *getChatLogger() override;
     ChatterinoBadges *getChatterinoBadges() override
     {
         return this->chatterinoBadges;
diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index cd275c14a..ff5dd2834 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -101,7 +101,8 @@ void Channel::addMessage(MessagePtr message,
         {
             channelPlatform = "twitch";
         }
-        app->logging->addMessage(this->name_, message, channelPlatform);
+        getIApp()->getChatLogger()->addMessage(this->name_, message,
+                                               channelPlatform);
     }
 
     if (this->messages_.pushBack(message, deleted))
diff --git a/src/singletons/Logging.cpp b/src/singletons/Logging.cpp
index a83ecbd17..323a9d9da 100644
--- a/src/singletons/Logging.cpp
+++ b/src/singletons/Logging.cpp
@@ -12,7 +12,7 @@
 
 namespace chatterino {
 
-void Logging::initialize(Settings &settings, Paths & /*paths*/)
+Logging::Logging(Settings &settings)
 {
     // We can safely ignore this signal connection since settings are only-ever destroyed
     // on application exit
diff --git a/src/singletons/Logging.hpp b/src/singletons/Logging.hpp
index 16c3cd81a..edd1ac07f 100644
--- a/src/singletons/Logging.hpp
+++ b/src/singletons/Logging.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/Singleton.hpp"
 #include "util/QStringHash.hpp"
 #include "util/ThreadGuard.hpp"
 
@@ -12,19 +11,15 @@
 
 namespace chatterino {
 
-class Paths;
+class Settings;
 struct Message;
 using MessagePtr = std::shared_ptr<const Message>;
 class LoggingChannel;
 
-class Logging : public Singleton
+class Logging
 {
-    Paths *pathManager = nullptr;
-
 public:
-    Logging() = default;
-
-    void initialize(Settings &settings, Paths &paths) override;
+    Logging(Settings &settings);
 
     void addMessage(const QString &channelName, MessagePtr message,
                     const QString &platformName);