Merge branch 'main' into WhitelistedProtocols

Author: jonassorgenfrei

.github/workflows/node.js.yml

@@ -10,6 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
       - uses: actions/checkout@v4
       - run: npm ci
       - run: npm test

.npmrc

@@ -0,0 +1 @@
+node-options=--experimental-strip-types

app/common/config-util.ts

@@ -3,7 +3,7 @@ import path from "node:path";
 
 import * as Sentry from "@sentry/core";
 import {JsonDB} from "node-json-db";
-import {DataError} from "node-json-db/dist/lib/Errors";
+import {DataError} from "node-json-db/dist/lib/Errors.js";
 import type {z} from "zod";
 import {app, dialog} from "zulip:remote";
 

app/common/enterprise-util.ts

@@ -26,8 +26,7 @@ reloadDatabase();
 function reloadDatabase(): void {
   let enterpriseFile = "/etc/zulip-desktop-config/global_config.json";
   if (process.platform === "win32") {
-    enterpriseFile =
-      "C:\\Program Files\\Zulip-Desktop-Config\\global_config.json";
+    enterpriseFile = String.raw`C:\Program Files\Zulip-Desktop-Config\global_config.json`;
   }
 
   enterpriseFile = path.resolve(enterpriseFile);

app/common/messages.ts

@@ -1,3 +1,5 @@
+import * as t from "./translation-util.ts";
+
 type DialogBoxError = {
   title: string;
   content: string;
@@ -13,26 +15,24 @@ export function invalidZulipServerError(domain: string): string {
  https://zulip.readthedocs.io/en/stable/production/ssl-certificates.html`;
 }
 
-export function enterpriseOrgError(
-  length: number,
-  domains: string[],
-): DialogBoxError {
+export function enterpriseOrgError(domains: string[]): DialogBoxError {
   let domainList = "";
   for (const domain of domains) {
     domainList += `• ${domain}\n`;
   }
 
   return {
-    title: `Could not add the following ${
-      length === 1 ? "organization" : "organizations"
-    }`,
-    content: `${domainList}\nPlease contact your system administrator.`,
+    title: t.__mf(
+      "{number, plural, one {Could not add # organization} other {Could not add # organizations}}",
+      {number: domains.length},
+    ),
+    content: `${domainList}\n${t.__("Please contact your system administrator.")}`,
   };
 }
 
 export function orgRemovalError(url: string): DialogBoxError {
   return {
-    title: `Removing ${url} is a restricted operation.`,
-    content: "Please contact your system administrator.",
+    title: t.__("Removing {{{url}}} is a restricted operation.", {url}),
+    content: t.__("Please contact your system administrator."),
   };
 }

app/common/translation-util.ts

@@ -13,4 +13,4 @@ i18n.configure({
 /* Fetches the current appLocale from settings.json */
 i18n.setLocale(ConfigUtil.getConfigItem("appLanguage", "en") ?? "en");
 
-export {__} from "i18n";
+export {__, __mf} from "i18n";

app/main/handle-external-link.ts

@@ -11,6 +11,7 @@ import path from "node:path";
 
 import * as ConfigUtil from "../common/config-util.ts";
 import * as LinkUtil from "../common/link-util.ts";
+import * as t from "../common/translation-util.ts";
 
 import {send} from "./typed-ipc-main.ts";
 
@@ -125,8 +126,8 @@ export default function handleExternalLink(
       downloadPath,
       async completed(filePath: string, fileName: string) {
         const downloadNotification = new Notification({
-          title: "Download Complete",
-          body: `Click to show ${fileName} in folder`,
+          title: t.__("Download Complete"),
+          body: t.__("Click to show {{{fileName}}} in folder", {fileName}),
           silent: true, // We'll play our own sound - ding.ogg
         });
         downloadNotification.on("click", () => {
@@ -149,8 +150,8 @@ export default function handleExternalLink(
         if (state !== "cancelled") {
           if (ConfigUtil.getConfigItem("promptDownload", false)) {
             new Notification({
-              title: "Download Complete",
-              body: "Download failed",
+              title: t.__("Download Complete"),
+              body: t.__("Download failed"),
             }).show();
           } else {
             contents.downloadURL(url.href);

app/main/index.ts

@@ -32,7 +32,7 @@ import {sentryInit} from "./sentry.ts";
 import {setAutoLaunch} from "./startup.ts";
 import {ipcMain, send} from "./typed-ipc-main.ts";
 
-import "gatemaker/electron-setup"; // eslint-disable-line import/no-unassigned-import
+import "gatemaker/electron-setup.js"; // eslint-disable-line import-x/no-unassigned-import
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 const {GDK_BACKEND} = process.env;
@@ -87,7 +87,7 @@ function createMainWindow(): BrowserWindow {
     minWidth: 500,
     minHeight: 400,
     webPreferences: {
-      preload: path.join(bundlePath, "renderer.js"),
+      preload: path.join(bundlePath, "renderer.cjs"),
       sandbox: false,
       webviewTag: true,
     },
@@ -239,9 +239,9 @@ function createMainWindow(): BrowserWindow {
     try {
       // Check that the data on the clipboard was encrypted to the key.
       const data = Buffer.from(clipboard.readText(), "hex");
-      const iv = data.slice(0, 12);
-      const ciphertext = data.slice(12, -16);
-      const authTag = data.slice(-16);
+      const iv = data.subarray(0, 12);
+      const ciphertext = data.subarray(12, -16);
+      const authTag = data.subarray(-16);
       const decipher = crypto.createDecipheriv("aes-256-gcm", key, iv, {
         authTagLength: 16,
       });

app/main/linux-update-util.ts

@@ -3,7 +3,7 @@ import fs from "node:fs";
 import path from "node:path";
 
 import {JsonDB} from "node-json-db";
-import {DataError} from "node-json-db/dist/lib/Errors";
+import {DataError} from "node-json-db/dist/lib/Errors.js";
 
 import Logger from "../common/logger-util.ts";
 import * as t from "../common/translation-util.ts";

app/main/linuxupdater.ts

@@ -5,6 +5,7 @@ import {z} from "zod";
 
 import * as ConfigUtil from "../common/config-util.ts";
 import Logger from "../common/logger-util.ts";
+import * as t from "../common/translation-util.ts";
 
 import * as LinuxUpdateUtil from "./linux-update-util.ts";
 
@@ -34,8 +35,11 @@ export async function linuxUpdateNotification(session: Session): Promise<void> {
       const notified = LinuxUpdateUtil.getUpdateItem(latestVersion);
       if (notified === null) {
         new Notification({
-          title: "Zulip Update",
-          body: `A new version ${latestVersion} is available. Please update using your package manager.`,
+          title: t.__("Zulip Update"),
+          body: t.__(
+            "A new version {{{version}}} is available. Please update using your package manager.",
+            {version: latestVersion},
+          ),
         }).show();
         LinuxUpdateUtil.setUpdateItem(latestVersion, true);
       }