From 7a056dbc9df679658bb981a387646179e666d413 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Sun, 16 Apr 2023 20:20:43 +0200
Subject: [PATCH 1/3] ci: use `macos` rather than `osx` in filenames

---
 .CI/CreateDMG.sh            | 2 +-
 .github/workflows/build.yml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.CI/CreateDMG.sh b/.CI/CreateDMG.sh
index c5cf2d209ec..5eaddc071a7 100755
--- a/.CI/CreateDMG.sh
+++ b/.CI/CreateDMG.sh
@@ -28,5 +28,5 @@ echo "Entering python3 virtual environment"
 echo "Installing dmgbuild"
 python3 -m pip install dmgbuild
 echo "Running dmgbuild.."
-dmgbuild --settings ./../.CI/dmg-settings.py -D app=./chatterino.app Chatterino2 chatterino-osx-Qt-$1.dmg
+dmgbuild --settings ./../.CI/dmg-settings.py -D app=./chatterino.app Chatterino2 chatterino-macos-Qt-$1.dmg
 echo "Done!"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b786a41572f..c9beb6b347d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -348,8 +348,8 @@ jobs:
         if: startsWith(matrix.os, 'macos')
         uses: actions/upload-artifact@v3
         with:
-          name: chatterino-osx-Qt-${{ matrix.qt-version }}.dmg
-          path: build/chatterino-osx-Qt-${{ matrix.qt-version }}.dmg
+          name: chatterino-macos-Qt-${{ matrix.qt-version }}.dmg
+          path: build/chatterino-macos-Qt-${{ matrix.qt-version }}.dmg
   create-release:
     needs: build
     runs-on: ubuntu-latest
@@ -411,13 +411,13 @@ jobs:
       - uses: actions/download-artifact@v3
         name: macOS x86_64 Qt5.15.2 dmg
         with:
-          name: chatterino-osx-Qt-5.15.2.dmg
+          name: chatterino-macos-Qt-5.15.2.dmg
           path: release-artifacts/
 
       - uses: actions/download-artifact@v3
         name: macOS x86_64 Qt6.5.0 dmg
         with:
-          name: chatterino-osx-Qt-6.5.0.dmg
+          name: chatterino-macos-Qt-6.5.0.dmg
           path: release-artifacts/
 
       - name: Copy flatpakref

From 112cdd1bf6ec48f4a070915616a22af4d790544a Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Sun, 16 Apr 2023 20:28:28 +0200
Subject: [PATCH 2/3] chore: add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdf47b1d609..2378a428edd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
 - Dev: Added tests and benchmarks for `LinkParser`. (#4436)
 - Dev: Experimental builds with Qt 6 are now provided. (#4522)
 - Dev: Removed `CHATTERINO_TEST` definitions. (#4526)
+- Dev: Builds for macOS now have `macos` in their name (previously: `osx`). (#4550)
 
 ## 2.4.2
 

From 27ade8399510226f6d7b5a16862556d049533e92 Mon Sep 17 00:00:00 2001
From: Felanbird <41973452+Felanbird@users.noreply.github.com>
Date: Sun, 16 Apr 2023 14:35:36 -0400
Subject: [PATCH 3/3] sneak in a comment update to respect this related change

---
 src/singletons/Toasts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/singletons/Toasts.cpp b/src/singletons/Toasts.cpp
index 09fbf8fbcc0..b421e46d8a3 100644
--- a/src/singletons/Toasts.cpp
+++ b/src/singletons/Toasts.cpp
@@ -76,7 +76,7 @@ void Toasts::sendChannelNotification(const QString &channelName,
     };
 #else
     auto sendChannelNotification = [] {
-        // Unimplemented for OSX and Linux
+        // Unimplemented for macOS and Linux
     };
 #endif
     // Fetch user profile avatar