Merge branch 'itchio:master' into i164

itchio · Jul 1, 2024 · 73a372c · 73a372c
2 parents 40c8655 + bb5e0f6
commit 73a372c
Show file tree

Hide file tree

Showing 7 changed files with 653 additions and 401 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "kitch",
   "productName": "kitch",
   "desktopName": "kitch",
-  "version": "26.1.5-canary",
+  "version": "26.1.9",
   "description": "itch.io desktop client",
   "keywords": [
     "itch.io",
@@ -67,7 +67,7 @@
     "source-map-support": "^0.5.19",
     "split2": "^3.2.2",
     "styled-components": "^5.2.1",
-    "systeminformation": "^5.6.20",
+    "systeminformation": "^5.21.7",
     "term-color": "^1.0.1",
     "tinycolor2": "^1.4.2",
     "triangulr": "^1.0.3",
@@ -110,7 +110,7 @@
     "cross-env": "^7.0.3",
     "css-loader": "^5.2.4",
     "electron": "^22.3.27",
-    "electron-notarize": "^1.0.0",
+    "@electron/notarize": "^2.3.2",
     "electron-packager": "^15.2.0",
     "file-loader": "^6.2.0",
     "happypack": "^5.0.1",

diff --git a/release/packaging/darwin.js b/release/packaging/darwin.js
@@ -58,13 +58,15 @@ async function sign(cx, packageDir) {
   } else {
     console.log("Notarizing...");
     await measure("electron-notarize", async () => {
-      require("debug").enable("electron-notarize");
-      const { notarize } = require("electron-notarize");
+      require("debug").enable("@electron/notarize");
+      const { notarize } = require("@electron/notarize");
       await notarize({
+
         appBundleId: appBundleId(),
         appPath: appBundle,
         appleId: "[email protected]",
         appleIdPassword: process.env.APPLE_ID_PASSWORD || "",
+        teamId: process.env.APPLE_TEAM_ID || "",
       });
     });
 

diff --git a/src/common/constants/urls.ts b/src/common/constants/urls.ts
@@ -1,4 +1,4 @@
-const originalItchio = "https://itch.io/";
+const originalItchio = "https://itch.io";
 const itchio = process.env.WHEN_IN_ROME || originalItchio;
 const manual = "https://itch.io/docs/itch";
 const itchRepo = "https://github.com/itchio/itch";

diff --git a/src/main/reactors/context-menu/build-template.ts b/src/main/reactors/context-menu/build-template.ts
@@ -116,7 +116,7 @@ export function gameControls(store: Store, game: Game): MenuTemplate {
       statusItems.push({
         localizedLabel: [
           `grid.item.${mainAction}_title`,
-          { title: game.title },
+          { title: escapeForContextMenu(game.title) },
         ],
         action: actions.queueGame({ game }),
       });
@@ -178,7 +178,10 @@ export function gameControls(store: Store, game: Game): MenuTemplate {
       } else {
         // we have any kind of access
         statusItems.push({
-          localizedLabel: ["grid.item.install_title", { title: game.title }],
+          localizedLabel: [
+            "grid.item.install_title",
+            { title: escapeForContextMenu(game.title) },
+          ],
           action: actions.queueGame({ game }),
         });
       }
@@ -265,3 +268,9 @@ export function userMenu(store: Store): MenuTemplate {
     },
   ];
 }
+
+function escapeForContextMenu(label: string) {
+  // In a context menu, '&[^&]' will be interpreted as a shortcut
+  // definition. Escaping requires a second ampersand
+  return label.replaceAll("&", "&&");
+}
diff --git a/src/main/reactors/menu.ts b/src/main/reactors/menu.ts
@@ -338,7 +338,7 @@ function computeMenuTemplate(
 
     edit: {
       localizedLabel: ["menu.edit.edit"],
-      visible: false,
+      visible: true,
       submenu: [
         {
           localizedLabel: ["menu.edit.cut"],

diff --git a/src/renderer/modal-widgets/SendFeedback.tsx b/src/renderer/modal-widgets/SendFeedback.tsx
@@ -481,7 +481,7 @@ ${log}
       );
     }
 
-    if (typeof input === "object") {
+    if (typeof input === "object" && input !== null) {
       return (
         <>
           {Object.keys(input).map((k) => (