Merge branch 'develop' into release (Bump to 6.5.1)v6.5.1

5 files changed, 17 insertions, 17 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8a6268274..ffda7acb9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -186,8 +186,15 @@ git merge --no-ff nightly --no-verify
 # <run the build script for your OS from the `scripts` folder>
 # <add all pertinent changes to git>
 # <create commit>
-# <create tag>
-git push
+git push upstream release
+# Note: Do NOT allow the GHA release process to create the tag automatically, since that will be at the SHA in the develop branch and not on the release branch - which is logically incorrect
+git tag v$(node -p 'require("./package.json").version')
+git push upstream --tags
+# Note: GHA will automatically build with publish since its the release branch
+# Note: Once the GHA action is completed, verify the builds (there should be 32 assets before publishing)
+gco develop
+# <If its a public release, manually bump to next nightly.0 version in package.json>
+# <If its a public release, manually fix homebrew-ferdium PR>
 ```
 
 This will automatically trigger the build, as part of which, a new, draft release will be created [here](https://github.com/ferdium/ferdium-app/releases/). Once all the assets are uploaded (19 assets in total), publish the release (you will need elevated permissions in GitHub for doing this). The last commit of the `release` branch will be tagged.
diff --git a/package.json b/package.json
index f2fefdd2f..cdfc7eefa 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdium",
   "desktopName": "ferdium.desktop",
   "appId": "org.ferdium.ferdium-app",
-  "version": "6.5.0",
+  "version": "6.5.1",
   "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.",
   "author": "Ferdium Contributors <hello@ferdium.org> (https://ferdium.org/)",
   "license": "Apache-2.0",
@@ -230,7 +230,7 @@
     "usocket": "_EXCLUDED_"
   },
   "optionalDependencies": {
-    "macos-notification-state": "github:ferdium/macos-notification-state#e0465373b0aed12ea4ce30522e82aaa8706cdf40",
+    "macos-notification-state": "github:ferdium/macos-notification-state#130bb2602795b65ae2dea74d823027b185eaf0ae",
     "node-mac-permissions": "2.3.0"
   },
   "browserslist": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ebcf767ed..ed9552d93 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -263,8 +263,8 @@ dependencies:
 
 optionalDependencies:
   macos-notification-state:
-    specifier: github:ferdium/macos-notification-state#e0465373b0aed12ea4ce30522e82aaa8706cdf40
-    version: github.com/ferdium/macos-notification-state/e0465373b0aed12ea4ce30522e82aaa8706cdf40
+    specifier: github:ferdium/macos-notification-state#130bb2602795b65ae2dea74d823027b185eaf0ae
+    version: github.com/ferdium/macos-notification-state/130bb2602795b65ae2dea74d823027b185eaf0ae
   node-mac-permissions:
     specifier: 2.3.0
     version: 2.3.0
@@ -9989,12 +9989,6 @@ packages:
     dev: true
     optional: true
 
-  /node-addon-api@3.0.0:
-    resolution: {integrity: sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg==}
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /node-addon-api@3.2.1:
     resolution: {integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==}
     requiresBuild: true
@@ -13728,13 +13722,12 @@ packages:
       stack-trace: 0.0.10
     dev: false
 
-  github.com/ferdium/macos-notification-state/e0465373b0aed12ea4ce30522e82aaa8706cdf40:
-    resolution: {tarball: https://codeload.github.com/ferdium/macos-notification-state/tar.gz/e0465373b0aed12ea4ce30522e82aaa8706cdf40}
+  github.com/ferdium/macos-notification-state/130bb2602795b65ae2dea74d823027b185eaf0ae:
+    resolution: {tarball: https://codeload.github.com/ferdium/macos-notification-state/tar.gz/130bb2602795b65ae2dea74d823027b185eaf0ae}
     name: macos-notification-state
-    version: 3.0.0
+    version: 2.0.2
     requiresBuild: true
     dependencies:
       bindings: 1.5.0
-      node-addon-api: 3.0.0
     dev: false
     optional: true
diff --git a/recipes b/recipes
-Subproject cdafac130fd454610d1fa2cb53b061b17b64e2c
+Subproject 36774cff661e1306ffd1b4ff5fce432eb107570
diff --git a/src/electron/ipc-api/dnd.ts b/src/electron/ipc-api/dnd.ts
index 30ace7c84..6e6e0920f 100644
--- a/src/electron/ipc-api/dnd.ts
+++ b/src/electron/ipc-api/dnd.ts
@@ -17,7 +17,7 @@ export default async () => {
     }
 
     try {
-      const isDND = await getDoNotDisturb();
+      const isDND = getDoNotDisturb();
       debug('Fetching DND state, set to', isDND);
       return isDND;
     } catch (error) {