Basic fixups for release (#451)

* update node version * fix name fetching for tray * use non deprecated way of opening link * update actions * update dependencies * upload actions
OrangeDrangon · Jun 8, 2024 · fb0b61c · fb0b61c
1 parent 528f80c
commit fb0b61c
Show file tree

Hide file tree

Showing 6 changed files with 1,158 additions and 1,282 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -17,17 +17,17 @@ jobs:
           - windows-latest
           - ubuntu-latest
         node-version:
-          - 17
+          - 20
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ./node_modules
           key: ${{ matrix.os }}-${{ matrix.node-version }}-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
@@ -45,7 +45,7 @@ jobs:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       - name: Upload Build
-        uses: actions/upload-artifact@v2.2.2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-${{ matrix.node-version }}
           path: ./dist
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -17,17 +17,17 @@ jobs:
           - windows-latest
           - ubuntu-latest
         node-version:
-          - 17
+          - 20
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ./node_modules
           key: ${{ matrix.os }}-${{ matrix.node-version }}-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
@@ -43,7 +43,7 @@ jobs:
       - run: yarn dist --publish never
 
       - name: Upload Build
-        uses: actions/upload-artifact@v2.2.2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-${{ matrix.node-version }}
           path: ./dist
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "android-messages-desktop",
   "description": "Messages for web, as a desktop app",
-  "version": "5.4.3",
+  "version": "5.4.4",
   "author": {
     "name": "Kyle Rosenberg",
     "email": "[email protected]"
@@ -28,32 +28,32 @@
   },
   "dependencies": {
     "about-window": "1.15.2",
-    "electron-updater": "5.2.1",
-    "fs-jetpack": "^4.3.1",
+    "electron-updater": "6.2.1",
+    "fs-jetpack": "^5.1.0",
     "rxjs": "^7.5.6",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@types/node": "18.7.18",
-    "@types/uuid": "^8.3.4",
+    "@types/node": "20.14.2",
+    "@types/uuid": "^9.0.8",
     "@types/webpack": "^5.28.0",
-    "@types/webpack-node-externals": "^2.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.37.0",
-    "@typescript-eslint/parser": "^5.37.0",
+    "@types/webpack-node-externals": "^3.0.4",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
     "cross-env": "^7.0.2",
     "electron": "20.1.4",
-    "electron-builder": "^23.3.3",
-    "eslint": "^8.23.1",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "electron-builder": "^24.13.3",
+    "eslint": "^9.4.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "png2icons": "^2.0.1",
-    "prettier": "^2.7.1",
+    "prettier": "^3.3.1",
     "source-map-support": "^0.5.21",
     "ts-loader": "^9.3.1",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.3",
+    "typescript": "^5.4.5",
     "webpack": "^5.74.0",
-    "webpack-cli": "^4.10.0",
+    "webpack-cli": "^5.1.4",
     "webpack-merge": "^5.8.0",
     "webpack-node-externals": "^3.0.0"
   }

diff --git a/src/background.ts b/src/background.ts
@@ -109,7 +109,7 @@ if (gotTheLock) {
         })
     );
 
-    mainWindow.webContents.loadURL("https://messages.google.com/web/");
+    mainWindow.loadURL("https://messages.google.com/web/");
 
     trayManager.startIfEnabled();
     settings.showIconsInRecentConversationTrayEnabled.subscribe(() =>
@@ -148,11 +148,12 @@ if (gotTheLock) {
       }
     });
 
-    mainWindow.webContents.on("new-window", (e, url) => {
-      e.preventDefault();
-      shell.openExternal(url);
+    mainWindow.webContents.setWindowOpenHandler((details) => {
+      shell.openExternal(details.url)
+      return {action: "deny"}
     });
 
+
     mainWindow.webContents.on("context-menu", popupContextMenu);
 
     // block Google collecting data

diff --git a/src/helpers/observers.ts b/src/helpers/observers.ts
@@ -34,7 +34,7 @@ export function recentThreadObserver() {
 
   const data: Conversation[] = conversations.map((conversation, i) => {
     const name = conversation.querySelector(
-      "a div.text-content h3.name span"
+      "a div.text-content h2.name span"
     )?.textContent;
     const canvas = conversation.querySelector(
       "a div.avatar-container canvas"