Merge remote-tracking branch 'origin/master' into chatterino7

Now we're on commit 3fcb634; Changes from upstream we've pulled - Bugfix: Fix Split Input hotkeys not being available when input is hidden (Chatterino#3362) - Bugfix: Fixed IRC highlights not triggering sounds or alerts properly. (Chatterino#3368)
D3XX3R · Nov 28, 2021 · a4ae09f · a4ae09f
2 parents d8bc1af + 3fcb634
commit a4ae09f
Show file tree

Hide file tree

Showing 22 changed files with 118 additions and 95 deletions.
diff --git a/.github/ISSUE_TEMPLATE/a_make_a_report.yml b/.github/ISSUE_TEMPLATE/a_make_a_report.yml
@@ -0,0 +1,53 @@
+name: Issue report
+description: Report something that's missing, that you have trouble with or that stopped working
+labels: [issue-report]
+
+body:
+  - type: checkboxes
+    id: acknowledgments
+    attributes:
+        label: Checklist
+        description:
+        options:
+            - label: I'm reporting a problem with Chatterino
+              required: true
+            - label: I've verified that I'm running a recent nightly build or the *newest* stable release
+              required: true
+            - label: I've looked for my problem on the [wiki](https://wiki.chatterino.com/Help/)
+              required: true
+            - label: I've searched the [issues](https://github.com/Chatterino/chatterino2/issues?q=) for similar looking reports
+              required: true
+
+  - type: textarea
+    id: description
+    validations:
+        required: true
+    attributes:
+        label: Describe your issue
+        description: |
+            Write a brief description of your issue.
+            Important:
+                Focus on the problem instead of a concrete solution. This ensures that the focus of the thread is to resolve your issue.
+                If you want to voice a concrete idea you can add a comment below after posting the issue.
+        placeholder: |
+            Examples:
+              - I cannot do X.
+              - I have trouble doing X.
+              - Feature X has stopped working for me.
+
+  - type: textarea
+    id: screenshots
+    attributes:
+        label: Screenshots
+        description: While optional, it's highly encouraged to include screenshots or videos to illustrate what you mean.
+        placeholder: You can upload them using the text editor's dedicated button.
+
+  - type: input
+    id: versions
+    validations:
+        required: true
+    attributes:
+        label: OS and Chatterino Version
+        description: The name of your Operating System and the version shown in Chatterino's title bar.
+        placeholder: Chatterino 2.3.4 on Windows 10 (insiders)
+
diff --git a/.github/ISSUE_TEMPLATE/a_report_your_issue.md b/.github/ISSUE_TEMPLATE/a_report_your_issue.md
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -52,7 +52,7 @@ jobs:
 
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         with:
           path: ../Qt
           key: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-20210109
@@ -73,7 +73,7 @@ jobs:
       # WINDOWS
       - name: Cache conan packages
         if: startsWith(matrix.os, 'windows')
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         with:
           key: ${{ runner.os }}-conan-${{ hashFiles('**/conanfile.txt') }}-20210412
           path: C:/.conan/

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
 
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         with:
           path: ../Qt
           key: ${{ runner.os }}-QtCache-20201005

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,7 @@
 - Minor: Made join and part message have links to usercards. (#3358)
 - Minor: Show picked outcome in prediction badges. (#3357)
 - Minor: Add support for Emoji in IRC (#3354)
+- Bugfix: Fix Split Input hotkeys not being available when input is hidden (#3362)
 - Bugfix: Fixed colored usernames sometimes not working. (#3170)
 - Bugfix: Restored ability to send duplicate `/me` messages. (#3166)
 - Bugfix: Notifications for moderators about other moderators deleting messages can now be disabled. (#3121)
@@ -60,6 +61,7 @@
 - Bugfix: Fixed splits losing filters when closing and reopening them (#3351)
 - Bugfix: Fixed the first usercard being broken in `/mods` and `/vips` (#3349)
 - Bugfix: Fixed Chatterino attempting to send empty messages (#3355)
+- Bugfix: Fixed IRC highlights not triggering sounds or alerts properly. (#3368)
 - Dev: Add GitHub action to test builds without precompiled headers enabled. (#3327)
 - Dev: Renamed CMake's build option `USE_SYSTEM_QT5KEYCHAIN` to `USE_SYSTEM_QTKEYCHAIN`. (#3103)
 - Dev: Add benchmarks that can be compiled with the `BUILD_BENCHMARKS` CMake flag. Off by default. (#3038)

diff --git a/src/common/ChannelChatters.cpp b/src/common/ChannelChatters.cpp
@@ -71,10 +71,10 @@ void ChannelChatters::addPartedUser(const QString &user)
 }
 
 void ChannelChatters::updateOnlineChatters(
-    const std::unordered_set<QString> &chatters)
+    const std::unordered_set<QString> &usernames)
 {
-    auto chatters_ = this->chatters_.access();
-    chatters_->updateOnlineChatters(chatters);
+    auto chatters = this->chatters_.access();
+    chatters->updateOnlineChatters(usernames);
 }
 
 size_t ChannelChatters::colorsSize() const

diff --git a/src/common/ChannelChatters.hpp b/src/common/ChannelChatters.hpp
@@ -23,7 +23,7 @@ class ChannelChatters
     void addPartedUser(const QString &user);
     const QColor getUserColor(const QString &user);
     void setUserColor(const QString &user, const QColor &color);
-    void updateOnlineChatters(const std::unordered_set<QString> &chatters);
+    void updateOnlineChatters(const std::unordered_set<QString> &usernames);
 
     // colorsSize returns the amount of colors stored in `chatterColors_`
     // NOTE: This function is only meant to be used in tests and benchmarks

diff --git a/src/common/DownloadManager.cpp b/src/common/DownloadManager.cpp
@@ -1,21 +1,21 @@
 #include "DownloadManager.hpp"
 
+#include "common/QLogging.hpp"
 #include "singletons/Paths.hpp"
 
 #include <QDesktopServices>
-#include "common/QLogging.hpp"
 
 namespace chatterino {
 
 DownloadManager::DownloadManager(QObject *parent)
     : QObject(parent)
+    , manager_(new QNetworkAccessManager)
 {
-    manager = new QNetworkAccessManager;
 }
 
 DownloadManager::~DownloadManager()
 {
-    manager->deleteLater();
+    this->manager_->deleteLater();
 }
 
 void DownloadManager::setFile(QString fileURL, const QString &channelName)
@@ -25,18 +25,18 @@ void DownloadManager::setFile(QString fileURL, const QString &channelName)
         getPaths()->twitchProfileAvatars + "/twitch/" + channelName + ".png";
     QNetworkRequest request;
     request.setUrl(QUrl(fileURL));
-    reply = manager->get(request);
+    this->reply_ = this->manager_->get(request);
 
-    file = new QFile;
-    file->setFileName(saveFilePath);
-    file->open(QIODevice::WriteOnly);
+    this->file_ = new QFile;
+    this->file_->setFileName(saveFilePath);
+    this->file_->open(QIODevice::WriteOnly);
 
-    connect(reply, SIGNAL(downloadProgress(qint64, qint64)), this,
+    connect(this->reply_, SIGNAL(downloadProgress(qint64, qint64)), this,
             SLOT(onDownloadProgress(qint64, qint64)));
-    connect(manager, SIGNAL(finished(QNetworkReply *)), this,
+    connect(this->manager_, SIGNAL(finished(QNetworkReply *)), this,
             SLOT(onFinished(QNetworkReply *)));
-    connect(reply, SIGNAL(readyRead()), this, SLOT(onReadyRead()));
-    connect(reply, SIGNAL(finished()), this, SLOT(onReplyFinished()));
+    connect(this->reply_, SIGNAL(readyRead()), this, SLOT(onReadyRead()));
+    connect(this->reply_, SIGNAL(finished()), this, SLOT(onReplyFinished()));
 }
 
 void DownloadManager::onDownloadProgress(qint64 bytesRead, qint64 bytesTotal)
@@ -58,25 +58,26 @@ void DownloadManager::onFinished(QNetworkReply *reply)
         };
     }
 
-    if (file->isOpen())
+    if (this->file_->isOpen())
     {
-        file->close();
-        file->deleteLater();
+        this->file_->close();
+        this->file_->deleteLater();
     }
     emit downloadComplete();
 }
 
 void DownloadManager::onReadyRead()
 {
-    file->write(reply->readAll());
+    this->file_->write(this->reply_->readAll());
 }
 
 void DownloadManager::onReplyFinished()
 {
-    if (file->isOpen())
+    if (this->file_->isOpen())
     {
-        file->close();
-        file->deleteLater();
+        this->file_->close();
+        this->file_->deleteLater();
     }
 }
+
 }  // namespace chatterino
diff --git a/src/common/DownloadManager.hpp b/src/common/DownloadManager.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Application.hpp"
-
 #include <QFile>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
@@ -20,9 +18,9 @@ class DownloadManager : public QObject
     void setFile(QString fileURL, const QString &channelName);
 
 private:
-    QNetworkAccessManager *manager;
-    QNetworkReply *reply;
-    QFile *file;
+    QNetworkAccessManager *manager_;
+    QNetworkReply *reply_;
+    QFile *file_;
 
 private slots:
     void onDownloadProgress(qint64, qint64);
@@ -33,4 +31,5 @@ private slots:
 signals:
     void downloadComplete();
 };
+
 }  // namespace chatterino
diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp
@@ -951,8 +951,6 @@ QString CommandController::execCommand(const QString &textNoEmoji,
         }
     }
 
-    auto *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get());
-
     {
         // check if user command exists
         const auto it = this->userCommands_.find(commandName);

diff --git a/src/controllers/filters/parser/Tokenizer.cpp b/src/controllers/filters/parser/Tokenizer.cpp
@@ -8,9 +8,9 @@ Tokenizer::Tokenizer(const QString &text)
     QRegularExpressionMatchIterator i = tokenRegex.globalMatch(text);
     while (i.hasNext())
     {
-        auto text = i.next().captured();
-        this->tokens_ << text;
-        this->tokenTypes_ << this->tokenize(text);
+        auto capturedText = i.next().captured();
+        this->tokens_ << capturedText;
+        this->tokenTypes_ << this->tokenize(capturedText);
     }
 }
 

diff --git a/src/controllers/highlights/HighlightModel.cpp b/src/controllers/highlights/HighlightModel.cpp
@@ -159,6 +159,12 @@ void HighlightModel::afterInit()
     firstMessageRow[Column::Pattern]->setData("First Messages",
                                               Qt::DisplayRole);
     firstMessageRow[Column::ShowInMentions]->setFlags({});
+    //    setBoolItem(firstMessageRow[Column::FlashTaskbar],
+    //                getSettings()->enableFirstMessageHighlightTaskbar.getValue(),
+    //                true, false);
+    //    setBoolItem(firstMessageRow[Column::PlaySound],
+    //                getSettings()->enableFirstMessageHighlightSound.getValue(),
+    //                true, false);
     firstMessageRow[Column::FlashTaskbar]->setFlags({});
     firstMessageRow[Column::PlaySound]->setFlags({});
     firstMessageRow[Column::UseRegex]->setFlags({});
@@ -245,6 +251,11 @@ void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
                     // getSettings()->enableRedeemedHighlightTaskbar.setValue(
                     //     value.toBool());
                 }
+                else if (rowIndex == 4)
+                {
+                    // getSettings()->enableFirstMessageHighlightTaskbar.setValue(
+                    //     value.toBool());
+                }
             }
         }
         break;
@@ -271,6 +282,11 @@ void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
                     // getSettings()->enableRedeemedHighlightSound.setValue(
                     //     value.toBool());
                 }
+                else if (rowIndex == 4)
+                {
+                    // getSettings()->enableFirstMessageHighlightSound.setValue(
+                    //     value.toBool());
+                }
             }
         }
         break;

diff --git a/src/messages/SharedMessageBuilder.cpp b/src/messages/SharedMessageBuilder.cpp
@@ -130,6 +130,7 @@ void SharedMessageBuilder::parseHighlights()
 {
     auto app = getApp();
 
+    // Highlight because it's a subscription
     if (this->message().flags.has(MessageFlag::Subscription) &&
         getSettings()->enableSubHighlight)
     {

diff --git a/src/messages/search/MessagePredicate.hpp b/src/messages/search/MessagePredicate.hpp
@@ -17,6 +17,8 @@ namespace chatterino {
 class MessagePredicate
 {
 public:
+    virtual ~MessagePredicate() = default;
+
     /**
      * @brief Checks whether this predicate applies to the passed message.
      *

diff --git a/src/providers/irc/IrcMessageBuilder.cpp b/src/providers/irc/IrcMessageBuilder.cpp
@@ -113,7 +113,6 @@ void IrcMessageBuilder::addWords(const QStringList &words)
             continue;
         }
 
-        int pos = 0;
         int lastPos = 0;
 
         while (i.hasNext())

diff --git a/src/providers/irc/IrcServer.cpp b/src/providers/irc/IrcServer.cpp
@@ -187,8 +187,8 @@ void IrcServer::privateMessageReceived(Communi::IrcPrivateMessage *message)
 
         if (!builder.isIgnored())
         {
-            builder.triggerHighlights();
             channel->addMessage(builder.build());
+            builder.triggerHighlights();
         }
         else
         {

diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
@@ -827,18 +827,18 @@ void IrcMessageHandler::handleNoticeMessage(Communi::IrcNoticeMessage *message)
             {
                 return;
             }
-            auto &channelName = hostOn ? parts[2] : parts[0];
-            if (channelName.size() < 2)
+            auto &hostedChannelName = hostOn ? parts[2] : parts[0];
+            if (hostedChannelName.size() < 2)
             {
                 return;
             }
             if (hostOn)
             {
-                channelName.chop(1);
+                hostedChannelName.chop(1);
             }
             MessageBuilder builder;
-            TwitchMessageBuilder::hostingSystemMessage(channelName, &builder,
-                                                       hostOn);
+            TwitchMessageBuilder::hostingSystemMessage(hostedChannelName,
+                                                       &builder, hostOn);
             channel->addMessage(builder.release());
         }
         else if (tags == "room_mods" || tags == "vips_success")