Merge chatterino2 into chatterino7

.cirrus.yml

@@ -1,13 +1,25 @@
 freebsd_instance:
-  image: freebsd-12-1-release-amd64
+  image: freebsd-13-1-release-amd64
 
 task:
   install_script:
-  - pkg install -y boost-libs git qt5-buildtools qt5-concurrent qt5-core qt5-multimedia qt5-svg qtkeychain-qt5 qt5-qmake cmake qt5-linguist
+    - pkg install -y boost-libs git qt5-buildtools qt5-concurrent qt5-core qt5-multimedia qt5-svg qtkeychain-qt5 qt5-qmake cmake qt5-linguist
   script: |
     git submodule init
     git submodule update
     mkdir build
     cd build
-    cmake CMAKE_C_COMPILER="cc" -DCMAKE_CXX_COMPILER="c++" -DCMAKE_C_FLAGS="-O2 -pipe  -fstack-protector-strong -fno-strict-aliasing "  -DCMAKE_CXX_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing  "  -DLINK_OPTIONS="-fstack-protector-strong" -DCMAKE_INSTALL_PREFIX="/usr/local" -DCMAKE_BUILD_TYPE="release" ..
+    c++ --version
+    cmake \
+        -DCMAKE_C_COMPILER="cc" \
+        -DCMAKE_CXX_COMPILER="c++" \
+        -DCMAKE_C_FLAGS="-O2 -pipe  -fstack-protector-strong -fno-strict-aliasing "  \
+        -DCMAKE_CXX_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing  " \
+        -DLINK_OPTIONS="-fstack-protector-strong" \
+        -DCMAKE_INSTALL_PREFIX="/usr/local" \
+        -DUSE_SYSTEM_QTKEYCHAIN="ON" \
+        -DCMAKE_BUILD_TYPE="release" \
+        -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+        ..
+    cat compile_commands.json
     make -j $(getconf _NPROCESSORS_ONLN)

.clang-tidy

@@ -1,56 +1,56 @@
-Checks: '-*,
-    clang-diagnostic-*,
-    llvm-*,
-    misc-*,
-    -misc-unused-parameters,
-    readability-identifier-naming,
-    -llvm-header-guard,
-    -llvm-include-order,
-    modernize-*,
-    readability-*,
-    performance-*,
-    misc-*,
-    bugprone-*,
-    cert-*,
-    cppcoreguidelines-*,
-    -cppcoreguidelines-pro-type-cstyle-cast,
-    -cppcoreguidelines-pro-bounds-pointer-arithmetic,
-    -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-    -cppcoreguidelines-pro-type-member-init,
-    -cppcoreguidelines-owning-memory,
-    -cppcoreguidelines-avoid-magic-numbers,
-    -readability-magic-numbers,
-    -performance-noexcept-move-constructor,
-    -misc-non-private-member-variables-in-classes,
-    -cppcoreguidelines-non-private-member-variables-in-classes,
-    -cppcoreguidelines-special-member-functions,
-    -modernize-use-nodiscard,
-    -modernize-use-trailing-return-type,
-    -readability-identifier-length,
-    -readability-function-cognitive-complexity,
-    -bugprone-easily-swappable-parameters,
-    -cert-err58-cpp,
-    '
+Checks: "-*,
+  clang-diagnostic-*,
+  llvm-*,
+  misc-*,
+  -misc-unused-parameters,
+  readability-identifier-naming,
+  -llvm-header-guard,
+  -llvm-include-order,
+  modernize-*,
+  readability-*,
+  performance-*,
+  misc-*,
+  bugprone-*,
+  cert-*,
+  cppcoreguidelines-*,
+  -cppcoreguidelines-pro-type-cstyle-cast,
+  -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+  -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
+  -cppcoreguidelines-pro-type-member-init,
+  -cppcoreguidelines-owning-memory,
+  -cppcoreguidelines-avoid-magic-numbers,
+  -readability-magic-numbers,
+  -performance-noexcept-move-constructor,
+  -misc-non-private-member-variables-in-classes,
+  -cppcoreguidelines-non-private-member-variables-in-classes,
+  -cppcoreguidelines-special-member-functions,
+  -modernize-use-nodiscard,
+  -modernize-use-trailing-return-type,
+  -readability-identifier-length,
+  -readability-function-cognitive-complexity,
+  -bugprone-easily-swappable-parameters,
+  -cert-err58-cpp,
+  "
 CheckOptions:
-  - key:             readability-identifier-naming.ClassCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.EnumCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.FunctionCase
-    value:           camelBack
-  - key:             readability-identifier-naming.MemberCase
-    value:           camelBack
-  - key:             readability-identifier-naming.PrivateMemberIgnoredRegexp
-    value:           .*
-  - key:             readability-identifier-naming.PrivateMemberSuffix
-    value:           _
-  - key:             readability-identifier-naming.ProtectedMemberSuffix
-    value:           _
-  - key:             readability-identifier-naming.UnionCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.GlobalVariableCase
-    value:           UPPER_CASE
-  - key:             readability-identifier-naming.VariableCase
-    value:           camelBack
-  - key:             readability-implicit-bool-conversion.AllowPointerConditions
-    value:           true
+  - key: readability-identifier-naming.ClassCase
+    value: CamelCase
+  - key: readability-identifier-naming.EnumCase
+    value: CamelCase
+  - key: readability-identifier-naming.FunctionCase
+    value: camelBack
+  - key: readability-identifier-naming.MemberCase
+    value: camelBack
+  - key: readability-identifier-naming.PrivateMemberIgnoredRegexp
+    value: .*
+  - key: readability-identifier-naming.PrivateMemberSuffix
+    value: _
+  - key: readability-identifier-naming.ProtectedMemberSuffix
+    value: _
+  - key: readability-identifier-naming.UnionCase
+    value: CamelCase
+  - key: readability-identifier-naming.GlobalConstantCase
+    value: UPPER_CASE
+  - key: readability-identifier-naming.VariableCase
+    value: camelBack
+  - key: readability-implicit-bool-conversion.AllowPointerConditions
+    value: true

.github/FUNDING.yml

@@ -1 +1 @@
-custom: "https://streamelements.com/fourtf/tip"
+custom: "https://streamelements.com/fourtf/tip"

.github/ISSUE_TEMPLATE/a_make_a_report.yml

@@ -6,48 +6,47 @@ 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 **the most** recent nightly build or 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 and pull requests](https://github.com/Chatterino/chatterino2/issues?q=) for similar looking reports
-              required: true
+      label: Checklist
+      description:
+      options:
+        - label: I'm reporting a problem with Chatterino
+          required: true
+        - label: I've verified that I'm running **the most** recent nightly build or 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 and pull requests](https://github.com/Chatterino/chatterino2/issues?q=) for similar looking reports
+          required: true
 
   - type: textarea
     id: description
     validations:
-        required: true
+      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.
+      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.
+      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
+      required: true
     attributes:
-        label: OS and Chatterino Version
-        description: The name of your Operating System and the version shown in Chatterino's about settings page (⚙ -> about tab).
-        placeholder: Chatterino 2.3.5 (commit 81a62764, 2022-04-05) on Windows 10 Version 2009, kernel 10.0.19043
-
+      label: OS and Chatterino Version
+      description: The name of your Operating System and the version shown in Chatterino's about settings page (⚙ -> about tab).
+      placeholder: Chatterino 2.3.5 (commit 81a62764, 2022-04-05) on Windows 10 Version 2009, kernel 10.0.19043

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-    - name: Issue about the Chatterino Browser Extension
-      url: https://github.com/Chatterino/chatterino-browser-ext/issues
-      about: Make a suggestion or report a bug about the Chatterino browser extension.
-    - name: Suggestions or feature request
-      url: https://github.com/chatterino/chatterino2/discussions/categories/ideas
-      about: Got something you think should change or be added? Search for or start a new discussion!
-    - name: Help
-      url: https://github.com/chatterino/chatterino2/discussions/categories/q-a
-      about: Chatterino2 not working as you'd expect? Not sure it's a bug? Check the Q&A section!
+  - name: Issue about the Chatterino Browser Extension
+    url: https://github.com/Chatterino/chatterino-browser-ext/issues
+    about: Make a suggestion or report a bug about the Chatterino browser extension.
+  - name: Suggestions or feature request
+    url: https://github.com/chatterino/chatterino2/discussions/categories/ideas
+    about: Got something you think should change or be added? Search for or start a new discussion!
+  - name: Help
+    url: https://github.com/chatterino/chatterino2/discussions/categories/q-a
+    about: Chatterino2 not working as you'd expect? Not sure it's a bug? Check the Q&A section!