Merge 'chatterino2' into chatterino7

.clang-tidy

@@ -65,5 +65,11 @@ CheckOptions:
   - key: readability-identifier-naming.LocalPointerIgnoredRegexp
     value: ^L$
 
+  # Benchmarks
+  - key: readability-identifier-naming.FunctionIgnoredRegexp
+    value: ^BM_[^_]+$
+  - key: readability-identifier-naming.ClassIgnoredRegexp
+    value: ^BM_[^_]+$
+
   - key: misc-const-correctness.AnalyzeValues
     value: false

.github/workflows/build.yml

@@ -139,7 +139,7 @@ jobs:
       # WINDOWS
       - name: Enable Developer Command Prompt (Windows)
         if: startsWith(matrix.os, 'windows')
-        uses: ilammy/msvc-dev-cmd@v1.12.1
+        uses: ilammy/msvc-dev-cmd@v1.13.0
 
       - name: Setup conan variables (Windows)
         if: startsWith(matrix.os, 'windows')

.github/workflows/create-installer.yml

@@ -45,7 +45,7 @@ jobs:
         run: echo "C:\Program Files (x86)\Inno Setup 6\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
       - name: Enable Developer Command Prompt
-        uses: ilammy/msvc-dev-cmd@v1.12.1
+        uses: ilammy/msvc-dev-cmd@v1.13.0
 
       - name: Build installer
         id: build-installer

.github/workflows/test-windows.yml

@@ -63,7 +63,7 @@ jobs:
           version: ${{ matrix.qt-version }}
 
       - name: Enable Developer Command Prompt
-        uses: ilammy/msvc-dev-cmd@v1.12.1
+        uses: ilammy/msvc-dev-cmd@v1.13.0
 
       - name: Setup conan variables
         if: startsWith(matrix.os, 'windows')

.prettierignore

@@ -1,12 +1,15 @@
 # JSON resources should not be prettified...
 resources/*.json
+benchmarks/resources/*.json
+tests/resources/*.json
 # ...themes should be prettified for readability.
 !resources/themes/*.json
 
 # Ignore submodule files
 lib/*/
 conan-pkgs/*/
 cmake/sanitizers-cmake/
+tools/crash-handler
 
 # Build folders
 *build-*/

CHANGELOG.md

@@ -4,7 +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)
+- Major: Show restricted chat messages and suspicious treatment updates. (#5056, #5060)
 - 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)
@@ -20,6 +20,8 @@
 - 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)
+- Minor: Added missing periods at various moderator messages and commands. (#5061)
+- Minor: Improved color selection and display. (#5057)
 - 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)
@@ -61,6 +63,7 @@
 - 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)
+- Bugfix: Fixed a bug where buttons would remain in a hovered state after leaving them. (#5077)
 - 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)
@@ -88,6 +91,7 @@
 - Dev: Refactor `DebugCount` and add copy button to debug popup. (#4921)
 - Dev: Refactor `common/Credentials`. (#4979)
 - Dev: Refactor chat logger. (#5058)
+- Dev: Refactor Twitch PubSub client. (#5059)
 - 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)
@@ -107,6 +111,10 @@
 - 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)
+- Dev: Refactor `NetworkPrivate`. (#5063)
+- Dev: Removed duplicate scale in settings dialog. (#5069)
+- Dev: Fix `NotebookTab` emitting updates for every message. (#5068)
+- Dev: Added benchmark for parsing and building recent messages. (#5071)
 
 ## 2.4.6
 

benchmarks/CMakeLists.txt

@@ -1,13 +1,16 @@
 project(chatterino-benchmark)
 
 set(benchmark_SOURCES
-    ${CMAKE_CURRENT_LIST_DIR}/src/main.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/Emojis.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/Highlights.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/FormatTime.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/Helpers.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/LimitedQueue.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/LinkParser.cpp
+    src/main.cpp
+    resources/bench.qrc
+
+    src/Emojis.cpp
+    src/Highlights.cpp
+    src/FormatTime.cpp
+    src/Helpers.cpp
+    src/LimitedQueue.cpp
+    src/LinkParser.cpp
+    src/RecentMessages.cpp
     # Add your new file above this line!
     )
 
@@ -27,4 +30,5 @@ set_target_properties(${PROJECT_NAME}
     RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/bin"
     RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin"
     RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/bin"
+    AUTORCC ON
     )

benchmarks/resources/bench.qrc

@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/bench">
+        <file>recentmessages-nymn.json</file>
+        <file>seventvemotes-nymn.json</file>
+    </qresource>
+</RCC>

benchmarks/src/Emojis.cpp

@@ -145,16 +145,13 @@ static void BM_EmojiParsing(benchmark::State &state)
 
 BENCHMARK(BM_EmojiParsing);
 
-template <class... Args>
-static void BM_EmojiParsing2(benchmark::State &state, Args &&...args)
+static void BM_EmojiParsing2(benchmark::State &state, const QString &input,
+                             int expectedNumEmojis)
 {
     Emojis emojis;
 
     emojis.load();
 
-    auto argsTuple = std::make_tuple(std::move(args)...);
-    auto input = std::get<0>(argsTuple);
-    auto expectedNumEmojis = std::get<1>(argsTuple);
     for (auto _ : state)
     {
         auto output = emojis.parse(input);

benchmarks/src/FormatTime.cpp

@@ -4,35 +4,41 @@
 
 using namespace chatterino;
 
-template <class... Args>
-void BM_TimeFormatting(benchmark::State &state, Args &&...args)
+void BM_TimeFormattingQString(benchmark::State &state, const QString &v)
 {
-    auto args_tuple = std::make_tuple(std::move(args)...);
     for (auto _ : state)
     {
-        formatTime(std::get<0>(args_tuple));
+        formatTime(v);
     }
 }
 
-BENCHMARK_CAPTURE(BM_TimeFormatting, 0, 0);
-BENCHMARK_CAPTURE(BM_TimeFormatting, qs0, "0");
-BENCHMARK_CAPTURE(BM_TimeFormatting, 1337, 1337);
-BENCHMARK_CAPTURE(BM_TimeFormatting, qs1337, "1337");
-BENCHMARK_CAPTURE(BM_TimeFormatting, 623452, 623452);
-BENCHMARK_CAPTURE(BM_TimeFormatting, qs623452, "623452");
-BENCHMARK_CAPTURE(BM_TimeFormatting, 8345, 8345);
-BENCHMARK_CAPTURE(BM_TimeFormatting, qs8345, "8345");
-BENCHMARK_CAPTURE(BM_TimeFormatting, 314034, 314034);
-BENCHMARK_CAPTURE(BM_TimeFormatting, qs314034, "314034");
-BENCHMARK_CAPTURE(BM_TimeFormatting, 27, 27);
-BENCHMARK_CAPTURE(BM_TimeFormatting, qs27, "27");
-BENCHMARK_CAPTURE(BM_TimeFormatting, 34589, 34589);
-BENCHMARK_CAPTURE(BM_TimeFormatting, qs34589, "34589");
-BENCHMARK_CAPTURE(BM_TimeFormatting, 3659, 3659);
-BENCHMARK_CAPTURE(BM_TimeFormatting, qs3659, "3659");
-BENCHMARK_CAPTURE(BM_TimeFormatting, 1045345, 1045345);
-BENCHMARK_CAPTURE(BM_TimeFormatting, qs1045345, "1045345");
-BENCHMARK_CAPTURE(BM_TimeFormatting, 86432, 86432);
-BENCHMARK_CAPTURE(BM_TimeFormatting, qs86432, "86432");
-BENCHMARK_CAPTURE(BM_TimeFormatting, qsempty, "");
-BENCHMARK_CAPTURE(BM_TimeFormatting, qsinvalid, "asd");
+void BM_TimeFormattingInt(benchmark::State &state, int v)
+{
+    for (auto _ : state)
+    {
+        formatTime(v);
+    }
+}
+
+BENCHMARK_CAPTURE(BM_TimeFormattingInt, 0, 0);
+BENCHMARK_CAPTURE(BM_TimeFormattingInt, 1045345, 1045345);
+BENCHMARK_CAPTURE(BM_TimeFormattingInt, 1337, 1337);
+BENCHMARK_CAPTURE(BM_TimeFormattingInt, 27, 27);
+BENCHMARK_CAPTURE(BM_TimeFormattingInt, 314034, 314034);
+BENCHMARK_CAPTURE(BM_TimeFormattingInt, 34589, 34589);
+BENCHMARK_CAPTURE(BM_TimeFormattingInt, 3659, 3659);
+BENCHMARK_CAPTURE(BM_TimeFormattingInt, 623452, 623452);
+BENCHMARK_CAPTURE(BM_TimeFormattingInt, 8345, 8345);
+BENCHMARK_CAPTURE(BM_TimeFormattingInt, 86432, 86432);
+BENCHMARK_CAPTURE(BM_TimeFormattingQString, qs0, "0");
+BENCHMARK_CAPTURE(BM_TimeFormattingQString, qs1045345, "1045345");
+BENCHMARK_CAPTURE(BM_TimeFormattingQString, qs1337, "1337");
+BENCHMARK_CAPTURE(BM_TimeFormattingQString, qs27, "27");
+BENCHMARK_CAPTURE(BM_TimeFormattingQString, qs314034, "314034");
+BENCHMARK_CAPTURE(BM_TimeFormattingQString, qs34589, "34589");
+BENCHMARK_CAPTURE(BM_TimeFormattingQString, qs3659, "3659");
+BENCHMARK_CAPTURE(BM_TimeFormattingQString, qs623452, "623452");
+BENCHMARK_CAPTURE(BM_TimeFormattingQString, qs8345, "8345");
+BENCHMARK_CAPTURE(BM_TimeFormattingQString, qs86432, "86432");
+BENCHMARK_CAPTURE(BM_TimeFormattingQString, qsempty, "");
+BENCHMARK_CAPTURE(BM_TimeFormattingQString, qsinvalid, "asd");