Update develop tarball url

Requires https://github.com/vector-im/element-web/pull/23454

.eslintrc.js

@@ -30,8 +30,9 @@ module.exports = {
             "prefer-promise-reject-errors": "off",
             "quotes": "off",
 
-            // We disable this while we're transitioning
             "@typescript-eslint/no-explicit-any": "off",
+            // We're okay with assertion errors when we ask for them
+            "@typescript-eslint/no-non-null-assertion": "off",
         },
     }],
 };

CHANGELOG.md

@@ -1,3 +1,106 @@
+Changes in [1.11.13](https://github.com/vector-im/element-desktop/releases/tag/v1.11.13) (2022-11-01)
+=====================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix default behavior of Room.getBlacklistUnverifiedDevices ([\#2830](https://github.com/matrix-org/matrix-js-sdk/pull/2830)). Contributed by @duxovni.
+ * Catch server versions API call exception when starting the client ([\#2828](https://github.com/matrix-org/matrix-js-sdk/pull/2828)). Fixes vector-im/element-web#23634.
+ * Fix authedRequest including `Authorization: Bearer undefined` for password resets ([\#2822](https://github.com/matrix-org/matrix-js-sdk/pull/2822)). Fixes vector-im/element-web#23655.
+
+Changes in [1.11.12](https://github.com/vector-im/element-desktop/releases/tag/v1.11.12) (2022-10-26)
+=====================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](https://github.com/vector-im/element-web/pull/23577)).
+
+Changes in [1.11.11](https://github.com/vector-im/element-desktop/releases/tag/v1.11.11) (2022-10-25)
+=====================================================================================================
+
+## ✨ Features
+ * Device manager - tweak string formatting of default device name ([\#23457](https://github.com/vector-im/element-web/pull/23457)).
+ * Add Element Call participant limit ([\#23431](https://github.com/vector-im/element-web/pull/23431)).
+ * Add Element Call `brand` ([\#23443](https://github.com/vector-im/element-web/pull/23443)).
+ * Include a file-safe room name and ISO date in chat exports ([\#9440](https://github.com/matrix-org/matrix-react-sdk/pull/9440)). Fixes vector-im/element-web#21812 and vector-im/element-web#19724.
+ * Room call banner ([\#9378](https://github.com/matrix-org/matrix-react-sdk/pull/9378)). Fixes vector-im/element-web#23453. Contributed by @toger5.
+ * Device manager - spinners while devices are signing out ([\#9433](https://github.com/matrix-org/matrix-react-sdk/pull/9433)). Fixes vector-im/element-web#15865.
+ * Device manager - silence call ringers when local notifications are silenced ([\#9420](https://github.com/matrix-org/matrix-react-sdk/pull/9420)).
+ * Pass the current language to Element Call ([\#9427](https://github.com/matrix-org/matrix-react-sdk/pull/9427)).
+ * Hide screen-sharing button in Element Call on desktop ([\#9423](https://github.com/matrix-org/matrix-react-sdk/pull/9423)).
+ * Add reply support to WysiwygComposer ([\#9422](https://github.com/matrix-org/matrix-react-sdk/pull/9422)). Contributed by @florianduros.
+ * Disconnect other connected devices (of the same user) when joining an Element call ([\#9379](https://github.com/matrix-org/matrix-react-sdk/pull/9379)).
+ * Device manager - device tile main click target ([\#9409](https://github.com/matrix-org/matrix-react-sdk/pull/9409)).
+ * Add formatting buttons to the rich text editor ([\#9410](https://github.com/matrix-org/matrix-react-sdk/pull/9410)). Contributed by @florianduros.
+ * Device manager - current session context menu ([\#9386](https://github.com/matrix-org/matrix-react-sdk/pull/9386)).
+ * Remove piwik config fallback for privacy policy URL ([\#9390](https://github.com/matrix-org/matrix-react-sdk/pull/9390)).
+ * Add the first step to integrate the matrix wysiwyg composer ([\#9374](https://github.com/matrix-org/matrix-react-sdk/pull/9374)). Contributed by @florianduros.
+ * Device manager - UA parsing tweaks ([\#9382](https://github.com/matrix-org/matrix-react-sdk/pull/9382)).
+ * Device manager - remove client information events when disabling setting ([\#9384](https://github.com/matrix-org/matrix-react-sdk/pull/9384)).
+ * Add Element Call participant limit ([\#9358](https://github.com/matrix-org/matrix-react-sdk/pull/9358)).
+ * Add Element Call room settings ([\#9347](https://github.com/matrix-org/matrix-react-sdk/pull/9347)).
+ * Device manager - render extended device information ([\#9360](https://github.com/matrix-org/matrix-react-sdk/pull/9360)).
+ * New group call experience: Room header and PiP designs ([\#9351](https://github.com/matrix-org/matrix-react-sdk/pull/9351)).
+ * Pass language to Jitsi Widget ([\#9346](https://github.com/matrix-org/matrix-react-sdk/pull/9346)). Contributed by @Fox32.
+ * Add notifications and toasts for Element Call calls ([\#9337](https://github.com/matrix-org/matrix-react-sdk/pull/9337)).
+ * Device manager - device type icon ([\#9355](https://github.com/matrix-org/matrix-react-sdk/pull/9355)).
+ * Delete the remainder of groups ([\#9357](https://github.com/matrix-org/matrix-react-sdk/pull/9357)). Fixes vector-im/element-web#22770.
+ * Device manager - display client information in device details ([\#9315](https://github.com/matrix-org/matrix-react-sdk/pull/9315)).
+
+## 🐛 Bug Fixes
+ * Send Content-Type: application/json header for integration manager /register API ([\#9490](https://github.com/matrix-org/matrix-react-sdk/pull/9490)). Fixes vector-im/element-web#23580.
+ * Make ErrorView & CompatibilityView scrollable ([\#23468](https://github.com/vector-im/element-web/pull/23468)). Fixes vector-im/element-web#23376.
+ * Device manager - put client/browser device metadata in correct section ([\#9447](https://github.com/matrix-org/matrix-react-sdk/pull/9447)).
+ * update the room unread notification counter when the server changes the value without any related read receipt ([\#9438](https://github.com/matrix-org/matrix-react-sdk/pull/9438)).
+ * Don't show call banners in video rooms ([\#9441](https://github.com/matrix-org/matrix-react-sdk/pull/9441)).
+ * Prevent useContextMenu isOpen from being true if the button ref goes away ([\#9418](https://github.com/matrix-org/matrix-react-sdk/pull/9418)). Fixes matrix-org/element-web-rageshakes#15637.
+ * Automatically focus the WYSIWYG composer when you enter a room ([\#9412](https://github.com/matrix-org/matrix-react-sdk/pull/9412)).
+ * Improve the tooltips on the call lobby join button ([\#9428](https://github.com/matrix-org/matrix-react-sdk/pull/9428)).
+ * Pass the homeserver's base URL to Element Call ([\#9429](https://github.com/matrix-org/matrix-react-sdk/pull/9429)). Fixes vector-im/element-web#23301.
+ * Better accommodate long room names in call toasts ([\#9426](https://github.com/matrix-org/matrix-react-sdk/pull/9426)).
+ * Hide virtual widgets from the room info panel ([\#9424](https://github.com/matrix-org/matrix-react-sdk/pull/9424)). Fixes vector-im/element-web#23494.
+ * Inhibit clicking on sender avatar in threads list ([\#9417](https://github.com/matrix-org/matrix-react-sdk/pull/9417)). Fixes vector-im/element-web#23482.
+ * Correct the dir parameter of MSC3715 ([\#9391](https://github.com/matrix-org/matrix-react-sdk/pull/9391)). Contributed by @dhenneke.
+ * Use a more correct subset of users in `/remakeolm` developer command ([\#9402](https://github.com/matrix-org/matrix-react-sdk/pull/9402)).
+ * use correct default for notification silencing ([\#9388](https://github.com/matrix-org/matrix-react-sdk/pull/9388)). Fixes vector-im/element-web#23456.
+ * Device manager - eagerly create `m.local_notification_settings` events ([\#9353](https://github.com/matrix-org/matrix-react-sdk/pull/9353)).
+ * Close incoming Element call toast when viewing the call lobby ([\#9375](https://github.com/matrix-org/matrix-react-sdk/pull/9375)).
+ * Always allow enabling sending read receipts ([\#9367](https://github.com/matrix-org/matrix-react-sdk/pull/9367)). Fixes vector-im/element-web#23433.
+ * Fixes (vector-im/element-web/issues/22609) where the white theme is not applied when `white -> dark -> white` sequence is done. ([\#9320](https://github.com/matrix-org/matrix-react-sdk/pull/9320)). Contributed by @florianduros.
+ * Fix applying programmatically set height for "top" room layout ([\#9339](https://github.com/matrix-org/matrix-react-sdk/pull/9339)). Contributed by @Fox32.
+
+Changes in [1.11.10](https://github.com/vector-im/element-desktop/releases/tag/v1.11.10) (2022-10-11)
+=====================================================================================================
+
+## 🐛 Bug Fixes
+ * Use correct default for notification silencing ([\#9388](https://github.com/matrix-org/matrix-react-sdk/pull/9388)). Fixes vector-im/element-web#23456.
+
+Changes in [1.11.9](https://github.com/vector-im/element-desktop/releases/tag/v1.11.9) (2022-10-11)
+===================================================================================================
+
+##   Deprecations 
+ * Legacy Piwik config.json option `piwik.policy_url` is deprecated in favour of `privacy_policy_url`. Support will be removed in the next release.
+
+## ✨ Features
+ * Device manager - select all devices ([\#9330](https://github.com/matrix-org/matrix-react-sdk/pull/9330)). Contributed by @kerryarchibald.
+ * New group call experience: Call tiles ([\#9332](https://github.com/matrix-org/matrix-react-sdk/pull/9332)).
+ * Add Shift key to FormatQuote keyboard shortcut ([\#9298](https://github.com/matrix-org/matrix-react-sdk/pull/9298)). Contributed by @owi92.
+ * Device manager - sign out of multiple sessions ([\#9325](https://github.com/matrix-org/matrix-react-sdk/pull/9325)). Contributed by @kerryarchibald.
+ * Display push toggle for web sessions (MSC3890) ([\#9327](https://github.com/matrix-org/matrix-react-sdk/pull/9327)).
+ * Add device notifications enabled switch ([\#9324](https://github.com/matrix-org/matrix-react-sdk/pull/9324)).
+ * Implement push notification toggle in device detail ([\#9308](https://github.com/matrix-org/matrix-react-sdk/pull/9308)).
+ * New group call experience: Starting and ending calls ([\#9318](https://github.com/matrix-org/matrix-react-sdk/pull/9318)).
+ * New group call experience: Room header call buttons ([\#9311](https://github.com/matrix-org/matrix-react-sdk/pull/9311)).
+ * Make device ID copyable in device list ([\#9297](https://github.com/matrix-org/matrix-react-sdk/pull/9297)). Contributed by @duxovni.
+ * Use display name instead of user ID when rendering power events ([\#9295](https://github.com/matrix-org/matrix-react-sdk/pull/9295)).
+ * Read receipts for threads ([\#9239](https://github.com/matrix-org/matrix-react-sdk/pull/9239)). Fixes vector-im/element-web#23191.
+
+## 🐛 Bug Fixes
+ * Use the correct sender key when checking shared secret ([\#2730](https://github.com/matrix-org/matrix-js-sdk/pull/2730)). Fixes vector-im/element-web#23374.
+ * Fix device selection in pre-join screen for Element Call video rooms ([\#9321](https://github.com/matrix-org/matrix-react-sdk/pull/9321)). Fixes vector-im/element-web#23331.
+ * Don't render a 1px high room topic if the room topic is empty ([\#9317](https://github.com/matrix-org/matrix-react-sdk/pull/9317)). Contributed by @Arnei.
+ * Don't show feedback prompts when that UIFeature is disabled ([\#9305](https://github.com/matrix-org/matrix-react-sdk/pull/9305)). Fixes vector-im/element-web#23327.
+ * Fix soft crash around unknown room pills ([\#9301](https://github.com/matrix-org/matrix-react-sdk/pull/9301)). Fixes matrix-org/element-web-rageshakes#15465.
+ * Fix spaces feedback prompt wrongly showing when feedback is disabled ([\#9302](https://github.com/matrix-org/matrix-react-sdk/pull/9302)). Fixes vector-im/element-web#23314.
+ * Fix tile soft crash in ReplyInThreadButton ([\#9300](https://github.com/matrix-org/matrix-react-sdk/pull/9300)). Fixes matrix-org/element-web-rageshakes#15493.
+
 Changes in [1.11.8](https://github.com/vector-im/element-desktop/releases/tag/v1.11.8) (2022-09-28)
 ===================================================================================================
 

element.io/nightly/config.json

@@ -49,5 +49,8 @@
         "feature_spotlight": true,
         "feature_video_rooms": true
     },
+    "element_call": {
+        "url": "https://element-call.netlify.app"
+    },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

package.json

@@ -2,7 +2,7 @@
   "name": "element-desktop",
   "productName": "Element",
   "main": "lib/electron-main.js",
-  "version": "1.11.8",
+  "version": "1.11.13",
   "description": "A feature-rich client for Matrix.org",
   "author": "Element",
   "repository": {
@@ -55,6 +55,7 @@
     "@babel/preset-typescript": "^7.18.6",
     "@types/auto-launch": "^5.0.1",
     "@types/counterpart": "^0.18.1",
+    "@types/detect-libc": "^1.0.0",
     "@types/jest": "^28",
     "@types/minimist": "^1.2.1",
     "@types/mkdirp": "^1.0.2",

scripts/fetch-package.js

@@ -14,7 +14,7 @@ const { setPackageVersion } = require('./set-version.js');
 
 const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc";
 const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/";
-const DEVELOP_TGZ_URL = "https://vector-im.github.io/element-web/develop.tar.gz";
+const DEVELOP_TGZ_URL = "https://element-web-develop.element.io/develop.tar.gz";
 const ASAR_PATH = 'webapp.asar';
 
 async function downloadToFile(url, filename) {
@@ -95,8 +95,12 @@ async function main() {
         filename = 'develop.tar.gz';
         url = DEVELOP_TGZ_URL;
         verify = false; // develop builds aren't signed
+    } else if (targetVersion.includes("://")) {
+        filename = targetVersion.substring(targetVersion.lastIndexOf("/") + 1);
+        url = targetVersion;
+        verify = false; // manually verified
     } else {
-        filename = 'element-' + targetVersion + '.tar.gz';
+        filename = `element-${targetVersion}.tar.gz`;
         url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename;
     }
 
@@ -217,7 +221,7 @@ async function main() {
     await asar.createPackage(expectedDeployDir, ASAR_PATH);
 
     if (setVersion) {
-        const semVer = targetVersion.slice(1);
+        const semVer = fs.readFileSync(path.join(expectedDeployDir, "version"), "utf-8").trim();
         console.log("Updating version to " + semVer);
         await setPackageVersion(semVer);
     }

scripts/hak/target.ts

@@ -44,9 +44,6 @@ export type Arch = 'arm64' | 'ia32' | 'x64' | 'ppc64' | 'universal';
 // See https://docs.microsoft.com/cpp/build/building-on-the-command-line?view=msvc-160#vcvarsall-syntax
 export type VcVarsArch = 'amd64' | 'arm64' | 'x86';
 
-// Values are expected to match those used in `detect-libc`.
-export type LibC = GLIBC | MUSL;
-
 export type Target = {
     id: TargetId;
     platform: Platform;
@@ -60,7 +57,7 @@ export type WindowsTarget = Target & {
 
 export type LinuxTarget = Target & {
     platform: 'linux';
-    libC: LibC;
+    libC: typeof processLibC;
 };
 
 export type UniversalTarget = Target & {
@@ -108,56 +105,56 @@ const x8664UnknownLinuxGnu: LinuxTarget = {
     id: 'x86_64-unknown-linux-gnu',
     platform: 'linux',
     arch: 'x64',
-    libC: 'glibc',
+    libC: GLIBC,
 };
 
 const x8664UnknownLinuxMusl: LinuxTarget = {
     id: 'x86_64-unknown-linux-musl',
     platform: 'linux',
     arch: 'x64',
-    libC: 'musl',
+    libC: MUSL,
 };
 
 const i686UnknownLinuxGnu: LinuxTarget = {
     id: 'i686-unknown-linux-gnu',
     platform: 'linux',
     arch: 'ia32',
-    libC: 'glibc',
+    libC: GLIBC,
 };
 
 const i686UnknownLinuxMusl: LinuxTarget = {
     id: 'i686-unknown-linux-musl',
     platform: 'linux',
     arch: 'ia32',
-    libC: 'musl',
+    libC: MUSL,
 };
 
 const aarch64UnknownLinuxGnu: LinuxTarget = {
     id: 'aarch64-unknown-linux-gnu',
     platform: 'linux',
     arch: 'arm64',
-    libC: 'glibc',
+    libC: GLIBC,
 };
 
 const aarch64UnknownLinuxMusl: LinuxTarget = {
     id: 'aarch64-unknown-linux-musl',
     platform: 'linux',
     arch: 'arm64',
-    libC: 'musl',
+    libC: MUSL,
 };
 
 const powerpc64leUnknownLinuxGnu: LinuxTarget = {
     id: 'powerpc64le-unknown-linux-gnu',
     platform: 'linux',
     arch: 'ppc64',
-    libC: 'glibc',
+    libC: GLIBC,
 };
 
 const powerpc64leUnknownLinuxMusl: LinuxTarget = {
     id: 'powerpc64le-unknown-linux-musl',
     platform: 'linux',
     arch: 'ppc64',
-    libC: 'musl',
+    libC: MUSL,
 };
 
 export const TARGETS: Record<TargetId, Target> = {
@@ -179,7 +176,7 @@ export const TARGETS: Record<TargetId, Target> = {
     'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
 };
 
-export function getHost(): Target {
+export function getHost(): Target | undefined {
     return Object.values(TARGETS).find(target => (
         target.platform === process.platform &&
         target.arch === process.arch &&

src/electron-main.ts

@@ -247,7 +247,9 @@ const warnBeforeExit = (event: Event, input: Input): void => {
     if (shouldWarnBeforeExit && exitShortcutPressed) {
         const shouldCancelCloseRequest = dialog.showMessageBoxSync(global.mainWindow, {
             type: "question",
-            buttons: [_t("Cancel"), _t("Close Element")],
+            buttons: [_t("Cancel"), _t("Close %(brand)s", {
+                brand: global.vectorConfig.brand || 'Element',
+            })],
             message: _t("Are you sure you want to quit?"),
             defaultId: 1,
             cancelId: 0,

src/i18n/strings/de.json

@@ -43,5 +43,6 @@
     "Show/Hide": "Anzeigen/Ausblenden",
     "Close Element": "Element schließen",
     "Cancel": "Abbrechen",
-    "Copy image address": "Bild-Adresse kopieren"
+    "Copy image address": "Bild-Adresse kopieren",
+    "Close %(brand)s": "%(brand)s schließen"
 }

src/i18n/strings/en_EN.json

@@ -1,6 +1,6 @@
 {
     "Cancel": "Cancel",
-    "Close Element": "Close Element",
+    "Close %(brand)s": "Close %(brand)s",
     "Are you sure you want to quit?": "Are you sure you want to quit?",
     "Show/Hide": "Show/Hide",
     "Quit": "Quit",

src/i18n/strings/es.json

@@ -43,5 +43,6 @@
     "Are you sure you want to quit?": "¿Quieres salir?",
     "Close Element": "Cerrar Element",
     "Cancel": "Cancelar",
-    "Copy image address": "Copiar dirección de la imagen"
+    "Copy image address": "Copiar dirección de la imagen",
+    "Close %(brand)s": "Cerrar %(brand)s"
 }

src/i18n/strings/et.json

@@ -43,5 +43,6 @@
     "Are you sure you want to quit?": "Kas sa kindlasti soovid rakendusest väljuda?",
     "Close Element": "Sulge Element",
     "Cancel": "Tühista",
-    "Copy image address": "Kopeeri pildi aadress"
+    "Copy image address": "Kopeeri pildi aadress",
+    "Close %(brand)s": "Sulge %(brand)s"
 }

src/i18n/strings/fa.json

@@ -43,5 +43,6 @@
     "Show/Hide": "نمایش/پنهان",
     "Are you sure you want to quit?": "آیا مطمئنید که می‌خواهید خارج شوید؟",
     "Close Element": "بستن المنت",
-    "Cancel": "لغو"
+    "Cancel": "لغو",
+    "Close %(brand)s": "بستن %(brand)s"
 }

src/i18n/strings/fi.json

@@ -43,5 +43,6 @@
     "Are you sure you want to quit?": "Haluatko varmasti poistua?",
     "Close Element": "Sulje Element",
     "Cancel": "Peruuta",
-    "Copy image address": "Kopioi kuvan osoite"
+    "Copy image address": "Kopioi kuvan osoite",
+    "Close %(brand)s": "Sulje %(brand)s"
 }

src/i18n/strings/hu.json

@@ -43,5 +43,6 @@
     "Are you sure you want to quit?": "Biztos, hogy kilép?",
     "Close Element": "Element bezárása",
     "Cancel": "Mégsem",
-    "Copy image address": "Kép címének másolása"
+    "Copy image address": "Kép címének másolása",
+    "Close %(brand)s": "%(brand)s bezárása"
 }

src/i18n/strings/id.json

@@ -43,5 +43,6 @@
     "Are you sure you want to quit?": "Apakah Anda yakin ingin keluar?",
     "Close Element": "Tutup Element",
     "Cancel": "Batal",
-    "Copy image address": "Salin alamat gambar"
+    "Copy image address": "Salin alamat gambar",
+    "Close %(brand)s": "Tutuo %(brand)s"
 }

src/i18n/strings/it.json

@@ -43,5 +43,6 @@
     "Cancel": "Annulla",
     "Stop Speaking": "Smetti di parlare",
     "Speech": "Dettatura",
-    "Copy image address": "Copia indirizzo immagine"
+    "Copy image address": "Copia indirizzo immagine",
+    "Close %(brand)s": "Chiudi %(brand)s"
 }

src/i18n/strings/lv.json

@@ -1,11 +1,11 @@
 {
     "Start Speaking": "Runājiet...",
     "Add to dictionary": "Pievienot vārdnīcai",
-    "The image failed to save": "Attēlu saglabāt neizdevās",
+    "The image failed to save": "Attēlu neizdevās saglabāt",
     "Failed to save image": "Neizdevās saglabāt attēlu",
     "Save image as...": "Saglabāt attēlu kā...",
     "Copy link address": "Kopēt saiti",
-    "Copy email address": "Kopēt e-pastu",
+    "Copy email address": "Kopēt e-pasta adresi",
     "Copy image": "Kopēt attēlu",
     "File": "Fails",
     "Bring All to Front": "Iznest visu priekšplānā",
@@ -15,7 +15,7 @@
     "Unhide": "Rādīt",
     "Hide Others": "Slēpt citus",
     "Hide": "Slēpt",
-    "Services": "Servisi/pakalpojumi",
+    "Services": "Pakalpojumi",
     "About": "Par programmu",
     "Element Help": "Element palīdzība",
     "Help": "Palīdzība",
@@ -24,7 +24,7 @@
     "Window": "Logs",
     "Toggle Developer Tools": "Pārslēgt uz Izstrādātāja rīkiem",
     "Toggle Full Screen": "Pārslēgt uz pilnekrānu",
-    "Preferences": "Parametri/iestatījumi",
+    "Preferences": "Iestatījumi",
     "Zoom Out": "Samazināt",
     "Zoom In": "Palielināt",
     "Actual Size": "Faktiskais izmērs",
@@ -35,12 +35,14 @@
     "Paste": "Ievietot",
     "Copy": "Kopēt",
     "Cut": "Izgriezt",
-    "Redo": "Atatdarīt/atatgriezt (redo)",
-    "Undo": "Atgreizt/atdarīt (undo)",
+    "Redo": "Atatgriezt/atatsaukt/atatdarīt",
+    "Undo": "Atgriezt/atsaukt/atdarīt",
     "Edit": "Rediģēt",
     "Quit": "Iziet",
     "Show/Hide": "Rādīt/nerādīt",
     "Are you sure you want to quit?": "Tiešām vēlaties iziet?",
     "Close Element": "Aizvērt Elementu",
-    "Cancel": "Atcelt"
+    "Cancel": "Atcelt",
+    "Copy image address": "Kopēt attēla adresi",
+    "Close %(brand)s": "Aizvērt %(brand)s"
 }

src/i18n/strings/nl.json

@@ -43,5 +43,6 @@
     "Are you sure you want to quit?": "Weet u zeker dat u wilt stoppen?",
     "Close Element": "Element sluiten",
     "Cancel": "Annuleren",
-    "Copy image address": "Kopieer afbeeldingsadres"
+    "Copy image address": "Kopieer afbeeldingsadres",
+    "Close %(brand)s": "Sluit %(brand)s"
 }

src/i18n/strings/pt_BR.json

@@ -43,5 +43,6 @@
     "Cancel": "Cancelar",
     "Bring All to Front": "Trazer Todas Para Frente",
     "Hide Others": "Esconder Outras(os)",
-    "Copy image address": "Copiar endereço de imagem"
+    "Copy image address": "Copiar endereço de imagem",
+    "Close %(brand)s": "Fechar %(brand)s"
 }

src/i18n/strings/ro.json

@@ -35,9 +35,9 @@
     "Redo": "Refă",
     "Undo": "Anulare",
     "Edit": "Editare",
-    "Quit": "Închide",
+    "Quit": "Închid",
     "Show/Hide": "Arată/Ascunde",
-    "Are you sure you want to quit?": "Sunte-ți sigur ca doriți sa inchideți aplicația ?",
-    "Close Element": "închide aplicația",
+    "Are you sure you want to quit?": "Sigur vrei să ieși din cont?",
+    "Close Element": "Închid Element",
     "Cancel": "Anulare"
 }

src/i18n/strings/ru.json

@@ -43,5 +43,6 @@
     "Speech": "Голос",
     "Hide Others": "Скрыть прочие",
     "Paste and Match Style": "Вставить с тем же стилем",
-    "Copy image address": "Копировать адрес изображения"
+    "Copy image address": "Копировать адрес изображения",
+    "Close %(brand)s": "Закрыть %(brand)s"
 }

src/i18n/strings/sk.json

@@ -43,5 +43,6 @@
     "Show/Hide": "Zobraziť/Skryť",
     "Are you sure you want to quit?": "Naozaj chcete zavrieť aplikáciu?",
     "Cancel": "Zrušiť",
-    "Copy image address": "Kopírovať adresu obrázka"
+    "Copy image address": "Kopírovať adresu obrázka",
+    "Close %(brand)s": "Zatvoriť %(brand)s"
 }

src/i18n/strings/sv.json

@@ -43,5 +43,6 @@
     "The image failed to save": "Bilden sparades inte",
     "Failed to save image": "Misslyckades med att spara bilden",
     "Are you sure you want to quit?": "Är du säker att du vill avsluta?",
-    "Copy image address": "Kopiera bildadress"
+    "Copy image address": "Kopiera bildadress",
+    "Close %(brand)s": "Stäng %(brand)s"
 }

src/i18n/strings/zh_Hant.json

@@ -43,5 +43,6 @@
     "Are you sure you want to quit?": "您確定要退出嗎？",
     "Close Element": "關閉 Element",
     "Cancel": "取消",
-    "Copy image address": "複製圖片地址"
+    "Copy image address": "複製圖片地址",
+    "Close %(brand)s": "關閉 %(brand)s"
 }

src/ipc.ts

@@ -46,7 +46,7 @@ ipcMain.on('loudNotification', function(): void {
     }
 });
 
-let powerSaveBlockerId: number = null;
+let powerSaveBlockerId: number | null = null;
 ipcMain.on('app_onAction', function(_ev: IpcMainEvent, payload) {
     switch (payload.action) {
         case 'call_state': {
@@ -147,11 +147,11 @@ ipcMain.on('ipcCall', async function(_ev: IpcMainEvent, payload) {
 
         case 'getPickleKey':
             try {
-                ret = await keytar.getPassword("element.io", `${args[0]}|${args[1]}`);
+                ret = await keytar?.getPassword("element.io", `${args[0]}|${args[1]}`);
                 // migrate from riot.im (remove once we think there will no longer be
                 // logins from the time of riot.im)
                 if (ret === null) {
-                    ret = await keytar.getPassword("riot.im", `${args[0]}|${args[1]}`);
+                    ret = await keytar?.getPassword("riot.im", `${args[0]}|${args[1]}`);
                 }
             } catch (e) {
                 // if an error is thrown (e.g. keytar can't connect to the keychain),
@@ -163,7 +163,7 @@ ipcMain.on('ipcCall', async function(_ev: IpcMainEvent, payload) {
         case 'createPickleKey':
             try {
                 const pickleKey = await randomArray(32);
-                await keytar.setPassword("element.io", `${args[0]}|${args[1]}`, pickleKey);
+                await keytar?.setPassword("element.io", `${args[0]}|${args[1]}`, pickleKey);
                 ret = pickleKey;
             } catch (e) {
                 ret = null;
@@ -172,10 +172,10 @@ ipcMain.on('ipcCall', async function(_ev: IpcMainEvent, payload) {
 
         case 'destroyPickleKey':
             try {
-                await keytar.deletePassword("element.io", `${args[0]}|${args[1]}`);
+                await keytar?.deletePassword("element.io", `${args[0]}|${args[1]}`);
                 // migrate from riot.im (remove once we think there will no longer be
                 // logins from the time of riot.im)
-                await keytar.deletePassword("riot.im", `${args[0]}|${args[1]}`);
+                await keytar?.deletePassword("riot.im", `${args[0]}|${args[1]}`);
             } catch (e) {}
             break;
         case 'getDesktopCapturerSources':

src/keytar.ts

@@ -21,7 +21,7 @@ try {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     keytar = require('keytar');
 } catch (e) {
-    if (e.code === "MODULE_NOT_FOUND") {
+    if ((<NodeJS.ErrnoException>e).code === "MODULE_NOT_FOUND") {
         console.log("Keytar isn't installed; secure key storage is disabled.");
     } else {
         console.warn("Keytar unexpected error:", e);

src/language-helper.ts

@@ -18,7 +18,7 @@ import counterpart from "counterpart";
 
 import type Store from 'electron-store';
 
-const DEFAULT_LOCALE = "en";
+const FALLBACK_LOCALE = 'en';
 
 export function _td(text: string): string {
     return text;
@@ -27,14 +27,12 @@ export function _td(text: string): string {
 type SubstitutionValue = number | string;
 
 interface IVariables {
-    [key: string]: SubstitutionValue;
+    [key: string]: SubstitutionValue | undefined;
     count?: number;
 }
 
 export function _t(text: string, variables: IVariables = {}): string {
-    const args = Object.assign({ interpolate: false }, variables);
-
-    const { count } = args;
+    const { count } = variables;
 
     // Horrible hack to avoid https://github.com/vector-im/element-web/issues/4191
     // The interpolation library that counterpart uses does not support undefined/null
@@ -43,21 +41,20 @@ export function _t(text: string, variables: IVariables = {}): string {
     // valid ES6 template strings to i18n strings it's extremely easy to pass undefined/null
     // if there are no existing null guards. To avoid this making the app completely inoperable,
     // we'll check all the values for undefined/null and stringify them here.
-    Object.keys(args).forEach((key) => {
-        if (args[key] === undefined) {
+    Object.keys(variables).forEach((key) => {
+        if (variables[key] === undefined) {
             console.warn("safeCounterpartTranslate called with undefined interpolation name: " + key);
-            args[key] = 'undefined';
+            variables[key] = 'undefined';
         }
-        if (args[key] === null) {
+        if (variables[key] === null) {
             console.warn("safeCounterpartTranslate called with null interpolation name: " + key);
-            args[key] = 'null';
+            variables[key] = 'null';
         }
     });
-    let translated = counterpart.translate(text, args);
-    if (translated === undefined && count !== undefined) {
-        // counterpart does not do fallback if no pluralisation exists
-        // in the preferred language, so do it here
-        translated = counterpart.translate(text, Object.assign({}, args, { locale: DEFAULT_LOCALE }));
+    let translated = counterpart.translate(text, variables);
+    if (!translated && count !== undefined) {
+        // counterpart does not do fallback if no pluralisation exists in the preferred language, so do it here
+        translated = counterpart.translate(text, { ...variables, locale: FALLBACK_LOCALE });
     }
 
     // The translation returns text so there's no XSS vector here (no unsafe HTML, no code execution)
@@ -66,17 +63,17 @@ export function _t(text: string, variables: IVariables = {}): string {
 
 type Component = () => void;
 
-type TypedStore = Store<{ locale?: string | string[] }>;
+type TypedStore = Store<{ locale?: string[] }>;
 
 export class AppLocalization {
     private static readonly STORE_KEY = "locale";
 
     private readonly store: TypedStore;
-    private readonly localizedComponents: Set<Component>;
+    private readonly localizedComponents?: Set<Component>;
 
     constructor({ store, components = [] }: { store: TypedStore, components: Component[] }) {
-        counterpart.registerTranslations("en", this.fetchTranslationJson("en_EN"));
-        counterpart.setFallbackLocale('en');
+        counterpart.registerTranslations(FALLBACK_LOCALE, this.fetchTranslationJson("en_EN"));
+        counterpart.setFallbackLocale(FALLBACK_LOCALE);
         counterpart.setSeparator('|');
 
         if (Array.isArray(components)) {
@@ -86,7 +83,8 @@ export class AppLocalization {
         this.store = store;
         if (this.store.has(AppLocalization.STORE_KEY)) {
             const locales = this.store.get(AppLocalization.STORE_KEY);
-            this.setAppLocale(locales);
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            this.setAppLocale(locales!);
         }
 
         this.resetLocalizedUI();
@@ -110,7 +108,7 @@ export class AppLocalization {
             return require(`./i18n/strings/${this.denormalize(locale)}.json`);
         } catch (e) {
             console.log(`Could not fetch translation json for locale: '${locale}'`, e);
-            return null;
+            return {};
         }
     }
 
@@ -121,16 +119,15 @@ export class AppLocalization {
             locales = [locales];
         }
 
-        locales.forEach(locale => {
+        const loadedLocales = locales.filter(locale => {
             const translations = this.fetchTranslationJson(locale);
             if (translations !== null) {
                 counterpart.registerTranslations(locale, translations);
             }
+            return !!translations;
         });
 
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore - this looks like a bug but is out of scope for this conversion
-        counterpart.setLocale(locales);
+        counterpart.setLocale(loadedLocales[0]);
         this.store.set(AppLocalization.STORE_KEY, locales);
 
         this.resetLocalizedUI();
@@ -138,7 +135,7 @@ export class AppLocalization {
 
     public resetLocalizedUI(): void {
         console.log("Resetting the UI components after locale change");
-        this.localizedComponents.forEach(componentSetup => {
+        this.localizedComponents?.forEach(componentSetup => {
             if (typeof componentSetup === "function") {
                 componentSetup();
             }

src/protocol.ts

@@ -86,7 +86,7 @@ export function getProfileFromDeeplink(args: string[]): string | undefined {
     if (deeplinkUrl && deeplinkUrl.includes(SEARCH_PARAM)) {
         const parsedUrl = new URL(deeplinkUrl);
         if (parsedUrl.protocol === PROTOCOL) {
-            const ssoID = parsedUrl.searchParams.get(SEARCH_PARAM);
+            const ssoID = parsedUrl.searchParams.get(SEARCH_PARAM)!;
             const store = readStore();
             console.log("Forwarding to profile: ", store[ssoID]);
             return store[ssoID];

src/seshat.ts

@@ -40,7 +40,7 @@ try {
     ReindexError = seshatModule.ReindexError;
     seshatSupported = true;
 } catch (e) {
-    if (e.code === "MODULE_NOT_FOUND") {
+    if ((<NodeJS.ErrnoException>e).code === "MODULE_NOT_FOUND") {
         console.log("Seshat isn't installed, event indexing is disabled.");
     } else {
         console.warn("Seshat unexpected error:", e);
@@ -49,7 +49,7 @@ try {
 
 const eventStorePath = path.join(app.getPath('userData'), 'EventStore');
 
-let eventIndex: SeshatType = null;
+let eventIndex: SeshatType | null = null;
 
 const seshatDefaultPassphrase = "DEFAULT_PASSPHRASE";
 async function getOrCreatePassphrase(key: string): Promise<string> {
@@ -66,9 +66,8 @@ async function getOrCreatePassphrase(key: string): Promise<string> {
         } catch (e) {
             console.log("Error getting the event index passphrase out of the secret store", e);
         }
-    } else {
-        return seshatDefaultPassphrase;
     }
+    return seshatDefaultPassphrase;
 }
 
 const deleteContents = async (p: string): Promise<void> => {
@@ -180,7 +179,7 @@ ipcMain.on('seshat', async function(_ev: IpcMainEvent, payload): Promise<void> {
 
         case 'addEventToIndex':
             try {
-                eventIndex.addEvent(args[0], args[1]);
+                eventIndex?.addEvent(args[0], args[1]);
             } catch (e) {
                 sendError(payload.id, e);
                 return;
@@ -189,7 +188,7 @@ ipcMain.on('seshat', async function(_ev: IpcMainEvent, payload): Promise<void> {
 
         case 'deleteEvent':
             try {
-                ret = await eventIndex.deleteEvent(args[0]);
+                ret = await eventIndex?.deleteEvent(args[0]);
             } catch (e) {
                 sendError(payload.id, e);
                 return;
@@ -198,7 +197,7 @@ ipcMain.on('seshat', async function(_ev: IpcMainEvent, payload): Promise<void> {
 
         case 'commitLiveEvents':
             try {
-                ret = await eventIndex.commit();
+                ret = await eventIndex?.commit();
             } catch (e) {
                 sendError(payload.id, e);
                 return;
@@ -207,7 +206,7 @@ ipcMain.on('seshat', async function(_ev: IpcMainEvent, payload): Promise<void> {
 
         case 'searchEventIndex':
             try {
-                ret = await eventIndex.search(args[0]);
+                ret = await eventIndex?.search(args[0]);
             } catch (e) {
                 sendError(payload.id, e);
                 return;

src/tray.ts

@@ -22,7 +22,7 @@ import fs from "fs";
 
 import { _t } from "./language-helper";
 
-let trayIcon: Tray = null;
+let trayIcon: Tray | null = null;
 
 export function hasTray(): boolean {
     return (trayIcon !== null);
@@ -65,7 +65,7 @@ export function create(config: IConfig): void {
         if (!favicons || favicons.length <= 0 || !favicons[0].startsWith('data:')) {
             if (lastFavicon !== null) {
                 global.mainWindow.setIcon(defaultIcon);
-                trayIcon.setImage(defaultIcon);
+                trayIcon?.setImage(defaultIcon);
                 lastFavicon = null;
             }
             return;
@@ -88,12 +88,12 @@ export function create(config: IConfig): void {
             }
         }
 
-        trayIcon.setImage(newFavicon);
+        trayIcon?.setImage(newFavicon);
         global.mainWindow.setIcon(newFavicon);
     });
 
     global.mainWindow.webContents.on('page-title-updated', function(ev, title) {
-        trayIcon.setToolTip(title);
+        trayIcon?.setToolTip(title);
     });
 }
 

src/updater.ts

@@ -70,6 +70,7 @@ export function start(updateBaseUrl: string): void {
             // I'm not even going to try to guess which feed style they'd use if they
             // implemented it on Linux, or if it would be different again.
             console.log('Auto update not supported on this platform');
+            return;
         }
 
         if (url) {

src/webcontents-handler.ts

@@ -50,7 +50,7 @@ function safeOpenURL(target: string): void {
     // (for instance, open /bin/sh does indeed open a terminal
     // with a shell, albeit with no arguments)
     const parsedUrl = url.parse(target);
-    if (PERMITTED_URL_SCHEMES.indexOf(parsedUrl.protocol) > -1) {
+    if (PERMITTED_URL_SCHEMES.includes(parsedUrl.protocol!)) {
         // explicitly use the URL re-assembled by the url library,
         // so we know the url parser has understood all the parts
         // of the input string
@@ -69,7 +69,7 @@ function onWindowOrNavigate(ev: Event, target: string): void {
 }
 
 function writeNativeImage(filePath: string, img: NativeImage): Promise<void> {
-    switch (filePath.split('.').pop().toLowerCase()) {
+    switch (filePath.split('.').pop()?.toLowerCase()) {
         case "jpg":
         case "jpeg":
             return fs.promises.writeFile(filePath, img.toJPEG(100));
@@ -181,7 +181,7 @@ function cutCopyPasteSelectContextMenus(params: ContextMenuParams): MenuItemCons
             options.push({
                 label: word,
                 click: (menuItem, browserWindow) => {
-                    browserWindow.webContents.replaceMisspelling(word);
+                    browserWindow?.webContents.replaceMisspelling(word);
                 },
             });
         });
@@ -190,7 +190,7 @@ function cutCopyPasteSelectContextMenus(params: ContextMenuParams): MenuItemCons
         }, {
             label: _t('Add to dictionary'),
             click: (menuItem, browserWindow) => {
-                browserWindow.webContents.session.addWordToSpellCheckerDictionary(params.misspelledWord);
+                browserWindow?.webContents.session.addWordToSpellCheckerDictionary(params.misspelledWord);
             },
         }, {
             type: 'separator',
@@ -251,8 +251,9 @@ function onEditableContextMenu(ev: Event, params: ContextMenuParams) {
 let userDownloadIndex = 0;
 const userDownloadMap = new Map<number, string>(); // Map from id to path
 ipcMain.on('userDownloadAction', function(ev: IpcMainEvent, { id, open = false }) {
-    if (open) {
-        shell.openPath(userDownloadMap.get(id));
+    const path = userDownloadMap.get(id);
+    if (open && path) {
+        shell.openPath(path);
     }
     userDownloadMap.delete(id);
 });

tsconfig.json

@@ -16,6 +16,7 @@
       "dom"
     ],
     "types": ["jest", "node"],
+    "strict": true
   },
   "include": [
     "./src/**/*.ts",