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

.CI/setup-clang-tidy.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -ev;
+
+# aqt installs into .qtinstall/Qt/<version>/gcc_64
+# This is doing the same as jurplel/install-qt-action
+# See https://github.com/jurplel/install-qt-action/blob/74ca8cd6681420fc8894aed264644c7a76d7c8cb/action/src/main.ts#L52-L74
+qtpath=$(echo .qtinstall/Qt/[0-9]*/*/bin/qmake | sed -e s:/bin/qmake$::)
+export LD_LIBRARY_PATH="$qtpath/lib"
+export QT_ROOT_DIR=$qtpath
+export QT_PLUGIN_PATH="$qtpath/plugins"
+export PATH="$PATH:$(realpath "$qtpath/bin")"
+export Qt6_DIR="$(realpath "$qtpath")"
+
+cmake -S. -Bbuild-clang-tidy \
+    -DCMAKE_BUILD_TYPE=Debug \
+    -DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \
+    -DUSE_PRECOMPILED_HEADERS=OFF \
+    -DCMAKE_EXPORT_COMPILE_COMMANDS=On \
+    -DCHATTERINO_LTO=Off \
+    -DCHATTERINO_PLUGINS=On \
+    -DBUILD_WITH_QT6=On \
+    -DBUILD_TESTS=On \
+    -DBUILD_BENCHMARKS=On
+
+# Run MOC and UIC
+# This will compile the dependencies
+# Get the targets using `ninja -t targets | grep autogen`
+cmake --build build-clang-tidy --parallel -t \
+    Core_autogen \
+    LibCommuni_autogen \
+    Model_autogen \
+    Util_autogen \
+    chatterino-lib_autogen

.clang-format

@@ -50,3 +50,4 @@ PointerBindsToType: false
 SpacesBeforeTrailingComments: 2
 Standard: Auto
 ReflowComments: false
+InsertNewlineAtEOF: true

.github/workflows/clang-tidy.yml

@@ -8,60 +8,25 @@ concurrency:
   group: clang-tidy-${{ github.ref }}
   cancel-in-progress: true
 
-env:
-  CHATTERINO_REQUIRE_CLEAN_GIT: On
-  C2_BUILD_WITH_QT6: Off
-
 jobs:
-  build:
+  review:
     name: "clang-tidy ${{ matrix.os }}, Qt ${{ matrix.qt-version }})"
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         include:
-          # Ubuntu 22.04, Qt 5.15
+          # Ubuntu 22.04, Qt 6.6
           - os: ubuntu-22.04
-            qt-version: 5.15.2
-            plugins: false
+            qt-version: 6.6.2
 
       fail-fast: false
 
     steps:
-      - name: Enable plugin support
-        if: matrix.plugins
-        run: |
-          echo "C2_PLUGINS=ON" >> "$GITHUB_ENV"
-        shell: bash
-
-      - name: Set BUILD_WITH_QT6
-        if: startsWith(matrix.qt-version, '6.')
-        run: |
-          echo "C2_BUILD_WITH_QT6=ON" >> "$GITHUB_ENV"
-        shell: bash
-
       - uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 0 # allows for tags access
 
-      - name: Install Qt5
-        if: startsWith(matrix.qt-version, '5.')
-        uses: jurplel/install-qt-action@v3.3.0
-        with:
-          cache: true
-          cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2
-          version: ${{ matrix.qt-version }}
-
-      - name: Install Qt 6.5.3 imageformats
-        if: startsWith(matrix.qt-version, '6.')
-        uses: jurplel/install-qt-action@v3.3.0
-        with:
-          cache: false
-          modules: qtimageformats
-          set-env: false
-          version: 6.5.3
-          extra: --noarchives
-
       - name: Install Qt6
         if: startsWith(matrix.qt-version, '6.')
         uses: jurplel/install-qt-action@v3.3.0
@@ -70,79 +35,31 @@ jobs:
           cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2
           modules: qt5compat qtimageformats
           version: ${{ matrix.qt-version }}
-
-      # LINUX
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install \
-              cmake \
-              virtualenv \
-              rapidjson-dev \
-              libfuse2 \
-              libssl-dev \
-              libboost-dev \
-              libxcb-randr0-dev \
-              libboost-system-dev \
-              libboost-filesystem-dev \
-              libpulse-dev \
-              libxkbcommon-x11-0 \
-              build-essential \
-              libgl1-mesa-dev \
-              libxcb-icccm4 \
-              libxcb-image0 \
-              libxcb-keysyms1 \
-              libxcb-render-util0 \
-              libxcb-xinerama0
-
-      - name: Apply Qt5 patches
-        if: startsWith(matrix.qt-version, '5.')
-        run: |
-          patch "$Qt5_DIR/include/QtConcurrent/qtconcurrentthreadengine.h" .patches/qt5-on-newer-gcc.patch
-        shell: bash
-
-      - name: Build
-        run: |
-          mkdir build
-          cd build
-          CXXFLAGS=-fno-sized-deallocation cmake \
-            -DCMAKE_INSTALL_PREFIX=appdir/usr/ \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \
-            -DUSE_PRECOMPILED_HEADERS=OFF \
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=On \
-            -DCHATTERINO_LTO="$C2_ENABLE_LTO" \
-            -DCHATTERINO_PLUGINS="$C2_PLUGINS" \
-            -DBUILD_WITH_QT6="$C2_BUILD_WITH_QT6" \
-            ..
-        shell: bash
+          dir: ${{ github.workspace }}/.qtinstall
+          set-env: false
 
       - name: clang-tidy review
         timeout-minutes: 20
-        uses: ZedThree/clang-tidy-review@v0.17.3
+        uses: ZedThree/clang-tidy-review@v0.18.0
         with:
           build_dir: build-clang-tidy
           config_file: ".clang-tidy"
           split_workflow: true
           exclude: "lib/*,tools/crash-handler/*"
           cmake_command: >-
-            cmake -S. -Bbuild-clang-tidy 
-            -DCMAKE_BUILD_TYPE=Release 
-            -DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On 
-            -DUSE_PRECOMPILED_HEADERS=OFF 
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=On 
-            -DCHATTERINO_LTO=Off 
-            -DCHATTERINO_PLUGINS=On 
-            -DBUILD_WITH_QT6=Off
-            -DBUILD_TESTS=On
-            -DBUILD_BENCHMARKS=On
+            ./.CI/setup-clang-tidy.sh
           apt_packages: >-
-            qttools5-dev, qt5-image-formats-plugins, libqt5svg5-dev, 
             libsecret-1-dev,
             libboost-dev, libboost-system-dev, libboost-filesystem-dev,
             libssl-dev,
             rapidjson-dev,
-            libbenchmark-dev
+            libbenchmark-dev,
+            build-essential,
+            libgl1-mesa-dev, libgstreamer-gl1.0-0, libpulse-dev,
+            libxcb-glx0, libxcb-icccm4, libxcb-image0, libxcb-keysyms1, libxcb-randr0,
+            libxcb-render-util0, libxcb-render0, libxcb-shape0, libxcb-shm0, libxcb-sync1,
+            libxcb-util1, libxcb-xfixes0, libxcb-xinerama0, libxcb1, libxkbcommon-dev,
+            libxkbcommon-x11-0, libxcb-xkb-dev, libxcb-cursor0
 
       - name: clang-tidy-review upload
-        uses: ZedThree/clang-tidy-review/upload@v0.17.3
+        uses: ZedThree/clang-tidy-review/upload@v0.18.0

.github/workflows/post-clang-tidy-review.yml

@@ -8,12 +8,13 @@ on:
       - completed
 
 jobs:
-  build:
+  post:
     runs-on: ubuntu-latest
     # Only when a build succeeds
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     steps:
-      - uses: ZedThree/clang-tidy-review/post@v0.17.3
+      - uses: ZedThree/clang-tidy-review/post@v0.18.0
         with:
           lgtm_comment_body: ""
+          num_comments_as_exitcode: false

CHANGELOG.md

@@ -50,6 +50,9 @@
 - Minor: Image links now reflect the scale of their image instead of an internal label. (#5201)
 - Minor: IPC files are now stored in the Chatterino directory instead of system directories on Windows. (#5226)
 - Minor: 7TV emotes now have a 4x image rather than a 3x image. (#5209)
+- Minor: Add `reward.cost` `reward.id`, `reward.title` filter variables. (#5275)
+- Minor: Change Lua `CompletionRequested` handler to use an event table. (#5280)
+- Minor: Changed the layout of the about page. (#5287)
 - Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840)
 - Bugfix: Fixed the `/shoutout` command not working with usernames starting with @'s (e.g. `/shoutout @forsen`). (#4800)
 - Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848)
@@ -103,6 +106,7 @@
 - Bugfix: Fixed popup windows not persisting between restarts. (#5081)
 - Bugfix: Fixed splits not retaining their focus after minimizing. (#5080)
 - Bugfix: Fixed _Copy message_ copying the channel name in global search. (#5106)
+- Bugfix: Fixed some Twitch emotes sizes being wrong at certain zoom levels. (#5279)
 - Bugfix: Fixed a missing space when the image uploader provided a delete link. (#5269)
 - Bugfix: Reply contexts now use the color of the replied-to message. (#5145)
 - Bugfix: Fixed top-level window getting stuck after opening settings. (#5161, #5166)
@@ -112,10 +116,12 @@
 - Bugfix: Fixed split header tooltips showing in the wrong position on Windows. (#5230)
 - Bugfix: Fixed split header tooltips appearing too tall. (#5232)
 - Bugfix: Fixed past messages not showing in the search popup after adding a channel. (#5248)
+- Bugfix: Fixed pause indicator not disappearing in some cases. (#5265)
 - Bugfix: Fixed the usercard popup not floating on tiling WMs on Linux when "Automatically close user popup when it loses focus" setting is enabled. (#3511)
 - Bugfix: Fixed moderator-only topics being subscribed to for non-moderators. (#5056)
 - Bugfix: Truncated IRC messages to be at most 512 bytes. (#5246)
 - Bugfix: Fixed a data race when disconnecting from Twitch PubSub. (#4771)
+- Bugfix: Fixed messages not immediately disappearing when clearing the chat. (#5282)
 - 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)
@@ -175,7 +181,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)
+- Dev: Autogenerate docs/plugin-meta.lua. (#5055, #5283)
 - Dev: Changed Ubuntu & AppImage builders to statically link Qt. (#5151)
 - Dev: Refactor `NetworkPrivate`. (#5063)
 - Dev: Refactor `Paths` & `Updates`, focusing on reducing their singletoniability. (#5092, #5102)
@@ -186,14 +192,16 @@
 - Dev: Added signal to invalidate paint buffers of channel views without forcing a relayout. (#5123)
 - Dev: Specialize `Atomic<std::shared_ptr<T>>` if underlying standard library supports it. (#5133)
 - Dev: Added the `developer_name` field to the Linux AppData specification. (#5138)
-- Dev: Twitch messages can be sent using Twitch's Helix API instead of IRC (disabled by default). (#5200)
+- Dev: Twitch messages can be sent using Twitch's Helix API instead of IRC (disabled by default). (#5200, #5276)
 - Dev: Added estimation for image sizes to avoid layout shifts. (#5192)
 - Dev: Added the `launachable` entry to Linux AppData. (#5210)
 - Dev: Cleaned up and optimized resources. (#5222)
 - Dev: Refactor `StreamerMode`. (#5216, #5236)
 - Dev: Cleaned up unused code in `MessageElement` and `MessageLayoutElement`. (#5225)
 - Dev: Adapted `magic_enum` to Qt's Utf-16 strings. (#5258)
 - Dev: `NetworkManager`'s statics are now created in its `init` method. (#5254)
+- Dev: `clang-tidy` CI now uses Qt 6. (#5273)
+- Dev: Enabled `InsertNewlineAtEOF` in `clang-format`. (#5278)
 
 ## 2.4.6
 

docs/chatterino.d.ts

@@ -75,6 +75,13 @@ declare module c2 {
     handler: (ctx: CommandContext) => void
   ): boolean;
 
+  class CompletionEvent {
+    query: string;
+    full_text_content: string;
+    cursor_position: number;
+    is_first_word: boolean;
+  }
+
   class CompletionList {
     values: String[];
     hide_others: boolean;
@@ -84,12 +91,7 @@ declare module c2 {
     CompletionRequested = "CompletionRequested",
   }
 
-  type CbFuncCompletionsRequested = (
-    query: string,
-    full_text_content: string,
-    cursor_position: number,
-    is_first_word: boolean
-  ) => CompletionList;
+  type CbFuncCompletionsRequested = (ev: CompletionEvent) => CompletionList;
   type CbFunc<T> = T extends EventType.CompletionRequested
     ? CbFuncCompletionsRequested
     : never;