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

Now we're on commit 770b9f2; Changes from upstream we pulled:

- Minor: Added informative messages for recent-messages API's errors. (Chatterino#3029)
- Minor: Added section with helpful Chatterino-related links to the About page. (Chatterino#3068)
- Bugfix: Fixed PubSub not properly trying to resolve pending listens when the pending listens list was larger than 50. (Chatterino#3037)
- Bugfix: Copy buttons in usercard now show properly in light mode (Chatterino#3057)
- Bugfix: Fixed comma appended to username completion when not at the beginning of the message. (Chatterino#3060)
- Bugfix: Fixed bug misplacing chat when zooming on Chrome with Chatterino Native Host extension (Chatterino#1936)
- Dev: Disabled update checker on Flatpak. (Chatterino#3051)
- Dev: Add logging for HTTP requests (Chatterino#2991)

CHANGELOG.md

@@ -6,8 +6,16 @@
 - Minor: Added autocompletion in /whispers for Twitch emotes, Global Bttv/Ffz emotes and emojis. (#2999, #3033)
 - Minor: Received Twitch messages now use the exact same timestamp (obtained from Twitch's server) for every Chatterino user instead of assuming message timestamp on client's side. (#3021)
 - Minor: Received IRC messages use `time` message tag for timestamp if it's available. (#3021)
+- Minor: Added informative messages for recent-messages API's errors. (#3029)
+- Minor: Added section with helpful Chatterino-related links to the About page. (#3068)
 - Bugfix: Fixed "smiley" emotes being unable to be "Tabbed" with autocompletion, introduced in v2.3.3. (#3010)
+- Bugfix: Fixed PubSub not properly trying to resolve pending listens when the pending listens list was larger than 50. (#3037)
+- Bugfix: Copy buttons in usercard now show properly in light mode (#3057)
+- Bugfix: Fixed comma appended to username completion when not at the beginning of the message. (#3060)
+- Bugfix: Fixed bug misplacing chat when zooming on Chrome with Chatterino Native Host extension (#1936)
 - Dev: Ubuntu packages are now available (#2936)
+- Dev: Disabled update checker on Flatpak. (#3051)
+- Dev: Add logging for HTTP requests (#2991)
 
 ## 2.3.3
 

conanfile.txt

@@ -1,6 +1,6 @@
 [requires]
-openssl/1.1.1d
-boost/1.75.0
+openssl/1.1.1k
+boost/1.76.0
 
 [generators]
 qmake

resources/resources_autogenerated.qrc

@@ -14,7 +14,6 @@
     <file>buttons/banRed.png</file>
     <file>buttons/copyDark.png</file>
     <file>buttons/copyDark.svg</file>
-    <file>buttons/copyDarkTheme.png</file>
     <file>buttons/copyLight.png</file>
     <file>buttons/copyLight.svg</file>
     <file>buttons/emote.svg</file>

src/autogenerated/ResourcesAutogen.cpp

@@ -15,7 +15,6 @@ Resources2::Resources2()
     this->buttons.ban = QPixmap(":/buttons/ban.png");
     this->buttons.banRed = QPixmap(":/buttons/banRed.png");
     this->buttons.copyDark = QPixmap(":/buttons/copyDark.png");
-    this->buttons.copyDarkTheme = QPixmap(":/buttons/copyDarkTheme.png");
     this->buttons.copyLight = QPixmap(":/buttons/copyLight.png");
     this->buttons.menuDark = QPixmap(":/buttons/menuDark.png");
     this->buttons.menuLight = QPixmap(":/buttons/menuLight.png");

src/autogenerated/ResourcesAutogen.hpp

@@ -22,7 +22,6 @@ class Resources2 : public Singleton
         QPixmap ban;
         QPixmap banRed;
         QPixmap copyDark;
-        QPixmap copyDarkTheme;
         QPixmap copyLight;
         QPixmap menuDark;
         QPixmap menuLight;

src/common/CompletionModel.cpp

@@ -10,6 +10,7 @@
 #include "providers/twitch/TwitchIrcServer.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Settings.hpp"
+#include "util/Helpers.hpp"
 #include "util/QStringHash.hpp"
 
 #include <QtAlgorithms>
@@ -156,9 +157,6 @@ void CompletionModel::refresh(const QString &prefix, bool isFirstWord)
     }
 
     // Usernames
-    QString usernamePostfix =
-        isFirstWord && getSettings()->mentionUsersWithComma ? "," : QString();
-
     if (prefix.startsWith("@"))
     {
         QString usernamePrefix = prefix;
@@ -168,8 +166,10 @@ void CompletionModel::refresh(const QString &prefix, bool isFirstWord)
 
         for (const auto &name : chatters)
         {
-            addString("@" + name + usernamePostfix,
-                      TaggedString::Type::Username);
+            addString(
+                "@" + formatUserMention(name, isFirstWord,
+                                        getSettings()->mentionUsersWithComma),
+                TaggedString::Type::Username);
         }
     }
     else if (!getSettings()->userCompletionOnlyWithAt)
@@ -178,7 +178,9 @@ void CompletionModel::refresh(const QString &prefix, bool isFirstWord)
 
         for (const auto &name : chatters)
         {
-            addString(name + usernamePostfix, TaggedString::Type::Username);
+            addString(formatUserMention(name, isFirstWord,
+                                        getSettings()->mentionUsersWithComma),
+                      TaggedString::Type::Username);
         }
     }
 

src/common/NetworkCommon.hpp

@@ -24,6 +24,13 @@ enum class NetworkRequestType {
     Delete,
     Patch,
 };
+const static std::vector<QString> networkRequestTypes{
+    "GET",     //
+    "POST",    //
+    "PUT",     //
+    "DELETE",  //
+    "PATCH",   //
+};
 
 // parseHeaderList takes a list of headers in string form,
 // where each header pair is separated by semicolons (;) and the header name and value is divided by a colon (:)