Compare commits
	
		
			135 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 15902e51f6 | ||
|  | 19705bc90b | ||
|  | a9313f4756 | ||
|  | 13b4d2037a | ||
|  | ab63ec2a4a | ||
|  | 1de4f88c6c | ||
|  | ab4381a6bf | ||
|  | d409a0bf33 | ||
|  | c40e05646e | ||
|  | 13f3818c77 | ||
|  | 4a0e590921 | ||
|  | eb19b20da2 | ||
|  | 69cb509fe5 | ||
|  | 123263e5bb | ||
|  | a26a10849d | ||
|  | da7e026550 | ||
|  | c70f6df096 | ||
|  | ef0110f8e7 | ||
|  | b7a7ca3e5c | ||
|  | 467e7b11c5 | ||
|  | 105e7e93a1 | ||
|  | a736f664c6 | ||
|  | 38c7695a99 | ||
|  | b268fe9478 | ||
|  | 981a262836 | ||
|  | 527bb5ab2f | ||
|  | e2947a0ce6 | ||
|  | 3b2c758e09 | ||
|  | 4867fc672a | ||
|  | f85f05d66b | ||
|  | 39fd0e9877 | ||
|  | f6ff112f0e | ||
|  | 6fcd1ef0d5 | ||
|  | 92260b0f97 | ||
|  | c45c9537d1 | ||
|  | 0eb4c9236e | ||
|  | 47366b7617 | ||
|  | 86e28f5b00 | ||
|  | 7072a41e01 | ||
|  | 79f6f13008 | ||
|  | 70f0170f1d | ||
|  | bc75eba2bd | ||
|  | af7272a439 | ||
|  | 9d08a13e64 | ||
|  | f98d6d7037 | ||
|  | da1cad9dff | ||
|  | 955a2eb6c7 | ||
|  | 1cf822a2b5 | ||
|  | b9baf140eb | ||
|  | 727c2335f6 | ||
|  | e8173919f8 | ||
|  | cf2f4fe9c9 | ||
|  | 47cdd5fa8b | ||
|  | 90e76fab6e | ||
|  | 193adb1901 | ||
|  | b520e12492 | ||
|  | ae642bc7ba | ||
|  | e90f3732c5 | ||
|  | 6b31a8a0c4 | ||
|  | f8758fa303 | ||
|  | d2de965106 | ||
|  | a32119b55d | ||
|  | 58049a91c4 | ||
|  | 9810d69c3b | ||
|  | d2f949d683 | ||
|  | a8c283a50b | ||
|  | dab29d4720 | ||
|  | 7fba8cfae9 | ||
|  | 32301656cc | ||
|  | 0e16283a37 | ||
|  | d86482a804 | ||
|  | 3af350e4dc | ||
|  | 39fc2053c5 | ||
|  | 044f1fd0f9 | ||
|  | 10fb0a82f9 | ||
|  | 123bd5b2c0 | ||
|  | ad771c3da8 | ||
|  | 4c58bc3aa3 | ||
|  | 9a8680d209 | ||
|  | 1569890f4d | ||
|  | 2ed400c23c | ||
|  | 70621431dc | ||
|  | 55b7e09796 | ||
|  | de2829a968 | ||
|  | 296de41779 | ||
|  | 8b9ebeee25 | ||
|  | 76e81ca337 | ||
|  | 2e7a9bb4ed | ||
|  | 77638f6287 | ||
|  | 6e8fe36876 | ||
|  | 2eea4a32a5 | ||
|  | 677dfe425c | ||
|  | 1da3ec545a | ||
|  | 3cb6ea4694 | ||
|  | 0cb7297017 | ||
|  | b8d7003446 | ||
|  | 6d27cf8c7d | ||
|  | 1ac2483cc4 | ||
|  | 4d3420dcd0 | ||
|  | 38450a9aed | ||
|  | 24de7ebb97 | ||
|  | 5a571d66d0 | ||
|  | 0ae998a51e | ||
|  | 447dd18b8b | ||
|  | 9a200dc40c | ||
|  | d42b752ac1 | ||
|  | 2f4103248d | ||
|  | 985d731d2b | ||
|  | 032f95150c | ||
|  | d1aa5778c3 | ||
|  | 13ce24b75e | ||
|  | c89ec2faf1 | ||
|  | 56ab0833b8 | ||
|  | c62b393c52 | ||
|  | 991de77cad | ||
|  | 94780c44c8 | ||
|  | 82542a6390 | ||
|  | 53ff8443dc | ||
|  | 3855ecab58 | ||
|  | a57cbb4aa8 | ||
|  | 56a4461c2a | ||
|  | cd023ec5ab | ||
|  | 1aa4ade3c0 | ||
|  | dcb46eef4f | ||
|  | e3e8ef6e3e | ||
|  | 6808b1971a | ||
|  | 1dd5269549 | ||
|  | d33adca1e8 | ||
|  | 8ea7f7864f | ||
|  | 493ae06e52 | ||
|  | 2b8f3536d3 | ||
|  | 544d23ec09 | ||
|  | 588d32fd22 | ||
|  | 1c471fe624 | ||
|  | 52486d687d | 
							
								
								
									
										53
									
								
								.github/PULL_REQUEST_TEMPLATE.md
									
									
									
									
										vendored
									
									
								
							
							
						
						| @@ -1,18 +1,49 @@ | |||||||
| --- | <!-- Describe your pull request here.--> | ||||||
|  |  | ||||||
| <!-- | Fixes: <!-- Issue link, or clear description.--> | ||||||
| Remove the fields that are not appropriate |  | ||||||
| Please include: | <!-- If the PR makes UI changes, always include one or more still screenshots to demonstrate your changes. If it seems helpful, add a screen capture of the new functionality as well. | ||||||
|  |  | ||||||
|  | Tooling tips: https://zulip.readthedocs.io/en/latest/tutorials/screenshot-and-gif-software.html | ||||||
| --> | --> | ||||||
|  |  | ||||||
| **What's this PR do?** | **Screenshots and screen captures:** | ||||||
|  |  | ||||||
| **Any background context you want to provide?** | **Platforms this PR was tested on:** | ||||||
|  |  | ||||||
| **Screenshots?** |  | ||||||
|  |  | ||||||
| **You have tested this PR on:** |  | ||||||
|  |  | ||||||
| - [ ] Windows | - [ ] Windows | ||||||
| - [ ] Linux/Ubuntu |  | ||||||
| - [ ] macOS | - [ ] macOS | ||||||
|  | - [ ] Linux (specify distro) | ||||||
|  |  | ||||||
|  | <details> | ||||||
|  | <summary>Self-review checklist</summary> | ||||||
|  |  | ||||||
|  | <!-- Prior to submitting a PR, follow our step-by-step guide to review your own code: | ||||||
|  | https://zulip.readthedocs.io/en/latest/contributing/code-reviewing.html#how-to-review-code --> | ||||||
|  |  | ||||||
|  | <!-- Once you create the PR, check off all the steps below that you have completed. | ||||||
|  | If any of these steps are not relevant or you have not completed, leave them unchecked.--> | ||||||
|  |  | ||||||
|  | - [ ] [Self-reviewed](https://zulip.readthedocs.io/en/latest/contributing/code-reviewing.html#how-to-review-code) the changes for clarity and maintainability | ||||||
|  |       (variable names, code reuse, readability, etc.). | ||||||
|  |  | ||||||
|  | Communicate decisions, questions, and potential concerns. | ||||||
|  |  | ||||||
|  | - [ ] Explains differences from previous plans (e.g., issue description). | ||||||
|  | - [ ] Highlights technical choices and bugs encountered. | ||||||
|  | - [ ] Calls out remaining decisions and concerns. | ||||||
|  | - [ ] Automated tests verify logic where appropriate. | ||||||
|  |  | ||||||
|  | Individual commits are ready for review (see [commit discipline](https://zulip.readthedocs.io/en/latest/contributing/commit-discipline.html)). | ||||||
|  |  | ||||||
|  | - [ ] Each commit is a coherent idea. | ||||||
|  | - [ ] Commit message(s) explain reasoning and motivation for changes. | ||||||
|  |  | ||||||
|  | Completed manual review and testing of the following: | ||||||
|  |  | ||||||
|  | - [ ] Visual appearance of the changes. | ||||||
|  | - [ ] Responsiveness and internationalization. | ||||||
|  | - [ ] Strings and tooltips. | ||||||
|  | - [ ] End-to-end functionality of buttons, interactions and flows. | ||||||
|  | - [ ] Corner cases, error conditions, and easily imagined bugs. | ||||||
|  | </details> | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/node.js.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						| @@ -10,6 +10,6 @@ jobs: | |||||||
|   build: |   build: | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v4 | ||||||
|       - run: npm ci |       - run: npm ci | ||||||
|       - run: npm test |       - run: npm test | ||||||
|   | |||||||
							
								
								
									
										6
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						| @@ -8,7 +8,8 @@ | |||||||
| .transifexrc | .transifexrc | ||||||
|  |  | ||||||
| # Compiled binary build directory | # Compiled binary build directory | ||||||
| dist/ | /dist/ | ||||||
|  | /dist-electron/ | ||||||
|  |  | ||||||
| #snap generated files | #snap generated files | ||||||
| snap/parts | snap/parts | ||||||
| @@ -39,6 +40,3 @@ config.gypi | |||||||
| # tests/package.json | # tests/package.json | ||||||
|  |  | ||||||
| .python-version | .python-version | ||||||
|  |  | ||||||
| # Ignore all the typescript compiled files |  | ||||||
| app/**/*.js |  | ||||||
|   | |||||||
| @@ -1,3 +1,3 @@ | |||||||
| /app/**/*.js |  | ||||||
| /app/translations/*.json |  | ||||||
| /dist | /dist | ||||||
|  | /dist-electron | ||||||
|  | /public/translations/*.json | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| { | { | ||||||
|   "extends": ["stylelint-config-standard", "stylelint-config-prettier"], |   "extends": ["stylelint-config-standard"], | ||||||
|   "rules": { |   "rules": { | ||||||
|     "color-named": "never", |     "color-named": "never", | ||||||
|     "color-no-hex": true, |     "color-no-hex": true, | ||||||
|   | |||||||
| @@ -1,9 +1,9 @@ | |||||||
| [main] | [main] | ||||||
| host = https://www.transifex.com | host = https://www.transifex.com | ||||||
|  |  | ||||||
| [zulip.desktopjson] | [o:zulip:p:zulip:r:desktopjson] | ||||||
| file_filter = app/translations/<lang>.json | file_filter = public/translations/<lang>.json | ||||||
| minimum_perc = 0 | minimum_perc = 0 | ||||||
| source_file = app/translations/en.json | source_file = public/translations/en.json | ||||||
| source_lang = en | source_lang = en | ||||||
| type = KEYVALUEJSON | type = KEYVALUEJSON | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ Zulip-Desktop app is built on top of [Electron](http://electron.atom.io/). If yo | |||||||
|  |  | ||||||
| ## Community | ## Community | ||||||
|  |  | ||||||
| - The whole Zulip documentation, such as setting up a development environment, setting up with the Zulip webapp project, and testing, can be read [here](https://zulip.readthedocs.io). | - The whole Zulip documentation, such as setting up a development environment, setting up with the Zulip web app project, and testing, can be read [here](https://zulip.readthedocs.io). | ||||||
|  |  | ||||||
| - If you have any questions regarding zulip-desktop, open an [issue](https://github.com/zulip/zulip-desktop/issues/new/) or ask it on [chat.zulip.org](https://chat.zulip.org/#narrow/stream/16-desktop). | - If you have any questions regarding zulip-desktop, open an [issue](https://github.com/zulip/zulip-desktop/issues/new/) or ask it on [chat.zulip.org](https://chat.zulip.org/#narrow/stream/16-desktop). | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # Zulip Desktop Client | # Zulip Desktop Client | ||||||
|  |  | ||||||
| [](https://travis-ci.com/github/zulip/zulip-desktop) | [](https://github.com/zulip/zulip-desktop/actions/workflows/node.js.yml?query=branch%3Amain) | ||||||
| [](https://ci.appveyor.com/project/zulip/zulip-desktop/branch/main) | [](https://ci.appveyor.com/project/zulip/zulip-desktop/branch/main) | ||||||
| [](https://github.com/sindresorhus/xo) | [](https://github.com/sindresorhus/xo) | ||||||
| [](https://chat.zulip.org) | [](https://chat.zulip.org) | ||||||
| @@ -24,9 +24,9 @@ Please see the [installation guide](https://zulip.com/help/desktop-app-install-g | |||||||
|  |  | ||||||
| # Reporting issues | # Reporting issues | ||||||
|  |  | ||||||
| This desktop client shares most of its code with the Zulip webapp. | This desktop client shares most of its code with the Zulip web app. | ||||||
| Issues in an individual organization's Zulip window should be reported | Issues in an individual organization's Zulip window should be reported | ||||||
| in the [Zulip server and webapp | in the [Zulip server and web app | ||||||
| project](https://github.com/zulip/zulip/issues/new). Other | project](https://github.com/zulip/zulip/issues/new). Other | ||||||
| issues in the desktop app and its settings should be reported [in this | issues in the desktop app and its settings should be reported [in this | ||||||
| project](https://github.com/zulip/zulip-desktop/issues/new). | project](https://github.com/zulip/zulip-desktop/issues/new). | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| import * as z from "zod"; | import {z} from "zod"; | ||||||
|  |  | ||||||
| export const dndSettingsSchemata = { | export const dndSettingsSchemata = { | ||||||
|   showNotification: z.boolean(), |   showNotification: z.boolean(), | ||||||
|   | |||||||
| @@ -1,41 +1,41 @@ | |||||||
| import fs from "node:fs"; | import fs from "node:fs"; | ||||||
| import path from "node:path"; | import path from "node:path"; | ||||||
|  |  | ||||||
| import * as Sentry from "@sentry/electron"; | import * as Sentry from "@sentry/core"; | ||||||
| import {JsonDB} from "node-json-db"; | import {JsonDB} from "node-json-db"; | ||||||
| import {DataError} from "node-json-db/dist/lib/Errors"; | import {DataError} from "node-json-db/dist/lib/Errors"; | ||||||
| import type * as z from "zod"; | import type {z} from "zod"; | ||||||
|  | import {app, dialog} from "zulip:remote"; | ||||||
|  |  | ||||||
| import {configSchemata} from "./config-schemata"; | import {configSchemata} from "./config-schemata.js"; | ||||||
| import * as EnterpriseUtil from "./enterprise-util"; | import * as EnterpriseUtil from "./enterprise-util.js"; | ||||||
| import Logger from "./logger-util"; | import Logger from "./logger-util.js"; | ||||||
| import {app, dialog} from "./remote"; |  | ||||||
|  |  | ||||||
| export type Config = { | export type Config = { | ||||||
|   [Key in keyof typeof configSchemata]: z.output<typeof configSchemata[Key]>; |   [Key in keyof typeof configSchemata]: z.output<(typeof configSchemata)[Key]>; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| const logger = new Logger({ | const logger = new Logger({ | ||||||
|   file: "config-util.log", |   file: "config-util.log", | ||||||
| }); | }); | ||||||
|  |  | ||||||
| let db: JsonDB; | let database: JsonDB; | ||||||
|  |  | ||||||
| reloadDb(); | reloadDatabase(); | ||||||
|  |  | ||||||
| export function getConfigItem<Key extends keyof Config>( | export function getConfigItem<Key extends keyof Config>( | ||||||
|   key: Key, |   key: Key, | ||||||
|   defaultValue: Config[Key], |   defaultValue: Config[Key], | ||||||
| ): z.output<typeof configSchemata[Key]> { | ): z.output<(typeof configSchemata)[Key]> { | ||||||
|   try { |   try { | ||||||
|     db.reload(); |     database.reload(); | ||||||
|   } catch (error: unknown) { |   } catch (error: unknown) { | ||||||
|     logger.error("Error while reloading settings.json: "); |     logger.error("Error while reloading settings.json: "); | ||||||
|     logger.error(error); |     logger.error(error); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   try { |   try { | ||||||
|     return configSchemata[key].parse(db.getObject<unknown>(`/${key}`)); |     return configSchemata[key].parse(database.getObject<unknown>(`/${key}`)); | ||||||
|   } catch (error: unknown) { |   } catch (error: unknown) { | ||||||
|     if (!(error instanceof DataError)) throw error; |     if (!(error instanceof DataError)) throw error; | ||||||
|     setConfigItem(key, defaultValue); |     setConfigItem(key, defaultValue); | ||||||
| @@ -46,13 +46,13 @@ export function getConfigItem<Key extends keyof Config>( | |||||||
| // This function returns whether a key exists in the configuration file (settings.json) | // This function returns whether a key exists in the configuration file (settings.json) | ||||||
| export function isConfigItemExists(key: string): boolean { | export function isConfigItemExists(key: string): boolean { | ||||||
|   try { |   try { | ||||||
|     db.reload(); |     database.reload(); | ||||||
|   } catch (error: unknown) { |   } catch (error: unknown) { | ||||||
|     logger.error("Error while reloading settings.json: "); |     logger.error("Error while reloading settings.json: "); | ||||||
|     logger.error(error); |     logger.error(error); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   return db.exists(`/${key}`); |   return database.exists(`/${key}`); | ||||||
| } | } | ||||||
|  |  | ||||||
| export function setConfigItem<Key extends keyof Config>( | export function setConfigItem<Key extends keyof Config>( | ||||||
| @@ -66,16 +66,16 @@ export function setConfigItem<Key extends keyof Config>( | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   configSchemata[key].parse(value); |   configSchemata[key].parse(value); | ||||||
|   db.push(`/${key}`, value, true); |   database.push(`/${key}`, value, true); | ||||||
|   db.save(); |   database.save(); | ||||||
| } | } | ||||||
|  |  | ||||||
| export function removeConfigItem(key: string): void { | export function removeConfigItem(key: string): void { | ||||||
|   db.delete(`/${key}`); |   database.delete(`/${key}`); | ||||||
|   db.save(); |   database.save(); | ||||||
| } | } | ||||||
|  |  | ||||||
| function reloadDb(): void { | function reloadDatabase(): void { | ||||||
|   const settingsJsonPath = path.join( |   const settingsJsonPath = path.join( | ||||||
|     app.getPath("userData"), |     app.getPath("userData"), | ||||||
|     "/config/settings.json", |     "/config/settings.json", | ||||||
| @@ -96,5 +96,5 @@ function reloadDb(): void { | |||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   db = new JsonDB(settingsJsonPath, true, true); |   database = new JsonDB(settingsJsonPath, true, true); | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,33 +1,33 @@ | |||||||
| import fs from "node:fs"; | import fs from "node:fs"; | ||||||
|  |  | ||||||
| import {app} from "./remote"; | import {app} from "zulip:remote"; | ||||||
|  |  | ||||||
| let setupCompleted = false; | let setupCompleted = false; | ||||||
|  |  | ||||||
| const zulipDir = app.getPath("userData"); | const zulipDirectory = app.getPath("userData"); | ||||||
| const logDir = `${zulipDir}/Logs/`; | const logDirectory = `${zulipDirectory}/Logs/`; | ||||||
| const configDir = `${zulipDir}/config/`; | const configDirectory = `${zulipDirectory}/config/`; | ||||||
| export const initSetUp = (): void => { | export const initSetUp = (): void => { | ||||||
|   // If it is the first time the app is running |   // If it is the first time the app is running | ||||||
|   // create zulip dir in userData folder to |   // create zulip dir in userData folder to | ||||||
|   // avoid errors |   // avoid errors | ||||||
|   if (!setupCompleted) { |   if (!setupCompleted) { | ||||||
|     if (!fs.existsSync(zulipDir)) { |     if (!fs.existsSync(zulipDirectory)) { | ||||||
|       fs.mkdirSync(zulipDir); |       fs.mkdirSync(zulipDirectory); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     if (!fs.existsSync(logDir)) { |     if (!fs.existsSync(logDirectory)) { | ||||||
|       fs.mkdirSync(logDir); |       fs.mkdirSync(logDirectory); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     // Migrate config files from app data folder to config folder inside app |     // Migrate config files from app data folder to config folder inside app | ||||||
|     // data folder. This will be done once when a user updates to the new version. |     // data folder. This will be done once when a user updates to the new version. | ||||||
|     if (!fs.existsSync(configDir)) { |     if (!fs.existsSync(configDirectory)) { | ||||||
|       fs.mkdirSync(configDir); |       fs.mkdirSync(configDirectory); | ||||||
|       const domainJson = `${zulipDir}/domain.json`; |       const domainJson = `${zulipDirectory}/domain.json`; | ||||||
|       const settingsJson = `${zulipDir}/settings.json`; |       const settingsJson = `${zulipDirectory}/settings.json`; | ||||||
|       const updatesJson = `${zulipDir}/updates.json`; |       const updatesJson = `${zulipDirectory}/updates.json`; | ||||||
|       const windowStateJson = `${zulipDir}/window-state.json`; |       const windowStateJson = `${zulipDirectory}/window-state.json`; | ||||||
|       const configData = [ |       const configData = [ | ||||||
|         { |         { | ||||||
|           path: domainJson, |           path: domainJson, | ||||||
| @@ -44,7 +44,7 @@ export const initSetUp = (): void => { | |||||||
|       ]; |       ]; | ||||||
|       for (const data of configData) { |       for (const data of configData) { | ||||||
|         if (fs.existsSync(data.path)) { |         if (fs.existsSync(data.path)) { | ||||||
|           fs.copyFileSync(data.path, configDir + data.fileName); |           fs.copyFileSync(data.path, configDirectory + data.fileName); | ||||||
|           fs.unlinkSync(data.path); |           fs.unlinkSync(data.path); | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|   | |||||||
| @@ -1,22 +1,22 @@ | |||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
|  |  | ||||||
| import type * as z from "zod"; | import type {z} from "zod"; | ||||||
|  |  | ||||||
| import type {dndSettingsSchemata} from "./config-schemata"; | import type {dndSettingsSchemata} from "./config-schemata.js"; | ||||||
| import * as ConfigUtil from "./config-util"; | import * as ConfigUtil from "./config-util.js"; | ||||||
|  |  | ||||||
| export type DndSettings = { | export type DndSettings = { | ||||||
|   [Key in keyof typeof dndSettingsSchemata]: z.output< |   [Key in keyof typeof dndSettingsSchemata]: z.output< | ||||||
|     typeof dndSettingsSchemata[Key] |     (typeof dndSettingsSchemata)[Key] | ||||||
|   >; |   >; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| type SettingName = keyof DndSettings; | type SettingName = keyof DndSettings; | ||||||
|  |  | ||||||
| interface Toggle { | type Toggle = { | ||||||
|   dnd: boolean; |   dnd: boolean; | ||||||
|   newSettings: Partial<DndSettings>; |   newSettings: Partial<DndSettings>; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export function toggle(): Toggle { | export function toggle(): Toggle { | ||||||
|   const dnd = !ConfigUtil.getConfigItem("dnd", false); |   const dnd = !ConfigUtil.getConfigItem("dnd", false); | ||||||
|   | |||||||
| @@ -2,14 +2,14 @@ import fs from "node:fs"; | |||||||
| import path from "node:path"; | import path from "node:path"; | ||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
|  |  | ||||||
| import * as z from "zod"; | import {z} from "zod"; | ||||||
|  |  | ||||||
| import {enterpriseConfigSchemata} from "./config-schemata"; | import {enterpriseConfigSchemata} from "./config-schemata.js"; | ||||||
| import Logger from "./logger-util"; | import Logger from "./logger-util.js"; | ||||||
|  |  | ||||||
| type EnterpriseConfig = { | type EnterpriseConfig = { | ||||||
|   [Key in keyof typeof enterpriseConfigSchemata]: z.output< |   [Key in keyof typeof enterpriseConfigSchemata]: z.output< | ||||||
|     typeof enterpriseConfigSchemata[Key] |     (typeof enterpriseConfigSchemata)[Key] | ||||||
|   >; |   >; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| @@ -20,9 +20,9 @@ const logger = new Logger({ | |||||||
| let enterpriseSettings: Partial<EnterpriseConfig>; | let enterpriseSettings: Partial<EnterpriseConfig>; | ||||||
| let configFile: boolean; | let configFile: boolean; | ||||||
|  |  | ||||||
| reloadDb(); | reloadDatabase(); | ||||||
|  |  | ||||||
| function reloadDb(): void { | function reloadDatabase(): void { | ||||||
|   let enterpriseFile = "/etc/zulip-desktop-config/global_config.json"; |   let enterpriseFile = "/etc/zulip-desktop-config/global_config.json"; | ||||||
|   if (process.platform === "win32") { |   if (process.platform === "win32") { | ||||||
|     enterpriseFile = |     enterpriseFile = | ||||||
| @@ -56,7 +56,7 @@ export function getConfigItem<Key extends keyof EnterpriseConfig>( | |||||||
|   key: Key, |   key: Key, | ||||||
|   defaultValue: EnterpriseConfig[Key], |   defaultValue: EnterpriseConfig[Key], | ||||||
| ): EnterpriseConfig[Key] { | ): EnterpriseConfig[Key] { | ||||||
|   reloadDb(); |   reloadDatabase(); | ||||||
|   if (!configFile) { |   if (!configFile) { | ||||||
|     return defaultValue; |     return defaultValue; | ||||||
|   } |   } | ||||||
| @@ -66,7 +66,7 @@ export function getConfigItem<Key extends keyof EnterpriseConfig>( | |||||||
| } | } | ||||||
|  |  | ||||||
| export function configItemExists(key: keyof EnterpriseConfig): boolean { | export function configItemExists(key: keyof EnterpriseConfig): boolean { | ||||||
|   reloadDb(); |   reloadDatabase(); | ||||||
|   if (!configFile) { |   if (!configFile) { | ||||||
|     return false; |     return false; | ||||||
|   } |   } | ||||||
|   | |||||||
| @@ -3,7 +3,7 @@ import fs from "node:fs"; | |||||||
| import os from "node:os"; | import os from "node:os"; | ||||||
| import path from "node:path"; | import path from "node:path"; | ||||||
|  |  | ||||||
| import {html} from "./html"; | import {html} from "./html.js"; | ||||||
|  |  | ||||||
| export async function openBrowser(url: URL): Promise<void> { | export async function openBrowser(url: URL): Promise<void> { | ||||||
|   if (["http:", "https:", "mailto:"].includes(url.protocol)) { |   if (["http:", "https:", "mailto:"].includes(url.protocol)) { | ||||||
| @@ -11,12 +11,12 @@ export async function openBrowser(url: URL): Promise<void> { | |||||||
|   } else { |   } else { | ||||||
|     // For security, indirect links to non-whitelisted protocols |     // For security, indirect links to non-whitelisted protocols | ||||||
|     // through a real web browser via a local HTML file. |     // through a real web browser via a local HTML file. | ||||||
|     const dir = fs.mkdtempSync(path.join(os.tmpdir(), "zulip-redirect-")); |     const directory = fs.mkdtempSync(path.join(os.tmpdir(), "zulip-redirect-")); | ||||||
|     const file = path.join(dir, "redirect.html"); |     const file = path.join(directory, "redirect.html"); | ||||||
|     fs.writeFileSync( |     fs.writeFileSync( | ||||||
|       file, |       file, | ||||||
|       html` |       html` | ||||||
|         <!DOCTYPE html> |         <!doctype html> | ||||||
|         <html> |         <html> | ||||||
|           <head> |           <head> | ||||||
|             <meta charset="UTF-8" /> |             <meta charset="UTF-8" /> | ||||||
| @@ -37,7 +37,7 @@ export async function openBrowser(url: URL): Promise<void> { | |||||||
|     await shell.openPath(file); |     await shell.openPath(file); | ||||||
|     setTimeout(() => { |     setTimeout(() => { | ||||||
|       fs.unlinkSync(file); |       fs.unlinkSync(file); | ||||||
|       fs.rmdirSync(dir); |       fs.rmdirSync(directory); | ||||||
|     }, 15_000); |     }, 15_000); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,18 +1,19 @@ | |||||||
| import {Console} from "node:console"; | import {Console} from "node:console"; // eslint-disable-line n/prefer-global/console | ||||||
| import fs from "node:fs"; | import fs from "node:fs"; | ||||||
| import os from "node:os"; | import os from "node:os"; | ||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
|  |  | ||||||
| import {initSetUp} from "./default-util"; | import {app} from "zulip:remote"; | ||||||
| import {app} from "./remote"; |  | ||||||
|  |  | ||||||
| interface LoggerOptions { | import {initSetUp} from "./default-util.js"; | ||||||
|  |  | ||||||
|  | type LoggerOptions = { | ||||||
|   file?: string; |   file?: string; | ||||||
| } | }; | ||||||
|  |  | ||||||
| initSetUp(); | initSetUp(); | ||||||
|  |  | ||||||
| const logDir = `${app.getPath("userData")}/Logs`; | const logDirectory = `${app.getPath("userData")}/Logs`; | ||||||
|  |  | ||||||
| type Level = "log" | "debug" | "info" | "warn" | "error"; | type Level = "log" | "debug" | "info" | "warn" | "error"; | ||||||
|  |  | ||||||
| @@ -22,7 +23,7 @@ export default class Logger { | |||||||
|   constructor(options: LoggerOptions = {}) { |   constructor(options: LoggerOptions = {}) { | ||||||
|     let {file = "console.log"} = options; |     let {file = "console.log"} = options; | ||||||
|  |  | ||||||
|     file = `${logDir}/${file}`; |     file = `${logDirectory}/${file}`; | ||||||
|  |  | ||||||
|     // Trim log according to type of process |     // Trim log according to type of process | ||||||
|     if (process.type === "renderer") { |     if (process.type === "renderer") { | ||||||
| @@ -37,31 +38,31 @@ export default class Logger { | |||||||
|     this.nodeConsole = nodeConsole; |     this.nodeConsole = nodeConsole; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   _log(type: Level, ...args: unknown[]): void { |   _log(type: Level, ...arguments_: unknown[]): void { | ||||||
|     args.unshift(this.getTimestamp() + " |\t"); |     arguments_.unshift(this.getTimestamp() + " |\t"); | ||||||
|     args.unshift(type.toUpperCase() + " |"); |     arguments_.unshift(type.toUpperCase() + " |"); | ||||||
|     this.nodeConsole[type](...args); |     this.nodeConsole[type](...arguments_); | ||||||
|     console[type](...args); |     console[type](...arguments_); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   log(...args: unknown[]): void { |   log(...arguments_: unknown[]): void { | ||||||
|     this._log("log", ...args); |     this._log("log", ...arguments_); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   debug(...args: unknown[]): void { |   debug(...arguments_: unknown[]): void { | ||||||
|     this._log("debug", ...args); |     this._log("debug", ...arguments_); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   info(...args: unknown[]): void { |   info(...arguments_: unknown[]): void { | ||||||
|     this._log("info", ...args); |     this._log("info", ...arguments_); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   warn(...args: unknown[]): void { |   warn(...arguments_: unknown[]): void { | ||||||
|     this._log("warn", ...args); |     this._log("warn", ...arguments_); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   error(...args: unknown[]): void { |   error(...arguments_: unknown[]): void { | ||||||
|     this._log("error", ...args); |     this._log("error", ...arguments_); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   getTimestamp(): string { |   getTimestamp(): string { | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| interface DialogBoxError { | type DialogBoxError = { | ||||||
|   title: string; |   title: string; | ||||||
|   content: string; |   content: string; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export function invalidZulipServerError(domain: string): string { | export function invalidZulipServerError(domain: string): string { | ||||||
|   return `${domain} does not appear to be a valid Zulip server. Make sure that |   return `${domain} does not appear to be a valid Zulip server. Make sure that | ||||||
|   | |||||||
							
								
								
									
										15
									
								
								app/common/paths.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,15 @@ | |||||||
|  | import path from "node:path"; | ||||||
|  | import process from "node:process"; | ||||||
|  | import url from "node:url"; | ||||||
|  |  | ||||||
|  | export const bundlePath = __dirname; | ||||||
|  |  | ||||||
|  | export const publicPath = import.meta.env.DEV | ||||||
|  |   ? path.join(bundlePath, "../public") | ||||||
|  |   : bundlePath; | ||||||
|  |  | ||||||
|  | export const bundleUrl = import.meta.env.DEV | ||||||
|  |   ? process.env.VITE_DEV_SERVER_URL | ||||||
|  |   : url.pathToFileURL(__dirname).href + "/"; | ||||||
|  |  | ||||||
|  | export const publicUrl = bundleUrl; | ||||||
| @@ -1,8 +0,0 @@ | |||||||
| import process from "node:process"; |  | ||||||
|  |  | ||||||
| export const {app, dialog} = |  | ||||||
|   process.type === "renderer" |  | ||||||
|     ? // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires |  | ||||||
|       (require("@electron/remote") as typeof import("@electron/remote")) |  | ||||||
|     : // eslint-disable-next-line @typescript-eslint/no-require-imports |  | ||||||
|       require("electron/main"); |  | ||||||
| @@ -2,17 +2,15 @@ import path from "node:path"; | |||||||
|  |  | ||||||
| import i18n from "i18n"; | import i18n from "i18n"; | ||||||
|  |  | ||||||
| import * as ConfigUtil from "./config-util"; | import * as ConfigUtil from "./config-util.js"; | ||||||
|  | import {publicPath} from "./paths.js"; | ||||||
|  |  | ||||||
| i18n.configure({ | i18n.configure({ | ||||||
|   directory: path.join(__dirname, "../translations/"), |   directory: path.join(publicPath, "translations/"), | ||||||
|   updateFiles: false, |   updateFiles: false, | ||||||
| }); | }); | ||||||
|  |  | ||||||
| /* Fetches the current appLocale from settings.json */ | /* Fetches the current appLocale from settings.json */ | ||||||
| const appLocale = ConfigUtil.getConfigItem("appLanguage", "en"); | i18n.setLocale(ConfigUtil.getConfigItem("appLanguage", "en") ?? "en"); | ||||||
|  |  | ||||||
| /* If no locale present in the json, en is set default */ | export {__} from "i18n"; | ||||||
| export function __(phrase: string): string { |  | ||||||
|   return i18n.__({phrase, locale: appLocale ? appLocale : "en"}); |  | ||||||
| } |  | ||||||
|   | |||||||
| @@ -1,12 +1,13 @@ | |||||||
| import type {DndSettings} from "./dnd-util"; | import type {DndSettings} from "./dnd-util.js"; | ||||||
| import type {MenuProps, ServerConf} from "./types"; | import type {MenuProperties, ServerConfig} from "./types.js"; | ||||||
|  |  | ||||||
| export interface MainMessage { | export type MainMessage = { | ||||||
|   "clear-app-settings": () => void; |   "clear-app-settings": () => void; | ||||||
|   "configure-spell-checker": () => void; |   "configure-spell-checker": () => void; | ||||||
|   "fetch-user-agent": () => string; |   "fetch-user-agent": () => string; | ||||||
|   "focus-app": () => void; |   "focus-app": () => void; | ||||||
|   "focus-this-webview": () => void; |   "focus-this-webview": () => void; | ||||||
|  |   "new-clipboard-key": () => {key: Uint8Array; sig: Uint8Array}; | ||||||
|   "permission-callback": (permissionCallbackId: number, grant: boolean) => void; |   "permission-callback": (permissionCallbackId: number, grant: boolean) => void; | ||||||
|   "quit-app": () => void; |   "quit-app": () => void; | ||||||
|   "realm-icon-changed": (serverURL: string, iconURL: string) => void; |   "realm-icon-changed": (serverURL: string, iconURL: string) => void; | ||||||
| @@ -20,17 +21,18 @@ export interface MainMessage { | |||||||
|   toggleAutoLauncher: (AutoLaunchValue: boolean) => void; |   toggleAutoLauncher: (AutoLaunchValue: boolean) => void; | ||||||
|   "unread-count": (unreadCount: number) => void; |   "unread-count": (unreadCount: number) => void; | ||||||
|   "update-badge": (messageCount: number) => void; |   "update-badge": (messageCount: number) => void; | ||||||
|   "update-menu": (props: MenuProps) => void; |   "update-menu": (properties: MenuProperties) => void; | ||||||
|   "update-taskbar-icon": (data: string, text: string) => void; |   "update-taskbar-icon": (data: string, text: string) => void; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export interface MainCall { | export type MainCall = { | ||||||
|   "get-server-settings": (domain: string) => ServerConf; |   "get-server-settings": (domain: string) => ServerConfig; | ||||||
|   "is-online": (url: string) => boolean; |   "is-online": (url: string) => boolean; | ||||||
|   "save-server-icon": (iconURL: string) => string; |   "poll-clipboard": (key: Uint8Array, sig: Uint8Array) => string | undefined; | ||||||
| } |   "save-server-icon": (iconURL: string) => string | null; | ||||||
|  | }; | ||||||
|  |  | ||||||
| export interface RendererMessage { | export type RendererMessage = { | ||||||
|   back: () => void; |   back: () => void; | ||||||
|   "copy-zulip-url": () => void; |   "copy-zulip-url": () => void; | ||||||
|   destroytray: () => void; |   destroytray: () => void; | ||||||
| @@ -72,11 +74,11 @@ export interface RendererMessage { | |||||||
|   "toggle-silent": (state: boolean) => void; |   "toggle-silent": (state: boolean) => void; | ||||||
|   "toggle-tray": (state: boolean) => void; |   "toggle-tray": (state: boolean) => void; | ||||||
|   toggletray: () => void; |   toggletray: () => void; | ||||||
|   tray: (arg: number) => void; |   tray: (argument: number) => void; | ||||||
|   "update-realm-icon": (serverURL: string, iconURL: string) => void; |   "update-realm-icon": (serverURL: string, iconURL: string) => void; | ||||||
|   "update-realm-name": (serveRURL: string, realmName: string) => void; |   "update-realm-name": (serverURL: string, realmName: string) => void; | ||||||
|   "webview-reload": () => void; |   "webview-reload": () => void; | ||||||
|   zoomActualSize: () => void; |   zoomActualSize: () => void; | ||||||
|   zoomIn: () => void; |   zoomIn: () => void; | ||||||
|   zoomOut: () => void; |   zoomOut: () => void; | ||||||
| } | }; | ||||||
|   | |||||||
| @@ -1,26 +1,30 @@ | |||||||
| export interface MenuProps { | export type MenuProperties = { | ||||||
|   tabs: TabData[]; |   tabs: TabData[]; | ||||||
|   activeTabIndex?: number; |   activeTabIndex?: number; | ||||||
|   enableMenu?: boolean; |   enableMenu?: boolean; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export type NavItem = | export type NavigationItem = | ||||||
|   | "General" |   | "General" | ||||||
|   | "Network" |   | "Network" | ||||||
|   | "AddServer" |   | "AddServer" | ||||||
|   | "Organizations" |   | "Organizations" | ||||||
|   | "Shortcuts"; |   | "Shortcuts"; | ||||||
|  |  | ||||||
| export interface ServerConf { | export type ServerConfig = { | ||||||
|   url: string; |   url: string; | ||||||
|   alias: string; |   alias: string; | ||||||
|   icon: string; |   icon: string; | ||||||
| } |   zulipVersion: string; | ||||||
|  |   zulipFeatureLevel: number; | ||||||
|  | }; | ||||||
|  |  | ||||||
| export type TabRole = "server" | "function"; | export type TabRole = "server" | "function"; | ||||||
|  | export type TabPage = "Settings" | "About"; | ||||||
|  |  | ||||||
| export interface TabData { | export type TabData = { | ||||||
|   role: TabRole; |   role: TabRole; | ||||||
|   name: string; |   page?: TabPage; | ||||||
|  |   label: string; | ||||||
|   index: number; |   index: number; | ||||||
| } | }; | ||||||
|   | |||||||
| @@ -1,17 +1,24 @@ | |||||||
| import {shell} from "electron/common"; | import {shell} from "electron/common"; | ||||||
| import {app, dialog, session} from "electron/main"; | import {app, dialog, session} from "electron/main"; | ||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
| import util from "node:util"; |  | ||||||
|  |  | ||||||
| import log from "electron-log"; | import log from "electron-log/main"; | ||||||
| import type {UpdateDownloadedEvent, UpdateInfo} from "electron-updater"; | import { | ||||||
| import {autoUpdater} from "electron-updater"; |   type UpdateDownloadedEvent, | ||||||
|  |   type UpdateInfo, | ||||||
|  |   autoUpdater, | ||||||
|  | } from "electron-updater"; | ||||||
|  |  | ||||||
| import * as ConfigUtil from "../common/config-util"; | import * as ConfigUtil from "../common/config-util.js"; | ||||||
|  | import * as t from "../common/translation-util.js"; | ||||||
|  |  | ||||||
| import {linuxUpdateNotification} from "./linuxupdater"; // Required only in case of linux | import {linuxUpdateNotification} from "./linuxupdater.js"; // Required only in case of linux | ||||||
|  |  | ||||||
| const sleep = util.promisify(setTimeout); | let quitting = false; | ||||||
|  |  | ||||||
|  | export function shouldQuitForUpdate(): boolean { | ||||||
|  |   return quitting; | ||||||
|  | } | ||||||
|  |  | ||||||
| export async function appUpdater(updateFromMenu = false): Promise<void> { | export async function appUpdater(updateFromMenu = false): Promise<void> { | ||||||
|   // Don't initiate auto-updates in development |   // Don't initiate auto-updates in development | ||||||
| @@ -27,17 +34,21 @@ export async function appUpdater(updateFromMenu = false): Promise<void> { | |||||||
|  |  | ||||||
|   let updateAvailable = false; |   let updateAvailable = false; | ||||||
|  |  | ||||||
|   // Log whats happening |   // Log what's happening | ||||||
|   log.transports.file.fileName = "updates.log"; |   const updateLogger = log.create({logId: "updates"}); | ||||||
|   log.transports.file.level = "info"; |   updateLogger.transports.file.fileName = "updates.log"; | ||||||
|   autoUpdater.logger = log; |   updateLogger.transports.file.level = "info"; | ||||||
|  |   autoUpdater.logger = updateLogger; | ||||||
|  |  | ||||||
|   // Handle auto updates for beta/pre releases |   // Handle auto updates for beta/pre releases | ||||||
|   const isBetaUpdate = ConfigUtil.getConfigItem("betaUpdate", false); |   const isBetaUpdate = ConfigUtil.getConfigItem("betaUpdate", false); | ||||||
|  |  | ||||||
|   autoUpdater.allowPrerelease = isBetaUpdate; |   autoUpdater.allowPrerelease = isBetaUpdate; | ||||||
|  |  | ||||||
|   const eventsListenerRemove = ["update-available", "update-not-available"]; |   const eventsListenerRemove = [ | ||||||
|  |     "update-available", | ||||||
|  |     "update-not-available", | ||||||
|  |   ] as const; | ||||||
|   autoUpdater.on("update-available", async (info: UpdateInfo) => { |   autoUpdater.on("update-available", async (info: UpdateInfo) => { | ||||||
|     if (updateFromMenu) { |     if (updateFromMenu) { | ||||||
|       updateAvailable = true; |       updateAvailable = true; | ||||||
| @@ -48,9 +59,13 @@ export async function appUpdater(updateFromMenu = false): Promise<void> { | |||||||
|       } |       } | ||||||
|  |  | ||||||
|       await dialog.showMessageBox({ |       await dialog.showMessageBox({ | ||||||
|         message: `A new version ${info.version}, of Zulip Desktop is available`, |         message: t.__( | ||||||
|         detail: |           "A new version {{{version}}} of Zulip Desktop is available.", | ||||||
|  |           {version: info.version}, | ||||||
|  |         ), | ||||||
|  |         detail: t.__( | ||||||
|           "The update will be downloaded in the background. You will be notified when it is ready to be installed.", |           "The update will be downloaded in the background. You will be notified when it is ready to be installed.", | ||||||
|  |         ), | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|   }); |   }); | ||||||
| @@ -62,8 +77,11 @@ export async function appUpdater(updateFromMenu = false): Promise<void> { | |||||||
|       autoUpdater.removeAllListeners(); |       autoUpdater.removeAllListeners(); | ||||||
|  |  | ||||||
|       await dialog.showMessageBox({ |       await dialog.showMessageBox({ | ||||||
|         message: "No updates available", |         message: t.__("No updates available."), | ||||||
|         detail: `You are running the latest version of Zulip Desktop.\nVersion: ${app.getVersion()}`, |         detail: t.__( | ||||||
|  |           "You are running the latest version of Zulip Desktop.\nVersion: {{{version}}}", | ||||||
|  |           {version: app.getVersion()}, | ||||||
|  |         ), | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|   }); |   }); | ||||||
| @@ -75,20 +93,20 @@ export async function appUpdater(updateFromMenu = false): Promise<void> { | |||||||
|       autoUpdater.removeAllListeners(); |       autoUpdater.removeAllListeners(); | ||||||
|  |  | ||||||
|       const messageText = updateAvailable |       const messageText = updateAvailable | ||||||
|         ? "Unable to download the updates" |         ? t.__("Unable to download the update.") | ||||||
|         : "Unable to check for updates"; |         : t.__("Unable to check for updates."); | ||||||
|  |       const link = "https://zulip.com/apps/"; | ||||||
|       const {response} = await dialog.showMessageBox({ |       const {response} = await dialog.showMessageBox({ | ||||||
|         type: "error", |         type: "error", | ||||||
|         buttons: ["Manual Download", "Cancel"], |         buttons: [t.__("Manual Download"), t.__("Cancel")], | ||||||
|         message: messageText, |         message: messageText, | ||||||
|         detail: `Error: ${error.message} |         detail: t.__( | ||||||
|  |           "Error: {{{error}}}\n\nThe latest version of Zulip Desktop is available at:\n{{{link}}}\nCurrent version: {{{version}}}", | ||||||
| The latest version of Zulip Desktop is available at - |           {error: error.message, link, version: app.getVersion()}, | ||||||
| https://zulip.com/apps/. |         ), | ||||||
| Current Version: ${app.getVersion()}`, |  | ||||||
|       }); |       }); | ||||||
|       if (response === 0) { |       if (response === 0) { | ||||||
|         await shell.openExternal("https://zulip.com/apps/"); |         await shell.openExternal(link); | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|   }); |   }); | ||||||
| @@ -98,16 +116,18 @@ Current Version: ${app.getVersion()}`, | |||||||
|     // Ask user to update the app |     // Ask user to update the app | ||||||
|     const {response} = await dialog.showMessageBox({ |     const {response} = await dialog.showMessageBox({ | ||||||
|       type: "question", |       type: "question", | ||||||
|       buttons: ["Install and Relaunch", "Install Later"], |       buttons: [t.__("Install and Relaunch"), t.__("Install Later")], | ||||||
|       defaultId: 0, |       defaultId: 0, | ||||||
|       message: `A new update ${event.version} has been downloaded`, |       message: t.__("A new update {{{version}}} has been downloaded.", { | ||||||
|       detail: "It will be installed the next time you restart the application", |         version: event.version, | ||||||
|  |       }), | ||||||
|  |       detail: t.__( | ||||||
|  |         "It will be installed the next time you restart the application.", | ||||||
|  |       ), | ||||||
|     }); |     }); | ||||||
|     if (response === 0) { |     if (response === 0) { | ||||||
|       await sleep(1000); |       quitting = true; | ||||||
|       autoUpdater.quitAndInstall(); |       autoUpdater.quitAndInstall(); | ||||||
|       // Force app to quit. This is just a workaround, ideally autoUpdater.quitAndInstall() should relaunch the app. |  | ||||||
|       app.quit(); |  | ||||||
|     } |     } | ||||||
|   }); |   }); | ||||||
|   // Init for updates |   // Init for updates | ||||||
|   | |||||||
| @@ -1,11 +1,10 @@ | |||||||
| import {nativeImage} from "electron/common"; | import {nativeImage} from "electron/common"; | ||||||
| import type {BrowserWindow} from "electron/main"; | import {type BrowserWindow, app} from "electron/main"; | ||||||
| import {app} from "electron/main"; |  | ||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
|  |  | ||||||
| import * as ConfigUtil from "../common/config-util"; | import * as ConfigUtil from "../common/config-util.js"; | ||||||
|  |  | ||||||
| import {send} from "./typed-ipc-main"; | import {send} from "./typed-ipc-main.js"; | ||||||
|  |  | ||||||
| function showBadgeCount(messageCount: number, mainWindow: BrowserWindow): void { | function showBadgeCount(messageCount: number, mainWindow: BrowserWindow): void { | ||||||
|   if (process.platform === "win32") { |   if (process.platform === "win32") { | ||||||
|   | |||||||
| @@ -1,17 +1,18 @@ | |||||||
| import {shell} from "electron/common"; | import {type Event, shell} from "electron/common"; | ||||||
| import type { | import { | ||||||
|   HandlerDetails, |   type HandlerDetails, | ||||||
|   SaveDialogOptions, |   Notification, | ||||||
|   WebContents, |   type SaveDialogOptions, | ||||||
|  |   type WebContents, | ||||||
|  |   app, | ||||||
| } from "electron/main"; | } from "electron/main"; | ||||||
| import {Notification, app} from "electron/main"; |  | ||||||
| import fs from "node:fs"; | import fs from "node:fs"; | ||||||
| import path from "node:path"; | import path from "node:path"; | ||||||
|  |  | ||||||
| import * as ConfigUtil from "../common/config-util"; | import * as ConfigUtil from "../common/config-util.js"; | ||||||
| import * as LinkUtil from "../common/link-util"; | import * as LinkUtil from "../common/link-util.js"; | ||||||
|  |  | ||||||
| import {send} from "./typed-ipc-main"; | import {send} from "./typed-ipc-main.js"; | ||||||
|  |  | ||||||
| function isUploadsUrl(server: string, url: URL): boolean { | function isUploadsUrl(server: string, url: URL): boolean { | ||||||
|   return url.origin === server && url.pathname.startsWith("/user_uploads/"); |   return url.origin === server && url.pathname.startsWith("/user_uploads/"); | ||||||
| @@ -31,7 +32,7 @@ function downloadFile({ | |||||||
|   failed(state: string): void; |   failed(state: string): void; | ||||||
| }) { | }) { | ||||||
|   contents.downloadURL(url); |   contents.downloadURL(url); | ||||||
|   contents.session.once("will-download", async (_event: Event, item) => { |   contents.session.once("will-download", async (_event, item) => { | ||||||
|     if (ConfigUtil.getConfigItem("promptDownload", false)) { |     if (ConfigUtil.getConfigItem("promptDownload", false)) { | ||||||
|       const showDialogOptions: SaveDialogOptions = { |       const showDialogOptions: SaveDialogOptions = { | ||||||
|         defaultPath: path.join(downloadPath, item.getFilename()), |         defaultPath: path.join(downloadPath, item.getFilename()), | ||||||
| @@ -86,7 +87,7 @@ function downloadFile({ | |||||||
|     }; |     }; | ||||||
|  |  | ||||||
|     item.on("updated", updatedListener); |     item.on("updated", updatedListener); | ||||||
|     item.once("done", async (_event: Event, state) => { |     item.once("done", async (_event, state) => { | ||||||
|       if (state === "completed") { |       if (state === "completed") { | ||||||
|         await completed(item.getSavePath(), path.basename(item.getSavePath())); |         await completed(item.getSavePath(), path.basename(item.getSavePath())); | ||||||
|       } else { |       } else { | ||||||
| @@ -105,7 +106,13 @@ export default function handleExternalLink( | |||||||
|   details: HandlerDetails, |   details: HandlerDetails, | ||||||
|   mainContents: WebContents, |   mainContents: WebContents, | ||||||
| ): void { | ): void { | ||||||
|   const url = new URL(details.url); |   let url: URL; | ||||||
|  |   try { | ||||||
|  |     url = new URL(details.url); | ||||||
|  |   } catch { | ||||||
|  |     return; | ||||||
|  |   } | ||||||
|  |  | ||||||
|   const downloadPath = ConfigUtil.getConfigItem( |   const downloadPath = ConfigUtil.getConfigItem( | ||||||
|     "downloadsPath", |     "downloadsPath", | ||||||
|     `${app.getPath("downloads")}`, |     `${app.getPath("downloads")}`, | ||||||
|   | |||||||
| @@ -1,23 +1,38 @@ | |||||||
| import type {IpcMainEvent, WebContents} from "electron/main"; | import {clipboard} from "electron/common"; | ||||||
| import {BrowserWindow, app, dialog, powerMonitor, session} from "electron/main"; | import { | ||||||
|  |   BrowserWindow, | ||||||
|  |   type IpcMainEvent, | ||||||
|  |   type WebContents, | ||||||
|  |   app, | ||||||
|  |   dialog, | ||||||
|  |   powerMonitor, | ||||||
|  |   session, | ||||||
|  |   webContents, | ||||||
|  | } from "electron/main"; | ||||||
|  | import {Buffer} from "node:buffer"; | ||||||
|  | import crypto from "node:crypto"; | ||||||
| import path from "node:path"; | import path from "node:path"; | ||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
|  |  | ||||||
| import * as remoteMain from "@electron/remote/main"; | import * as remoteMain from "@electron/remote/main"; | ||||||
| import windowStateKeeper from "electron-window-state"; | import windowStateKeeper from "electron-window-state"; | ||||||
|  |  | ||||||
| import * as ConfigUtil from "../common/config-util"; | import * as ConfigUtil from "../common/config-util.js"; | ||||||
| import type {RendererMessage} from "../common/typed-ipc"; | import {bundlePath, bundleUrl, publicPath} from "../common/paths.js"; | ||||||
| import type {MenuProps} from "../common/types"; | import * as t from "../common/translation-util.js"; | ||||||
|  | import type {RendererMessage} from "../common/typed-ipc.js"; | ||||||
|  | import type {MenuProperties} from "../common/types.js"; | ||||||
|  |  | ||||||
| import {appUpdater} from "./autoupdater"; | import {appUpdater, shouldQuitForUpdate} from "./autoupdater.js"; | ||||||
| import * as BadgeSettings from "./badge-settings"; | import * as BadgeSettings from "./badge-settings.js"; | ||||||
| import handleExternalLink from "./handle-external-link"; | import handleExternalLink from "./handle-external-link.js"; | ||||||
| import * as AppMenu from "./menu"; | import * as AppMenu from "./menu.js"; | ||||||
| import {_getServerSettings, _isOnline, _saveServerIcon} from "./request"; | import {_getServerSettings, _isOnline, _saveServerIcon} from "./request.js"; | ||||||
| import {sentryInit} from "./sentry"; | import {sentryInit} from "./sentry.js"; | ||||||
| import {setAutoLaunch} from "./startup"; | import {setAutoLaunch} from "./startup.js"; | ||||||
| import {ipcMain, send} from "./typed-ipc-main"; | import {ipcMain, send} from "./typed-ipc-main.js"; | ||||||
|  |  | ||||||
|  | import "gatemaker/electron-setup"; // eslint-disable-line import/no-unassigned-import | ||||||
|  |  | ||||||
| // eslint-disable-next-line @typescript-eslint/naming-convention | // eslint-disable-next-line @typescript-eslint/naming-convention | ||||||
| const {GDK_BACKEND} = process.env; | const {GDK_BACKEND} = process.env; | ||||||
| @@ -33,13 +48,13 @@ let badgeCount: number; | |||||||
|  |  | ||||||
| let isQuitting = false; | let isQuitting = false; | ||||||
|  |  | ||||||
| // Load this url in main window | // Load this file in main window | ||||||
| const mainUrl = "file://" + path.join(__dirname, "../renderer", "main.html"); | const mainUrl = new URL("app/renderer/main.html", bundleUrl).href; | ||||||
|  |  | ||||||
| const permissionCallbacks = new Map<number, (grant: boolean) => void>(); | const permissionCallbacks = new Map<number, (grant: boolean) => void>(); | ||||||
| let nextPermissionCallbackId = 0; | let nextPermissionCallbackId = 0; | ||||||
|  |  | ||||||
| const appIcon = path.join(__dirname, "../resources", "Icon"); | const appIcon = path.join(publicPath, "resources/Icon"); | ||||||
|  |  | ||||||
| const iconPath = (): string => | const iconPath = (): string => | ||||||
|   appIcon + (process.platform === "win32" ? ".ico" : ".png"); |   appIcon + (process.platform === "win32" ? ".ico" : ".png"); | ||||||
| @@ -72,7 +87,8 @@ function createMainWindow(): BrowserWindow { | |||||||
|     minWidth: 500, |     minWidth: 500, | ||||||
|     minHeight: 400, |     minHeight: 400, | ||||||
|     webPreferences: { |     webPreferences: { | ||||||
|       preload: require.resolve("../renderer/js/main"), |       preload: path.join(bundlePath, "renderer.js"), | ||||||
|  |       sandbox: false, | ||||||
|       webviewTag: true, |       webviewTag: true, | ||||||
|     }, |     }, | ||||||
|     show: false, |     show: false, | ||||||
| @@ -91,11 +107,18 @@ function createMainWindow(): BrowserWindow { | |||||||
|       app.quit(); |       app.quit(); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     if (!isQuitting) { |     if (!isQuitting && !shouldQuitForUpdate()) { | ||||||
|       event.preventDefault(); |       event.preventDefault(); | ||||||
|  |  | ||||||
|       if (process.platform === "darwin") { |       if (process.platform === "darwin") { | ||||||
|         app.hide(); |         if (win.isFullScreen()) { | ||||||
|  |           win.setFullScreen(false); | ||||||
|  |           win.once("leave-full-screen", () => { | ||||||
|  |             app.hide(); | ||||||
|  |           }); | ||||||
|  |         } else { | ||||||
|  |           app.hide(); | ||||||
|  |         } | ||||||
|       } else { |       } else { | ||||||
|         win.hide(); |         win.hide(); | ||||||
|       } |       } | ||||||
| @@ -163,7 +186,7 @@ function createMainWindow(): BrowserWindow { | |||||||
|  |  | ||||||
|   ipcMain.on( |   ipcMain.on( | ||||||
|     "permission-callback", |     "permission-callback", | ||||||
|     (event: Event, permissionCallbackId: number, grant: boolean) => { |     (event, permissionCallbackId: number, grant: boolean) => { | ||||||
|       permissionCallbacks.get(permissionCallbackId)?.(grant); |       permissionCallbacks.get(permissionCallbackId)?.(grant); | ||||||
|       permissionCallbacks.delete(permissionCallbackId); |       permissionCallbacks.delete(permissionCallbackId); | ||||||
|     }, |     }, | ||||||
| @@ -174,7 +197,7 @@ function createMainWindow(): BrowserWindow { | |||||||
|     mainWindow.show(); |     mainWindow.show(); | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   app.on("web-contents-created", (_event: Event, contents: WebContents) => { |   app.on("web-contents-created", (_event, contents: WebContents) => { | ||||||
|     contents.setWindowOpenHandler((details) => { |     contents.setWindowOpenHandler((details) => { | ||||||
|       handleExternalLink(contents, details, page); |       handleExternalLink(contents, details, page); | ||||||
|       return {action: "deny"}; |       return {action: "deny"}; | ||||||
| @@ -198,6 +221,42 @@ function createMainWindow(): BrowserWindow { | |||||||
|   configureSpellChecker(); |   configureSpellChecker(); | ||||||
|   ipcMain.on("configure-spell-checker", configureSpellChecker); |   ipcMain.on("configure-spell-checker", configureSpellChecker); | ||||||
|  |  | ||||||
|  |   const clipboardSigKey = crypto.randomBytes(32); | ||||||
|  |  | ||||||
|  |   ipcMain.on("new-clipboard-key", (event) => { | ||||||
|  |     const key = crypto.randomBytes(32); | ||||||
|  |     const hmac = crypto.createHmac("sha256", clipboardSigKey); | ||||||
|  |     hmac.update(key); | ||||||
|  |     event.returnValue = {key, sig: hmac.digest()}; | ||||||
|  |   }); | ||||||
|  |  | ||||||
|  |   ipcMain.handle("poll-clipboard", (event, key, sig) => { | ||||||
|  |     // Check that the key was generated here. | ||||||
|  |     const hmac = crypto.createHmac("sha256", clipboardSigKey); | ||||||
|  |     hmac.update(key); | ||||||
|  |     if (!crypto.timingSafeEqual(sig, hmac.digest())) return; | ||||||
|  |  | ||||||
|  |     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 decipher = crypto.createDecipheriv("aes-256-gcm", key, iv, { | ||||||
|  |         authTagLength: 16, | ||||||
|  |       }); | ||||||
|  |       decipher.setAuthTag(authTag); | ||||||
|  |       return ( | ||||||
|  |         decipher.update(ciphertext, undefined, "utf8") + decipher.final("utf8") | ||||||
|  |       ); | ||||||
|  |     } catch { | ||||||
|  |       // If the parsing or decryption failed in any way, | ||||||
|  |       // the correct token hasn’t been copied yet; try | ||||||
|  |       // again next time. | ||||||
|  |       return undefined; | ||||||
|  |     } | ||||||
|  |   }); | ||||||
|  |  | ||||||
|   AppMenu.setMenu({ |   AppMenu.setMenu({ | ||||||
|     tabs: [], |     tabs: [], | ||||||
|   }); |   }); | ||||||
| @@ -248,18 +307,25 @@ function createMainWindow(): BrowserWindow { | |||||||
|   app.on( |   app.on( | ||||||
|     "certificate-error", |     "certificate-error", | ||||||
|     ( |     ( | ||||||
|       event: Event, |       event, | ||||||
|       webContents: WebContents, |       webContents, | ||||||
|       urlString: string, |       urlString, | ||||||
|       error: string, |       error, | ||||||
|  |       certificate, | ||||||
|  |       callback, | ||||||
|  |       isMainFrame, | ||||||
|  |       // eslint-disable-next-line max-params | ||||||
|     ) => { |     ) => { | ||||||
|       const url = new URL(urlString); |       if (isMainFrame) { | ||||||
|       dialog.showErrorBox( |         const url = new URL(urlString); | ||||||
|         "Certificate error", |         dialog.showErrorBox( | ||||||
|         `The server presented an invalid certificate for ${url.origin}: |           t.__("Certificate error"), | ||||||
|  |           t.__( | ||||||
| ${error}`, |             "The server presented an invalid certificate for {{{origin}}}:\n\n{{{error}}}", | ||||||
|       ); |             {origin: url.origin, error}, | ||||||
|  |           ), | ||||||
|  |         ); | ||||||
|  |       } | ||||||
|     }, |     }, | ||||||
|   ); |   ); | ||||||
|  |  | ||||||
| @@ -318,24 +384,21 @@ ${error}`, | |||||||
|     BadgeSettings.updateBadge(badgeCount, mainWindow); |     BadgeSettings.updateBadge(badgeCount, mainWindow); | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   ipcMain.on("toggle-menubar", (_event: IpcMainEvent, showMenubar: boolean) => { |   ipcMain.on("toggle-menubar", (_event, showMenubar: boolean) => { | ||||||
|     mainWindow.autoHideMenuBar = showMenubar; |     mainWindow.autoHideMenuBar = showMenubar; | ||||||
|     mainWindow.setMenuBarVisibility(!showMenubar); |     mainWindow.setMenuBarVisibility(!showMenubar); | ||||||
|     send(page, "toggle-autohide-menubar", showMenubar, true); |     send(page, "toggle-autohide-menubar", showMenubar, true); | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   ipcMain.on("update-badge", (_event: IpcMainEvent, messageCount: number) => { |   ipcMain.on("update-badge", (_event, messageCount: number) => { | ||||||
|     badgeCount = messageCount; |     badgeCount = messageCount; | ||||||
|     BadgeSettings.updateBadge(badgeCount, mainWindow); |     BadgeSettings.updateBadge(badgeCount, mainWindow); | ||||||
|     send(page, "tray", messageCount); |     send(page, "tray", messageCount); | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   ipcMain.on( |   ipcMain.on("update-taskbar-icon", (_event, data: string, text: string) => { | ||||||
|     "update-taskbar-icon", |     BadgeSettings.updateTaskbarIcon(data, text, mainWindow); | ||||||
|     (_event: IpcMainEvent, data: string, text: string) => { |   }); | ||||||
|       BadgeSettings.updateTaskbarIcon(data, text, mainWindow); |  | ||||||
|     }, |  | ||||||
|   ); |  | ||||||
|  |  | ||||||
|   ipcMain.on( |   ipcMain.on( | ||||||
|     "forward-message", |     "forward-message", | ||||||
| @@ -348,40 +411,52 @@ ${error}`, | |||||||
|     }, |     }, | ||||||
|   ); |   ); | ||||||
|  |  | ||||||
|   ipcMain.on("update-menu", (_event: IpcMainEvent, props: MenuProps) => { |  | ||||||
|     AppMenu.setMenu(props); |  | ||||||
|     if (props.activeTabIndex !== undefined) { |  | ||||||
|       const activeTab = props.tabs[props.activeTabIndex]; |  | ||||||
|       mainWindow.setTitle(`Zulip - ${activeTab.name}`); |  | ||||||
|     } |  | ||||||
|   }); |  | ||||||
|  |  | ||||||
|   ipcMain.on( |   ipcMain.on( | ||||||
|     "toggleAutoLauncher", |     "forward-to", | ||||||
|     async (_event: IpcMainEvent, AutoLaunchValue: boolean) => { |     <Channel extends keyof RendererMessage>( | ||||||
|       await setAutoLaunch(AutoLaunchValue); |       _event: IpcMainEvent, | ||||||
|  |       webContentsId: number, | ||||||
|  |       listener: Channel, | ||||||
|  |       ...parameters: Parameters<RendererMessage[Channel]> | ||||||
|  |     ) => { | ||||||
|  |       const contents = webContents.fromId(webContentsId); | ||||||
|  |       if (contents !== undefined) { | ||||||
|  |         send(contents, listener, ...parameters); | ||||||
|  |       } | ||||||
|     }, |     }, | ||||||
|   ); |   ); | ||||||
|  |  | ||||||
|  |   ipcMain.on("update-menu", (_event, properties: MenuProperties) => { | ||||||
|  |     AppMenu.setMenu(properties); | ||||||
|  |     if (properties.activeTabIndex !== undefined) { | ||||||
|  |       const activeTab = properties.tabs[properties.activeTabIndex]; | ||||||
|  |       mainWindow.setTitle(`Zulip - ${activeTab.label}`); | ||||||
|  |     } | ||||||
|  |   }); | ||||||
|  |  | ||||||
|  |   ipcMain.on("toggleAutoLauncher", async (_event, AutoLaunchValue: boolean) => { | ||||||
|  |     await setAutoLaunch(AutoLaunchValue); | ||||||
|  |   }); | ||||||
|  |  | ||||||
|   ipcMain.on( |   ipcMain.on( | ||||||
|     "realm-name-changed", |     "realm-name-changed", | ||||||
|     (_event: IpcMainEvent, serverURL: string, realmName: string) => { |     (_event, serverURL: string, realmName: string) => { | ||||||
|       send(page, "update-realm-name", serverURL, realmName); |       send(page, "update-realm-name", serverURL, realmName); | ||||||
|     }, |     }, | ||||||
|   ); |   ); | ||||||
|  |  | ||||||
|   ipcMain.on( |   ipcMain.on( | ||||||
|     "realm-icon-changed", |     "realm-icon-changed", | ||||||
|     (_event: IpcMainEvent, serverURL: string, iconURL: string) => { |     (_event, serverURL: string, iconURL: string) => { | ||||||
|       send(page, "update-realm-icon", serverURL, iconURL); |       send(page, "update-realm-icon", serverURL, iconURL); | ||||||
|     }, |     }, | ||||||
|   ); |   ); | ||||||
|  |  | ||||||
|   ipcMain.on("save-last-tab", (_event: IpcMainEvent, index: number) => { |   ipcMain.on("save-last-tab", (_event, index: number) => { | ||||||
|     ConfigUtil.setConfigItem("lastActiveTab", index); |     ConfigUtil.setConfigItem("lastActiveTab", index); | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   ipcMain.on("focus-this-webview", (event: IpcMainEvent) => { |   ipcMain.on("focus-this-webview", (event) => { | ||||||
|     send(page, "focus-webview-with-id", event.sender.id); |     send(page, "focus-webview-with-id", event.sender.id); | ||||||
|     mainWindow.show(); |     mainWindow.show(); | ||||||
|   }); |   }); | ||||||
|   | |||||||
| @@ -5,24 +5,25 @@ import path from "node:path"; | |||||||
| import {JsonDB} from "node-json-db"; | import {JsonDB} from "node-json-db"; | ||||||
| import {DataError} from "node-json-db/dist/lib/Errors"; | import {DataError} from "node-json-db/dist/lib/Errors"; | ||||||
|  |  | ||||||
| import Logger from "../common/logger-util"; | import Logger from "../common/logger-util.js"; | ||||||
|  | import * as t from "../common/translation-util.js"; | ||||||
|  |  | ||||||
| const logger = new Logger({ | const logger = new Logger({ | ||||||
|   file: "linux-update-util.log", |   file: "linux-update-util.log", | ||||||
| }); | }); | ||||||
|  |  | ||||||
| let db: JsonDB; | let database: JsonDB; | ||||||
|  |  | ||||||
| reloadDb(); | reloadDatabase(); | ||||||
|  |  | ||||||
| export function getUpdateItem( | export function getUpdateItem( | ||||||
|   key: string, |   key: string, | ||||||
|   defaultValue: true | null = null, |   defaultValue: true | null = null, | ||||||
| ): true | null { | ): true | null { | ||||||
|   reloadDb(); |   reloadDatabase(); | ||||||
|   let value: unknown; |   let value: unknown; | ||||||
|   try { |   try { | ||||||
|     value = db.getObject<unknown>(`/${key}`); |     value = database.getObject<unknown>(`/${key}`); | ||||||
|   } catch (error: unknown) { |   } catch (error: unknown) { | ||||||
|     if (!(error instanceof DataError)) throw error; |     if (!(error instanceof DataError)) throw error; | ||||||
|   } |   } | ||||||
| @@ -36,16 +37,16 @@ export function getUpdateItem( | |||||||
| } | } | ||||||
|  |  | ||||||
| export function setUpdateItem(key: string, value: true | null): void { | export function setUpdateItem(key: string, value: true | null): void { | ||||||
|   db.push(`/${key}`, value, true); |   database.push(`/${key}`, value, true); | ||||||
|   reloadDb(); |   reloadDatabase(); | ||||||
| } | } | ||||||
|  |  | ||||||
| export function removeUpdateItem(key: string): void { | export function removeUpdateItem(key: string): void { | ||||||
|   db.delete(`/${key}`); |   database.delete(`/${key}`); | ||||||
|   reloadDb(); |   reloadDatabase(); | ||||||
| } | } | ||||||
|  |  | ||||||
| function reloadDb(): void { | function reloadDatabase(): void { | ||||||
|   const linuxUpdateJsonPath = path.join( |   const linuxUpdateJsonPath = path.join( | ||||||
|     app.getPath("userData"), |     app.getPath("userData"), | ||||||
|     "/config/updates.json", |     "/config/updates.json", | ||||||
| @@ -57,13 +58,13 @@ function reloadDb(): void { | |||||||
|     if (fs.existsSync(linuxUpdateJsonPath)) { |     if (fs.existsSync(linuxUpdateJsonPath)) { | ||||||
|       fs.unlinkSync(linuxUpdateJsonPath); |       fs.unlinkSync(linuxUpdateJsonPath); | ||||||
|       dialog.showErrorBox( |       dialog.showErrorBox( | ||||||
|         "Error saving update notifications.", |         t.__("Error saving update notifications"), | ||||||
|         "We encountered an error while saving the update notifications.", |         t.__("We encountered an error while saving the update notifications."), | ||||||
|       ); |       ); | ||||||
|       logger.error("Error while JSON parsing updates.json: "); |       logger.error("Error while JSON parsing updates.json: "); | ||||||
|       logger.error(error); |       logger.error(error); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   db = new JsonDB(linuxUpdateJsonPath, true, true); |   database = new JsonDB(linuxUpdateJsonPath, true, true); | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,15 +1,12 @@ | |||||||
| import type {Session} from "electron/main"; | import {Notification, type Session, app} from "electron/main"; | ||||||
| import {Notification, app, net} from "electron/main"; |  | ||||||
|  |  | ||||||
| import getStream from "get-stream"; |  | ||||||
| import * as semver from "semver"; | import * as semver from "semver"; | ||||||
| import * as z from "zod"; | import {z} from "zod"; | ||||||
|  |  | ||||||
| import * as ConfigUtil from "../common/config-util"; | import * as ConfigUtil from "../common/config-util.js"; | ||||||
| import Logger from "../common/logger-util"; | import Logger from "../common/logger-util.js"; | ||||||
|  |  | ||||||
| import * as LinuxUpdateUtil from "./linux-update-util"; | import * as LinuxUpdateUtil from "./linux-update-util.js"; | ||||||
| import {fetchResponse} from "./request"; |  | ||||||
|  |  | ||||||
| const logger = new Logger({ | const logger = new Logger({ | ||||||
|   file: "linux-update-util.log", |   file: "linux-update-util.log", | ||||||
| @@ -20,13 +17,13 @@ export async function linuxUpdateNotification(session: Session): Promise<void> { | |||||||
|   url = ConfigUtil.getConfigItem("betaUpdate", false) ? url : url + "/latest"; |   url = ConfigUtil.getConfigItem("betaUpdate", false) ? url : url + "/latest"; | ||||||
|  |  | ||||||
|   try { |   try { | ||||||
|     const response = await fetchResponse(net.request({url, session})); |     const response = await session.fetch(url); | ||||||
|     if (response.statusCode !== 200) { |     if (!response.ok) { | ||||||
|       logger.log("Linux update response status: ", response.statusCode); |       logger.log("Linux update response status: ", response.status); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     const data: unknown = JSON.parse(await getStream(response)); |     const data: unknown = await response.json(); | ||||||
|     /* eslint-disable @typescript-eslint/naming-convention */ |     /* eslint-disable @typescript-eslint/naming-convention */ | ||||||
|     const latestVersion = ConfigUtil.getConfigItem("betaUpdate", false) |     const latestVersion = ConfigUtil.getConfigItem("betaUpdate", false) | ||||||
|       ? z.array(z.object({tag_name: z.string()})).parse(data)[0].tag_name |       ? z.array(z.object({tag_name: z.string()})).parse(data)[0].tag_name | ||||||
|   | |||||||
| @@ -1,18 +1,22 @@ | |||||||
| import {shell} from "electron/common"; | import {shell} from "electron/common"; | ||||||
| import type {MenuItemConstructorOptions} from "electron/main"; | import { | ||||||
| import {BrowserWindow, Menu, app} from "electron/main"; |   BrowserWindow, | ||||||
|  |   Menu, | ||||||
|  |   type MenuItemConstructorOptions, | ||||||
|  |   app, | ||||||
|  | } from "electron/main"; | ||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
|  |  | ||||||
| import AdmZip from "adm-zip"; | import AdmZip from "adm-zip"; | ||||||
|  |  | ||||||
| import * as ConfigUtil from "../common/config-util"; | import * as ConfigUtil from "../common/config-util.js"; | ||||||
| import * as DNDUtil from "../common/dnd-util"; | import * as DNDUtil from "../common/dnd-util.js"; | ||||||
| import * as t from "../common/translation-util"; | import * as t from "../common/translation-util.js"; | ||||||
| import type {RendererMessage} from "../common/typed-ipc"; | import type {RendererMessage} from "../common/typed-ipc.js"; | ||||||
| import type {MenuProps, TabData} from "../common/types"; | import type {MenuProperties, TabData} from "../common/types.js"; | ||||||
|  |  | ||||||
| import {appUpdater} from "./autoupdater"; | import {appUpdater} from "./autoupdater.js"; | ||||||
| import {send} from "./typed-ipc-main"; | import {send} from "./typed-ipc-main.js"; | ||||||
|  |  | ||||||
| const appName = app.name; | const appName = app.name; | ||||||
|  |  | ||||||
| @@ -66,7 +70,7 @@ function getToolsSubmenu(): MenuItemConstructorOptions[] { | |||||||
|       click() { |       click() { | ||||||
|         const zip = new AdmZip(); |         const zip = new AdmZip(); | ||||||
|         const date = new Date(); |         const date = new Date(); | ||||||
|         const dateString = date.toLocaleDateString().replace(/\//g, "-"); |         const dateString = date.toLocaleDateString().replaceAll("/", "-"); | ||||||
|  |  | ||||||
|         // Create a zip file of all the logs and config data |         // Create a zip file of all the logs and config data | ||||||
|         zip.addLocalFolder(`${app.getPath("appData")}/${appName}/Logs`); |         zip.addLocalFolder(`${app.getPath("appData")}/${appName}/Logs`); | ||||||
| @@ -90,7 +94,7 @@ function getToolsSubmenu(): MenuItemConstructorOptions[] { | |||||||
|       accelerator: |       accelerator: | ||||||
|         process.platform === "darwin" ? "Alt+Command+I" : "Ctrl+Shift+I", |         process.platform === "darwin" ? "Alt+Command+I" : "Ctrl+Shift+I", | ||||||
|       click(_item, focusedWindow) { |       click(_item, focusedWindow) { | ||||||
|         if (focusedWindow) { |         if (focusedWindow instanceof BrowserWindow) { | ||||||
|           focusedWindow.webContents.openDevTools({mode: "undocked"}); |           focusedWindow.webContents.openDevTools({mode: "undocked"}); | ||||||
|         } |         } | ||||||
|       }, |       }, | ||||||
| @@ -218,7 +222,7 @@ function getViewSubmenu(): MenuItemConstructorOptions[] { | |||||||
|     { |     { | ||||||
|       label: t.__("Toggle Tray Icon"), |       label: t.__("Toggle Tray Icon"), | ||||||
|       click(_item, focusedWindow) { |       click(_item, focusedWindow) { | ||||||
|         if (focusedWindow) { |         if (focusedWindow instanceof BrowserWindow) { | ||||||
|           send(focusedWindow.webContents, "toggletray"); |           send(focusedWindow.webContents, "toggletray"); | ||||||
|         } |         } | ||||||
|       }, |       }, | ||||||
| @@ -227,7 +231,7 @@ function getViewSubmenu(): MenuItemConstructorOptions[] { | |||||||
|       label: t.__("Toggle Sidebar"), |       label: t.__("Toggle Sidebar"), | ||||||
|       accelerator: "CommandOrControl+Shift+S", |       accelerator: "CommandOrControl+Shift+S", | ||||||
|       click(_item, focusedWindow) { |       click(_item, focusedWindow) { | ||||||
|         if (focusedWindow) { |         if (focusedWindow instanceof BrowserWindow) { | ||||||
|           const newValue = !ConfigUtil.getConfigItem("showSidebar", true); |           const newValue = !ConfigUtil.getConfigItem("showSidebar", true); | ||||||
|           send(focusedWindow.webContents, "toggle-sidebar", newValue); |           send(focusedWindow.webContents, "toggle-sidebar", newValue); | ||||||
|           ConfigUtil.setConfigItem("showSidebar", newValue); |           ConfigUtil.setConfigItem("showSidebar", newValue); | ||||||
| @@ -239,7 +243,7 @@ function getViewSubmenu(): MenuItemConstructorOptions[] { | |||||||
|       checked: ConfigUtil.getConfigItem("autoHideMenubar", false), |       checked: ConfigUtil.getConfigItem("autoHideMenubar", false), | ||||||
|       visible: process.platform !== "darwin", |       visible: process.platform !== "darwin", | ||||||
|       click(_item, focusedWindow) { |       click(_item, focusedWindow) { | ||||||
|         if (focusedWindow) { |         if (focusedWindow instanceof BrowserWindow) { | ||||||
|           const newValue = !ConfigUtil.getConfigItem("autoHideMenubar", false); |           const newValue = !ConfigUtil.getConfigItem("autoHideMenubar", false); | ||||||
|           focusedWindow.autoHideMenuBar = newValue; |           focusedWindow.autoHideMenuBar = newValue; | ||||||
|           focusedWindow.setMenuBarVisibility(!newValue); |           focusedWindow.setMenuBarVisibility(!newValue); | ||||||
| @@ -314,12 +318,12 @@ function getWindowSubmenu( | |||||||
|       if (tab === undefined) continue; |       if (tab === undefined) continue; | ||||||
|  |  | ||||||
|       // Do not add functional tab settings to list of windows in menu bar |       // Do not add functional tab settings to list of windows in menu bar | ||||||
|       if (tab.role === "function" && tab.name === "Settings") { |       if (tab.role === "function" && tab.page === "Settings") { | ||||||
|         continue; |         continue; | ||||||
|       } |       } | ||||||
|  |  | ||||||
|       initialSubmenu.push({ |       initialSubmenu.push({ | ||||||
|         label: tab.name, |         label: tab.label, | ||||||
|         accelerator: |         accelerator: | ||||||
|           tab.role === "function" ? "" : `${shortcutKey} + ${tab.index + 1}`, |           tab.role === "function" ? "" : `${shortcutKey} + ${tab.index + 1}`, | ||||||
|         checked: tab.index === activeTabIndex, |         checked: tab.index === activeTabIndex, | ||||||
| @@ -368,8 +372,10 @@ function getWindowSubmenu( | |||||||
|   return initialSubmenu; |   return initialSubmenu; | ||||||
| } | } | ||||||
|  |  | ||||||
| function getDarwinTpl(props: MenuProps): MenuItemConstructorOptions[] { | function getDarwinTpl( | ||||||
|   const {tabs, activeTabIndex, enableMenu = false} = props; |   properties: MenuProperties, | ||||||
|  | ): MenuItemConstructorOptions[] { | ||||||
|  |   const {tabs, activeTabIndex, enableMenu = false} = properties; | ||||||
|  |  | ||||||
|   return [ |   return [ | ||||||
|     { |     { | ||||||
| @@ -533,8 +539,8 @@ function getDarwinTpl(props: MenuProps): MenuItemConstructorOptions[] { | |||||||
|   ]; |   ]; | ||||||
| } | } | ||||||
|  |  | ||||||
| function getOtherTpl(props: MenuProps): MenuItemConstructorOptions[] { | function getOtherTpl(properties: MenuProperties): MenuItemConstructorOptions[] { | ||||||
|   const {tabs, activeTabIndex, enableMenu = false} = props; |   const {tabs, activeTabIndex, enableMenu = false} = properties; | ||||||
|   return [ |   return [ | ||||||
|     { |     { | ||||||
|       label: t.__("File"), |       label: t.__("File"), | ||||||
| @@ -683,7 +689,7 @@ function getOtherTpl(props: MenuProps): MenuItemConstructorOptions[] { | |||||||
|  |  | ||||||
| function sendAction<Channel extends keyof RendererMessage>( | function sendAction<Channel extends keyof RendererMessage>( | ||||||
|   channel: Channel, |   channel: Channel, | ||||||
|   ...args: Parameters<RendererMessage[Channel]> |   ...arguments_: Parameters<RendererMessage[Channel]> | ||||||
| ): void { | ): void { | ||||||
|   const win = BrowserWindow.getAllWindows()[0]; |   const win = BrowserWindow.getAllWindows()[0]; | ||||||
|  |  | ||||||
| @@ -691,7 +697,7 @@ function sendAction<Channel extends keyof RendererMessage>( | |||||||
|     win.restore(); |     win.restore(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   send(win.webContents, channel, ...args); |   send(win.webContents, channel, ...arguments_); | ||||||
| } | } | ||||||
|  |  | ||||||
| async function checkForUpdate(): Promise<void> { | async function checkForUpdate(): Promise<void> { | ||||||
| @@ -714,9 +720,11 @@ function getPreviousServer(tabs: TabData[], activeTabIndex: number): number { | |||||||
|   return activeTabIndex; |   return activeTabIndex; | ||||||
| } | } | ||||||
|  |  | ||||||
| export function setMenu(props: MenuProps): void { | export function setMenu(properties: MenuProperties): void { | ||||||
|   const tpl = |   const tpl = | ||||||
|     process.platform === "darwin" ? getDarwinTpl(props) : getOtherTpl(props); |     process.platform === "darwin" | ||||||
|  |       ? getDarwinTpl(properties) | ||||||
|  |       : getOtherTpl(properties); | ||||||
|   const menu = Menu.buildFromTemplate(tpl); |   const menu = Menu.buildFromTemplate(tpl); | ||||||
|   Menu.setApplicationMenu(menu); |   Menu.setApplicationMenu(menu); | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,43 +1,25 @@ | |||||||
| import type {ClientRequest, IncomingMessage, Session} from "electron/main"; | import {type Session, app} from "electron/main"; | ||||||
| import {app, net} from "electron/main"; |  | ||||||
| import fs from "node:fs"; | import fs from "node:fs"; | ||||||
| import path from "node:path"; | import path from "node:path"; | ||||||
| import stream from "node:stream"; | import {Readable} from "node:stream"; | ||||||
| import util from "node:util"; | import {pipeline} from "node:stream/promises"; | ||||||
|  | import type {ReadableStream} from "node:stream/web"; | ||||||
|  |  | ||||||
| import * as Sentry from "@sentry/electron"; | import * as Sentry from "@sentry/electron/main"; | ||||||
| import getStream from "get-stream"; | import {z} from "zod"; | ||||||
| import * as z from "zod"; |  | ||||||
|  |  | ||||||
| import Logger from "../common/logger-util"; | import Logger from "../common/logger-util.js"; | ||||||
| import * as Messages from "../common/messages"; | import * as Messages from "../common/messages.js"; | ||||||
| import type {ServerConf} from "../common/types"; | import type {ServerConfig} from "../common/types.js"; | ||||||
|  |  | ||||||
| export async function fetchResponse( |  | ||||||
|   request: ClientRequest, |  | ||||||
| ): Promise<IncomingMessage> { |  | ||||||
|   return new Promise((resolve, reject) => { |  | ||||||
|     request.on("response", resolve); |  | ||||||
|     request.on("abort", () => { |  | ||||||
|       reject(new Error("Request aborted")); |  | ||||||
|     }); |  | ||||||
|     request.on("error", reject); |  | ||||||
|     request.end(); |  | ||||||
|   }); |  | ||||||
| } |  | ||||||
|  |  | ||||||
| const pipeline = util.promisify(stream.pipeline); |  | ||||||
|  |  | ||||||
| /* Request: domain-util */ | /* Request: domain-util */ | ||||||
|  |  | ||||||
| const defaultIconUrl = "../renderer/img/icon.png"; |  | ||||||
|  |  | ||||||
| const logger = new Logger({ | const logger = new Logger({ | ||||||
|   file: "domain-util.log", |   file: "domain-util.log", | ||||||
| }); | }); | ||||||
|  |  | ||||||
| const generateFilePath = (url: string): string => { | const generateFilePath = (url: string): string => { | ||||||
|   const dir = `${app.getPath("userData")}/server-icons`; |   const directory = `${app.getPath("userData")}/server-icons`; | ||||||
|   const extension = path.extname(url).split("?")[0]; |   const extension = path.extname(url).split("?")[0]; | ||||||
|  |  | ||||||
|   let hash = 5381; |   let hash = 5381; | ||||||
| @@ -49,35 +31,38 @@ const generateFilePath = (url: string): string => { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   // Create 'server-icons' directory if not existed |   // Create 'server-icons' directory if not existed | ||||||
|   if (!fs.existsSync(dir)) { |   if (!fs.existsSync(directory)) { | ||||||
|     fs.mkdirSync(dir); |     fs.mkdirSync(directory); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   // eslint-disable-next-line no-bitwise |   // eslint-disable-next-line no-bitwise | ||||||
|   return `${dir}/${hash >>> 0}${extension}`; |   return `${directory}/${hash >>> 0}${extension}`; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| export const _getServerSettings = async ( | export const _getServerSettings = async ( | ||||||
|   domain: string, |   domain: string, | ||||||
|   session: Session, |   session: Session, | ||||||
| ): Promise<ServerConf> => { | ): Promise<ServerConfig> => { | ||||||
|   const response = await fetchResponse( |   const response = await session.fetch(domain + "/api/v1/server_settings"); | ||||||
|     net.request({ |   if (!response.ok) { | ||||||
|       url: domain + "/api/v1/server_settings", |  | ||||||
|       session, |  | ||||||
|     }), |  | ||||||
|   ); |  | ||||||
|   if (response.statusCode !== 200) { |  | ||||||
|     throw new Error(Messages.invalidZulipServerError(domain)); |     throw new Error(Messages.invalidZulipServerError(domain)); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   const data: unknown = JSON.parse(await getStream(response)); |   const data: unknown = await response.json(); | ||||||
|   /* eslint-disable @typescript-eslint/naming-convention */ |   /* eslint-disable @typescript-eslint/naming-convention */ | ||||||
|   const {realm_name, realm_uri, realm_icon} = z |   const { | ||||||
|  |     realm_name, | ||||||
|  |     realm_uri, | ||||||
|  |     realm_icon, | ||||||
|  |     zulip_version, | ||||||
|  |     zulip_feature_level, | ||||||
|  |   } = z | ||||||
|     .object({ |     .object({ | ||||||
|       realm_name: z.string(), |       realm_name: z.string(), | ||||||
|       realm_uri: z.string(), |       realm_uri: z.string().url(), | ||||||
|       realm_icon: z.string(), |       realm_icon: z.string(), | ||||||
|  |       zulip_version: z.string().default("unknown"), | ||||||
|  |       zulip_feature_level: z.number().default(0), | ||||||
|     }) |     }) | ||||||
|     .parse(data); |     .parse(data); | ||||||
|   /* eslint-enable @typescript-eslint/naming-convention */ |   /* eslint-enable @typescript-eslint/naming-convention */ | ||||||
| @@ -88,28 +73,33 @@ export const _getServerSettings = async ( | |||||||
|     icon: realm_icon.startsWith("/") ? realm_uri + realm_icon : realm_icon, |     icon: realm_icon.startsWith("/") ? realm_uri + realm_icon : realm_icon, | ||||||
|     url: realm_uri, |     url: realm_uri, | ||||||
|     alias: realm_name, |     alias: realm_name, | ||||||
|  |     zulipVersion: zulip_version, | ||||||
|  |     zulipFeatureLevel: zulip_feature_level, | ||||||
|   }; |   }; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| export const _saveServerIcon = async ( | export const _saveServerIcon = async ( | ||||||
|   url: string, |   url: string, | ||||||
|   session: Session, |   session: Session, | ||||||
| ): Promise<string> => { | ): Promise<string | null> => { | ||||||
|   try { |   try { | ||||||
|     const response = await fetchResponse(net.request({url, session})); |     const response = await session.fetch(url); | ||||||
|     if (response.statusCode !== 200) { |     if (!response.ok) { | ||||||
|       logger.log("Could not get server icon."); |       logger.log("Could not get server icon."); | ||||||
|       return defaultIconUrl; |       return null; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     const filePath = generateFilePath(url); |     const filePath = generateFilePath(url); | ||||||
|     await pipeline(response, fs.createWriteStream(filePath)); |     await pipeline( | ||||||
|  |       Readable.fromWeb(response.body as ReadableStream<Uint8Array>), | ||||||
|  |       fs.createWriteStream(filePath), | ||||||
|  |     ); | ||||||
|     return filePath; |     return filePath; | ||||||
|   } catch (error: unknown) { |   } catch (error: unknown) { | ||||||
|     logger.log("Could not get server icon."); |     logger.log("Could not get server icon."); | ||||||
|     logger.log(error); |     logger.log(error); | ||||||
|     Sentry.captureException(error); |     Sentry.captureException(error); | ||||||
|     return defaultIconUrl; |     return null; | ||||||
|   } |   } | ||||||
| }; | }; | ||||||
|  |  | ||||||
| @@ -120,16 +110,10 @@ export const _isOnline = async ( | |||||||
|   session: Session, |   session: Session, | ||||||
| ): Promise<boolean> => { | ): Promise<boolean> => { | ||||||
|   try { |   try { | ||||||
|     const response = await fetchResponse( |     const response = await session.fetch(`${url}/api/v1/server_settings`, { | ||||||
|       net.request({ |       method: "HEAD", | ||||||
|         method: "HEAD", |     }); | ||||||
|         url: `${url}/api/v1/server_settings`, |     return response.ok; | ||||||
|         session, |  | ||||||
|       }), |  | ||||||
|     ); |  | ||||||
|     const isValidResponse = |  | ||||||
|       response.statusCode >= 200 && response.statusCode < 400; |  | ||||||
|     return isValidResponse; |  | ||||||
|   } catch (error: unknown) { |   } catch (error: unknown) { | ||||||
|     logger.log(error); |     logger.log(error); | ||||||
|     return false; |     return false; | ||||||
|   | |||||||
| @@ -1,8 +1,8 @@ | |||||||
| import {app} from "electron/main"; | import {app} from "electron/main"; | ||||||
|  |  | ||||||
| import * as Sentry from "@sentry/electron"; | import * as Sentry from "@sentry/electron/main"; | ||||||
|  |  | ||||||
| import {getConfigItem} from "../common/config-util"; | import {getConfigItem} from "../common/config-util.js"; | ||||||
|  |  | ||||||
| export const sentryInit = (): void => { | export const sentryInit = (): void => { | ||||||
|   Sentry.init({ |   Sentry.init({ | ||||||
|   | |||||||
| @@ -3,7 +3,7 @@ import process from "node:process"; | |||||||
|  |  | ||||||
| import AutoLaunch from "auto-launch"; | import AutoLaunch from "auto-launch"; | ||||||
|  |  | ||||||
| import * as ConfigUtil from "../common/config-util"; | import * as ConfigUtil from "../common/config-util.js"; | ||||||
|  |  | ||||||
| export const setAutoLaunch = async ( | export const setAutoLaunch = async ( | ||||||
|   AutoLaunchValue: boolean, |   AutoLaunchValue: boolean, | ||||||
|   | |||||||
| @@ -1,9 +1,7 @@ | |||||||
| import type { |  | ||||||
|   IpcMainEvent, |  | ||||||
|   IpcMainInvokeEvent, |  | ||||||
|   WebContents, |  | ||||||
| } from "electron/main"; |  | ||||||
| import { | import { | ||||||
|  |   type IpcMainEvent, | ||||||
|  |   type IpcMainInvokeEvent, | ||||||
|  |   type WebContents, | ||||||
|   ipcMain as untypedIpcMain, // eslint-disable-line no-restricted-imports |   ipcMain as untypedIpcMain, // eslint-disable-line no-restricted-imports | ||||||
| } from "electron/main"; | } from "electron/main"; | ||||||
|  |  | ||||||
| @@ -14,14 +12,20 @@ import type { | |||||||
| } from "../common/typed-ipc.js"; | } from "../common/typed-ipc.js"; | ||||||
|  |  | ||||||
| type MainListener<Channel extends keyof MainMessage> = | type MainListener<Channel extends keyof MainMessage> = | ||||||
|   MainMessage[Channel] extends (...args: infer Args) => infer Return |   MainMessage[Channel] extends (...arguments_: infer Arguments) => infer Return | ||||||
|     ? (event: IpcMainEvent & {returnValue: Return}, ...args: Args) => void |     ? ( | ||||||
|  |         event: IpcMainEvent & {returnValue: Return}, | ||||||
|  |         ...arguments_: Arguments | ||||||
|  |       ) => void | ||||||
|     : never; |     : never; | ||||||
|  |  | ||||||
| type MainHandler<Channel extends keyof MainCall> = MainCall[Channel] extends ( | type MainHandler<Channel extends keyof MainCall> = MainCall[Channel] extends ( | ||||||
|   ...args: infer Args |   ...arguments_: infer Arguments | ||||||
| ) => infer Return | ) => infer Return | ||||||
|   ? (event: IpcMainInvokeEvent, ...args: Args) => Return | Promise<Return> |   ? ( | ||||||
|  |       event: IpcMainInvokeEvent, | ||||||
|  |       ...arguments_: Arguments | ||||||
|  |     ) => Return | Promise<Return> | ||||||
|   : never; |   : never; | ||||||
|  |  | ||||||
| export const ipcMain: { | export const ipcMain: { | ||||||
| @@ -30,7 +34,16 @@ export const ipcMain: { | |||||||
|     listener: <Channel extends keyof RendererMessage>( |     listener: <Channel extends keyof RendererMessage>( | ||||||
|       event: IpcMainEvent, |       event: IpcMainEvent, | ||||||
|       channel: Channel, |       channel: Channel, | ||||||
|       ...args: Parameters<RendererMessage[Channel]> |       ...arguments_: Parameters<RendererMessage[Channel]> | ||||||
|  |     ) => void, | ||||||
|  |   ): void; | ||||||
|  |   on( | ||||||
|  |     channel: "forward-to", | ||||||
|  |     listener: <Channel extends keyof RendererMessage>( | ||||||
|  |       event: IpcMainEvent, | ||||||
|  |       webContentsId: number, | ||||||
|  |       channel: Channel, | ||||||
|  |       ...arguments_: Parameters<RendererMessage[Channel]> | ||||||
|     ) => void, |     ) => void, | ||||||
|   ): void; |   ): void; | ||||||
|   on<Channel extends keyof MainMessage>( |   on<Channel extends keyof MainMessage>( | ||||||
| @@ -60,16 +73,16 @@ export const ipcMain: { | |||||||
| export function send<Channel extends keyof RendererMessage>( | export function send<Channel extends keyof RendererMessage>( | ||||||
|   contents: WebContents, |   contents: WebContents, | ||||||
|   channel: Channel, |   channel: Channel, | ||||||
|   ...args: Parameters<RendererMessage[Channel]> |   ...arguments_: Parameters<RendererMessage[Channel]> | ||||||
| ): void { | ): void { | ||||||
|   contents.send(channel, ...args); |   contents.send(channel, ...arguments_); | ||||||
| } | } | ||||||
|  |  | ||||||
| export function sendToFrame<Channel extends keyof RendererMessage>( | export function sendToFrame<Channel extends keyof RendererMessage>( | ||||||
|   contents: WebContents, |   contents: WebContents, | ||||||
|   frameId: number | [number, number], |   frameId: number | [number, number], | ||||||
|   channel: Channel, |   channel: Channel, | ||||||
|   ...args: Parameters<RendererMessage[Channel]> |   ...arguments_: Parameters<RendererMessage[Channel]> | ||||||
| ): void { | ): void { | ||||||
|   contents.sendToFrame(frameId, channel, ...args); |   contents.sendToFrame(frameId, channel, ...arguments_); | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										9
									
								
								app/renderer/about.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,9 @@ | |||||||
|  | <!doctype html> | ||||||
|  | <meta charset="UTF-8" /> | ||||||
|  | <link rel="stylesheet" href="css/about.css" /> | ||||||
|  |  | ||||||
|  | <!-- Initially hidden to prevent FOUC --> | ||||||
|  | <div class="about" hidden> | ||||||
|  |   <img class="logo" src="../resources/zulip.png" /> | ||||||
|  |   <p class="detail" id="version"></p> | ||||||
|  | </div> | ||||||
| @@ -47,7 +47,6 @@ | |||||||
| } | } | ||||||
|  |  | ||||||
| .maintenance-info { | .maintenance-info { | ||||||
|   cursor: pointer; |  | ||||||
|   position: absolute; |   position: absolute; | ||||||
|   width: 100%; |   width: 100%; | ||||||
|   left: 0; |   left: 0; | ||||||
|   | |||||||
| @@ -2,7 +2,9 @@ | |||||||
|   font-family: "Material Icons"; |   font-family: "Material Icons"; | ||||||
|   font-style: normal; |   font-style: normal; | ||||||
|   font-weight: 400; |   font-weight: 400; | ||||||
|   src: local("Material Icons"), local("MaterialIcons-Regular"), |   src: | ||||||
|  |     local("Material Icons"), | ||||||
|  |     local("MaterialIcons-Regular"), | ||||||
|     url("../fonts/MaterialIcons-Regular.ttf") format("truetype"); |     url("../fonts/MaterialIcons-Regular.ttf") format("truetype"); | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -44,6 +44,7 @@ body { | |||||||
|  |  | ||||||
| #view-controls-container { | #view-controls-container { | ||||||
|   height: calc(100% - 208px); |   height: calc(100% - 208px); | ||||||
|  |   scrollbar-gutter: stable both-edges; | ||||||
|   overflow-y: hidden; |   overflow-y: hidden; | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -52,16 +53,15 @@ body { | |||||||
| } | } | ||||||
|  |  | ||||||
| #view-controls-container::-webkit-scrollbar-track { | #view-controls-container::-webkit-scrollbar-track { | ||||||
|   box-shadow: inset 0 0 6px rgb(0 0 0 / 30%); |   background-color: rgb(0 0 0 / 30%); | ||||||
| } | } | ||||||
|  |  | ||||||
| #view-controls-container::-webkit-scrollbar-thumb { | #view-controls-container::-webkit-scrollbar-thumb { | ||||||
|   background-color: rgb(169 169 169 / 100%); |   background-color: rgb(169 169 169 / 100%); | ||||||
|   outline: 1px solid rgb(169 169 169 / 100%); |  | ||||||
| } | } | ||||||
|  |  | ||||||
| #view-controls-container:hover { | #view-controls-container:hover { | ||||||
|   overflow-y: overlay; |   overflow-y: scroll; | ||||||
| } | } | ||||||
|  |  | ||||||
| /******************* | /******************* | ||||||
| @@ -290,7 +290,9 @@ body { | |||||||
|   content: ""; |   content: ""; | ||||||
|   position: absolute; |   position: absolute; | ||||||
|   z-index: 1; |   z-index: 1; | ||||||
|   background: rgb(255 255 255 / 100%) url("../img/ic_loading.gif") no-repeat; |  | ||||||
|  |   /* Spinner is released under loading.io free License: https://loading.io/license/#free-license */ | ||||||
|  |   background: rgb(255 255 255 / 100%) url("../img/ic_loading.svg") no-repeat; | ||||||
|   background-size: 60px 60px; |   background-size: 60px 60px; | ||||||
|   background-position: center; |   background-position: center; | ||||||
|   width: 100%; |   width: 100%; | ||||||
| @@ -303,7 +305,7 @@ body { | |||||||
|   visibility: hidden; |   visibility: hidden; | ||||||
| } | } | ||||||
|  |  | ||||||
| webview, | .webview-pane, | ||||||
| .functional-view { | .functional-view { | ||||||
|   position: absolute; |   position: absolute; | ||||||
|   width: 100%; |   width: 100%; | ||||||
| @@ -312,7 +314,16 @@ webview, | |||||||
|   visibility: hidden; |   visibility: hidden; | ||||||
| } | } | ||||||
|  |  | ||||||
| webview.active, | .webview-pane { | ||||||
|  |   display: flex; | ||||||
|  |   flex-direction: column; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .webview-pane > webview { | ||||||
|  |   flex: 1; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .webview-pane.active, | ||||||
| .functional-view.active { | .functional-view.active { | ||||||
|   z-index: 1; |   z-index: 1; | ||||||
|   visibility: visible; |   visibility: visible; | ||||||
| @@ -322,6 +333,30 @@ webview.focus { | |||||||
|   outline: 0 solid transparent; |   outline: 0 solid transparent; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | .webview-unsupported { | ||||||
|  |   background: rgb(254 243 199); | ||||||
|  |   border: 1px solid rgb(253 230 138); | ||||||
|  |   color: rgb(69 26 3); | ||||||
|  |   font-family: system-ui; | ||||||
|  |   font-size: 14px; | ||||||
|  |   display: flex; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .webview-unsupported[hidden] { | ||||||
|  |   display: none; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .webview-unsupported-message { | ||||||
|  |   padding: 0.3em; | ||||||
|  |   flex: 1; | ||||||
|  |   text-align: center; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .webview-unsupported-dismiss { | ||||||
|  |   padding: 0.3em; | ||||||
|  |   cursor: pointer; | ||||||
|  | } | ||||||
|  |  | ||||||
| /* Tooltip styling */ | /* Tooltip styling */ | ||||||
|  |  | ||||||
| #loading-tooltip, | #loading-tooltip, | ||||||
|   | |||||||
| @@ -1,3 +1,5 @@ | |||||||
|  | @import url("@yaireo/tagify/dist/tagify.css"); | ||||||
|  |  | ||||||
| :host { | :host { | ||||||
|   contain: strict; |   contain: strict; | ||||||
|   display: flow-root; |   display: flow-root; | ||||||
| @@ -10,6 +12,11 @@ | |||||||
|   letter-spacing: -0.08px; |   letter-spacing: -0.08px; | ||||||
|   line-height: 18px; |   line-height: 18px; | ||||||
|   color: rgb(139 142 143 / 100%); |   color: rgb(139 142 143 / 100%); | ||||||
|  |  | ||||||
|  |   /* Copied from https://github.com/yairEO/tagify/blob/v4.17.7/src/tagify.scss#L4-L8 */ | ||||||
|  |   --tagify-dd-color-primary: rgb(53 149 246); | ||||||
|  |   --tagify-dd-bg-color: rgb(255 255 255); | ||||||
|  |   --tagify-dd-item-pad: 0.3em 0.5em; | ||||||
| } | } | ||||||
|  |  | ||||||
| kbd { | kbd { | ||||||
| @@ -300,7 +307,9 @@ img.server-info-icon { | |||||||
| } | } | ||||||
|  |  | ||||||
| .settings-card:hover { | .settings-card:hover { | ||||||
|   box-shadow: 0 2px 5px 0 rgb(0 0 0 / 16%), 0 2px 0 0 rgb(0 0 0 / 12%); |   box-shadow: | ||||||
|  |     0 2px 5px 0 rgb(0 0 0 / 16%), | ||||||
|  |     0 2px 0 0 rgb(0 0 0 / 12%); | ||||||
| } | } | ||||||
|  |  | ||||||
| .hidden { | .hidden { | ||||||
| @@ -475,10 +484,7 @@ input.toggle-round + label::after { | |||||||
| input.toggle-round + label::before { | input.toggle-round + label::before { | ||||||
|   background-color: rgb(241 241 241 / 100%); |   background-color: rgb(241 241 241 / 100%); | ||||||
|   border-radius: 25px; |   border-radius: 25px; | ||||||
|   top: 0; |   inset: 0; | ||||||
|   right: 0; |  | ||||||
|   left: 0; |  | ||||||
|   bottom: 0; |  | ||||||
| } | } | ||||||
|  |  | ||||||
| input.toggle-round + label::after { | input.toggle-round + label::after { | ||||||
| @@ -490,10 +496,7 @@ input.toggle-round + label::after { | |||||||
|  |  | ||||||
| input.toggle-round:checked + label::before { | input.toggle-round:checked + label::before { | ||||||
|   background-color: rgb(78 191 172 / 100%); |   background-color: rgb(78 191 172 / 100%); | ||||||
|   top: 0; |   inset: 0; | ||||||
|   right: 0; |  | ||||||
|   left: 0; |  | ||||||
|   bottom: 0; |  | ||||||
| } | } | ||||||
|  |  | ||||||
| input.toggle-round:checked + label::after { | input.toggle-round:checked + label::after { | ||||||
| @@ -575,7 +578,6 @@ input.toggle-round:checked + label::after { | |||||||
|   text-align: center; |   text-align: center; | ||||||
|   color: rgb(255 255 255 / 100%); |   color: rgb(255 255 255 / 100%); | ||||||
|   background: rgb(78 191 172 / 100%); |   background: rgb(78 191 172 / 100%); | ||||||
|   border-color: none; |  | ||||||
|   border: none; |   border: none; | ||||||
|   width: 98%; |   width: 98%; | ||||||
|   height: 46px; |   height: 46px; | ||||||
| @@ -651,7 +653,7 @@ i.open-network-button { | |||||||
| } | } | ||||||
|  |  | ||||||
| /* responsive grid */ | /* responsive grid */ | ||||||
| @media (min-width: 500px) and (max-width: 720px) { | @media (width >= 500px) and (width <= 720px) { | ||||||
|   #new-server-container { |   #new-server-container { | ||||||
|     padding-left: 0; |     padding-left: 0; | ||||||
|     width: 60vw; |     width: 60vw; | ||||||
| @@ -663,7 +665,7 @@ i.open-network-button { | |||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| @media (max-width: 500px) { | @media (width <= 500px) { | ||||||
|   #new-server-container { |   #new-server-container { | ||||||
|     padding-left: 0; |     padding-left: 0; | ||||||
|     width: 54%; |     width: 54%; | ||||||
| @@ -674,7 +676,7 @@ i.open-network-button { | |||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| @media (max-width: 650px) { | @media (width <= 650px) { | ||||||
|   .selected-css-path, |   .selected-css-path, | ||||||
|   .download-folder-path { |   .download-folder-path { | ||||||
|     margin-right: 15px; |     margin-right: 15px; | ||||||
| @@ -689,7 +691,7 @@ i.open-network-button { | |||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| @media (max-width: 720px) { | @media (width <= 720px) { | ||||||
|   .modal-container { |   .modal-container { | ||||||
|     width: 60vw; |     width: 60vw; | ||||||
|     padding: 40px; |     padding: 40px; | ||||||
| @@ -712,7 +714,7 @@ i.open-network-button { | |||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| @media (max-width: 600px) { | @media (width <= 600px) { | ||||||
|   .divider { |   .divider { | ||||||
|     margin-left: 4%; |     margin-left: 4%; | ||||||
|   } |   } | ||||||
| @@ -724,7 +726,7 @@ i.open-network-button { | |||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| @media (max-width: 900px) { | @media (width <= 900px) { | ||||||
|   .settings-card { |   .settings-card { | ||||||
|     flex-direction: column; |     flex-direction: column; | ||||||
|     align-items: center; |     align-items: center; | ||||||
| @@ -760,3 +762,9 @@ i.open-network-button { | |||||||
|   top: 0; |   top: 0; | ||||||
|   bottom: 0; |   bottom: 0; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | .settings-tagify-dropdown { | ||||||
|  |   position: relative; | ||||||
|  |   z-index: 9999; | ||||||
|  |   height: 0; | ||||||
|  | } | ||||||
|   | |||||||
| Before Width: | Height: | Size: 22 KiB | 
							
								
								
									
										8
									
								
								app/renderer/img/ic_loading.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,8 @@ | |||||||
|  | <?xml version="1.0" encoding="utf-8"?> | ||||||
|  | <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgba(0, 0, 0, 0) none repeat scroll 0% 0%; display: block; shape-rendering: auto; animation-play-state: running; animation-delay: 0s;" width="150px" height="150px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid"> | ||||||
|  | <circle cx="50" cy="50" fill="none" stroke="#759ed4" stroke-width="10" r="42" stroke-dasharray="197.92033717615698 67.97344572538566" style="animation-play-state: running; animation-delay: 0s;"> | ||||||
|  |   <animateTransform attributeName="transform" type="rotate" repeatCount="indefinite" dur="1s" values="0 50 50;360 50 50" keyTimes="0;1" style="animation-play-state: running; animation-delay: 0s;"></animateTransform> | ||||||
|  | </circle> | ||||||
|  | <!-- Created with loading.io (https://loading.io/spinner/rolling/-bar-circle-curve-round-rotate) --> | ||||||
|  | <!-- "The Rolling spinner is released under loading.io free License." (https://loading.io/license/#free-license) --> | ||||||
|  | </svg> | ||||||
| After Width: | Height: | Size: 1018 B | 
| @@ -1,6 +1,4 @@ | |||||||
| import {clipboard} from "electron/common"; | import {ipcRenderer} from "./typed-ipc-renderer.js"; | ||||||
| import {Buffer} from "node:buffer"; |  | ||||||
| import crypto from "node:crypto"; |  | ||||||
|  |  | ||||||
| // This helper is exposed via electron_bridge for use in the social | // This helper is exposed via electron_bridge for use in the social | ||||||
| // login flow. | // login flow. | ||||||
| @@ -16,13 +14,13 @@ import crypto from "node:crypto"; | |||||||
| // don’t leak anything from the user’s clipboard other than the token | // don’t leak anything from the user’s clipboard other than the token | ||||||
| // intended for us. | // intended for us. | ||||||
|  |  | ||||||
| export interface ClipboardDecrypter { | export type ClipboardDecrypter = { | ||||||
|   version: number; |   version: number; | ||||||
|   key: Uint8Array; |   key: Uint8Array; | ||||||
|   pasted: Promise<string>; |   pasted: Promise<string>; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export class ClipboardDecrypterImpl implements ClipboardDecrypter { | export class ClipboardDecrypterImplementation implements ClipboardDecrypter { | ||||||
|   version: number; |   version: number; | ||||||
|   key: Uint8Array; |   key: Uint8Array; | ||||||
|   pasted: Promise<string>; |   pasted: Promise<string>; | ||||||
| @@ -30,7 +28,8 @@ export class ClipboardDecrypterImpl implements ClipboardDecrypter { | |||||||
|   constructor(_: number) { |   constructor(_: number) { | ||||||
|     // At this time, the only version is 1. |     // At this time, the only version is 1. | ||||||
|     this.version = 1; |     this.version = 1; | ||||||
|     this.key = crypto.randomBytes(32); |     const {key, sig} = ipcRenderer.sendSync("new-clipboard-key"); | ||||||
|  |     this.key = key; | ||||||
|     this.pasted = new Promise((resolve) => { |     this.pasted = new Promise((resolve) => { | ||||||
|       let interval: NodeJS.Timeout | null = null; |       let interval: NodeJS.Timeout | null = null; | ||||||
|       const startPolling = () => { |       const startPolling = () => { | ||||||
| @@ -38,7 +37,7 @@ export class ClipboardDecrypterImpl implements ClipboardDecrypter { | |||||||
|           interval = setInterval(poll, 1000); |           interval = setInterval(poll, 1000); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         poll(); |         void poll(); | ||||||
|       }; |       }; | ||||||
|  |  | ||||||
|       const stopPolling = () => { |       const stopPolling = () => { | ||||||
| @@ -48,30 +47,9 @@ export class ClipboardDecrypterImpl implements ClipboardDecrypter { | |||||||
|         } |         } | ||||||
|       }; |       }; | ||||||
|  |  | ||||||
|       const poll = () => { |       const poll = async () => { | ||||||
|         let plaintext; |         const plaintext = await ipcRenderer.invoke("poll-clipboard", key, sig); | ||||||
|  |         if (plaintext === undefined) return; | ||||||
|         try { |  | ||||||
|           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 decipher = crypto.createDecipheriv( |  | ||||||
|             "aes-256-gcm", |  | ||||||
|             this.key, |  | ||||||
|             iv, |  | ||||||
|             {authTagLength: 16}, |  | ||||||
|           ); |  | ||||||
|           decipher.setAuthTag(authTag); |  | ||||||
|           plaintext = |  | ||||||
|             decipher.update(ciphertext, undefined, "utf8") + |  | ||||||
|             decipher.final("utf8"); |  | ||||||
|         } catch { |  | ||||||
|           // If the parsing or decryption failed in any way, |  | ||||||
|           // the correct token hasn’t been copied yet; try |  | ||||||
|           // again next time. |  | ||||||
|           return; |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         window.removeEventListener("focus", startPolling); |         window.removeEventListener("focus", startPolling); | ||||||
|         window.removeEventListener("blur", stopPolling); |         window.removeEventListener("blur", stopPolling); | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| import type {Html} from "../../../common/html"; | import type {Html} from "../../../common/html.js"; | ||||||
|  |  | ||||||
| export function generateNodeFromHtml(html: Html): Element { | export function generateNodeFromHtml(html: Html): Element { | ||||||
|   const wrapper = document.createElement("div"); |   const wrapper = document.createElement("div"); | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| import {clipboard} from "electron/common"; | import {type Event, clipboard} from "electron/common"; | ||||||
| import type {WebContents} from "electron/main"; | import type {WebContents} from "electron/main"; | ||||||
| import type { | import type { | ||||||
|   ContextMenuParams, |   ContextMenuParams, | ||||||
| @@ -8,16 +8,16 @@ import process from "node:process"; | |||||||
|  |  | ||||||
| import {Menu} from "@electron/remote"; | import {Menu} from "@electron/remote"; | ||||||
|  |  | ||||||
| import * as t from "../../../common/translation-util"; | import * as t from "../../../common/translation-util.js"; | ||||||
|  |  | ||||||
| export const contextMenu = ( | export const contextMenu = ( | ||||||
|   webContents: WebContents, |   webContents: WebContents, | ||||||
|   event: Event, |   event: Event, | ||||||
|   props: ContextMenuParams, |   properties: ContextMenuParams, | ||||||
| ) => { | ) => { | ||||||
|   const isText = props.selectionText !== ""; |   const isText = properties.selectionText !== ""; | ||||||
|   const isLink = props.linkURL !== ""; |   const isLink = properties.linkURL !== ""; | ||||||
|   const linkUrl = isLink ? new URL(props.linkURL) : undefined; |   const linkUrl = isLink ? new URL(properties.linkURL) : undefined; | ||||||
|  |  | ||||||
|   const makeSuggestion = (suggestion: string) => ({ |   const makeSuggestion = (suggestion: string) => ({ | ||||||
|     label: suggestion, |     label: suggestion, | ||||||
| @@ -30,19 +30,21 @@ export const contextMenu = ( | |||||||
|   let menuTemplate: MenuItemConstructorOptions[] = [ |   let menuTemplate: MenuItemConstructorOptions[] = [ | ||||||
|     { |     { | ||||||
|       label: t.__("Add to Dictionary"), |       label: t.__("Add to Dictionary"), | ||||||
|       visible: props.isEditable && isText && props.misspelledWord.length > 0, |       visible: | ||||||
|  |         properties.isEditable && isText && properties.misspelledWord.length > 0, | ||||||
|       click(_item) { |       click(_item) { | ||||||
|         webContents.session.addWordToSpellCheckerDictionary( |         webContents.session.addWordToSpellCheckerDictionary( | ||||||
|           props.misspelledWord, |           properties.misspelledWord, | ||||||
|         ); |         ); | ||||||
|       }, |       }, | ||||||
|     }, |     }, | ||||||
|     { |     { | ||||||
|       type: "separator", |       type: "separator", | ||||||
|       visible: props.isEditable && isText && props.misspelledWord.length > 0, |       visible: | ||||||
|  |         properties.isEditable && isText && properties.misspelledWord.length > 0, | ||||||
|     }, |     }, | ||||||
|     { |     { | ||||||
|       label: `${t.__("Look Up")} "${props.selectionText}"`, |       label: `${t.__("Look Up")} "${properties.selectionText}"`, | ||||||
|       visible: process.platform === "darwin" && isText, |       visible: process.platform === "darwin" && isText, | ||||||
|       click(_item) { |       click(_item) { | ||||||
|         webContents.showDefinitionForSelection(); |         webContents.showDefinitionForSelection(); | ||||||
| @@ -55,7 +57,7 @@ export const contextMenu = ( | |||||||
|     { |     { | ||||||
|       label: t.__("Cut"), |       label: t.__("Cut"), | ||||||
|       visible: isText, |       visible: isText, | ||||||
|       enabled: props.isEditable, |       enabled: properties.isEditable, | ||||||
|       accelerator: "CommandOrControl+X", |       accelerator: "CommandOrControl+X", | ||||||
|       click(_item) { |       click(_item) { | ||||||
|         webContents.cut(); |         webContents.cut(); | ||||||
| @@ -64,7 +66,7 @@ export const contextMenu = ( | |||||||
|     { |     { | ||||||
|       label: t.__("Copy"), |       label: t.__("Copy"), | ||||||
|       accelerator: "CommandOrControl+C", |       accelerator: "CommandOrControl+C", | ||||||
|       enabled: props.editFlags.canCopy, |       enabled: properties.editFlags.canCopy, | ||||||
|       click(_item) { |       click(_item) { | ||||||
|         webContents.copy(); |         webContents.copy(); | ||||||
|       }, |       }, | ||||||
| @@ -72,7 +74,7 @@ export const contextMenu = ( | |||||||
|     { |     { | ||||||
|       label: t.__("Paste"), // Bug: Paste replaces text |       label: t.__("Paste"), // Bug: Paste replaces text | ||||||
|       accelerator: "CommandOrControl+V", |       accelerator: "CommandOrControl+V", | ||||||
|       enabled: props.isEditable, |       enabled: properties.isEditable, | ||||||
|       click() { |       click() { | ||||||
|         webContents.paste(); |         webContents.paste(); | ||||||
|       }, |       }, | ||||||
| @@ -88,32 +90,34 @@ export const contextMenu = ( | |||||||
|       visible: isLink, |       visible: isLink, | ||||||
|       click(_item) { |       click(_item) { | ||||||
|         clipboard.write({ |         clipboard.write({ | ||||||
|           bookmark: props.linkText, |           bookmark: properties.linkText, | ||||||
|           text: |           text: | ||||||
|             linkUrl?.protocol === "mailto:" ? linkUrl.pathname : props.linkURL, |             linkUrl?.protocol === "mailto:" | ||||||
|  |               ? linkUrl.pathname | ||||||
|  |               : properties.linkURL, | ||||||
|         }); |         }); | ||||||
|       }, |       }, | ||||||
|     }, |     }, | ||||||
|     { |     { | ||||||
|       label: t.__("Copy Image"), |       label: t.__("Copy Image"), | ||||||
|       visible: props.mediaType === "image", |       visible: properties.mediaType === "image", | ||||||
|       click(_item) { |       click(_item) { | ||||||
|         webContents.copyImageAt(props.x, props.y); |         webContents.copyImageAt(properties.x, properties.y); | ||||||
|       }, |       }, | ||||||
|     }, |     }, | ||||||
|     { |     { | ||||||
|       label: t.__("Copy Image URL"), |       label: t.__("Copy Image URL"), | ||||||
|       visible: props.mediaType === "image", |       visible: properties.mediaType === "image", | ||||||
|       click(_item) { |       click(_item) { | ||||||
|         clipboard.write({ |         clipboard.write({ | ||||||
|           bookmark: props.srcURL, |           bookmark: properties.srcURL, | ||||||
|           text: props.srcURL, |           text: properties.srcURL, | ||||||
|         }); |         }); | ||||||
|       }, |       }, | ||||||
|     }, |     }, | ||||||
|     { |     { | ||||||
|       type: "separator", |       type: "separator", | ||||||
|       visible: isLink || props.mediaType === "image", |       visible: isLink || properties.mediaType === "image", | ||||||
|     }, |     }, | ||||||
|     { |     { | ||||||
|       label: t.__("Services"), |       label: t.__("Services"), | ||||||
| @@ -122,10 +126,10 @@ export const contextMenu = ( | |||||||
|     }, |     }, | ||||||
|   ]; |   ]; | ||||||
|  |  | ||||||
|   if (props.misspelledWord) { |   if (properties.misspelledWord) { | ||||||
|     if (props.dictionarySuggestions.length > 0) { |     if (properties.dictionarySuggestions.length > 0) { | ||||||
|       const suggestions: MenuItemConstructorOptions[] = |       const suggestions: MenuItemConstructorOptions[] = | ||||||
|         props.dictionarySuggestions.map((suggestion: string) => |         properties.dictionarySuggestions.map((suggestion: string) => | ||||||
|           makeSuggestion(suggestion), |           makeSuggestion(suggestion), | ||||||
|         ); |         ); | ||||||
|       menuTemplate = [...suggestions, ...menuTemplate]; |       menuTemplate = [...suggestions, ...menuTemplate]; | ||||||
| @@ -137,7 +141,7 @@ export const contextMenu = ( | |||||||
|     } |     } | ||||||
|   } |   } | ||||||
|   // Hide the invisible separators on Linux and Windows |   // Hide the invisible separators on Linux and Windows | ||||||
|   // Electron has a bug which ignores visible: false parameter for separator menuitems. So we remove them here. |   // Electron has a bug which ignores visible: false parameter for separator menu items. So we remove them here. | ||||||
|   // https://github.com/electron/electron/issues/5869 |   // https://github.com/electron/electron/issues/5869 | ||||||
|   // https://github.com/electron/electron/issues/6906 |   // https://github.com/electron/electron/issues/6906 | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,26 +1,26 @@ | |||||||
| import type {Html} from "../../../common/html"; | import {type Html, html} from "../../../common/html.js"; | ||||||
| import {html} from "../../../common/html"; | import type {TabPage} from "../../../common/types.js"; | ||||||
|  |  | ||||||
| import {generateNodeFromHtml} from "./base"; | import {generateNodeFromHtml} from "./base.js"; | ||||||
| import type {TabProps} from "./tab"; | import Tab, {type TabProperties} from "./tab.js"; | ||||||
| import Tab from "./tab"; |  | ||||||
|  |  | ||||||
| export interface FunctionalTabProps extends TabProps { | export type FunctionalTabProperties = { | ||||||
|   $view: Element; |   $view: Element; | ||||||
| } |   page: TabPage; | ||||||
|  | } & TabProperties; | ||||||
|  |  | ||||||
| export default class FunctionalTab extends Tab { | export default class FunctionalTab extends Tab { | ||||||
|   $view: Element; |   $view: Element; | ||||||
|   $el: Element; |   $el: Element; | ||||||
|   $closeButton?: Element; |   $closeButton?: Element; | ||||||
|  |  | ||||||
|   constructor({$view, ...props}: FunctionalTabProps) { |   constructor({$view, ...properties}: FunctionalTabProperties) { | ||||||
|     super(props); |     super(properties); | ||||||
|  |  | ||||||
|     this.$view = $view; |     this.$view = $view; | ||||||
|     this.$el = generateNodeFromHtml(this.templateHtml()); |     this.$el = generateNodeFromHtml(this.templateHtml()); | ||||||
|     if (this.props.name !== "Settings") { |     if (properties.page !== "Settings") { | ||||||
|       this.props.$root.append(this.$el); |       this.properties.$root.append(this.$el); | ||||||
|       this.$closeButton = this.$el.querySelector(".server-tab-badge")!; |       this.$closeButton = this.$el.querySelector(".server-tab-badge")!; | ||||||
|       this.registerListeners(); |       this.registerListeners(); | ||||||
|     } |     } | ||||||
| @@ -43,12 +43,12 @@ export default class FunctionalTab extends Tab { | |||||||
|  |  | ||||||
|   templateHtml(): Html { |   templateHtml(): Html { | ||||||
|     return html` |     return html` | ||||||
|       <div class="tab functional-tab" data-tab-id="${this.props.tabIndex}"> |       <div class="tab functional-tab" data-tab-id="${this.properties.tabIndex}"> | ||||||
|         <div class="server-tab-badge close-button"> |         <div class="server-tab-badge close-button"> | ||||||
|           <i class="material-icons">close</i> |           <i class="material-icons">close</i> | ||||||
|         </div> |         </div> | ||||||
|         <div class="server-tab"> |         <div class="server-tab"> | ||||||
|           <i class="material-icons">${this.props.materialIcon}</i> |           <i class="material-icons">${this.properties.materialIcon}</i> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|     `; |     `; | ||||||
| @@ -65,8 +65,8 @@ export default class FunctionalTab extends Tab { | |||||||
|       this.$closeButton?.classList.remove("active"); |       this.$closeButton?.classList.remove("active"); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     this.$closeButton?.addEventListener("click", (event: Event) => { |     this.$closeButton?.addEventListener("click", (event) => { | ||||||
|       this.props.onDestroy?.(); |       this.properties.onDestroy?.(); | ||||||
|       event.stopPropagation(); |       event.stopPropagation(); | ||||||
|     }); |     }); | ||||||
|   } |   } | ||||||
|   | |||||||
| @@ -1,30 +1,32 @@ | |||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
|  |  | ||||||
| import type {Html} from "../../../common/html"; | import {type Html, html} from "../../../common/html.js"; | ||||||
| import {html} from "../../../common/html"; | import {ipcRenderer} from "../typed-ipc-renderer.js"; | ||||||
| import {ipcRenderer} from "../typed-ipc-renderer"; |  | ||||||
|  |  | ||||||
| import {generateNodeFromHtml} from "./base"; | import {generateNodeFromHtml} from "./base.js"; | ||||||
| import type {TabProps} from "./tab"; | import Tab, {type TabProperties} from "./tab.js"; | ||||||
| import Tab from "./tab"; | import type WebView from "./webview.js"; | ||||||
| import type WebView from "./webview"; |  | ||||||
|  |  | ||||||
| export interface ServerTabProps extends TabProps { | export type ServerTabProperties = { | ||||||
|   webview: Promise<WebView>; |   webview: Promise<WebView>; | ||||||
| } | } & TabProperties; | ||||||
|  |  | ||||||
| export default class ServerTab extends Tab { | export default class ServerTab extends Tab { | ||||||
|   webview: Promise<WebView>; |   webview: Promise<WebView>; | ||||||
|   $el: Element; |   $el: Element; | ||||||
|  |   $name: Element; | ||||||
|  |   $icon: HTMLImageElement; | ||||||
|   $badge: Element; |   $badge: Element; | ||||||
|  |  | ||||||
|   constructor({webview, ...props}: ServerTabProps) { |   constructor({webview, ...properties}: ServerTabProperties) { | ||||||
|     super(props); |     super(properties); | ||||||
|  |  | ||||||
|     this.webview = webview; |     this.webview = webview; | ||||||
|     this.$el = generateNodeFromHtml(this.templateHtml()); |     this.$el = generateNodeFromHtml(this.templateHtml()); | ||||||
|     this.props.$root.append(this.$el); |     this.properties.$root.append(this.$el); | ||||||
|     this.registerListeners(); |     this.registerListeners(); | ||||||
|  |     this.$name = this.$el.querySelector(".server-tooltip")!; | ||||||
|  |     this.$icon = this.$el.querySelector(".server-icons")!; | ||||||
|     this.$badge = this.$el.querySelector(".server-tab-badge")!; |     this.$badge = this.$el.querySelector(".server-tab-badge")!; | ||||||
|   } |   } | ||||||
|  |  | ||||||
| @@ -40,24 +42,34 @@ export default class ServerTab extends Tab { | |||||||
|  |  | ||||||
|   override async destroy(): Promise<void> { |   override async destroy(): Promise<void> { | ||||||
|     await super.destroy(); |     await super.destroy(); | ||||||
|     (await this.webview).$el.remove(); |     (await this.webview).destroy(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   templateHtml(): Html { |   templateHtml(): Html { | ||||||
|     return html` |     return html` | ||||||
|       <div class="tab" data-tab-id="${this.props.tabIndex}"> |       <div class="tab" data-tab-id="${this.properties.tabIndex}"> | ||||||
|         <div class="server-tooltip" style="display:none"> |         <div class="server-tooltip" style="display:none"> | ||||||
|           ${this.props.name} |           ${this.properties.label} | ||||||
|         </div> |         </div> | ||||||
|         <div class="server-tab-badge"></div> |         <div class="server-tab-badge"></div> | ||||||
|         <div class="server-tab"> |         <div class="server-tab"> | ||||||
|           <img class="server-icons" src="${this.props.icon}" /> |           <img class="server-icons" src="${this.properties.icon}" /> | ||||||
|         </div> |         </div> | ||||||
|         <div class="server-tab-shortcut">${this.generateShortcutText()}</div> |         <div class="server-tab-shortcut">${this.generateShortcutText()}</div> | ||||||
|       </div> |       </div> | ||||||
|     `; |     `; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |   setLabel(label: string): void { | ||||||
|  |     this.properties.label = label; | ||||||
|  |     this.$name.textContent = label; | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   setIcon(icon: string): void { | ||||||
|  |     this.properties.icon = icon; | ||||||
|  |     this.$icon.src = icon; | ||||||
|  |   } | ||||||
|  |  | ||||||
|   updateBadge(count: number): void { |   updateBadge(count: number): void { | ||||||
|     this.$badge.textContent = count > 999 ? "1K+" : count.toString(); |     this.$badge.textContent = count > 999 ? "1K+" : count.toString(); | ||||||
|     this.$badge.classList.toggle("active", count > 0); |     this.$badge.classList.toggle("active", count > 0); | ||||||
| @@ -65,11 +77,11 @@ export default class ServerTab extends Tab { | |||||||
|  |  | ||||||
|   generateShortcutText(): string { |   generateShortcutText(): string { | ||||||
|     // Only provide shortcuts for server [0..9] |     // Only provide shortcuts for server [0..9] | ||||||
|     if (this.props.index >= 9) { |     if (this.properties.index >= 9) { | ||||||
|       return ""; |       return ""; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     const shownIndex = this.props.index + 1; |     const shownIndex = this.properties.index + 1; | ||||||
|  |  | ||||||
|     // Array index == Shown index - 1 |     // Array index == Shown index - 1 | ||||||
|     ipcRenderer.send("switch-server-tab", shownIndex - 1); |     ipcRenderer.send("switch-server-tab", shownIndex - 1); | ||||||
|   | |||||||
| @@ -1,9 +1,10 @@ | |||||||
| import type {TabRole} from "../../../common/types"; | import type {TabPage, TabRole} from "../../../common/types.js"; | ||||||
|  |  | ||||||
| export interface TabProps { | export type TabProperties = { | ||||||
|   role: TabRole; |   role: TabRole; | ||||||
|  |   page?: TabPage; | ||||||
|   icon?: string; |   icon?: string; | ||||||
|   name: string; |   label: string; | ||||||
|   $root: Element; |   $root: Element; | ||||||
|   onClick: () => void; |   onClick: () => void; | ||||||
|   index: number; |   index: number; | ||||||
| @@ -12,25 +13,22 @@ export interface TabProps { | |||||||
|   onHoverOut?: () => void; |   onHoverOut?: () => void; | ||||||
|   materialIcon?: string; |   materialIcon?: string; | ||||||
|   onDestroy?: () => void; |   onDestroy?: () => void; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export default abstract class Tab { | export default abstract class Tab { | ||||||
|   props: TabProps; |  | ||||||
|   abstract $el: Element; |   abstract $el: Element; | ||||||
|  |  | ||||||
|   constructor(props: TabProps) { |   constructor(readonly properties: TabProperties) {} | ||||||
|     this.props = props; |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   registerListeners(): void { |   registerListeners(): void { | ||||||
|     this.$el.addEventListener("click", this.props.onClick); |     this.$el.addEventListener("click", this.properties.onClick); | ||||||
|  |  | ||||||
|     if (this.props.onHover !== undefined) { |     if (this.properties.onHover !== undefined) { | ||||||
|       this.$el.addEventListener("mouseover", this.props.onHover); |       this.$el.addEventListener("mouseover", this.properties.onHover); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     if (this.props.onHoverOut !== undefined) { |     if (this.properties.onHoverOut !== undefined) { | ||||||
|       this.$el.addEventListener("mouseout", this.props.onHoverOut); |       this.$el.addEventListener("mouseout", this.properties.onHoverOut); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,25 +1,25 @@ | |||||||
| import type {WebContents} from "electron/main"; | import type {WebContents} from "electron/main"; | ||||||
| import fs from "node:fs"; | import fs from "node:fs"; | ||||||
| import path from "node:path"; |  | ||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
|  |  | ||||||
| import * as remote from "@electron/remote"; | import * as remote from "@electron/remote"; | ||||||
| import {app, dialog} from "@electron/remote"; | import {app, dialog} from "@electron/remote"; | ||||||
|  |  | ||||||
| import * as ConfigUtil from "../../../common/config-util"; | import * as ConfigUtil from "../../../common/config-util.js"; | ||||||
| import type {Html} from "../../../common/html"; | import {type Html, html} from "../../../common/html.js"; | ||||||
| import {html} from "../../../common/html"; | import * as t from "../../../common/translation-util.js"; | ||||||
| import type {RendererMessage} from "../../../common/typed-ipc"; | import type {RendererMessage} from "../../../common/typed-ipc.js"; | ||||||
| import type {TabRole} from "../../../common/types"; | import type {TabRole} from "../../../common/types.js"; | ||||||
| import {ipcRenderer} from "../typed-ipc-renderer"; | import preloadCss from "../../css/preload.css?raw"; | ||||||
| import * as SystemUtil from "../utils/system-util"; | import {ipcRenderer} from "../typed-ipc-renderer.js"; | ||||||
|  | import * as SystemUtil from "../utils/system-util.js"; | ||||||
|  |  | ||||||
| import {generateNodeFromHtml} from "./base"; | import {generateNodeFromHtml} from "./base.js"; | ||||||
| import {contextMenu} from "./context-menu"; | import {contextMenu} from "./context-menu.js"; | ||||||
|  |  | ||||||
| const shouldSilentWebview = ConfigUtil.getConfigItem("silent", false); | const shouldSilentWebview = ConfigUtil.getConfigItem("silent", false); | ||||||
|  |  | ||||||
| interface WebViewProps { | type WebViewProperties = { | ||||||
|   $root: Element; |   $root: Element; | ||||||
|   rootWebContents: WebContents; |   rootWebContents: WebContents; | ||||||
|   index: number; |   index: number; | ||||||
| @@ -32,35 +32,46 @@ interface WebViewProps { | |||||||
|   preload?: string; |   preload?: string; | ||||||
|   onTitleChange: () => void; |   onTitleChange: () => void; | ||||||
|   hasPermission?: (origin: string, permission: string) => boolean; |   hasPermission?: (origin: string, permission: string) => boolean; | ||||||
| } |   unsupportedMessage?: string; | ||||||
|  | }; | ||||||
|  |  | ||||||
| export default class WebView { | export default class WebView { | ||||||
|   static templateHtml(props: WebViewProps): Html { |   static templateHtml(properties: WebViewProperties): Html { | ||||||
|     return html` |     return html` | ||||||
|       <webview |       <div class="webview-pane"> | ||||||
|         data-tab-id="${props.tabIndex}" |         <div | ||||||
|         src="${props.url}" |           class="webview-unsupported" | ||||||
|         ${props.preload === undefined |           ${properties.unsupportedMessage === undefined ? html`hidden` : html``} | ||||||
|           ? html`` |         > | ||||||
|           : html`preload="${props.preload}"`} |           <span class="webview-unsupported-message" | ||||||
|         partition="persist:webviewsession" |             >${properties.unsupportedMessage ?? ""}</span | ||||||
|         allowpopups |           > | ||||||
|       > |           <span class="webview-unsupported-dismiss">×</span> | ||||||
|       </webview> |         </div> | ||||||
|  |         <webview | ||||||
|  |           data-tab-id="${properties.tabIndex}" | ||||||
|  |           src="${properties.url}" | ||||||
|  |           ${properties.preload === undefined | ||||||
|  |             ? html`` | ||||||
|  |             : html`preload="${properties.preload}"`} | ||||||
|  |           partition="persist:webviewsession" | ||||||
|  |           allowpopups | ||||||
|  |         > | ||||||
|  |         </webview> | ||||||
|  |       </div> | ||||||
|     `; |     `; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   static async create(props: WebViewProps): Promise<WebView> { |   static async create(properties: WebViewProperties): Promise<WebView> { | ||||||
|     const $element = generateNodeFromHtml( |     const $pane = generateNodeFromHtml( | ||||||
|       WebView.templateHtml(props), |       WebView.templateHtml(properties), | ||||||
|     ) as HTMLElement; |     ) as HTMLElement; | ||||||
|     props.$root.append($element); |     properties.$root.append($pane); | ||||||
|  |  | ||||||
|     // Wait for did-navigate rather than did-attach to work around |     const $webview: HTMLElement = $pane.querySelector(":scope > webview")!; | ||||||
|     // https://github.com/electron/electron/issues/31918 |  | ||||||
|     await new Promise<void>((resolve) => { |     await new Promise<void>((resolve) => { | ||||||
|       $element.addEventListener( |       $webview.addEventListener( | ||||||
|         "did-navigate", |         "did-attach", | ||||||
|         () => { |         () => { | ||||||
|           resolve(); |           resolve(); | ||||||
|         }, |         }, | ||||||
| @@ -79,52 +90,145 @@ export default class WebView { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     const selector = `webview[data-tab-id="${CSS.escape( |     const selector = `webview[data-tab-id="${CSS.escape( | ||||||
|       `${props.tabIndex}`, |       `${properties.tabIndex}`, | ||||||
|     )}"]`; |     )}"]`; | ||||||
|     const webContentsId: unknown = |     const webContentsId: unknown = | ||||||
|       await props.rootWebContents.executeJavaScript( |       await properties.rootWebContents.executeJavaScript( | ||||||
|         `(${getWebContentsIdFunction.toString()})(${JSON.stringify(selector)})`, |         `(${getWebContentsIdFunction.toString()})(${JSON.stringify(selector)})`, | ||||||
|       ); |       ); | ||||||
|     if (typeof webContentsId !== "number") { |     if (typeof webContentsId !== "number") { | ||||||
|       throw new TypeError("Failed to get WebContents ID"); |       throw new TypeError("Failed to get WebContents ID"); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     return new WebView(props, $element, webContentsId); |     return new WebView(properties, $pane, $webview, webContentsId); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   props: WebViewProps; |   badgeCount = 0; | ||||||
|   zoomFactor: number; |   loading = true; | ||||||
|   badgeCount: number; |   private customCss: string | false | null; | ||||||
|   loading: boolean; |   private readonly $webviewsContainer: DOMTokenList; | ||||||
|   customCss: string | false | null; |   private readonly $unsupported: HTMLElement; | ||||||
|   $webviewsContainer: DOMTokenList; |   private readonly $unsupportedMessage: HTMLElement; | ||||||
|   $el: HTMLElement; |   private readonly $unsupportedDismiss: HTMLElement; | ||||||
|   webContentsId: number; |   private unsupportedDismissed = false; | ||||||
|  |  | ||||||
|   private constructor( |   private constructor( | ||||||
|     props: WebViewProps, |     readonly properties: WebViewProperties, | ||||||
|     $element: HTMLElement, |     private readonly $pane: HTMLElement, | ||||||
|     webContentsId: number, |     private readonly $webview: HTMLElement, | ||||||
|  |     readonly webContentsId: number, | ||||||
|   ) { |   ) { | ||||||
|     this.props = props; |  | ||||||
|     this.zoomFactor = 1; |  | ||||||
|     this.loading = true; |  | ||||||
|     this.badgeCount = 0; |  | ||||||
|     this.customCss = ConfigUtil.getConfigItem("customCSS", null); |     this.customCss = ConfigUtil.getConfigItem("customCSS", null); | ||||||
|     this.$webviewsContainer = document.querySelector( |     this.$webviewsContainer = document.querySelector( | ||||||
|       "#webviews-container", |       "#webviews-container", | ||||||
|     )!.classList; |     )!.classList; | ||||||
|     this.$el = $element; |     this.$unsupported = $pane.querySelector(".webview-unsupported")!; | ||||||
|     this.webContentsId = webContentsId; |     this.$unsupportedMessage = $pane.querySelector( | ||||||
|  |       ".webview-unsupported-message", | ||||||
|  |     )!; | ||||||
|  |     this.$unsupportedDismiss = $pane.querySelector( | ||||||
|  |       ".webview-unsupported-dismiss", | ||||||
|  |     )!; | ||||||
|  |  | ||||||
|     this.registerListeners(); |     this.registerListeners(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   getWebContents(): WebContents { |   destroy(): void { | ||||||
|     return remote.webContents.fromId(this.webContentsId); |     this.$pane.remove(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   registerListeners(): void { |   getWebContents(): WebContents { | ||||||
|  |     return remote.webContents.fromId(this.webContentsId)!; | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   showNotificationSettings(): void { | ||||||
|  |     this.send("show-notification-settings"); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   focus(): void { | ||||||
|  |     this.$webview.focus(); | ||||||
|  |     // Work around https://github.com/electron/electron/issues/31918 | ||||||
|  |     this.$webview.shadowRoot?.querySelector("iframe")?.focus(); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   hide(): void { | ||||||
|  |     this.$pane.classList.remove("active"); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   load(): void { | ||||||
|  |     this.show(); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   zoomIn(): void { | ||||||
|  |     this.getWebContents().zoomLevel += 0.5; | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   zoomOut(): void { | ||||||
|  |     this.getWebContents().zoomLevel -= 0.5; | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   zoomActualSize(): void { | ||||||
|  |     this.getWebContents().zoomLevel = 0; | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   logOut(): void { | ||||||
|  |     this.send("logout"); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   showKeyboardShortcuts(): void { | ||||||
|  |     this.send("show-keyboard-shortcuts"); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   openDevTools(): void { | ||||||
|  |     this.getWebContents().openDevTools(); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   back(): void { | ||||||
|  |     if (this.getWebContents().navigationHistory.canGoBack()) { | ||||||
|  |       this.getWebContents().navigationHistory.goBack(); | ||||||
|  |       this.focus(); | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   canGoBackButton(): void { | ||||||
|  |     const $backButton = document.querySelector( | ||||||
|  |       "#actions-container #back-action", | ||||||
|  |     )!; | ||||||
|  |     $backButton.classList.toggle( | ||||||
|  |       "disable", | ||||||
|  |       !this.getWebContents().navigationHistory.canGoBack(), | ||||||
|  |     ); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   forward(): void { | ||||||
|  |     if (this.getWebContents().navigationHistory.canGoForward()) { | ||||||
|  |       this.getWebContents().navigationHistory.goForward(); | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   reload(): void { | ||||||
|  |     this.hide(); | ||||||
|  |     // Shows the loading indicator till the webview is reloaded | ||||||
|  |     this.$webviewsContainer.remove("loaded"); | ||||||
|  |     this.loading = true; | ||||||
|  |     this.properties.switchLoading(true, this.properties.url); | ||||||
|  |     this.getWebContents().reload(); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   setUnsupportedMessage(unsupportedMessage: string | undefined) { | ||||||
|  |     this.$unsupported.hidden = | ||||||
|  |       unsupportedMessage === undefined || this.unsupportedDismissed; | ||||||
|  |     this.$unsupportedMessage.textContent = unsupportedMessage ?? ""; | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   send<Channel extends keyof RendererMessage>( | ||||||
|  |     channel: Channel, | ||||||
|  |     ...arguments_: Parameters<RendererMessage[Channel]> | ||||||
|  |   ): void { | ||||||
|  |     ipcRenderer.send("forward-to", this.webContentsId, channel, ...arguments_); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   private registerListeners(): void { | ||||||
|     const webContents = this.getWebContents(); |     const webContents = this.getWebContents(); | ||||||
|  |  | ||||||
|     if (shouldSilentWebview) { |     if (shouldSilentWebview) { | ||||||
| @@ -133,14 +237,14 @@ export default class WebView { | |||||||
|  |  | ||||||
|     webContents.on("page-title-updated", (_event, title) => { |     webContents.on("page-title-updated", (_event, title) => { | ||||||
|       this.badgeCount = this.getBadgeCount(title); |       this.badgeCount = this.getBadgeCount(title); | ||||||
|       this.props.onTitleChange(); |       this.properties.onTitleChange(); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     this.$el.addEventListener("did-navigate-in-page", () => { |     this.$webview.addEventListener("did-navigate-in-page", () => { | ||||||
|       this.canGoBackButton(); |       this.canGoBackButton(); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     this.$el.addEventListener("did-navigate", () => { |     this.$webview.addEventListener("did-navigate", () => { | ||||||
|       this.canGoBackButton(); |       this.canGoBackButton(); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
| @@ -164,9 +268,9 @@ export default class WebView { | |||||||
|       contextMenu(webContents, event, menuParameters); |       contextMenu(webContents, event, menuParameters); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     this.$el.addEventListener("dom-ready", () => { |     this.$webview.addEventListener("dom-ready", () => { | ||||||
|       this.loading = false; |       this.loading = false; | ||||||
|       this.props.switchLoading(false, this.props.url); |       this.properties.switchLoading(false, this.properties.url); | ||||||
|       this.show(); |       this.show(); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
| @@ -175,47 +279,50 @@ export default class WebView { | |||||||
|         SystemUtil.connectivityError.includes(errorDescription); |         SystemUtil.connectivityError.includes(errorDescription); | ||||||
|       if (hasConnectivityError) { |       if (hasConnectivityError) { | ||||||
|         console.error("error", errorDescription); |         console.error("error", errorDescription); | ||||||
|         if (!this.props.url.includes("network.html")) { |         if (!this.properties.url.includes("network.html")) { | ||||||
|           this.props.onNetworkError(this.props.index); |           this.properties.onNetworkError(this.properties.index); | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     this.$el.addEventListener("did-start-loading", () => { |     this.$webview.addEventListener("did-start-loading", () => { | ||||||
|       this.props.switchLoading(true, this.props.url); |       this.properties.switchLoading(true, this.properties.url); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     this.$el.addEventListener("did-stop-loading", () => { |     this.$webview.addEventListener("did-stop-loading", () => { | ||||||
|       this.props.switchLoading(false, this.props.url); |       this.properties.switchLoading(false, this.properties.url); | ||||||
|  |     }); | ||||||
|  |  | ||||||
|  |     this.$unsupportedDismiss.addEventListener("click", () => { | ||||||
|  |       this.unsupportedDismissed = true; | ||||||
|  |       this.$unsupported.hidden = true; | ||||||
|  |     }); | ||||||
|  |  | ||||||
|  |     webContents.on("zoom-changed", (event, zoomDirection) => { | ||||||
|  |       if (zoomDirection === "in") this.zoomIn(); | ||||||
|  |       else if (zoomDirection === "out") this.zoomOut(); | ||||||
|     }); |     }); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   getBadgeCount(title: string): number { |   private getBadgeCount(title: string): number { | ||||||
|     const messageCountInTitle = /^\((\d+)\)/.exec(title); |     const messageCountInTitle = /^\((\d+)\)/.exec(title); | ||||||
|     return messageCountInTitle ? Number(messageCountInTitle[1]) : 0; |     return messageCountInTitle ? Number(messageCountInTitle[1]) : 0; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   showNotificationSettings(): void { |   private show(): void { | ||||||
|     this.send("show-notification-settings"); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   show(): void { |  | ||||||
|     // Do not show WebView if another tab was selected and this tab should be in background. |     // Do not show WebView if another tab was selected and this tab should be in background. | ||||||
|     if (!this.props.isActive()) { |     if (!this.properties.isActive()) { | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     // To show or hide the loading indicator in the the active tab |     // To show or hide the loading indicator in the active tab | ||||||
|     this.$webviewsContainer.toggle("loaded", !this.loading); |     this.$webviewsContainer.toggle("loaded", !this.loading); | ||||||
|  |  | ||||||
|     this.$el.classList.add("active"); |     this.$pane.classList.add("active"); | ||||||
|     this.focus(); |     this.focus(); | ||||||
|     this.props.onTitleChange(); |     this.properties.onTitleChange(); | ||||||
|     // Injecting preload css in webview to override some css rules |     // Injecting preload css in webview to override some css rules | ||||||
|     (async () => |     (async () => this.getWebContents().insertCSS(preloadCss))(); | ||||||
|       this.getWebContents().insertCSS( |  | ||||||
|         fs.readFileSync(path.join(__dirname, "/../../css/preload.css"), "utf8"), |  | ||||||
|       ))(); |  | ||||||
|  |  | ||||||
|     // Get customCSS again from config util to avoid warning user again |     // Get customCSS again from config util to avoid warning user again | ||||||
|     const customCss = ConfigUtil.getConfigItem("customCSS", null); |     const customCss = ConfigUtil.getConfigItem("customCSS", null); | ||||||
| @@ -225,92 +332,13 @@ export default class WebView { | |||||||
|         this.customCss = null; |         this.customCss = null; | ||||||
|         ConfigUtil.setConfigItem("customCSS", null); |         ConfigUtil.setConfigItem("customCSS", null); | ||||||
|  |  | ||||||
|         const errorMessage = "The custom css previously set is deleted!"; |         const errorMessage = t.__("The custom CSS previously set is deleted."); | ||||||
|         dialog.showErrorBox("custom css file deleted!", errorMessage); |         dialog.showErrorBox(t.__("Custom CSS file deleted"), errorMessage); | ||||||
|         return; |         return; | ||||||
|       } |       } | ||||||
|  |  | ||||||
|       (async () => |       (async () => | ||||||
|         this.getWebContents().insertCSS( |         this.getWebContents().insertCSS(fs.readFileSync(customCss, "utf8")))(); | ||||||
|           fs.readFileSync(path.resolve(__dirname, customCss), "utf8"), |  | ||||||
|         ))(); |  | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   focus(): void { |  | ||||||
|     this.$el.focus(); |  | ||||||
|     // Work around https://github.com/electron/electron/issues/31918 |  | ||||||
|     this.$el.shadowRoot?.querySelector("iframe")?.focus(); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   hide(): void { |  | ||||||
|     this.$el.classList.remove("active"); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   load(): void { |  | ||||||
|     this.show(); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   zoomIn(): void { |  | ||||||
|     this.zoomFactor += 0.1; |  | ||||||
|     this.getWebContents().setZoomFactor(this.zoomFactor); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   zoomOut(): void { |  | ||||||
|     this.zoomFactor -= 0.1; |  | ||||||
|     this.getWebContents().setZoomFactor(this.zoomFactor); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   zoomActualSize(): void { |  | ||||||
|     this.zoomFactor = 1; |  | ||||||
|     this.getWebContents().setZoomFactor(this.zoomFactor); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   logOut(): void { |  | ||||||
|     this.send("logout"); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   showKeyboardShortcuts(): void { |  | ||||||
|     this.send("show-keyboard-shortcuts"); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   openDevTools(): void { |  | ||||||
|     this.getWebContents().openDevTools(); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   back(): void { |  | ||||||
|     if (this.getWebContents().canGoBack()) { |  | ||||||
|       this.getWebContents().goBack(); |  | ||||||
|       this.focus(); |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   canGoBackButton(): void { |  | ||||||
|     const $backButton = document.querySelector( |  | ||||||
|       "#actions-container #back-action", |  | ||||||
|     )!; |  | ||||||
|     $backButton.classList.toggle("disable", !this.getWebContents().canGoBack()); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   forward(): void { |  | ||||||
|     if (this.getWebContents().canGoForward()) { |  | ||||||
|       this.getWebContents().goForward(); |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   reload(): void { |  | ||||||
|     this.hide(); |  | ||||||
|     // Shows the loading indicator till the webview is reloaded |  | ||||||
|     this.$webviewsContainer.remove("loaded"); |  | ||||||
|     this.loading = true; |  | ||||||
|     this.props.switchLoading(true, this.props.url); |  | ||||||
|     this.getWebContents().reload(); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   send<Channel extends keyof RendererMessage>( |  | ||||||
|     channel: Channel, |  | ||||||
|     ...args: Parameters<RendererMessage[Channel]> |  | ||||||
|   ): void { |  | ||||||
|     ipcRenderer.sendTo(this.webContentsId, channel, ...args); |  | ||||||
|   } |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,15 +1,17 @@ | |||||||
| import {EventEmitter} from "node:events"; | import {EventEmitter} from "node:events"; | ||||||
|  |  | ||||||
| import type {ClipboardDecrypter} from "./clipboard-decrypter"; | import { | ||||||
| import {ClipboardDecrypterImpl} from "./clipboard-decrypter"; |   type ClipboardDecrypter, | ||||||
| import type {NotificationData} from "./notification"; |   ClipboardDecrypterImplementation, | ||||||
| import {newNotification} from "./notification"; | } from "./clipboard-decrypter.js"; | ||||||
| import {ipcRenderer} from "./typed-ipc-renderer"; | import {type NotificationData, newNotification} from "./notification/index.js"; | ||||||
|  | import {ipcRenderer} from "./typed-ipc-renderer.js"; | ||||||
|  |  | ||||||
| type ListenerType = (...args: any[]) => void; | type ListenerType = (...arguments_: any[]) => void; | ||||||
|  |  | ||||||
| export interface ElectronBridge { | /* eslint-disable @typescript-eslint/naming-convention */ | ||||||
|   send_event: (eventName: string | symbol, ...args: unknown[]) => boolean; | export type ElectronBridge = { | ||||||
|  |   send_event: (eventName: string | symbol, ...arguments_: unknown[]) => boolean; | ||||||
|   on_event: (eventName: string, listener: ListenerType) => void; |   on_event: (eventName: string, listener: ListenerType) => void; | ||||||
|   new_notification: ( |   new_notification: ( | ||||||
|     title: string, |     title: string, | ||||||
| @@ -21,7 +23,8 @@ export interface ElectronBridge { | |||||||
|   get_send_notification_reply_message_supported: () => boolean; |   get_send_notification_reply_message_supported: () => boolean; | ||||||
|   set_send_notification_reply_message_supported: (value: boolean) => void; |   set_send_notification_reply_message_supported: (value: boolean) => void; | ||||||
|   decrypt_clipboard: (version: number) => ClipboardDecrypter; |   decrypt_clipboard: (version: number) => ClipboardDecrypter; | ||||||
| } | }; | ||||||
|  | /* eslint-enable @typescript-eslint/naming-convention */ | ||||||
|  |  | ||||||
| let notificationReplySupported = false; | let notificationReplySupported = false; | ||||||
| // Indicates if the user is idle or not | // Indicates if the user is idle or not | ||||||
| @@ -29,12 +32,12 @@ let idle = false; | |||||||
| // Indicates the time at which user was last active | // Indicates the time at which user was last active | ||||||
| let lastActive = Date.now(); | let lastActive = Date.now(); | ||||||
|  |  | ||||||
| export const bridgeEvents = new EventEmitter(); | export const bridgeEvents = new EventEmitter(); // eslint-disable-line unicorn/prefer-event-target | ||||||
|  |  | ||||||
| /* eslint-disable @typescript-eslint/naming-convention */ | /* eslint-disable @typescript-eslint/naming-convention */ | ||||||
| const electron_bridge: ElectronBridge = { | const electron_bridge: ElectronBridge = { | ||||||
|   send_event: (eventName: string | symbol, ...args: unknown[]): boolean => |   send_event: (eventName: string | symbol, ...arguments_: unknown[]): boolean => | ||||||
|     bridgeEvents.emit(eventName, ...args), |     bridgeEvents.emit(eventName, ...arguments_), | ||||||
|  |  | ||||||
|   on_event(eventName: string, listener: ListenerType): void { |   on_event(eventName: string, listener: ListenerType): void { | ||||||
|     bridgeEvents.on(eventName, listener); |     bridgeEvents.on(eventName, listener); | ||||||
| @@ -58,7 +61,7 @@ const electron_bridge: ElectronBridge = { | |||||||
|   }, |   }, | ||||||
|  |  | ||||||
|   decrypt_clipboard: (version: number): ClipboardDecrypter => |   decrypt_clipboard: (version: number): ClipboardDecrypter => | ||||||
|     new ClipboardDecrypterImpl(version), |     new ClipboardDecrypterImplementation(version), | ||||||
| }; | }; | ||||||
| /* eslint-enable @typescript-eslint/naming-convention */ | /* eslint-enable @typescript-eslint/naming-convention */ | ||||||
|  |  | ||||||
| @@ -105,7 +108,7 @@ ipcRenderer.on("set-idle", () => { | |||||||
|  |  | ||||||
| // This follows node's idiomatic implementation of event | // This follows node's idiomatic implementation of event | ||||||
| // emitters to make event handling more simpler instead of using | // emitters to make event handling more simpler instead of using | ||||||
| // functions zulip side will emit event using ElectronBrigde.send_event | // functions zulip side will emit event using ElectronBridge.send_event | ||||||
| // which is alias of .emit and on this side we can handle the data by adding | // which is alias of .emit and on this side we can handle the data by adding | ||||||
| // a listener for the event. | // a listener for the event. | ||||||
| export default electron_bridge; | export default electron_bridge; | ||||||
|   | |||||||
| @@ -1,113 +0,0 @@ | |||||||
| "use strict"; |  | ||||||
|  |  | ||||||
| type ElectronBridge = import("./electron-bridge").ElectronBridge; |  | ||||||
|  |  | ||||||
| interface CompatElectronBridge extends ElectronBridge { |  | ||||||
|   readonly idle_on_system: boolean; |  | ||||||
|   readonly last_active_on_system: number; |  | ||||||
|   send_notification_reply_message_supported: boolean; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| (() => { |  | ||||||
|   const zulipWindow = window as typeof window & { |  | ||||||
|     electron_bridge: CompatElectronBridge; |  | ||||||
|     raw_electron_bridge: ElectronBridge; |  | ||||||
|   }; |  | ||||||
|  |  | ||||||
|   /* eslint-disable @typescript-eslint/naming-convention */ |  | ||||||
|   const electron_bridge: CompatElectronBridge = { |  | ||||||
|     ...zulipWindow.raw_electron_bridge, |  | ||||||
|  |  | ||||||
|     get idle_on_system(): boolean { |  | ||||||
|       return this.get_idle_on_system(); |  | ||||||
|     }, |  | ||||||
|  |  | ||||||
|     get last_active_on_system(): number { |  | ||||||
|       return this.get_last_active_on_system(); |  | ||||||
|     }, |  | ||||||
|  |  | ||||||
|     get send_notification_reply_message_supported(): boolean { |  | ||||||
|       return this.get_send_notification_reply_message_supported(); |  | ||||||
|     }, |  | ||||||
|  |  | ||||||
|     set send_notification_reply_message_supported(value: boolean) { |  | ||||||
|       this.set_send_notification_reply_message_supported(value); |  | ||||||
|     }, |  | ||||||
|   }; |  | ||||||
|   /* eslint-enable @typescript-eslint/naming-convention */ |  | ||||||
|  |  | ||||||
|   zulipWindow.electron_bridge = electron_bridge; |  | ||||||
|  |  | ||||||
|   function attributeListener<T extends EventTarget>( |  | ||||||
|     type: string, |  | ||||||
|   ): PropertyDescriptor { |  | ||||||
|     const handlers = new WeakMap<T, (event: Event) => unknown>(); |  | ||||||
|  |  | ||||||
|     function listener(this: T, event: Event): void { |  | ||||||
|       if (handlers.get(this)!.call(this, event) === false) { |  | ||||||
|         event.preventDefault(); |  | ||||||
|       } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     return { |  | ||||||
|       configurable: true, |  | ||||||
|       enumerable: true, |  | ||||||
|       get(this: T) { |  | ||||||
|         return handlers.get(this); |  | ||||||
|       }, |  | ||||||
|       set(this: T, value: unknown) { |  | ||||||
|         if (typeof value === "function") { |  | ||||||
|           if (!handlers.has(this)) { |  | ||||||
|             this.addEventListener(type, listener); |  | ||||||
|           } |  | ||||||
|  |  | ||||||
|           handlers.set(this, value as (event: Event) => unknown); |  | ||||||
|         } else if (handlers.has(this)) { |  | ||||||
|           this.removeEventListener(type, listener); |  | ||||||
|           handlers.delete(this); |  | ||||||
|         } |  | ||||||
|       }, |  | ||||||
|     }; |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   // eslint-disable-next-line @typescript-eslint/naming-convention |  | ||||||
|   const NativeNotification = Notification; |  | ||||||
|  |  | ||||||
|   class InjectedNotification extends EventTarget { |  | ||||||
|     static get permission(): NotificationPermission { |  | ||||||
|       return NativeNotification.permission; |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     static async requestPermission( |  | ||||||
|       callback?: NotificationPermissionCallback, |  | ||||||
|     ): Promise<NotificationPermission> { |  | ||||||
|       if (callback) { |  | ||||||
|         callback(await Promise.resolve(NativeNotification.permission)); |  | ||||||
|       } |  | ||||||
|  |  | ||||||
|       return NativeNotification.permission; |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     constructor(title: string, options: NotificationOptions = {}) { |  | ||||||
|       super(); |  | ||||||
|       Object.assign( |  | ||||||
|         this, |  | ||||||
|         electron_bridge.new_notification( |  | ||||||
|           title, |  | ||||||
|           options, |  | ||||||
|           (type: string, eventInit: EventInit) => |  | ||||||
|             this.dispatchEvent(new Event(type, eventInit)), |  | ||||||
|         ), |  | ||||||
|       ); |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   Object.defineProperties(InjectedNotification.prototype, { |  | ||||||
|     onclick: attributeListener("click"), |  | ||||||
|     onclose: attributeListener("close"), |  | ||||||
|     onerror: attributeListener("error"), |  | ||||||
|     onshow: attributeListener("show"), |  | ||||||
|   }); |  | ||||||
|  |  | ||||||
|   window.Notification = InjectedNotification as unknown as typeof Notification; |  | ||||||
| })(); |  | ||||||
| @@ -1,30 +1,40 @@ | |||||||
| import {clipboard} from "electron/common"; | import {clipboard} from "electron/common"; | ||||||
| import path from "node:path"; | import path from "node:path"; | ||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
|  | import url from "node:url"; | ||||||
|  |  | ||||||
| import {Menu, app, dialog, session} from "@electron/remote"; | import {Menu, app, dialog, session} from "@electron/remote"; | ||||||
| import * as remote from "@electron/remote"; | import * as remote from "@electron/remote"; | ||||||
| import * as Sentry from "@sentry/electron"; | import * as Sentry from "@sentry/electron/renderer"; | ||||||
|  |  | ||||||
| import type {Config} from "../../common/config-util"; | import type {Config} from "../../common/config-util.js"; | ||||||
| import * as ConfigUtil from "../../common/config-util"; | import * as ConfigUtil from "../../common/config-util.js"; | ||||||
| import * as DNDUtil from "../../common/dnd-util"; | import * as DNDUtil from "../../common/dnd-util.js"; | ||||||
| import type {DndSettings} from "../../common/dnd-util"; | import type {DndSettings} from "../../common/dnd-util.js"; | ||||||
| import * as EnterpriseUtil from "../../common/enterprise-util"; | import * as EnterpriseUtil from "../../common/enterprise-util.js"; | ||||||
| import * as LinkUtil from "../../common/link-util"; | import {html} from "../../common/html.js"; | ||||||
| import Logger from "../../common/logger-util"; | import * as LinkUtil from "../../common/link-util.js"; | ||||||
| import * as Messages from "../../common/messages"; | import Logger from "../../common/logger-util.js"; | ||||||
| import type {NavItem, ServerConf, TabData} from "../../common/types"; | import * as Messages from "../../common/messages.js"; | ||||||
|  | import {bundlePath, bundleUrl} from "../../common/paths.js"; | ||||||
|  | import * as t from "../../common/translation-util.js"; | ||||||
|  | import type { | ||||||
|  |   NavigationItem, | ||||||
|  |   ServerConfig, | ||||||
|  |   TabData, | ||||||
|  |   TabPage, | ||||||
|  | } from "../../common/types.js"; | ||||||
|  | import defaultIcon from "../img/icon.png"; | ||||||
|  |  | ||||||
| import FunctionalTab from "./components/functional-tab"; | import FunctionalTab from "./components/functional-tab.js"; | ||||||
| import ServerTab from "./components/server-tab"; | import ServerTab from "./components/server-tab.js"; | ||||||
| import WebView from "./components/webview"; | import WebView from "./components/webview.js"; | ||||||
| import {AboutView} from "./pages/about"; | import {AboutView} from "./pages/about.js"; | ||||||
| import {PreferenceView} from "./pages/preference/preference"; | import {PreferenceView} from "./pages/preference/preference.js"; | ||||||
| import {initializeTray} from "./tray"; | import {initializeTray} from "./tray.js"; | ||||||
| import {ipcRenderer} from "./typed-ipc-renderer"; | import {ipcRenderer} from "./typed-ipc-renderer.js"; | ||||||
| import * as DomainUtil from "./utils/domain-util"; | import * as DomainUtil from "./utils/domain-util.js"; | ||||||
| import ReconnectUtil from "./utils/reconnect-util"; | import ReconnectUtil from "./utils/reconnect-util.js"; | ||||||
|  |  | ||||||
| Sentry.init({}); | Sentry.init({}); | ||||||
|  |  | ||||||
| @@ -44,12 +54,13 @@ const logger = new Logger({ | |||||||
|   file: "errors.log", |   file: "errors.log", | ||||||
| }); | }); | ||||||
|  |  | ||||||
| const rendererDirectory = path.resolve(__dirname, ".."); |  | ||||||
| type ServerOrFunctionalTab = ServerTab | FunctionalTab; | type ServerOrFunctionalTab = ServerTab | FunctionalTab; | ||||||
|  |  | ||||||
| const rootWebContents = remote.getCurrentWebContents(); | const rootWebContents = remote.getCurrentWebContents(); | ||||||
|  |  | ||||||
| const dingSound = new Audio("../resources/sounds/ding.ogg"); | const dingSound = new Audio( | ||||||
|  |   new URL("resources/sounds/ding.ogg", bundleUrl).href, | ||||||
|  | ); | ||||||
|  |  | ||||||
| export class ServerManagerView { | export class ServerManagerView { | ||||||
|   $addServerButton: HTMLButtonElement; |   $addServerButton: HTMLButtonElement; | ||||||
| @@ -73,7 +84,7 @@ export class ServerManagerView { | |||||||
|   loading: Set<string>; |   loading: Set<string>; | ||||||
|   activeTabIndex: number; |   activeTabIndex: number; | ||||||
|   tabs: ServerOrFunctionalTab[]; |   tabs: ServerOrFunctionalTab[]; | ||||||
|   functionalTabs: Map<string, number>; |   functionalTabs: Map<TabPage, number>; | ||||||
|   tabIndex: number; |   tabIndex: number; | ||||||
|   presetOrgs: string[]; |   presetOrgs: string[]; | ||||||
|   preferenceView?: PreferenceView; |   preferenceView?: PreferenceView; | ||||||
| @@ -152,12 +163,12 @@ export class ServerManagerView { | |||||||
|       ConfigUtil.getConfigItem("useSystemProxy", false) |       ConfigUtil.getConfigItem("useSystemProxy", false) | ||||||
|         ? {mode: "system"} |         ? {mode: "system"} | ||||||
|         : ConfigUtil.getConfigItem("useManualProxy", false) |         : ConfigUtil.getConfigItem("useManualProxy", false) | ||||||
|         ? { |           ? { | ||||||
|             pacScript: ConfigUtil.getConfigItem("proxyPAC", ""), |               pacScript: ConfigUtil.getConfigItem("proxyPAC", ""), | ||||||
|             proxyRules: ConfigUtil.getConfigItem("proxyRules", ""), |               proxyRules: ConfigUtil.getConfigItem("proxyRules", ""), | ||||||
|             proxyBypassRules: ConfigUtil.getConfigItem("proxyBypass", ""), |               proxyBypassRules: ConfigUtil.getConfigItem("proxyBypass", ""), | ||||||
|           } |             } | ||||||
|         : {mode: "direct"}, |           : {mode: "direct"}, | ||||||
|     ); |     ); | ||||||
|   } |   } | ||||||
|  |  | ||||||
| @@ -244,8 +255,8 @@ export class ServerManagerView { | |||||||
|     // promise of addition resolves in both cases, but we consider it rejected |     // promise of addition resolves in both cases, but we consider it rejected | ||||||
|     // if the resolved value is false |     // if the resolved value is false | ||||||
|     try { |     try { | ||||||
|       const serverConf = await DomainUtil.checkDomain(domain); |       const serverConfig = await DomainUtil.checkDomain(domain); | ||||||
|       await DomainUtil.addDomain(serverConf); |       await DomainUtil.addDomain(serverConfig); | ||||||
|       return true; |       return true; | ||||||
|     } catch (error: unknown) { |     } catch (error: unknown) { | ||||||
|       logger.error(error); |       logger.error(error); | ||||||
| @@ -279,12 +290,9 @@ export class ServerManagerView { | |||||||
|         // ask them before reloading the app |         // ask them before reloading the app | ||||||
|         const {response} = await dialog.showMessageBox({ |         const {response} = await dialog.showMessageBox({ | ||||||
|           type: "question", |           type: "question", | ||||||
|           buttons: ["Yes", "Later"], |           buttons: [t.__("Yes"), t.__("Later")], | ||||||
|           defaultId: 0, |           defaultId: 0, | ||||||
|           message: |           message: t.__("New servers added. Reload app now?"), | ||||||
|             "New server" + |  | ||||||
|             (domainsAdded.length > 1 ? "s" : "") + |  | ||||||
|             " added. Reload app now?", |  | ||||||
|         }); |         }); | ||||||
|         if (response === 0) { |         if (response === 0) { | ||||||
|           ipcRenderer.send("reload-full-app"); |           ipcRenderer.send("reload-full-app"); | ||||||
| @@ -319,7 +327,18 @@ export class ServerManagerView { | |||||||
|     const servers = DomainUtil.getDomains(); |     const servers = DomainUtil.getDomains(); | ||||||
|     if (servers.length > 0) { |     if (servers.length > 0) { | ||||||
|       for (const [i, server] of servers.entries()) { |       for (const [i, server] of servers.entries()) { | ||||||
|         this.initServer(server, i); |         const tab = this.initServer(server, i); | ||||||
|  |         (async () => { | ||||||
|  |           const serverConfig = await DomainUtil.updateSavedServer( | ||||||
|  |             server.url, | ||||||
|  |             i, | ||||||
|  |           ); | ||||||
|  |           tab.setLabel(serverConfig.alias); | ||||||
|  |           tab.setIcon(DomainUtil.iconAsUrl(serverConfig.icon)); | ||||||
|  |           (await tab.webview).setUnsupportedMessage( | ||||||
|  |             DomainUtil.getUnsupportedMessage(serverConfig), | ||||||
|  |           ); | ||||||
|  |         })(); | ||||||
|       } |       } | ||||||
|  |  | ||||||
|       // Open last active tab |       // Open last active tab | ||||||
| @@ -328,11 +347,7 @@ export class ServerManagerView { | |||||||
|         lastActiveTab = 0; |         lastActiveTab = 0; | ||||||
|       } |       } | ||||||
|  |  | ||||||
|       // `checkDomain()` and `webview.load()` for lastActiveTab before the others |       // `webview.load()` for lastActiveTab before the others | ||||||
|       await DomainUtil.updateSavedServer( |  | ||||||
|         servers[lastActiveTab].url, |  | ||||||
|         lastActiveTab, |  | ||||||
|       ); |  | ||||||
|       await this.activateTab(lastActiveTab); |       await this.activateTab(lastActiveTab); | ||||||
|       await Promise.all( |       await Promise.all( | ||||||
|         servers.map(async (server, i) => { |         servers.map(async (server, i) => { | ||||||
| @@ -342,7 +357,6 @@ export class ServerManagerView { | |||||||
|             return; |             return; | ||||||
|           } |           } | ||||||
|  |  | ||||||
|           await DomainUtil.updateSavedServer(server.url, i); |  | ||||||
|           const tab = this.tabs[i]; |           const tab = this.tabs[i]; | ||||||
|           if (tab instanceof ServerTab) (await tab.webview).load(); |           if (tab instanceof ServerTab) (await tab.webview).load(); | ||||||
|         }), |         }), | ||||||
| @@ -357,51 +371,54 @@ export class ServerManagerView { | |||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   initServer(server: ServerConf, index: number): void { |   initServer(server: ServerConfig, index: number): ServerTab { | ||||||
|     const tabIndex = this.getTabIndex(); |     const tabIndex = this.getTabIndex(); | ||||||
|     this.tabs.push( |     const tab = new ServerTab({ | ||||||
|       new ServerTab({ |       role: "server", | ||||||
|         role: "server", |       icon: DomainUtil.iconAsUrl(server.icon), | ||||||
|         icon: server.icon, |       label: server.alias, | ||||||
|         name: server.alias, |       $root: this.$tabsContainer, | ||||||
|         $root: this.$tabsContainer, |       onClick: this.activateLastTab.bind(this, index), | ||||||
|         onClick: this.activateLastTab.bind(this, index), |       index, | ||||||
|  |       tabIndex, | ||||||
|  |       onHover: this.onHover.bind(this, index), | ||||||
|  |       onHoverOut: this.onHoverOut.bind(this, index), | ||||||
|  |       webview: WebView.create({ | ||||||
|  |         $root: this.$webviewsContainer, | ||||||
|  |         rootWebContents, | ||||||
|         index, |         index, | ||||||
|         tabIndex, |         tabIndex, | ||||||
|         onHover: this.onHover.bind(this, index), |         url: server.url, | ||||||
|         onHoverOut: this.onHoverOut.bind(this, index), |         role: "server", | ||||||
|         webview: WebView.create({ |         hasPermission: (origin: string, permission: string) => | ||||||
|           $root: this.$webviewsContainer, |           origin === server.url && | ||||||
|           rootWebContents, |           permission === "notifications" && | ||||||
|           index, |           ConfigUtil.getConfigItem("showNotification", true), | ||||||
|           tabIndex, |         isActive: () => index === this.activeTabIndex, | ||||||
|           url: server.url, |         switchLoading: async (loading: boolean, url: string) => { | ||||||
|           role: "server", |           if (loading) { | ||||||
|           hasPermission: (origin: string, permission: string) => |             this.loading.add(url); | ||||||
|             origin === server.url && permission === "notifications", |           } else { | ||||||
|           isActive: () => index === this.activeTabIndex, |             this.loading.delete(url); | ||||||
|           switchLoading: async (loading: boolean, url: string) => { |           } | ||||||
|             if (loading) { |  | ||||||
|               this.loading.add(url); |  | ||||||
|             } else { |  | ||||||
|               this.loading.delete(url); |  | ||||||
|             } |  | ||||||
|  |  | ||||||
|             const tab = this.tabs[this.activeTabIndex]; |           const tab = this.tabs[this.activeTabIndex]; | ||||||
|             this.showLoading( |           this.showLoading( | ||||||
|               tab instanceof ServerTab && |             tab instanceof ServerTab && | ||||||
|                 this.loading.has((await tab.webview).props.url), |               this.loading.has((await tab.webview).properties.url), | ||||||
|             ); |           ); | ||||||
|           }, |         }, | ||||||
|           onNetworkError: async (index: number) => { |         onNetworkError: async (index: number) => { | ||||||
|             await this.openNetworkTroubleshooting(index); |           await this.openNetworkTroubleshooting(index); | ||||||
|           }, |         }, | ||||||
|           onTitleChange: this.updateBadge.bind(this), |         onTitleChange: this.updateBadge.bind(this), | ||||||
|           preload: "js/preload.js", |         preload: url.pathToFileURL(path.join(bundlePath, "preload.js")).href, | ||||||
|         }), |         unsupportedMessage: DomainUtil.getUnsupportedMessage(server), | ||||||
|       }), |       }), | ||||||
|     ); |     }); | ||||||
|  |     this.tabs.push(tab); | ||||||
|     this.loading.add(server.url); |     this.loading.add(server.url); | ||||||
|  |     return tab; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   initActions(): void { |   initActions(): void { | ||||||
| @@ -415,7 +432,7 @@ export class ServerManagerView { | |||||||
|       document.querySelectorAll(".server-icons"); |       document.querySelectorAll(".server-icons"); | ||||||
|     for (const [index, $serverImg] of $serverImgs.entries()) { |     for (const [index, $serverImg] of $serverImgs.entries()) { | ||||||
|       this.addContextMenu($serverImg, index); |       this.addContextMenu($serverImg, index); | ||||||
|       if ($serverImg.src.includes("img/icon.png")) { |       if ($serverImg.src === defaultIcon) { | ||||||
|         this.displayInitialCharLogo($serverImg, index); |         this.displayInitialCharLogo($serverImg, index); | ||||||
|       } |       } | ||||||
|  |  | ||||||
| @@ -471,7 +488,7 @@ export class ServerManagerView { | |||||||
|  |  | ||||||
|   async getCurrentActiveServer(): Promise<string> { |   async getCurrentActiveServer(): Promise<string> { | ||||||
|     const tab = this.tabs[this.activeTabIndex]; |     const tab = this.tabs[this.activeTabIndex]; | ||||||
|     return tab instanceof ServerTab ? (await tab.webview).props.url : ""; |     return tab instanceof ServerTab ? (await tab.webview).properties.url : ""; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   displayInitialCharLogo($img: HTMLImageElement, index: number): void { |   displayInitialCharLogo($img: HTMLImageElement, index: number): void { | ||||||
| @@ -489,7 +506,7 @@ export class ServerManagerView { | |||||||
|     const realmName = $webview.getAttribute("name"); |     const realmName = $webview.getAttribute("name"); | ||||||
|  |  | ||||||
|     if (realmName === null) { |     if (realmName === null) { | ||||||
|       $img.src = "/img/icon.png"; |       $img.src = defaultIcon; | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|  |  | ||||||
| @@ -540,36 +557,38 @@ export class ServerManagerView { | |||||||
|     this.$serverIconTooltip[index].style.display = "none"; |     this.$serverIconTooltip[index].style.display = "none"; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   async openFunctionalTab(tabProps: { |   async openFunctionalTab(tabProperties: { | ||||||
|     name: string; |     label: string; | ||||||
|  |     page: TabPage; | ||||||
|     materialIcon: string; |     materialIcon: string; | ||||||
|     makeView: () => Element; |     makeView: () => Promise<Element>; | ||||||
|     destroyView: () => void; |     destroyView: () => void; | ||||||
|   }): Promise<void> { |   }): Promise<void> { | ||||||
|     if (this.functionalTabs.has(tabProps.name)) { |     if (this.functionalTabs.has(tabProperties.page)) { | ||||||
|       await this.activateTab(this.functionalTabs.get(tabProps.name)!); |       await this.activateTab(this.functionalTabs.get(tabProperties.page)!); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     const index = this.tabs.length; |     const index = this.tabs.length; | ||||||
|     this.functionalTabs.set(tabProps.name, index); |     this.functionalTabs.set(tabProperties.page, index); | ||||||
|  |  | ||||||
|     const tabIndex = this.getTabIndex(); |     const tabIndex = this.getTabIndex(); | ||||||
|     const $view = tabProps.makeView(); |     const $view = await tabProperties.makeView(); | ||||||
|     this.$webviewsContainer.append($view); |     this.$webviewsContainer.append($view); | ||||||
|  |  | ||||||
|     this.tabs.push( |     this.tabs.push( | ||||||
|       new FunctionalTab({ |       new FunctionalTab({ | ||||||
|         role: "function", |         role: "function", | ||||||
|         materialIcon: tabProps.materialIcon, |         materialIcon: tabProperties.materialIcon, | ||||||
|         name: tabProps.name, |         label: tabProperties.label, | ||||||
|  |         page: tabProperties.page, | ||||||
|         $root: this.$tabsContainer, |         $root: this.$tabsContainer, | ||||||
|         index, |         index, | ||||||
|         tabIndex, |         tabIndex, | ||||||
|         onClick: this.activateTab.bind(this, index), |         onClick: this.activateTab.bind(this, index), | ||||||
|         onDestroy: async () => { |         onDestroy: async () => { | ||||||
|           await this.destroyTab(tabProps.name, index); |           await this.destroyFunctionalTab(tabProperties.page, index); | ||||||
|           tabProps.destroyView(); |           tabProperties.destroyView(); | ||||||
|         }, |         }, | ||||||
|         $view, |         $view, | ||||||
|       }), |       }), | ||||||
| @@ -579,15 +598,18 @@ export class ServerManagerView { | |||||||
|     // closed when the functional tab DOM is ready, handled in webview.js |     // closed when the functional tab DOM is ready, handled in webview.js | ||||||
|     this.$webviewsContainer.classList.remove("loaded"); |     this.$webviewsContainer.classList.remove("loaded"); | ||||||
|  |  | ||||||
|     await this.activateTab(this.functionalTabs.get(tabProps.name)!); |     await this.activateTab(this.functionalTabs.get(tabProperties.page)!); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   async openSettings(nav: NavItem = "General"): Promise<void> { |   async openSettings( | ||||||
|  |     navigationItem: NavigationItem = "General", | ||||||
|  |   ): Promise<void> { | ||||||
|     await this.openFunctionalTab({ |     await this.openFunctionalTab({ | ||||||
|       name: "Settings", |       page: "Settings", | ||||||
|  |       label: t.__("Settings"), | ||||||
|       materialIcon: "settings", |       materialIcon: "settings", | ||||||
|       makeView: () => { |       makeView: async () => { | ||||||
|         this.preferenceView = new PreferenceView(); |         this.preferenceView = await PreferenceView.create(); | ||||||
|         this.preferenceView.$view.classList.add("functional-view"); |         this.preferenceView.$view.classList.add("functional-view"); | ||||||
|         return this.preferenceView.$view; |         return this.preferenceView.$view; | ||||||
|       }, |       }, | ||||||
| @@ -597,16 +619,17 @@ export class ServerManagerView { | |||||||
|       }, |       }, | ||||||
|     }); |     }); | ||||||
|     this.$settingsButton.classList.add("active"); |     this.$settingsButton.classList.add("active"); | ||||||
|     this.preferenceView!.handleNavigation(nav); |     this.preferenceView!.handleNavigation(navigationItem); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   async openAbout(): Promise<void> { |   async openAbout(): Promise<void> { | ||||||
|     let aboutView: AboutView; |     let aboutView: AboutView; | ||||||
|     await this.openFunctionalTab({ |     await this.openFunctionalTab({ | ||||||
|       name: "About", |       page: "About", | ||||||
|  |       label: t.__("About"), | ||||||
|       materialIcon: "sentiment_very_satisfied", |       materialIcon: "sentiment_very_satisfied", | ||||||
|       makeView() { |       async makeView() { | ||||||
|         aboutView = new AboutView(); |         aboutView = await AboutView.create(); | ||||||
|         aboutView.$view.classList.add("functional-view"); |         aboutView.$view.classList.add("functional-view"); | ||||||
|         return aboutView.$view; |         return aboutView.$view; | ||||||
|       }, |       }, | ||||||
| @@ -624,7 +647,7 @@ export class ServerManagerView { | |||||||
|     reconnectUtil.pollInternetAndReload(); |     reconnectUtil.pollInternetAndReload(); | ||||||
|     await webview |     await webview | ||||||
|       .getWebContents() |       .getWebContents() | ||||||
|       .loadURL(`file://${rendererDirectory}/network.html`); |       .loadURL(new URL("app/renderer/network.html", bundleUrl).href); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   async activateLastTab(index: number): Promise<void> { |   async activateLastTab(index: number): Promise<void> { | ||||||
| @@ -636,13 +659,14 @@ export class ServerManagerView { | |||||||
|  |  | ||||||
|   // Returns this.tabs in an way that does |   // Returns this.tabs in an way that does | ||||||
|   // not crash app when this.tabs is passed into |   // not crash app when this.tabs is passed into | ||||||
|   // ipcRenderer. Something about webview, and props.webview |   // ipcRenderer. Something about webview, and properties.webview | ||||||
|   // properties in ServerTab causes the app to crash. |   // properties in ServerTab causes the app to crash. | ||||||
|   get tabsForIpc(): TabData[] { |   get tabsForIpc(): TabData[] { | ||||||
|     return this.tabs.map((tab) => ({ |     return this.tabs.map((tab) => ({ | ||||||
|       role: tab.props.role, |       role: tab.properties.role, | ||||||
|       name: tab.props.name, |       page: tab.properties.page, | ||||||
|       index: tab.props.index, |       label: tab.properties.label, | ||||||
|  |       index: tab.properties.index, | ||||||
|     })); |     })); | ||||||
|   } |   } | ||||||
|  |  | ||||||
| @@ -660,8 +684,8 @@ export class ServerManagerView { | |||||||
|       if (hideOldTab) { |       if (hideOldTab) { | ||||||
|         // If old tab is functional tab Settings, remove focus from the settings icon at sidebar bottom |         // If old tab is functional tab Settings, remove focus from the settings icon at sidebar bottom | ||||||
|         if ( |         if ( | ||||||
|           this.tabs[this.activeTabIndex].props.role === "function" && |           this.tabs[this.activeTabIndex].properties.role === "function" && | ||||||
|           this.tabs[this.activeTabIndex].props.name === "Settings" |           this.tabs[this.activeTabIndex].properties.page === "Settings" | ||||||
|         ) { |         ) { | ||||||
|           this.$settingsButton.classList.remove("active"); |           this.$settingsButton.classList.remove("active"); | ||||||
|         } |         } | ||||||
| @@ -685,7 +709,7 @@ export class ServerManagerView { | |||||||
|  |  | ||||||
|     this.showLoading( |     this.showLoading( | ||||||
|       tab instanceof ServerTab && |       tab instanceof ServerTab && | ||||||
|         this.loading.has((await tab.webview).props.url), |         this.loading.has((await tab.webview).properties.url), | ||||||
|     ); |     ); | ||||||
|  |  | ||||||
|     ipcRenderer.send("update-menu", { |     ipcRenderer.send("update-menu", { | ||||||
| @@ -694,7 +718,7 @@ export class ServerManagerView { | |||||||
|       tabs: this.tabsForIpc, |       tabs: this.tabsForIpc, | ||||||
|       activeTabIndex: this.activeTabIndex, |       activeTabIndex: this.activeTabIndex, | ||||||
|       // Following flag controls whether a menu item should be enabled or not |       // Following flag controls whether a menu item should be enabled or not | ||||||
|       enableMenu: tab.props.role === "server", |       enableMenu: tab.properties.role === "server", | ||||||
|     }); |     }); | ||||||
|   } |   } | ||||||
|  |  | ||||||
| @@ -703,7 +727,7 @@ export class ServerManagerView { | |||||||
|     this.$loadingIndicator.classList.toggle("hidden", !loading); |     this.$loadingIndicator.classList.toggle("hidden", !loading); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   async destroyTab(name: string, index: number): Promise<void> { |   async destroyFunctionalTab(page: TabPage, index: number): Promise<void> { | ||||||
|     const tab = this.tabs[index]; |     const tab = this.tabs[index]; | ||||||
|     if (tab instanceof ServerTab && (await tab.webview).loading) { |     if (tab instanceof ServerTab && (await tab.webview).loading) { | ||||||
|       return; |       return; | ||||||
| @@ -711,8 +735,8 @@ export class ServerManagerView { | |||||||
|  |  | ||||||
|     await tab.destroy(); |     await tab.destroy(); | ||||||
|  |  | ||||||
|     delete this.tabs[index]; |     delete this.tabs[index]; // eslint-disable-line @typescript-eslint/no-array-delete | ||||||
|     this.functionalTabs.delete(name); |     this.functionalTabs.delete(page); | ||||||
|  |  | ||||||
|     // Issue #188: If the functional tab was not focused, do not activate another tab. |     // Issue #188: If the functional tab was not focused, do not activate another tab. | ||||||
|     if (this.activeTabIndex === index) { |     if (this.activeTabIndex === index) { | ||||||
| @@ -736,7 +760,7 @@ export class ServerManagerView { | |||||||
|  |  | ||||||
|   async reloadView(): Promise<void> { |   async reloadView(): Promise<void> { | ||||||
|     // Save and remember the index of last active tab so that we can use it later |     // Save and remember the index of last active tab so that we can use it later | ||||||
|     const lastActiveTab = this.tabs[this.activeTabIndex].props.index; |     const lastActiveTab = this.tabs[this.activeTabIndex].properties.index; | ||||||
|     ConfigUtil.setConfigItem("lastActiveTab", lastActiveTab); |     ConfigUtil.setConfigItem("lastActiveTab", lastActiveTab); | ||||||
|  |  | ||||||
|     // Destroy the current view and re-initiate it |     // Destroy the current view and re-initiate it | ||||||
| @@ -792,13 +816,15 @@ export class ServerManagerView { | |||||||
|       event.preventDefault(); |       event.preventDefault(); | ||||||
|       const template = [ |       const template = [ | ||||||
|         { |         { | ||||||
|           label: "Disconnect organization", |           label: t.__("Disconnect organization"), | ||||||
|           async click() { |           async click() { | ||||||
|             const {response} = await dialog.showMessageBox({ |             const {response} = await dialog.showMessageBox({ | ||||||
|               type: "warning", |               type: "warning", | ||||||
|               buttons: ["YES", "NO"], |               buttons: [t.__("Yes"), t.__("No")], | ||||||
|               defaultId: 0, |               defaultId: 0, | ||||||
|               message: "Are you sure you want to disconnect this organization?", |               message: t.__( | ||||||
|  |                 "Are you sure you want to disconnect this organization?", | ||||||
|  |               ), | ||||||
|             }); |             }); | ||||||
|             if (response === 0) { |             if (response === 0) { | ||||||
|               if (DomainUtil.removeDomain(index)) { |               if (DomainUtil.removeDomain(index)) { | ||||||
| @@ -813,7 +839,7 @@ export class ServerManagerView { | |||||||
|           }, |           }, | ||||||
|         }, |         }, | ||||||
|         { |         { | ||||||
|           label: "Notification settings", |           label: t.__("Notification settings"), | ||||||
|           enabled: await this.isLoggedIn(index), |           enabled: await this.isLoggedIn(index), | ||||||
|           click: async () => { |           click: async () => { | ||||||
|             // Switch to tab whose icon was right-clicked |             // Switch to tab whose icon was right-clicked | ||||||
| @@ -824,7 +850,7 @@ export class ServerManagerView { | |||||||
|           }, |           }, | ||||||
|         }, |         }, | ||||||
|         { |         { | ||||||
|           label: "Copy Zulip URL", |           label: t.__("Copy Zulip URL"), | ||||||
|           click() { |           click() { | ||||||
|             clipboard.writeText(DomainUtil.getDomain(index).url); |             clipboard.writeText(DomainUtil.getDomain(index).url); | ||||||
|           }, |           }, | ||||||
| @@ -914,7 +940,7 @@ export class ServerManagerView { | |||||||
|     ipcRenderer.on( |     ipcRenderer.on( | ||||||
|       "permission-request", |       "permission-request", | ||||||
|       async ( |       async ( | ||||||
|         event: Event, |         event, | ||||||
|         { |         { | ||||||
|           webContentsId, |           webContentsId, | ||||||
|           origin, |           origin, | ||||||
| @@ -936,7 +962,7 @@ export class ServerManagerView { | |||||||
|                     const webview = await tab.webview; |                     const webview = await tab.webview; | ||||||
|                     return ( |                     return ( | ||||||
|                       webview.webContentsId === webContentsId && |                       webview.webContentsId === webContentsId && | ||||||
|                       webview.props.hasPermission?.(origin, permission) |                       webview.properties.hasPermission?.(origin, permission) | ||||||
|                     ); |                     ); | ||||||
|                   }), |                   }), | ||||||
|                 ) |                 ) | ||||||
| @@ -963,10 +989,7 @@ export class ServerManagerView { | |||||||
|       await LinkUtil.openBrowser(new URL("https://zulip.com/help/")); |       await LinkUtil.openBrowser(new URL("https://zulip.com/help/")); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     ipcRenderer.on( |     ipcRenderer.on("reload-viewer", this.reloadView.bind(this)); | ||||||
|       "reload-viewer", |  | ||||||
|       this.reloadView.bind(this, this.tabs[this.activeTabIndex].props.index), |  | ||||||
|     ); |  | ||||||
|  |  | ||||||
|     ipcRenderer.on("reload-current-viewer", this.reloadCurrentView.bind(this)); |     ipcRenderer.on("reload-current-viewer", this.reloadCurrentView.bind(this)); | ||||||
|  |  | ||||||
| @@ -974,7 +997,7 @@ export class ServerManagerView { | |||||||
|       ipcRenderer.send("reload-full-app"); |       ipcRenderer.send("reload-full-app"); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     ipcRenderer.on("switch-server-tab", async (event: Event, index: number) => { |     ipcRenderer.on("switch-server-tab", async (event, index: number) => { | ||||||
|       await this.activateLastTab(index); |       await this.activateLastTab(index); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
| @@ -982,23 +1005,23 @@ export class ServerManagerView { | |||||||
|       await this.openSettings("AddServer"); |       await this.openSettings("AddServer"); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     ipcRenderer.on("reload-proxy", async (event: Event, showAlert: boolean) => { |     ipcRenderer.on("reload-proxy", async (event, showAlert: boolean) => { | ||||||
|       await this.loadProxy(); |       await this.loadProxy(); | ||||||
|       if (showAlert) { |       if (showAlert) { | ||||||
|         await dialog.showMessageBox({ |         await dialog.showMessageBox({ | ||||||
|           message: "Proxy settings saved!", |           message: t.__("Proxy settings saved."), | ||||||
|           buttons: ["OK"], |           buttons: [t.__("OK")], | ||||||
|         }); |         }); | ||||||
|         ipcRenderer.send("reload-full-app"); |         ipcRenderer.send("reload-full-app"); | ||||||
|       } |       } | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     ipcRenderer.on("toggle-sidebar", async (event: Event, show: boolean) => { |     ipcRenderer.on("toggle-sidebar", async (event, show: boolean) => { | ||||||
|       // Toggle the left sidebar |       // Toggle the left sidebar | ||||||
|       this.toggleSidebar(show); |       this.toggleSidebar(show); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     ipcRenderer.on("toggle-silent", async (event: Event, state: boolean) => |     ipcRenderer.on("toggle-silent", async (event, state: boolean) => | ||||||
|       Promise.all( |       Promise.all( | ||||||
|         this.tabs.map(async (tab) => { |         this.tabs.map(async (tab) => { | ||||||
|           if (tab instanceof ServerTab) |           if (tab instanceof ServerTab) | ||||||
| @@ -1009,7 +1032,7 @@ export class ServerManagerView { | |||||||
|  |  | ||||||
|     ipcRenderer.on( |     ipcRenderer.on( | ||||||
|       "toggle-autohide-menubar", |       "toggle-autohide-menubar", | ||||||
|       async (event: Event, autoHideMenubar: boolean, updateMenu: boolean) => { |       async (event, autoHideMenubar: boolean, updateMenu: boolean) => { | ||||||
|         if (updateMenu) { |         if (updateMenu) { | ||||||
|           ipcRenderer.send("update-menu", { |           ipcRenderer.send("update-menu", { | ||||||
|             tabs: this.tabsForIpc, |             tabs: this.tabsForIpc, | ||||||
| @@ -1021,11 +1044,7 @@ export class ServerManagerView { | |||||||
|  |  | ||||||
|     ipcRenderer.on( |     ipcRenderer.on( | ||||||
|       "toggle-dnd", |       "toggle-dnd", | ||||||
|       async ( |       async (event, state: boolean, newSettings: Partial<DndSettings>) => { | ||||||
|         event: Event, |  | ||||||
|         state: boolean, |  | ||||||
|         newSettings: Partial<DndSettings>, |  | ||||||
|       ) => { |  | ||||||
|         this.toggleDndButton(state); |         this.toggleDndButton(state); | ||||||
|         ipcRenderer.send( |         ipcRenderer.send( | ||||||
|           "forward-message", |           "forward-message", | ||||||
| @@ -1037,16 +1056,11 @@ export class ServerManagerView { | |||||||
|  |  | ||||||
|     ipcRenderer.on( |     ipcRenderer.on( | ||||||
|       "update-realm-name", |       "update-realm-name", | ||||||
|       (event: Event, serverURL: string, realmName: string) => { |       (event, serverURL: string, realmName: string) => { | ||||||
|         for (const [index, domain] of DomainUtil.getDomains().entries()) { |         for (const [index, domain] of DomainUtil.getDomains().entries()) { | ||||||
|           if (domain.url.includes(serverURL)) { |           if (domain.url === serverURL) { | ||||||
|             const serverTooltipSelector = ".tab .server-tooltip"; |             const tab = this.tabs[index]; | ||||||
|             const serverTooltips = document.querySelectorAll( |             if (tab instanceof ServerTab) tab.setLabel(realmName); | ||||||
|               serverTooltipSelector, |  | ||||||
|             ); |  | ||||||
|             serverTooltips[index].textContent = realmName; |  | ||||||
|             this.tabs[index].props.name = realmName; |  | ||||||
|  |  | ||||||
|             domain.alias = realmName; |             domain.alias = realmName; | ||||||
|             DomainUtil.updateDomain(index, domain); |             DomainUtil.updateDomain(index, domain); | ||||||
|             // Update the realm name also on the Window menu |             // Update the realm name also on the Window menu | ||||||
| @@ -1061,18 +1075,15 @@ export class ServerManagerView { | |||||||
|  |  | ||||||
|     ipcRenderer.on( |     ipcRenderer.on( | ||||||
|       "update-realm-icon", |       "update-realm-icon", | ||||||
|       async (event: Event, serverURL: string, iconURL: string) => { |       async (event, serverURL: string, iconURL: string) => { | ||||||
|         await Promise.all( |         await Promise.all( | ||||||
|           DomainUtil.getDomains().map(async (domain, index) => { |           DomainUtil.getDomains().map(async (domain, index) => { | ||||||
|             if (domain.url.includes(serverURL)) { |             if (domain.url === serverURL) { | ||||||
|               const localIconUrl: string = await DomainUtil.saveServerIcon( |               const localIconPath = await DomainUtil.saveServerIcon(iconURL); | ||||||
|                 iconURL, |               const tab = this.tabs[index]; | ||||||
|               ); |               if (tab instanceof ServerTab) | ||||||
|               const serverImgsSelector = ".tab .server-icons"; |                 tab.setIcon(DomainUtil.iconAsUrl(localIconPath)); | ||||||
|               const serverImgs: NodeListOf<HTMLImageElement> = |               domain.icon = localIconPath; | ||||||
|                 document.querySelectorAll(serverImgsSelector); |  | ||||||
|               serverImgs[index].src = localIconUrl; |  | ||||||
|               domain.icon = localIconUrl; |  | ||||||
|               DomainUtil.updateDomain(index, domain); |               DomainUtil.updateDomain(index, domain); | ||||||
|             } |             } | ||||||
|           }), |           }), | ||||||
| @@ -1089,61 +1100,56 @@ export class ServerManagerView { | |||||||
|       this.$fullscreenPopup.classList.remove("show"); |       this.$fullscreenPopup.classList.remove("show"); | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     ipcRenderer.on( |     ipcRenderer.on("focus-webview-with-id", async (event, webviewId: number) => | ||||||
|       "focus-webview-with-id", |       Promise.all( | ||||||
|       async (event: Event, webviewId: number) => |         this.tabs.map(async (tab) => { | ||||||
|         Promise.all( |           if ( | ||||||
|           this.tabs.map(async (tab) => { |             tab instanceof ServerTab && | ||||||
|             if ( |             (await tab.webview).webContentsId === webviewId | ||||||
|               tab instanceof ServerTab && |           ) { | ||||||
|               (await tab.webview).webContentsId === webviewId |             const concurrentTab: HTMLButtonElement = document.querySelector( | ||||||
|             ) { |               `div[data-tab-id="${CSS.escape(`${tab.properties.tabIndex}`)}"]`, | ||||||
|               const concurrentTab: HTMLButtonElement = document.querySelector( |             )!; | ||||||
|                 `div[data-tab-id="${CSS.escape(`${tab.props.tabIndex}`)}"]`, |             concurrentTab.click(); | ||||||
|               )!; |           } | ||||||
|               concurrentTab.click(); |         }), | ||||||
|             } |       ), | ||||||
|           }), |  | ||||||
|         ), |  | ||||||
|     ); |     ); | ||||||
|  |  | ||||||
|     ipcRenderer.on( |     ipcRenderer.on("render-taskbar-icon", (event, messageCount: number) => { | ||||||
|       "render-taskbar-icon", |       // Create a canvas from unread message counts | ||||||
|       (event: Event, messageCount: number) => { |       function createOverlayIcon(messageCount: number): HTMLCanvasElement { | ||||||
|         // Create a canvas from unread messagecounts |         const canvas = document.createElement("canvas"); | ||||||
|         function createOverlayIcon(messageCount: number): HTMLCanvasElement { |         canvas.height = 128; | ||||||
|           const canvas = document.createElement("canvas"); |         canvas.width = 128; | ||||||
|           canvas.height = 128; |         canvas.style.letterSpacing = "-5px"; | ||||||
|           canvas.width = 128; |         const context = canvas.getContext("2d")!; | ||||||
|           canvas.style.letterSpacing = "-5px"; |         context.fillStyle = "#f42020"; | ||||||
|           const ctx = canvas.getContext("2d")!; |         context.beginPath(); | ||||||
|           ctx.fillStyle = "#f42020"; |         context.ellipse(64, 64, 64, 64, 0, 0, 2 * Math.PI); | ||||||
|           ctx.beginPath(); |         context.fill(); | ||||||
|           ctx.ellipse(64, 64, 64, 64, 0, 0, 2 * Math.PI); |         context.textAlign = "center"; | ||||||
|           ctx.fill(); |         context.fillStyle = "white"; | ||||||
|           ctx.textAlign = "center"; |         if (messageCount > 99) { | ||||||
|           ctx.fillStyle = "white"; |           context.font = "65px Helvetica"; | ||||||
|           if (messageCount > 99) { |           context.fillText("99+", 64, 85); | ||||||
|             ctx.font = "65px Helvetica"; |         } else if (messageCount < 10) { | ||||||
|             ctx.fillText("99+", 64, 85); |           context.font = "90px Helvetica"; | ||||||
|           } else if (messageCount < 10) { |           context.fillText(String(Math.min(99, messageCount)), 64, 96); | ||||||
|             ctx.font = "90px Helvetica"; |         } else { | ||||||
|             ctx.fillText(String(Math.min(99, messageCount)), 64, 96); |           context.font = "85px Helvetica"; | ||||||
|           } else { |           context.fillText(String(Math.min(99, messageCount)), 64, 90); | ||||||
|             ctx.font = "85px Helvetica"; |  | ||||||
|             ctx.fillText(String(Math.min(99, messageCount)), 64, 90); |  | ||||||
|           } |  | ||||||
|  |  | ||||||
|           return canvas; |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         ipcRenderer.send( |         return canvas; | ||||||
|           "update-taskbar-icon", |       } | ||||||
|           createOverlayIcon(messageCount).toDataURL(), |  | ||||||
|           String(messageCount), |       ipcRenderer.send( | ||||||
|         ); |         "update-taskbar-icon", | ||||||
|       }, |         createOverlayIcon(messageCount).toDataURL(), | ||||||
|     ); |         String(messageCount), | ||||||
|  |       ); | ||||||
|  |     }); | ||||||
|  |  | ||||||
|     ipcRenderer.on("copy-zulip-url", async () => { |     ipcRenderer.on("copy-zulip-url", async () => { | ||||||
|       clipboard.writeText(await this.getCurrentActiveServer()); |       clipboard.writeText(await this.getCurrentActiveServer()); | ||||||
| @@ -1180,6 +1186,62 @@ export class ServerManagerView { | |||||||
| } | } | ||||||
|  |  | ||||||
| window.addEventListener("load", async () => { | window.addEventListener("load", async () => { | ||||||
|  |   document.body.innerHTML = html` | ||||||
|  |     <div id="content"> | ||||||
|  |       <div class="popup"> | ||||||
|  |         <span class="popuptext hidden" id="fullscreen-popup"></span> | ||||||
|  |       </div> | ||||||
|  |       <div id="sidebar" class="toggle-sidebar"> | ||||||
|  |         <div id="view-controls-container"> | ||||||
|  |           <div id="tabs-container"></div> | ||||||
|  |           <div id="add-tab" class="tab functional-tab"> | ||||||
|  |             <div class="server-tab" id="add-action"> | ||||||
|  |               <i class="material-icons">add</i> | ||||||
|  |             </div> | ||||||
|  |             <span id="add-server-tooltip" style="display: none" | ||||||
|  |               >${t.__("Add Organization")}</span | ||||||
|  |             > | ||||||
|  |           </div> | ||||||
|  |         </div> | ||||||
|  |         <div id="actions-container"> | ||||||
|  |           <div class="action-button" id="dnd-action"> | ||||||
|  |             <i class="material-icons md-48">notifications</i> | ||||||
|  |             <span id="dnd-tooltip" style="display: none" | ||||||
|  |               >${t.__("Do Not Disturb")}</span | ||||||
|  |             > | ||||||
|  |           </div> | ||||||
|  |           <div class="action-button hidden" id="reload-action"> | ||||||
|  |             <i class="material-icons md-48">refresh</i> | ||||||
|  |             <span id="reload-tooltip" style="display: none" | ||||||
|  |               >${t.__("Reload")}</span | ||||||
|  |             > | ||||||
|  |           </div> | ||||||
|  |           <div class="action-button disable" id="loading-action"> | ||||||
|  |             <i class="refresh material-icons md-48">loop</i> | ||||||
|  |             <span id="loading-tooltip" style="display: none" | ||||||
|  |               >${t.__("Loading")}</span | ||||||
|  |             > | ||||||
|  |           </div> | ||||||
|  |           <div class="action-button disable" id="back-action"> | ||||||
|  |             <i class="material-icons md-48">arrow_back</i> | ||||||
|  |             <span id="back-tooltip" style="display: none" | ||||||
|  |               >${t.__("Go Back")}</span | ||||||
|  |             > | ||||||
|  |           </div> | ||||||
|  |           <div class="action-button" id="settings-action"> | ||||||
|  |             <i class="material-icons md-48">settings</i> | ||||||
|  |             <span id="setting-tooltip" style="display: none" | ||||||
|  |               >${t.__("Settings")}</span | ||||||
|  |             > | ||||||
|  |           </div> | ||||||
|  |         </div> | ||||||
|  |       </div> | ||||||
|  |       <div id="main-container"> | ||||||
|  |         <div id="webviews-container"></div> | ||||||
|  |       </div> | ||||||
|  |     </div> | ||||||
|  |   `.html; | ||||||
|  |  | ||||||
|   const serverManagerView = new ServerManagerView(); |   const serverManagerView = new ServerManagerView(); | ||||||
|   await serverManagerView.init(); |   await serverManagerView.init(); | ||||||
| }); | }); | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| import {ipcRenderer} from "../typed-ipc-renderer"; | import {ipcRenderer} from "../typed-ipc-renderer.js"; | ||||||
|  |  | ||||||
| export interface NotificationData { | export type NotificationData = { | ||||||
|   close: () => void; |   close: () => void; | ||||||
|   title: string; |   title: string; | ||||||
|   dir: NotificationDirection; |   dir: NotificationDirection; | ||||||
| @@ -9,7 +9,7 @@ export interface NotificationData { | |||||||
|   tag: string; |   tag: string; | ||||||
|   icon: string; |   icon: string; | ||||||
|   data: unknown; |   data: unknown; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export function newNotification( | export function newNotification( | ||||||
|   title: string, |   title: string, | ||||||
| @@ -18,10 +18,10 @@ export function newNotification( | |||||||
| ): NotificationData { | ): NotificationData { | ||||||
|   const notification = new Notification(title, {...options, silent: true}); |   const notification = new Notification(title, {...options, silent: true}); | ||||||
|   for (const type of ["click", "close", "error", "show"]) { |   for (const type of ["click", "close", "error", "show"]) { | ||||||
|     notification.addEventListener(type, (ev: Event) => { |     notification.addEventListener(type, (event) => { | ||||||
|       if (type === "click") ipcRenderer.send("focus-this-webview"); |       if (type === "click") ipcRenderer.send("focus-this-webview"); | ||||||
|       if (!dispatch(type, ev)) { |       if (!dispatch(type, event)) { | ||||||
|         ev.preventDefault(); |         event.preventDefault(); | ||||||
|       } |       } | ||||||
|     }); |     }); | ||||||
|   } |   } | ||||||
|   | |||||||
| @@ -1,41 +1,50 @@ | |||||||
| import {app} from "@electron/remote"; | import {app} from "@electron/remote"; | ||||||
|  |  | ||||||
| import {html} from "../../../common/html"; | import {Html, html} from "../../../common/html.js"; | ||||||
|  | import {bundleUrl} from "../../../common/paths.js"; | ||||||
|  | import * as t from "../../../common/translation-util.js"; | ||||||
|  | import {generateNodeFromHtml} from "../components/base.js"; | ||||||
|  |  | ||||||
| export class AboutView { | export class AboutView { | ||||||
|  |   static async create(): Promise<AboutView> { | ||||||
|  |     return new AboutView( | ||||||
|  |       await (await fetch(new URL("app/renderer/about.html", bundleUrl))).text(), | ||||||
|  |     ); | ||||||
|  |   } | ||||||
|  |  | ||||||
|   readonly $view: HTMLElement; |   readonly $view: HTMLElement; | ||||||
|  |  | ||||||
|   constructor() { |   private constructor(templateHtml: string) { | ||||||
|     this.$view = document.createElement("div"); |     this.$view = document.createElement("div"); | ||||||
|     const $shadow = this.$view.attachShadow({mode: "open"}); |     const $shadow = this.$view.attachShadow({mode: "open"}); | ||||||
|     $shadow.innerHTML = html` |     $shadow.innerHTML = templateHtml; | ||||||
|       <link rel="stylesheet" href="css/about.css" /> |     $shadow.querySelector("#version")!.textContent = `v${app.getVersion()}`; | ||||||
|       <!-- Initially hidden to prevent FOUC --> |     const maintenanceInfoHtml = html` | ||||||
|       <div class="about" hidden> |       <div class="maintenance-info"> | ||||||
|         <img class="logo" src="../resources/zulip.png" /> |         <p class="detail maintainer"> | ||||||
|         <p class="detail" id="version">v${app.getVersion()}</p> |           ${new Html({ | ||||||
|         <div class="maintenance-info"> |             html: t.__("Maintained by {{{link}}}Zulip{{{endLink}}}", { | ||||||
|           <p class="detail maintainer"> |               link: '<a href="https://zulip.com" target="_blank" rel="noopener noreferrer">', | ||||||
|             Maintained by |               endLink: "</a>", | ||||||
|             <a |             }), | ||||||
|               href="https://zulip.com" |           })} | ||||||
|               target="_blank" |         </p> | ||||||
|               rel="noopener noreferrer" |         <p class="detail license"> | ||||||
|               >Zulip</a |           ${new Html({ | ||||||
|             > |             html: t.__( | ||||||
|           </p> |               "Available under the {{{link}}}Apache 2.0 License{{{endLink}}}", | ||||||
|           <p class="detail license"> |               { | ||||||
|             Available under the |                 link: '<a href="https://github.com/zulip/zulip-desktop/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">', | ||||||
|             <a |                 endLink: "</a>", | ||||||
|               href="https://github.com/zulip/zulip-desktop/blob/main/LICENSE" |               }, | ||||||
|               target="_blank" |             ), | ||||||
|               rel="noopener noreferrer" |           })} | ||||||
|               >Apache 2.0 License</a |         </p> | ||||||
|             > |  | ||||||
|           </p> |  | ||||||
|         </div> |  | ||||||
|       </div> |       </div> | ||||||
|     `.html; |     `; | ||||||
|  |     $shadow | ||||||
|  |       .querySelector(".about")! | ||||||
|  |       .append(generateNodeFromHtml(maintenanceInfoHtml)); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   destroy() { |   destroy() { | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| import {ipcRenderer} from "../typed-ipc-renderer"; | import {ipcRenderer} from "../typed-ipc-renderer.js"; | ||||||
|  |  | ||||||
| export function init( | export function init( | ||||||
|   $reconnectButton: Element, |   $reconnectButton: Element, | ||||||
|   | |||||||
| @@ -1,17 +1,16 @@ | |||||||
| import type {Html} from "../../../../common/html"; | import {type Html, html} from "../../../../common/html.js"; | ||||||
| import {html} from "../../../../common/html"; | import {generateNodeFromHtml} from "../../components/base.js"; | ||||||
| import {generateNodeFromHtml} from "../../components/base"; | import {ipcRenderer} from "../../typed-ipc-renderer.js"; | ||||||
| import {ipcRenderer} from "../../typed-ipc-renderer"; |  | ||||||
|  |  | ||||||
| interface BaseSectionProps { | type BaseSectionProperties = { | ||||||
|   $element: HTMLElement; |   $element: HTMLElement; | ||||||
|   disabled?: boolean; |   disabled?: boolean; | ||||||
|   value: boolean; |   value: boolean; | ||||||
|   clickHandler: () => void; |   clickHandler: () => void; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export function generateSettingOption(props: BaseSectionProps): void { | export function generateSettingOption(properties: BaseSectionProperties): void { | ||||||
|   const {$element, disabled, value, clickHandler} = props; |   const {$element, disabled, value, clickHandler} = properties; | ||||||
|  |  | ||||||
|   $element.textContent = ""; |   $element.textContent = ""; | ||||||
|  |  | ||||||
| @@ -30,8 +29,7 @@ export function generateOptionHtml( | |||||||
|   disabled?: boolean, |   disabled?: boolean, | ||||||
| ): Html { | ): Html { | ||||||
|   const labelHtml = disabled |   const labelHtml = disabled | ||||||
|     ? // eslint-disable-next-line unicorn/template-indent |     ? html`<label | ||||||
|       html`<label |  | ||||||
|         class="disallowed" |         class="disallowed" | ||||||
|         title="Setting locked by system administrator." |         title="Setting locked by system administrator." | ||||||
|       ></label>` |       ></label>` | ||||||
|   | |||||||
| @@ -1,19 +1,19 @@ | |||||||
| import {html} from "../../../../common/html"; | import {html} from "../../../../common/html.js"; | ||||||
| import * as t from "../../../../common/translation-util"; | import * as t from "../../../../common/translation-util.js"; | ||||||
| import {ipcRenderer} from "../../typed-ipc-renderer"; | import {ipcRenderer} from "../../typed-ipc-renderer.js"; | ||||||
| import * as DomainUtil from "../../utils/domain-util"; | import * as DomainUtil from "../../utils/domain-util.js"; | ||||||
|  |  | ||||||
| import {reloadApp} from "./base-section"; | import {reloadApp} from "./base-section.js"; | ||||||
| import {initFindAccounts} from "./find-accounts"; | import {initFindAccounts} from "./find-accounts.js"; | ||||||
| import {initServerInfoForm} from "./server-info-form"; | import {initServerInfoForm} from "./server-info-form.js"; | ||||||
|  |  | ||||||
| interface ConnectedOrgSectionProps { | type ConnectedOrgSectionProperties = { | ||||||
|   $root: Element; |   $root: Element; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export function initConnectedOrgSection({ | export function initConnectedOrgSection({ | ||||||
|   $root, |   $root, | ||||||
| }: ConnectedOrgSectionProps): void { | }: ConnectedOrgSectionProperties): void { | ||||||
|   $root.textContent = ""; |   $root.textContent = ""; | ||||||
|  |  | ||||||
|   const servers = DomainUtil.getDomains(); |   const servers = DomainUtil.getDomains(); | ||||||
| @@ -21,7 +21,7 @@ export function initConnectedOrgSection({ | |||||||
|     <div class="settings-pane" id="server-settings-pane"> |     <div class="settings-pane" id="server-settings-pane"> | ||||||
|       <div class="page-title">${t.__("Connected organizations")}</div> |       <div class="page-title">${t.__("Connected organizations")}</div> | ||||||
|       <div class="title" id="existing-servers"> |       <div class="title" id="existing-servers"> | ||||||
|         ${t.__("All the connected orgnizations will appear here.")} |         ${t.__("All the connected organizations will appear here.")} | ||||||
|       </div> |       </div> | ||||||
|       <div id="server-info-container"></div> |       <div id="server-info-container"></div> | ||||||
|       <div id="new-org-button"> |       <div id="new-org-button"> | ||||||
| @@ -42,7 +42,9 @@ export function initConnectedOrgSection({ | |||||||
|     "#find-accounts-container", |     "#find-accounts-container", | ||||||
|   )!; |   )!; | ||||||
|  |  | ||||||
|   const noServerText = t.__("All the connected orgnizations will appear here"); |   const noServerText = t.__( | ||||||
|  |     "All the connected organizations will appear here.", | ||||||
|  |   ); | ||||||
|   // Show noServerText if no servers are there otherwise hide it |   // Show noServerText if no servers are there otherwise hide it | ||||||
|   $existingServers.textContent = servers.length === 0 ? noServerText : ""; |   $existingServers.textContent = servers.length === 0 ? noServerText : ""; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,11 +1,11 @@ | |||||||
| import {html} from "../../../../common/html"; | import {html} from "../../../../common/html.js"; | ||||||
| import * as LinkUtil from "../../../../common/link-util"; | import * as LinkUtil from "../../../../common/link-util.js"; | ||||||
| import * as t from "../../../../common/translation-util"; | import * as t from "../../../../common/translation-util.js"; | ||||||
| import {generateNodeFromHtml} from "../../components/base"; | import {generateNodeFromHtml} from "../../components/base.js"; | ||||||
|  |  | ||||||
| interface FindAccountsProps { | type FindAccountsProperties = { | ||||||
|   $root: Element; |   $root: Element; | ||||||
| } | }; | ||||||
|  |  | ||||||
| async function findAccounts(url: string): Promise<void> { | async function findAccounts(url: string): Promise<void> { | ||||||
|   if (!url) { |   if (!url) { | ||||||
| @@ -19,7 +19,7 @@ async function findAccounts(url: string): Promise<void> { | |||||||
|   await LinkUtil.openBrowser(new URL("/accounts/find", url)); |   await LinkUtil.openBrowser(new URL("/accounts/find", url)); | ||||||
| } | } | ||||||
|  |  | ||||||
| export function initFindAccounts(props: FindAccountsProps): void { | export function initFindAccounts(properties: FindAccountsProperties): void { | ||||||
|   const $findAccounts = generateNodeFromHtml(html` |   const $findAccounts = generateNodeFromHtml(html` | ||||||
|     <div class="settings-card certificate-card"> |     <div class="settings-card certificate-card"> | ||||||
|       <div class="certificate-input"> |       <div class="certificate-input"> | ||||||
| @@ -33,7 +33,7 @@ export function initFindAccounts(props: FindAccountsProps): void { | |||||||
|       </div> |       </div> | ||||||
|     </div> |     </div> | ||||||
|   `); |   `); | ||||||
|   props.$root.append($findAccounts); |   properties.$root.append($findAccounts); | ||||||
|   const $findAccountsButton = $findAccounts.querySelector( |   const $findAccountsButton = $findAccounts.querySelector( | ||||||
|     "#find-accounts-button", |     "#find-accounts-button", | ||||||
|   )!; |   )!; | ||||||
|   | |||||||
| @@ -6,25 +6,24 @@ import process from "node:process"; | |||||||
| import * as remote from "@electron/remote"; | import * as remote from "@electron/remote"; | ||||||
| import {app, dialog, session} from "@electron/remote"; | import {app, dialog, session} from "@electron/remote"; | ||||||
| import Tagify from "@yaireo/tagify"; | import Tagify from "@yaireo/tagify"; | ||||||
| import ISO6391 from "iso-639-1"; | import {z} from "zod"; | ||||||
| import * as z from "zod"; |  | ||||||
|  |  | ||||||
| import * as ConfigUtil from "../../../../common/config-util"; | import supportedLocales from "../../../../../public/translations/supported-locales.json"; | ||||||
| import * as EnterpriseUtil from "../../../../common/enterprise-util"; | import * as ConfigUtil from "../../../../common/config-util.js"; | ||||||
| import {html} from "../../../../common/html"; | import * as EnterpriseUtil from "../../../../common/enterprise-util.js"; | ||||||
| import * as t from "../../../../common/translation-util"; | import {html} from "../../../../common/html.js"; | ||||||
| import supportedLocales from "../../../../translations/supported-locales.json"; | import * as t from "../../../../common/translation-util.js"; | ||||||
| import {ipcRenderer} from "../../typed-ipc-renderer"; | import {ipcRenderer} from "../../typed-ipc-renderer.js"; | ||||||
|  |  | ||||||
| import {generateSelectHtml, generateSettingOption} from "./base-section"; | import {generateSelectHtml, generateSettingOption} from "./base-section.js"; | ||||||
|  |  | ||||||
| const currentBrowserWindow = remote.getCurrentWindow(); | const currentBrowserWindow = remote.getCurrentWindow(); | ||||||
|  |  | ||||||
| interface GeneralSectionProps { | type GeneralSectionProperties = { | ||||||
|   $root: Element; |   $root: Element; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export function initGeneralSection({$root}: GeneralSectionProps): void { | export function initGeneralSection({$root}: GeneralSectionProperties): void { | ||||||
|   $root.innerHTML = html` |   $root.innerHTML = html` | ||||||
|     <div class="settings-pane"> |     <div class="settings-pane"> | ||||||
|       <div class="title">${t.__("Appearance")}</div> |       <div class="title">${t.__("Appearance")}</div> | ||||||
| @@ -57,7 +56,7 @@ export function initGeneralSection({$root}: GeneralSectionProps): void { | |||||||
|         </div> |         </div> | ||||||
|         <div class="setting-row" id="badge-option"> |         <div class="setting-row" id="badge-option"> | ||||||
|           <div class="setting-description"> |           <div class="setting-description"> | ||||||
|             ${t.__("Show app unread badge")} |             ${t.__("Show unread count badge on app icon")} | ||||||
|           </div> |           </div> | ||||||
|           <div class="setting-control"></div> |           <div class="setting-control"></div> | ||||||
|         </div> |         </div> | ||||||
| @@ -356,7 +355,8 @@ export function initGeneralSection({$root}: GeneralSectionProps): void { | |||||||
|         const newValue = !ConfigUtil.getConfigItem("silent", true); |         const newValue = !ConfigUtil.getConfigItem("silent", true); | ||||||
|         ConfigUtil.setConfigItem("silent", newValue); |         ConfigUtil.setConfigItem("silent", newValue); | ||||||
|         updateSilentOption(); |         updateSilentOption(); | ||||||
|         ipcRenderer.sendTo( |         ipcRenderer.send( | ||||||
|  |           "forward-to", | ||||||
|           currentBrowserWindow.webContents.id, |           currentBrowserWindow.webContents.id, | ||||||
|           "toggle-silent", |           "toggle-silent", | ||||||
|           newValue, |           newValue, | ||||||
| @@ -455,14 +455,13 @@ export function initGeneralSection({$root}: GeneralSectionProps): void { | |||||||
|  |  | ||||||
|   async function customCssDialog(): Promise<void> { |   async function customCssDialog(): Promise<void> { | ||||||
|     const showDialogOptions: OpenDialogOptions = { |     const showDialogOptions: OpenDialogOptions = { | ||||||
|       title: "Select file", |       title: t.__("Select file"), | ||||||
|       properties: ["openFile"], |       properties: ["openFile"], | ||||||
|       filters: [{name: "CSS file", extensions: ["css"]}], |       filters: [{name: t.__("CSS file"), extensions: ["css"]}], | ||||||
|     }; |     }; | ||||||
|  |  | ||||||
|     const {filePaths, canceled} = await dialog.showOpenDialog( |     const {filePaths, canceled} = | ||||||
|       showDialogOptions, |       await dialog.showOpenDialog(showDialogOptions); | ||||||
|     ); |  | ||||||
|     if (!canceled) { |     if (!canceled) { | ||||||
|       ConfigUtil.setConfigItem("customCSS", filePaths[0]); |       ConfigUtil.setConfigItem("customCSS", filePaths[0]); | ||||||
|       ipcRenderer.send("forward-message", "hard-reload"); |       ipcRenderer.send("forward-message", "hard-reload"); | ||||||
| @@ -525,13 +524,12 @@ export function initGeneralSection({$root}: GeneralSectionProps): void { | |||||||
|  |  | ||||||
|   async function downloadFolderDialog(): Promise<void> { |   async function downloadFolderDialog(): Promise<void> { | ||||||
|     const showDialogOptions: OpenDialogOptions = { |     const showDialogOptions: OpenDialogOptions = { | ||||||
|       title: "Select Download Location", |       title: t.__("Select Download Location"), | ||||||
|       properties: ["openDirectory"], |       properties: ["openDirectory"], | ||||||
|     }; |     }; | ||||||
|  |  | ||||||
|     const {filePaths, canceled} = await dialog.showOpenDialog( |     const {filePaths, canceled} = | ||||||
|       showDialogOptions, |       await dialog.showOpenDialog(showDialogOptions); | ||||||
|     ); |  | ||||||
|     if (!canceled) { |     if (!canceled) { | ||||||
|       ConfigUtil.setConfigItem("downloadsPath", filePaths[0]); |       ConfigUtil.setConfigItem("downloadsPath", filePaths[0]); | ||||||
|       const downloadFolderPath: HTMLElement = $root.querySelector( |       const downloadFolderPath: HTMLElement = $root.querySelector( | ||||||
| @@ -569,9 +567,9 @@ export function initGeneralSection({$root}: GeneralSectionProps): void { | |||||||
|  |  | ||||||
|     const {response} = await dialog.showMessageBox({ |     const {response} = await dialog.showMessageBox({ | ||||||
|       type: "warning", |       type: "warning", | ||||||
|       buttons: ["YES", "NO"], |       buttons: [t.__("Yes"), t.__("No")], | ||||||
|       defaultId: 0, |       defaultId: 0, | ||||||
|       message: "Are you sure?", |       message: t.__("Are you sure?"), | ||||||
|       detail: clearAppDataMessage, |       detail: clearAppDataMessage, | ||||||
|     }); |     }); | ||||||
|     if (response === 0) { |     if (response === 0) { | ||||||
| @@ -592,7 +590,7 @@ export function initGeneralSection({$root}: GeneralSectionProps): void { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   function initSpellChecker(): void { |   function initSpellChecker(): void { | ||||||
|     // The elctron API is a no-op on macOS and macOS default spellchecker is used. |     // The Electron API is a no-op on macOS and macOS default spellchecker is used. | ||||||
|     if (process.platform === "darwin") { |     if (process.platform === "darwin") { | ||||||
|       const note: HTMLElement = $root.querySelector("#note")!; |       const note: HTMLElement = $root.querySelector("#note")!; | ||||||
|       note.append(t.__("On macOS, the OS spellchecker is used.")); |       note.append(t.__("On macOS, the OS spellchecker is used.")); | ||||||
| @@ -610,34 +608,33 @@ export function initGeneralSection({$root}: GeneralSectionProps): void { | |||||||
|       const spellDiv: HTMLElement = $root.querySelector("#spellcheck-langs")!; |       const spellDiv: HTMLElement = $root.querySelector("#spellcheck-langs")!; | ||||||
|       spellDiv.innerHTML += html` |       spellDiv.innerHTML += html` | ||||||
|         <div class="setting-description">${t.__("Spellchecker Languages")}</div> |         <div class="setting-description">${t.__("Spellchecker Languages")}</div> | ||||||
|         <input name="spellcheck" placeholder="Enter Languages" /> |         <div id="spellcheck-langs-value"> | ||||||
|  |           <input name="spellcheck" placeholder="Enter Languages" /> | ||||||
|  |         </div> | ||||||
|       `.html; |       `.html; | ||||||
|  |  | ||||||
|       const availableLanguages = session.fromPartition( |       const availableLanguages = session.fromPartition( | ||||||
|         "persist:webviewsession", |         "persist:webviewsession", | ||||||
|       ).availableSpellCheckerLanguages; |       ).availableSpellCheckerLanguages; | ||||||
|       let languagePairs: Map<string, string> = new Map(); |       let languagePairs = new Map<string, string>(); | ||||||
|       for (const l of availableLanguages) { |       for (const l of availableLanguages) { | ||||||
|         if (ISO6391.validate(l)) { |         const locale = new Intl.Locale(l.replaceAll("_", "-")); | ||||||
|           languagePairs.set(ISO6391.getName(l), l); |         let displayName = new Intl.DisplayNames([locale], { | ||||||
|         } |           type: "language", | ||||||
|  |         }).of(locale.language); | ||||||
|  |         if (displayName === undefined) continue; | ||||||
|  |         displayName = displayName.replace(/^./u, (firstChar) => | ||||||
|  |           firstChar.toLocaleUpperCase(locale), | ||||||
|  |         ); | ||||||
|  |         if (locale.script !== undefined) | ||||||
|  |           displayName += ` (${new Intl.DisplayNames([locale], {type: "script"}).of(locale.script)})`; | ||||||
|  |         if (locale.region !== undefined) | ||||||
|  |           displayName += ` (${new Intl.DisplayNames([locale], {type: "region"}).of(locale.region)})`; | ||||||
|  |         languagePairs.set(displayName, l); | ||||||
|       } |       } | ||||||
|  |  | ||||||
|       // Manually set names for languages not available in ISO6391 |  | ||||||
|       languagePairs.set("English (AU)", "en-AU"); |  | ||||||
|       languagePairs.set("English (CA)", "en-CA"); |  | ||||||
|       languagePairs.set("English (GB)", "en-GB"); |  | ||||||
|       languagePairs.set("English (US)", "en-US"); |  | ||||||
|       languagePairs.set("Spanish (Latin America)", "es-419"); |  | ||||||
|       languagePairs.set("Spanish (Argentina)", "es-AR"); |  | ||||||
|       languagePairs.set("Spanish (Mexico)", "es-MX"); |  | ||||||
|       languagePairs.set("Spanish (US)", "es-US"); |  | ||||||
|       languagePairs.set("Portuguese (Brazil)", "pt-BR"); |  | ||||||
|       languagePairs.set("Portuguese (Portugal)", "pt-PT"); |  | ||||||
|       languagePairs.set("Serbo-Croatian", "sh"); |  | ||||||
|  |  | ||||||
|       languagePairs = new Map( |       languagePairs = new Map( | ||||||
|         [...languagePairs].sort((a, b) => (a[0] < b[0] ? -1 : 1)), |         [...languagePairs].sort((a, b) => a[0].localeCompare(b[1])), | ||||||
|       ); |       ); | ||||||
|  |  | ||||||
|       const tagField: HTMLInputElement = $root.querySelector( |       const tagField: HTMLInputElement = $root.querySelector( | ||||||
| @@ -652,8 +649,20 @@ export function initGeneralSection({$root}: GeneralSectionProps): void { | |||||||
|           maxItems: Number.POSITIVE_INFINITY, |           maxItems: Number.POSITIVE_INFINITY, | ||||||
|           closeOnSelect: false, |           closeOnSelect: false, | ||||||
|           highlightFirst: true, |           highlightFirst: true, | ||||||
|  |           position: "manual", | ||||||
|  |           classname: "settings-tagify-dropdown", | ||||||
|         }, |         }, | ||||||
|       }); |       }); | ||||||
|  |       tagify.DOM.input.addEventListener("focus", () => { | ||||||
|  |         tagify.dropdown.show(); | ||||||
|  |         $root | ||||||
|  |           .querySelector("#spellcheck-langs-value")! | ||||||
|  |           .append(tagify.DOM.dropdown); | ||||||
|  |       }); | ||||||
|  |       tagify.DOM.input.addEventListener("blur", () => { | ||||||
|  |         tagify.dropdown.hide(true); | ||||||
|  |         tagify.DOM.dropdown.remove(); | ||||||
|  |       }); | ||||||
|  |  | ||||||
|       const configuredLanguages: string[] = ( |       const configuredLanguages: string[] = ( | ||||||
|         ConfigUtil.getConfigItem("spellcheckerLanguages", null) ?? [] |         ConfigUtil.getConfigItem("spellcheckerLanguages", null) ?? [] | ||||||
|   | |||||||
| @@ -1,76 +1,74 @@ | |||||||
| import type {Html} from "../../../../common/html"; | import {type Html, html} from "../../../../common/html.js"; | ||||||
| import {html} from "../../../../common/html"; | import * as t from "../../../../common/translation-util.js"; | ||||||
| import * as t from "../../../../common/translation-util"; | import type {NavigationItem} from "../../../../common/types.js"; | ||||||
| import type {NavItem} from "../../../../common/types"; | import {generateNodeFromHtml} from "../../components/base.js"; | ||||||
| import {generateNodeFromHtml} from "../../components/base"; |  | ||||||
|  |  | ||||||
| interface PreferenceNavProps { | type PreferenceNavigationProperties = { | ||||||
|   $root: Element; |   $root: Element; | ||||||
|   onItemSelected: (navItem: NavItem) => void; |   onItemSelected: (navigationItem: NavigationItem) => void; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export default class PreferenceNav { | export default class PreferenceNavigation { | ||||||
|   props: PreferenceNavProps; |   navigationItems: Array<{navigationItem: NavigationItem; label: string}>; | ||||||
|   navItems: NavItem[]; |  | ||||||
|   $el: Element; |   $el: Element; | ||||||
|   constructor(props: PreferenceNavProps) { |   constructor(private readonly properties: PreferenceNavigationProperties) { | ||||||
|     this.props = props; |     this.navigationItems = [ | ||||||
|     this.navItems = [ |       {navigationItem: "General", label: t.__("General")}, | ||||||
|       "General", |       {navigationItem: "Network", label: t.__("Network")}, | ||||||
|       "Network", |       {navigationItem: "AddServer", label: t.__("Add Organization")}, | ||||||
|       "AddServer", |       {navigationItem: "Organizations", label: t.__("Organizations")}, | ||||||
|       "Organizations", |       {navigationItem: "Shortcuts", label: t.__("Shortcuts")}, | ||||||
|       "Shortcuts", |  | ||||||
|     ]; |     ]; | ||||||
|  |  | ||||||
|     this.$el = generateNodeFromHtml(this.templateHtml()); |     this.$el = generateNodeFromHtml(this.templateHtml()); | ||||||
|     this.props.$root.append(this.$el); |     this.properties.$root.append(this.$el); | ||||||
|     this.registerListeners(); |     this.registerListeners(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   templateHtml(): Html { |   templateHtml(): Html { | ||||||
|     const navItemsHtml = html``.join( |     const navigationItemsHtml = html``.join( | ||||||
|       this.navItems.map( |       this.navigationItems.map( | ||||||
|         (navItem) => html` |         ({navigationItem, label}) => | ||||||
|           <div class="nav" id="nav-${navItem}">${t.__(navItem)}</div> |           html`<div class="nav" id="nav-${navigationItem}">${label}</div>`, | ||||||
|         `, |  | ||||||
|       ), |       ), | ||||||
|     ); |     ); | ||||||
|  |  | ||||||
|     return html` |     return html` | ||||||
|       <div> |       <div> | ||||||
|         <div id="settings-header">${t.__("Settings")}</div> |         <div id="settings-header">${t.__("Settings")}</div> | ||||||
|         <div id="nav-container">${navItemsHtml}</div> |         <div id="nav-container">${navigationItemsHtml}</div> | ||||||
|       </div> |       </div> | ||||||
|     `; |     `; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   registerListeners(): void { |   registerListeners(): void { | ||||||
|     for (const navItem of this.navItems) { |     for (const {navigationItem} of this.navigationItems) { | ||||||
|       const $item = this.$el.querySelector(`#nav-${CSS.escape(navItem)}`)!; |       const $item = this.$el.querySelector( | ||||||
|  |         `#nav-${CSS.escape(navigationItem)}`, | ||||||
|  |       )!; | ||||||
|       $item.addEventListener("click", () => { |       $item.addEventListener("click", () => { | ||||||
|         this.props.onItemSelected(navItem); |         this.properties.onItemSelected(navigationItem); | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   select(navItemToSelect: NavItem): void { |   select(navigationItemToSelect: NavigationItem): void { | ||||||
|     for (const navItem of this.navItems) { |     for (const {navigationItem} of this.navigationItems) { | ||||||
|       if (navItem === navItemToSelect) { |       if (navigationItem === navigationItemToSelect) { | ||||||
|         this.activate(navItem); |         this.activate(navigationItem); | ||||||
|       } else { |       } else { | ||||||
|         this.deactivate(navItem); |         this.deactivate(navigationItem); | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   activate(navItem: NavItem): void { |   activate(navigationItem: NavigationItem): void { | ||||||
|     const $item = this.$el.querySelector(`#nav-${CSS.escape(navItem)}`)!; |     const $item = this.$el.querySelector(`#nav-${CSS.escape(navigationItem)}`)!; | ||||||
|     $item.classList.add("active"); |     $item.classList.add("active"); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   deactivate(navItem: NavItem): void { |   deactivate(navigationItem: NavigationItem): void { | ||||||
|     const $item = this.$el.querySelector(`#nav-${CSS.escape(navItem)}`)!; |     const $item = this.$el.querySelector(`#nav-${CSS.escape(navigationItem)}`)!; | ||||||
|     $item.classList.remove("active"); |     $item.classList.remove("active"); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,15 +1,15 @@ | |||||||
| import * as ConfigUtil from "../../../../common/config-util"; | import * as ConfigUtil from "../../../../common/config-util.js"; | ||||||
| import {html} from "../../../../common/html"; | import {html} from "../../../../common/html.js"; | ||||||
| import * as t from "../../../../common/translation-util"; | import * as t from "../../../../common/translation-util.js"; | ||||||
| import {ipcRenderer} from "../../typed-ipc-renderer"; | import {ipcRenderer} from "../../typed-ipc-renderer.js"; | ||||||
|  |  | ||||||
| import {generateSettingOption} from "./base-section"; | import {generateSettingOption} from "./base-section.js"; | ||||||
|  |  | ||||||
| interface NetworkSectionProps { | type NetworkSectionProperties = { | ||||||
|   $root: Element; |   $root: Element; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export function initNetworkSection({$root}: NetworkSectionProps): void { | export function initNetworkSection({$root}: NetworkSectionProperties): void { | ||||||
|   $root.innerHTML = html` |   $root.innerHTML = html` | ||||||
|     <div class="settings-pane"> |     <div class="settings-pane"> | ||||||
|       <div class="title">${t.__("Proxy")}</div> |       <div class="title">${t.__("Proxy")}</div> | ||||||
|   | |||||||
| @@ -1,18 +1,21 @@ | |||||||
| import {dialog} from "@electron/remote"; | import {dialog} from "@electron/remote"; | ||||||
|  |  | ||||||
| import {html} from "../../../../common/html"; | import {html} from "../../../../common/html.js"; | ||||||
| import * as LinkUtil from "../../../../common/link-util"; | import * as LinkUtil from "../../../../common/link-util.js"; | ||||||
| import * as t from "../../../../common/translation-util"; | import * as t from "../../../../common/translation-util.js"; | ||||||
| import {generateNodeFromHtml} from "../../components/base"; | import {generateNodeFromHtml} from "../../components/base.js"; | ||||||
| import {ipcRenderer} from "../../typed-ipc-renderer"; | import {ipcRenderer} from "../../typed-ipc-renderer.js"; | ||||||
| import * as DomainUtil from "../../utils/domain-util"; | import * as DomainUtil from "../../utils/domain-util.js"; | ||||||
|  |  | ||||||
| interface NewServerFormProps { | type NewServerFormProperties = { | ||||||
|   $root: Element; |   $root: Element; | ||||||
|   onChange: () => void; |   onChange: () => void; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export function initNewServerForm({$root, onChange}: NewServerFormProps): void { | export function initNewServerForm({ | ||||||
|  |   $root, | ||||||
|  |   onChange, | ||||||
|  | }: NewServerFormProperties): void { | ||||||
|   const $newServerForm = generateNodeFromHtml(html` |   const $newServerForm = generateNodeFromHtml(html` | ||||||
|     <div class="server-input-container"> |     <div class="server-input-container"> | ||||||
|       <div class="title">${t.__("Organization URL")}</div> |       <div class="title">${t.__("Organization URL")}</div> | ||||||
| @@ -58,9 +61,9 @@ export function initNewServerForm({$root, onChange}: NewServerFormProps): void { | |||||||
|  |  | ||||||
|   async function submitFormHandler(): Promise<void> { |   async function submitFormHandler(): Promise<void> { | ||||||
|     $saveServerButton.textContent = "Connecting..."; |     $saveServerButton.textContent = "Connecting..."; | ||||||
|     let serverConf; |     let serverConfig; | ||||||
|     try { |     try { | ||||||
|       serverConf = await DomainUtil.checkDomain($newServerUrl.value.trim()); |       serverConfig = await DomainUtil.checkDomain($newServerUrl.value.trim()); | ||||||
|     } catch (error: unknown) { |     } catch (error: unknown) { | ||||||
|       $saveServerButton.textContent = "Connect"; |       $saveServerButton.textContent = "Connect"; | ||||||
|       await dialog.showMessageBox({ |       await dialog.showMessageBox({ | ||||||
| @@ -68,13 +71,13 @@ export function initNewServerForm({$root, onChange}: NewServerFormProps): void { | |||||||
|         message: |         message: | ||||||
|           error instanceof Error |           error instanceof Error | ||||||
|             ? `${error.name}: ${error.message}` |             ? `${error.name}: ${error.message}` | ||||||
|             : "Unknown error", |             : t.__("Unknown error"), | ||||||
|         buttons: ["OK"], |         buttons: [t.__("OK")], | ||||||
|       }); |       }); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     await DomainUtil.addDomain(serverConf); |     await DomainUtil.addDomain(serverConfig); | ||||||
|     onChange(); |     onChange(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,46 +1,37 @@ | |||||||
|  | import type {IpcRendererEvent} from "electron/renderer"; | ||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
|  |  | ||||||
| import type {DndSettings} from "../../../../common/dnd-util"; | import type {DndSettings} from "../../../../common/dnd-util.js"; | ||||||
| import {html} from "../../../../common/html"; | import {bundleUrl} from "../../../../common/paths.js"; | ||||||
| import type {NavItem} from "../../../../common/types"; | import type {NavigationItem} from "../../../../common/types.js"; | ||||||
| import {ipcRenderer} from "../../typed-ipc-renderer"; | import {ipcRenderer} from "../../typed-ipc-renderer.js"; | ||||||
|  |  | ||||||
| import {initConnectedOrgSection} from "./connected-org-section"; | import {initConnectedOrgSection} from "./connected-org-section.js"; | ||||||
| import {initGeneralSection} from "./general-section"; | import {initGeneralSection} from "./general-section.js"; | ||||||
| import Nav from "./nav"; | import Nav from "./nav.js"; | ||||||
| import {initNetworkSection} from "./network-section"; | import {initNetworkSection} from "./network-section.js"; | ||||||
| import {initServersSection} from "./servers-section"; | import {initServersSection} from "./servers-section.js"; | ||||||
| import {initShortcutsSection} from "./shortcuts-section"; | import {initShortcutsSection} from "./shortcuts-section.js"; | ||||||
|  |  | ||||||
| export class PreferenceView { | export class PreferenceView { | ||||||
|  |   static async create(): Promise<PreferenceView> { | ||||||
|  |     return new PreferenceView( | ||||||
|  |       await ( | ||||||
|  |         await fetch(new URL("app/renderer/preference.html", bundleUrl)) | ||||||
|  |       ).text(), | ||||||
|  |     ); | ||||||
|  |   } | ||||||
|  |  | ||||||
|   readonly $view: HTMLElement; |   readonly $view: HTMLElement; | ||||||
|   private readonly $shadow: ShadowRoot; |   private readonly $shadow: ShadowRoot; | ||||||
|   private readonly $settingsContainer: Element; |   private readonly $settingsContainer: Element; | ||||||
|   private readonly nav: Nav; |   private readonly nav: Nav; | ||||||
|   private navItem: NavItem = "General"; |   private navigationItem: NavigationItem = "General"; | ||||||
|  |  | ||||||
|   constructor() { |   private constructor(templateHtml: string) { | ||||||
|     this.$view = document.createElement("div"); |     this.$view = document.createElement("div"); | ||||||
|     this.$shadow = this.$view.attachShadow({mode: "open"}); |     this.$shadow = this.$view.attachShadow({mode: "open"}); | ||||||
|     this.$shadow.innerHTML = html` |     this.$shadow.innerHTML = templateHtml; | ||||||
|       <link |  | ||||||
|         rel="stylesheet" |  | ||||||
|         href="${require.resolve("../../../css/fonts.css")}" |  | ||||||
|       /> |  | ||||||
|       <link |  | ||||||
|         rel="stylesheet" |  | ||||||
|         href="${require.resolve("../../../css/preference.css")}" |  | ||||||
|       /> |  | ||||||
|       <link |  | ||||||
|         rel="stylesheet" |  | ||||||
|         href="${require.resolve("@yaireo/tagify/dist/tagify.css")}" |  | ||||||
|       /> |  | ||||||
|       <!-- Initially hidden to prevent FOUC --> |  | ||||||
|       <div id="content" hidden> |  | ||||||
|         <div id="sidebar"></div> |  | ||||||
|         <div id="settings-container"></div> |  | ||||||
|       </div> |  | ||||||
|     `.html; |  | ||||||
|  |  | ||||||
|     const $sidebarContainer = this.$shadow.querySelector("#sidebar")!; |     const $sidebarContainer = this.$shadow.querySelector("#sidebar")!; | ||||||
|     this.$settingsContainer = this.$shadow.querySelector( |     this.$settingsContainer = this.$shadow.querySelector( | ||||||
| @@ -56,36 +47,40 @@ export class PreferenceView { | |||||||
|     ipcRenderer.on("toggle-autohide-menubar", this.handleToggleMenubar); |     ipcRenderer.on("toggle-autohide-menubar", this.handleToggleMenubar); | ||||||
|     ipcRenderer.on("toggle-dnd", this.handleToggleDnd); |     ipcRenderer.on("toggle-dnd", this.handleToggleDnd); | ||||||
|  |  | ||||||
|     this.handleNavigation(this.navItem); |     this.handleNavigation(this.navigationItem); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   handleNavigation = (navItem: NavItem): void => { |   handleNavigation = (navigationItem: NavigationItem): void => { | ||||||
|     this.navItem = navItem; |     this.navigationItem = navigationItem; | ||||||
|     this.nav.select(navItem); |     this.nav.select(navigationItem); | ||||||
|     switch (navItem) { |     switch (navigationItem) { | ||||||
|       case "AddServer": |       case "AddServer": { | ||||||
|         initServersSection({ |         initServersSection({ | ||||||
|           $root: this.$settingsContainer, |           $root: this.$settingsContainer, | ||||||
|         }); |         }); | ||||||
|         break; |         break; | ||||||
|  |       } | ||||||
|  |  | ||||||
|       case "General": |       case "General": { | ||||||
|         initGeneralSection({ |         initGeneralSection({ | ||||||
|           $root: this.$settingsContainer, |           $root: this.$settingsContainer, | ||||||
|         }); |         }); | ||||||
|         break; |         break; | ||||||
|  |       } | ||||||
|  |  | ||||||
|       case "Organizations": |       case "Organizations": { | ||||||
|         initConnectedOrgSection({ |         initConnectedOrgSection({ | ||||||
|           $root: this.$settingsContainer, |           $root: this.$settingsContainer, | ||||||
|         }); |         }); | ||||||
|         break; |         break; | ||||||
|  |       } | ||||||
|  |  | ||||||
|       case "Network": |       case "Network": { | ||||||
|         initNetworkSection({ |         initNetworkSection({ | ||||||
|           $root: this.$settingsContainer, |           $root: this.$settingsContainer, | ||||||
|         }); |         }); | ||||||
|         break; |         break; | ||||||
|  |       } | ||||||
|  |  | ||||||
|       case "Shortcuts": { |       case "Shortcuts": { | ||||||
|         initShortcutsSection({ |         initShortcutsSection({ | ||||||
| @@ -93,12 +88,9 @@ export class PreferenceView { | |||||||
|         }); |         }); | ||||||
|         break; |         break; | ||||||
|       } |       } | ||||||
|  |  | ||||||
|       default: |  | ||||||
|         ((n: never) => n)(navItem); |  | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     window.location.hash = `#${navItem}`; |     location.hash = `#${navigationItem}`; | ||||||
|   }; |   }; | ||||||
|  |  | ||||||
|   handleToggleTray(state: boolean) { |   handleToggleTray(state: boolean) { | ||||||
| @@ -120,16 +112,22 @@ export class PreferenceView { | |||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   private readonly handleToggleSidebar = (_event: Event, state: boolean) => { |   private readonly handleToggleSidebar = ( | ||||||
|  |     _event: IpcRendererEvent, | ||||||
|  |     state: boolean, | ||||||
|  |   ) => { | ||||||
|     this.handleToggle("sidebar-option", state); |     this.handleToggle("sidebar-option", state); | ||||||
|   }; |   }; | ||||||
|  |  | ||||||
|   private readonly handleToggleMenubar = (_event: Event, state: boolean) => { |   private readonly handleToggleMenubar = ( | ||||||
|  |     _event: IpcRendererEvent, | ||||||
|  |     state: boolean, | ||||||
|  |   ) => { | ||||||
|     this.handleToggle("menubar-option", state); |     this.handleToggle("menubar-option", state); | ||||||
|   }; |   }; | ||||||
|  |  | ||||||
|   private readonly handleToggleDnd = ( |   private readonly handleToggleDnd = ( | ||||||
|     _event: Event, |     _event: IpcRendererEvent, | ||||||
|     _state: boolean, |     _state: boolean, | ||||||
|     newSettings: Partial<DndSettings>, |     newSettings: Partial<DndSettings>, | ||||||
|   ) => { |   ) => { | ||||||
|   | |||||||
| @@ -1,34 +1,37 @@ | |||||||
| import {dialog} from "@electron/remote"; | import {dialog} from "@electron/remote"; | ||||||
|  |  | ||||||
| import {html} from "../../../../common/html"; | import {html} from "../../../../common/html.js"; | ||||||
| import * as Messages from "../../../../common/messages"; | import * as Messages from "../../../../common/messages.js"; | ||||||
| import * as t from "../../../../common/translation-util"; | import * as t from "../../../../common/translation-util.js"; | ||||||
| import type {ServerConf} from "../../../../common/types"; | import type {ServerConfig} from "../../../../common/types.js"; | ||||||
| import {generateNodeFromHtml} from "../../components/base"; | import {generateNodeFromHtml} from "../../components/base.js"; | ||||||
| import {ipcRenderer} from "../../typed-ipc-renderer"; | import {ipcRenderer} from "../../typed-ipc-renderer.js"; | ||||||
| import * as DomainUtil from "../../utils/domain-util"; | import * as DomainUtil from "../../utils/domain-util.js"; | ||||||
|  |  | ||||||
| interface ServerInfoFormProps { | type ServerInfoFormProperties = { | ||||||
|   $root: Element; |   $root: Element; | ||||||
|   server: ServerConf; |   server: ServerConfig; | ||||||
|   index: number; |   index: number; | ||||||
|   onChange: () => void; |   onChange: () => void; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export function initServerInfoForm(props: ServerInfoFormProps): void { | export function initServerInfoForm(properties: ServerInfoFormProperties): void { | ||||||
|   const $serverInfoForm = generateNodeFromHtml(html` |   const $serverInfoForm = generateNodeFromHtml(html` | ||||||
|     <div class="settings-card"> |     <div class="settings-card"> | ||||||
|       <div class="server-info-left"> |       <div class="server-info-left"> | ||||||
|         <img class="server-info-icon" src="${props.server.icon}" /> |         <img | ||||||
|  |           class="server-info-icon" | ||||||
|  |           src="${DomainUtil.iconAsUrl(properties.server.icon)}" | ||||||
|  |         /> | ||||||
|         <div class="server-info-row"> |         <div class="server-info-row"> | ||||||
|           <span class="server-info-alias">${props.server.alias}</span> |           <span class="server-info-alias">${properties.server.alias}</span> | ||||||
|           <i class="material-icons open-tab-button">open_in_new</i> |           <i class="material-icons open-tab-button">open_in_new</i> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|       <div class="server-info-right"> |       <div class="server-info-right"> | ||||||
|         <div class="server-info-row server-url"> |         <div class="server-info-row server-url"> | ||||||
|           <span class="server-url-info" title="${props.server.url}" |           <span class="server-url-info" title="${properties.server.url}" | ||||||
|             >${props.server.url}</span |             >${properties.server.url}</span | ||||||
|           > |           > | ||||||
|         </div> |         </div> | ||||||
|         <div class="server-info-row"> |         <div class="server-info-row"> | ||||||
| @@ -45,21 +48,21 @@ export function initServerInfoForm(props: ServerInfoFormProps): void { | |||||||
|     ".server-delete-action", |     ".server-delete-action", | ||||||
|   )!; |   )!; | ||||||
|   const $openServerButton = $serverInfoForm.querySelector(".open-tab-button")!; |   const $openServerButton = $serverInfoForm.querySelector(".open-tab-button")!; | ||||||
|   props.$root.append($serverInfoForm); |   properties.$root.append($serverInfoForm); | ||||||
|  |  | ||||||
|   $deleteServerButton.addEventListener("click", async () => { |   $deleteServerButton.addEventListener("click", async () => { | ||||||
|     const {response} = await dialog.showMessageBox({ |     const {response} = await dialog.showMessageBox({ | ||||||
|       type: "warning", |       type: "warning", | ||||||
|       buttons: [t.__("YES"), t.__("NO")], |       buttons: [t.__("Yes"), t.__("No")], | ||||||
|       defaultId: 0, |       defaultId: 0, | ||||||
|       message: t.__("Are you sure you want to disconnect this organization?"), |       message: t.__("Are you sure you want to disconnect this organization?"), | ||||||
|     }); |     }); | ||||||
|     if (response === 0) { |     if (response === 0) { | ||||||
|       if (DomainUtil.removeDomain(props.index)) { |       if (DomainUtil.removeDomain(properties.index)) { | ||||||
|         ipcRenderer.send("reload-full-app"); |         ipcRenderer.send("reload-full-app"); | ||||||
|       } else { |       } else { | ||||||
|         const {title, content} = Messages.orgRemovalError( |         const {title, content} = Messages.orgRemovalError( | ||||||
|           DomainUtil.getDomain(props.index).url, |           DomainUtil.getDomain(properties.index).url, | ||||||
|         ); |         ); | ||||||
|         dialog.showErrorBox(title, content); |         dialog.showErrorBox(title, content); | ||||||
|       } |       } | ||||||
| @@ -67,14 +70,14 @@ export function initServerInfoForm(props: ServerInfoFormProps): void { | |||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   $openServerButton.addEventListener("click", () => { |   $openServerButton.addEventListener("click", () => { | ||||||
|     ipcRenderer.send("forward-message", "switch-server-tab", props.index); |     ipcRenderer.send("forward-message", "switch-server-tab", properties.index); | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   $serverInfoAlias.addEventListener("click", () => { |   $serverInfoAlias.addEventListener("click", () => { | ||||||
|     ipcRenderer.send("forward-message", "switch-server-tab", props.index); |     ipcRenderer.send("forward-message", "switch-server-tab", properties.index); | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   $serverIcon.addEventListener("click", () => { |   $serverIcon.addEventListener("click", () => { | ||||||
|     ipcRenderer.send("forward-message", "switch-server-tab", props.index); |     ipcRenderer.send("forward-message", "switch-server-tab", properties.index); | ||||||
|   }); |   }); | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,14 +1,14 @@ | |||||||
| import {html} from "../../../../common/html"; | import {html} from "../../../../common/html.js"; | ||||||
| import * as t from "../../../../common/translation-util"; | import * as t from "../../../../common/translation-util.js"; | ||||||
|  |  | ||||||
| import {reloadApp} from "./base-section"; | import {reloadApp} from "./base-section.js"; | ||||||
| import {initNewServerForm} from "./new-server-form"; | import {initNewServerForm} from "./new-server-form.js"; | ||||||
|  |  | ||||||
| interface ServersSectionProps { | type ServersSectionProperties = { | ||||||
|   $root: Element; |   $root: Element; | ||||||
| } | }; | ||||||
|  |  | ||||||
| export function initServersSection({$root}: ServersSectionProps): void { | export function initServersSection({$root}: ServersSectionProperties): void { | ||||||
|   $root.innerHTML = html` |   $root.innerHTML = html` | ||||||
|     <div class="add-server-modal"> |     <div class="add-server-modal"> | ||||||
|       <div class="modal-container"> |       <div class="modal-container"> | ||||||
|   | |||||||
| @@ -1,15 +1,17 @@ | |||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
|  |  | ||||||
| import {html} from "../../../../common/html"; | import {html} from "../../../../common/html.js"; | ||||||
| import * as LinkUtil from "../../../../common/link-util"; | import * as LinkUtil from "../../../../common/link-util.js"; | ||||||
| import * as t from "../../../../common/translation-util"; | import * as t from "../../../../common/translation-util.js"; | ||||||
|  |  | ||||||
| interface ShortcutsSectionProps { | type ShortcutsSectionProperties = { | ||||||
|   $root: Element; |   $root: Element; | ||||||
| } | }; | ||||||
|  |  | ||||||
| // eslint-disable-next-line complexity | // eslint-disable-next-line complexity | ||||||
| export function initShortcutsSection({$root}: ShortcutsSectionProps): void { | export function initShortcutsSection({ | ||||||
|  |   $root, | ||||||
|  | }: ShortcutsSectionProperties): void { | ||||||
|   const cmdOrCtrl = process.platform === "darwin" ? "⌘" : "Ctrl"; |   const cmdOrCtrl = process.platform === "darwin" ? "⌘" : "Ctrl"; | ||||||
|  |  | ||||||
|   $root.innerHTML = html` |   $root.innerHTML = html` | ||||||
|   | |||||||
| @@ -1,68 +1,21 @@ | |||||||
| import {contextBridge, webFrame} from "electron/renderer"; | import {contextBridge} from "electron/renderer"; | ||||||
| import fs from "node:fs"; |  | ||||||
|  |  | ||||||
| import electron_bridge, {bridgeEvents} from "./electron-bridge"; | import electron_bridge, {bridgeEvents} from "./electron-bridge.js"; | ||||||
| import * as NetworkError from "./pages/network"; | import * as NetworkError from "./pages/network.js"; | ||||||
| import {ipcRenderer} from "./typed-ipc-renderer"; | import {ipcRenderer} from "./typed-ipc-renderer.js"; | ||||||
|  |  | ||||||
| contextBridge.exposeInMainWorld("raw_electron_bridge", electron_bridge); | contextBridge.exposeInMainWorld("electron_bridge", electron_bridge); | ||||||
|  |  | ||||||
| ipcRenderer.on("logout", () => { | ipcRenderer.on("logout", () => { | ||||||
|   if (bridgeEvents.emit("logout")) { |   bridgeEvents.emit("logout"); | ||||||
|     return; |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   // Create the menu for the below |  | ||||||
|   const dropdown: HTMLElement = document.querySelector(".dropdown-toggle")!; |  | ||||||
|   dropdown.click(); |  | ||||||
|  |  | ||||||
|   const nodes: NodeListOf<HTMLElement> = document.querySelectorAll( |  | ||||||
|     ".dropdown-menu li:last-child a", |  | ||||||
|   ); |  | ||||||
|   nodes[nodes.length - 1].click(); |  | ||||||
| }); | }); | ||||||
|  |  | ||||||
| ipcRenderer.on("show-keyboard-shortcuts", () => { | ipcRenderer.on("show-keyboard-shortcuts", () => { | ||||||
|   if (bridgeEvents.emit("show-keyboard-shortcuts")) { |   bridgeEvents.emit("show-keyboard-shortcuts"); | ||||||
|     return; |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   // Create the menu for the below |  | ||||||
|   const node: HTMLElement = document.querySelector( |  | ||||||
|     "a[data-overlay-trigger=keyboard-shortcuts]", |  | ||||||
|   )!; |  | ||||||
|   // Additional check |  | ||||||
|   if (node.textContent!.trim().toLowerCase() === "keyboard shortcuts (?)") { |  | ||||||
|     node.click(); |  | ||||||
|   } else { |  | ||||||
|     // Atleast click the dropdown |  | ||||||
|     const dropdown: HTMLElement = document.querySelector(".dropdown-toggle")!; |  | ||||||
|     dropdown.click(); |  | ||||||
|   } |  | ||||||
| }); | }); | ||||||
|  |  | ||||||
| ipcRenderer.on("show-notification-settings", () => { | ipcRenderer.on("show-notification-settings", () => { | ||||||
|   if (bridgeEvents.emit("show-notification-settings")) { |   bridgeEvents.emit("show-notification-settings"); | ||||||
|     return; |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   // Create the menu for the below |  | ||||||
|   const dropdown: HTMLElement = document.querySelector(".dropdown-toggle")!; |  | ||||||
|   dropdown.click(); |  | ||||||
|  |  | ||||||
|   const nodes: NodeListOf<HTMLElement> = document.querySelectorAll( |  | ||||||
|     ".dropdown-menu li a", |  | ||||||
|   ); |  | ||||||
|   nodes[2].click(); |  | ||||||
|  |  | ||||||
|   const notificationItem: NodeListOf<HTMLElement> = document.querySelectorAll( |  | ||||||
|     ".normal-settings-list li div", |  | ||||||
|   ); |  | ||||||
|  |  | ||||||
|   // Wait until the notification dom element shows up |  | ||||||
|   setTimeout(() => { |  | ||||||
|     notificationItem[2].click(); |  | ||||||
|   }, 100); |  | ||||||
| }); | }); | ||||||
|  |  | ||||||
| window.addEventListener("load", () => { | window.addEventListener("load", () => { | ||||||
| @@ -74,8 +27,3 @@ window.addEventListener("load", () => { | |||||||
|   const $settingsButton = document.querySelector("#settings")!; |   const $settingsButton = document.querySelector("#settings")!; | ||||||
|   NetworkError.init($reconnectButton, $settingsButton); |   NetworkError.init($reconnectButton, $settingsButton); | ||||||
| }); | }); | ||||||
|  |  | ||||||
| (async () => |  | ||||||
|   webFrame.executeJavaScript( |  | ||||||
|     fs.readFileSync(require.resolve("./injected"), "utf8"), |  | ||||||
|   ))(); |  | ||||||
|   | |||||||
| @@ -1,24 +1,20 @@ | |||||||
| import type {NativeImage} from "electron/common"; | import {type NativeImage, nativeImage} from "electron/common"; | ||||||
| import {nativeImage} from "electron/common"; |  | ||||||
| import type {Tray as ElectronTray} from "electron/main"; | import type {Tray as ElectronTray} from "electron/main"; | ||||||
| import path from "node:path"; | import path from "node:path"; | ||||||
| import process from "node:process"; | import process from "node:process"; | ||||||
|  |  | ||||||
| import {BrowserWindow, Menu, Tray} from "@electron/remote"; | import {BrowserWindow, Menu, Tray} from "@electron/remote"; | ||||||
|  |  | ||||||
| import * as ConfigUtil from "../../common/config-util"; | import * as ConfigUtil from "../../common/config-util.js"; | ||||||
| import type {RendererMessage} from "../../common/typed-ipc"; | import {publicPath} from "../../common/paths.js"; | ||||||
|  | import type {RendererMessage} from "../../common/typed-ipc.js"; | ||||||
|  |  | ||||||
| import type {ServerManagerView} from "./main"; | import type {ServerManagerView} from "./main.js"; | ||||||
| import {ipcRenderer} from "./typed-ipc-renderer"; | import {ipcRenderer} from "./typed-ipc-renderer.js"; | ||||||
|  |  | ||||||
| let tray: ElectronTray | null = null; | let tray: ElectronTray | null = null; | ||||||
|  |  | ||||||
| const iconDir = "../../resources/tray"; | const appIcon = path.join(publicPath, "resources/tray/tray"); | ||||||
|  |  | ||||||
| const traySuffix = "tray"; |  | ||||||
|  |  | ||||||
| const appIcon = path.join(__dirname, iconDir, traySuffix); |  | ||||||
|  |  | ||||||
| const iconPath = (): string => { | const iconPath = (): string => { | ||||||
|   if (process.platform === "linux") { |   if (process.platform === "linux") { | ||||||
| @@ -36,14 +32,21 @@ let unread = 0; | |||||||
|  |  | ||||||
| const trayIconSize = (): number => { | const trayIconSize = (): number => { | ||||||
|   switch (process.platform) { |   switch (process.platform) { | ||||||
|     case "darwin": |     case "darwin": { | ||||||
|       return 20; |       return 20; | ||||||
|     case "win32": |     } | ||||||
|  |  | ||||||
|  |     case "win32": { | ||||||
|       return 100; |       return 100; | ||||||
|     case "linux": |     } | ||||||
|  |  | ||||||
|  |     case "linux": { | ||||||
|       return 100; |       return 100; | ||||||
|     default: |     } | ||||||
|  |  | ||||||
|  |     default: { | ||||||
|       return 80; |       return 80; | ||||||
|  |     } | ||||||
|   } |   } | ||||||
| }; | }; | ||||||
|  |  | ||||||
| @@ -60,8 +63,8 @@ const config = { | |||||||
|   thick: process.platform === "win32", |   thick: process.platform === "win32", | ||||||
| }; | }; | ||||||
|  |  | ||||||
| const renderCanvas = function (arg: number): HTMLCanvasElement { | const renderCanvas = function (argument: number): HTMLCanvasElement { | ||||||
|   config.unreadCount = arg; |   config.unreadCount = argument; | ||||||
|  |  | ||||||
|   const size = config.size * config.pixelRatio; |   const size = config.size * config.pixelRatio; | ||||||
|   const padding = size * 0.05; |   const padding = size * 0.05; | ||||||
| @@ -75,30 +78,34 @@ const renderCanvas = function (arg: number): HTMLCanvasElement { | |||||||
|   const canvas = document.createElement("canvas"); |   const canvas = document.createElement("canvas"); | ||||||
|   canvas.width = size; |   canvas.width = size; | ||||||
|   canvas.height = size; |   canvas.height = size; | ||||||
|   const ctx = canvas.getContext("2d")!; |   const context = canvas.getContext("2d")!; | ||||||
|  |  | ||||||
|   // Circle |   // Circle | ||||||
|   // If (!config.thick || config.thick && hasCount) { |   // If (!config.thick || config.thick && hasCount) { | ||||||
|   ctx.beginPath(); |   context.beginPath(); | ||||||
|   ctx.arc(center, center, size / 2 - padding, 0, 2 * Math.PI, false); |   context.arc(center, center, size / 2 - padding, 0, 2 * Math.PI, false); | ||||||
|   ctx.fillStyle = backgroundColor; |   context.fillStyle = backgroundColor; | ||||||
|   ctx.fill(); |   context.fill(); | ||||||
|   ctx.lineWidth = size / (config.thick ? 10 : 20); |   context.lineWidth = size / (config.thick ? 10 : 20); | ||||||
|   ctx.strokeStyle = backgroundColor; |   context.strokeStyle = backgroundColor; | ||||||
|   ctx.stroke(); |   context.stroke(); | ||||||
|   // Count or Icon |   // Count or Icon | ||||||
|   if (hasCount) { |   if (hasCount) { | ||||||
|     ctx.fillStyle = color; |     context.fillStyle = color; | ||||||
|     ctx.textAlign = "center"; |     context.textAlign = "center"; | ||||||
|     if (config.unreadCount > 99) { |     if (config.unreadCount > 99) { | ||||||
|       ctx.font = `${config.thick ? "bold " : ""}${size * 0.4}px Helvetica`; |       context.font = `${config.thick ? "bold " : ""}${size * 0.4}px Helvetica`; | ||||||
|       ctx.fillText("99+", center, center + size * 0.15); |       context.fillText("99+", center, center + size * 0.15); | ||||||
|     } else if (config.unreadCount < 10) { |     } else if (config.unreadCount < 10) { | ||||||
|       ctx.font = `${config.thick ? "bold " : ""}${size * 0.5}px Helvetica`; |       context.font = `${config.thick ? "bold " : ""}${size * 0.5}px Helvetica`; | ||||||
|       ctx.fillText(String(config.unreadCount), center, center + size * 0.2); |       context.fillText(String(config.unreadCount), center, center + size * 0.2); | ||||||
|     } else { |     } else { | ||||||
|       ctx.font = `${config.thick ? "bold " : ""}${size * 0.5}px Helvetica`; |       context.font = `${config.thick ? "bold " : ""}${size * 0.5}px Helvetica`; | ||||||
|       ctx.fillText(String(config.unreadCount), center, center + size * 0.15); |       context.fillText( | ||||||
|  |         String(config.unreadCount), | ||||||
|  |         center, | ||||||
|  |         center + size * 0.15, | ||||||
|  |       ); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
| @@ -110,12 +117,12 @@ const renderCanvas = function (arg: number): HTMLCanvasElement { | |||||||
|  * @param arg: Unread count |  * @param arg: Unread count | ||||||
|  * @return the native image |  * @return the native image | ||||||
|  */ |  */ | ||||||
| const renderNativeImage = function (arg: number): NativeImage { | const renderNativeImage = function (argument: number): NativeImage { | ||||||
|   if (process.platform === "win32") { |   if (process.platform === "win32") { | ||||||
|     return nativeImage.createFromPath(winUnreadTrayIconPath()); |     return nativeImage.createFromPath(winUnreadTrayIconPath()); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   const canvas = renderCanvas(arg); |   const canvas = renderCanvas(argument); | ||||||
|   const pngData = nativeImage |   const pngData = nativeImage | ||||||
|     .createFromDataURL(canvas.toDataURL("image/png")) |     .createFromDataURL(canvas.toDataURL("image/png")) | ||||||
|     .toPNG(); |     .toPNG(); | ||||||
| @@ -126,7 +133,7 @@ const renderNativeImage = function (arg: number): NativeImage { | |||||||
|  |  | ||||||
| function sendAction<Channel extends keyof RendererMessage>( | function sendAction<Channel extends keyof RendererMessage>( | ||||||
|   channel: Channel, |   channel: Channel, | ||||||
|   ...args: Parameters<RendererMessage[Channel]> |   ...arguments_: Parameters<RendererMessage[Channel]> | ||||||
| ): void { | ): void { | ||||||
|   const win = BrowserWindow.getAllWindows()[0]; |   const win = BrowserWindow.getAllWindows()[0]; | ||||||
|  |  | ||||||
| @@ -134,7 +141,7 @@ function sendAction<Channel extends keyof RendererMessage>( | |||||||
|     win.restore(); |     win.restore(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   ipcRenderer.sendTo(win.webContents.id, channel, ...args); |   ipcRenderer.send("forward-to", win.webContents.id, channel, ...arguments_); | ||||||
| } | } | ||||||
|  |  | ||||||
| const createTray = function (): void { | const createTray = function (): void { | ||||||
| @@ -172,7 +179,7 @@ const createTray = function (): void { | |||||||
| }; | }; | ||||||
|  |  | ||||||
| export function initializeTray(serverManagerView: ServerManagerView) { | export function initializeTray(serverManagerView: ServerManagerView) { | ||||||
|   ipcRenderer.on("destroytray", (_event: Event) => { |   ipcRenderer.on("destroytray", () => { | ||||||
|     if (!tray) { |     if (!tray) { | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
| @@ -185,22 +192,22 @@ export function initializeTray(serverManagerView: ServerManagerView) { | |||||||
|     } |     } | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   ipcRenderer.on("tray", (_event: Event, arg: number): void => { |   ipcRenderer.on("tray", (_event, argument: number): void => { | ||||||
|     if (!tray) { |     if (!tray) { | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     // We don't want to create tray from unread messages on macOS since it already has dock badges. |     // We don't want to create tray from unread messages on macOS since it already has dock badges. | ||||||
|     if (process.platform === "linux" || process.platform === "win32") { |     if (process.platform === "linux" || process.platform === "win32") { | ||||||
|       if (arg === 0) { |       if (argument === 0) { | ||||||
|         unread = arg; |         unread = argument; | ||||||
|         tray.setImage(iconPath()); |         tray.setImage(iconPath()); | ||||||
|         tray.setToolTip("No unread messages"); |         tray.setToolTip("No unread messages"); | ||||||
|       } else { |       } else { | ||||||
|         unread = arg; |         unread = argument; | ||||||
|         const image = renderNativeImage(arg); |         const image = renderNativeImage(argument); | ||||||
|         tray.setImage(image); |         tray.setImage(image); | ||||||
|         tray.setToolTip(`${arg} unread messages`); |         tray.setToolTip(`${argument} unread messages`); | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|   }); |   }); | ||||||
| @@ -236,5 +243,3 @@ export function initializeTray(serverManagerView: ServerManagerView) { | |||||||
|     createTray(); |     createTray(); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| export {}; |  | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| import type {IpcRendererEvent} from "electron/renderer"; |  | ||||||
| import { | import { | ||||||
|  |   type IpcRendererEvent, | ||||||
|   ipcRenderer as untypedIpcRenderer, // eslint-disable-line no-restricted-imports |   ipcRenderer as untypedIpcRenderer, // eslint-disable-line no-restricted-imports | ||||||
| } from "electron/renderer"; | } from "electron/renderer"; | ||||||
|  |  | ||||||
| @@ -7,11 +7,11 @@ import type { | |||||||
|   MainCall, |   MainCall, | ||||||
|   MainMessage, |   MainMessage, | ||||||
|   RendererMessage, |   RendererMessage, | ||||||
| } from "../../common/typed-ipc"; | } from "../../common/typed-ipc.js"; | ||||||
|  |  | ||||||
| type RendererListener<Channel extends keyof RendererMessage> = | type RendererListener<Channel extends keyof RendererMessage> = | ||||||
|   RendererMessage[Channel] extends (...args: infer Args) => void |   RendererMessage[Channel] extends (...arguments_: infer Arguments) => void | ||||||
|     ? (event: IpcRendererEvent, ...args: Args) => void |     ? (event: IpcRendererEvent, ...arguments_: Arguments) => void | ||||||
|     : never; |     : never; | ||||||
|  |  | ||||||
| export const ipcRenderer: { | export const ipcRenderer: { | ||||||
| @@ -35,19 +35,25 @@ export const ipcRenderer: { | |||||||
|   send<Channel extends keyof RendererMessage>( |   send<Channel extends keyof RendererMessage>( | ||||||
|     channel: "forward-message", |     channel: "forward-message", | ||||||
|     rendererChannel: Channel, |     rendererChannel: Channel, | ||||||
|     ...args: Parameters<RendererMessage[Channel]> |     ...arguments_: Parameters<RendererMessage[Channel]> | ||||||
|  |   ): void; | ||||||
|  |   send<Channel extends keyof RendererMessage>( | ||||||
|  |     channel: "forward-to", | ||||||
|  |     webContentsId: number, | ||||||
|  |     rendererChannel: Channel, | ||||||
|  |     ...arguments_: Parameters<RendererMessage[Channel]> | ||||||
|   ): void; |   ): void; | ||||||
|   send<Channel extends keyof MainMessage>( |   send<Channel extends keyof MainMessage>( | ||||||
|     channel: Channel, |     channel: Channel, | ||||||
|     ...args: Parameters<MainMessage[Channel]> |     ...arguments_: Parameters<MainMessage[Channel]> | ||||||
|   ): void; |   ): void; | ||||||
|   invoke<Channel extends keyof MainCall>( |   invoke<Channel extends keyof MainCall>( | ||||||
|     channel: Channel, |     channel: Channel, | ||||||
|     ...args: Parameters<MainCall[Channel]> |     ...arguments_: Parameters<MainCall[Channel]> | ||||||
|   ): Promise<ReturnType<MainCall[Channel]>>; |   ): Promise<ReturnType<MainCall[Channel]>>; | ||||||
|   sendSync<Channel extends keyof MainMessage>( |   sendSync<Channel extends keyof MainMessage>( | ||||||
|     channel: Channel, |     channel: Channel, | ||||||
|     ...args: Parameters<MainMessage[Channel]> |     ...arguments_: Parameters<MainMessage[Channel]> | ||||||
|   ): ReturnType<MainMessage[Channel]>; |   ): ReturnType<MainMessage[Channel]>; | ||||||
|   postMessage<Channel extends keyof MainMessage>( |   postMessage<Channel extends keyof MainMessage>( | ||||||
|     channel: Channel, |     channel: Channel, | ||||||
| @@ -56,13 +62,8 @@ export const ipcRenderer: { | |||||||
|       : never, |       : never, | ||||||
|     transfer?: MessagePort[], |     transfer?: MessagePort[], | ||||||
|   ): void; |   ): void; | ||||||
|   sendTo<Channel extends keyof RendererMessage>( |  | ||||||
|     webContentsId: number, |  | ||||||
|     channel: Channel, |  | ||||||
|     ...args: Parameters<RendererMessage[Channel]> |  | ||||||
|   ): void; |  | ||||||
|   sendToHost<Channel extends keyof RendererMessage>( |   sendToHost<Channel extends keyof RendererMessage>( | ||||||
|     channel: Channel, |     channel: Channel, | ||||||
|     ...args: Parameters<RendererMessage[Channel]> |     ...arguments_: Parameters<RendererMessage[Channel]> | ||||||
|   ): void; |   ): void; | ||||||
| } = untypedIpcRenderer; | } = untypedIpcRenderer; | ||||||
|   | |||||||
| @@ -2,68 +2,78 @@ import fs from "node:fs"; | |||||||
| import path from "node:path"; | import path from "node:path"; | ||||||
|  |  | ||||||
| import {app, dialog} from "@electron/remote"; | import {app, dialog} from "@electron/remote"; | ||||||
| import * as Sentry from "@sentry/electron"; | import * as Sentry from "@sentry/electron/renderer"; | ||||||
| import {JsonDB} from "node-json-db"; | import {JsonDB} from "node-json-db"; | ||||||
| import {DataError} from "node-json-db/dist/lib/Errors"; | import {DataError} from "node-json-db/dist/lib/Errors"; | ||||||
| import * as z from "zod"; | import {z} from "zod"; | ||||||
|  |  | ||||||
| import * as EnterpriseUtil from "../../../common/enterprise-util"; | import * as EnterpriseUtil from "../../../common/enterprise-util.js"; | ||||||
| import Logger from "../../../common/logger-util"; | import Logger from "../../../common/logger-util.js"; | ||||||
| import * as Messages from "../../../common/messages"; | import * as Messages from "../../../common/messages.js"; | ||||||
| import type {ServerConf} from "../../../common/types"; | import * as t from "../../../common/translation-util.js"; | ||||||
| import {ipcRenderer} from "../typed-ipc-renderer"; | import type {ServerConfig} from "../../../common/types.js"; | ||||||
|  | import defaultIcon from "../../img/icon.png"; | ||||||
|  | import {ipcRenderer} from "../typed-ipc-renderer.js"; | ||||||
|  |  | ||||||
| const logger = new Logger({ | const logger = new Logger({ | ||||||
|   file: "domain-util.log", |   file: "domain-util.log", | ||||||
| }); | }); | ||||||
|  |  | ||||||
| const defaultIconUrl = "../renderer/img/icon.png"; | // For historical reasons, we store this string in domain.json to denote a | ||||||
|  | // missing icon; it does not change with the actual icon location. | ||||||
|  | export const defaultIconSentinel = "../renderer/img/icon.png"; | ||||||
|  |  | ||||||
| const serverConfSchema = z.object({ | const serverConfigSchema = z.object({ | ||||||
|   url: z.string(), |   url: z.string().url(), | ||||||
|   alias: z.string(), |   alias: z.string(), | ||||||
|   icon: z.string(), |   icon: z.string(), | ||||||
|  |   zulipVersion: z.string().default("unknown"), | ||||||
|  |   zulipFeatureLevel: z.number().default(0), | ||||||
| }); | }); | ||||||
|  |  | ||||||
| let db!: JsonDB; | let database!: JsonDB; | ||||||
|  |  | ||||||
| reloadDb(); | reloadDatabase(); | ||||||
|  |  | ||||||
| // Migrate from old schema | // Migrate from old schema | ||||||
| try { | try { | ||||||
|   const oldDomain = db.getObject<unknown>("/domain"); |   const oldDomain = database.getObject<unknown>("/domain"); | ||||||
|   if (typeof oldDomain === "string") { |   if (typeof oldDomain === "string") { | ||||||
|     (async () => { |     (async () => { | ||||||
|       await addDomain({ |       await addDomain({ | ||||||
|         alias: "Zulip", |         alias: "Zulip", | ||||||
|         url: oldDomain, |         url: oldDomain, | ||||||
|       }); |       }); | ||||||
|       db.delete("/domain"); |       database.delete("/domain"); | ||||||
|     })(); |     })(); | ||||||
|   } |   } | ||||||
| } catch (error: unknown) { | } catch (error: unknown) { | ||||||
|   if (!(error instanceof DataError)) throw error; |   if (!(error instanceof DataError)) throw error; | ||||||
| } | } | ||||||
|  |  | ||||||
| export function getDomains(): ServerConf[] { | export function getDomains(): ServerConfig[] { | ||||||
|   reloadDb(); |   reloadDatabase(); | ||||||
|   try { |   try { | ||||||
|     return serverConfSchema.array().parse(db.getObject<unknown>("/domains")); |     return serverConfigSchema | ||||||
|  |       .array() | ||||||
|  |       .parse(database.getObject<unknown>("/domains")); | ||||||
|   } catch (error: unknown) { |   } catch (error: unknown) { | ||||||
|     if (!(error instanceof DataError)) throw error; |     if (!(error instanceof DataError)) throw error; | ||||||
|     return []; |     return []; | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| export function getDomain(index: number): ServerConf { | export function getDomain(index: number): ServerConfig { | ||||||
|   reloadDb(); |   reloadDatabase(); | ||||||
|   return serverConfSchema.parse(db.getObject<unknown>(`/domains[${index}]`)); |   return serverConfigSchema.parse( | ||||||
|  |     database.getObject<unknown>(`/domains[${index}]`), | ||||||
|  |   ); | ||||||
| } | } | ||||||
|  |  | ||||||
| export function updateDomain(index: number, server: ServerConf): void { | export function updateDomain(index: number, server: ServerConfig): void { | ||||||
|   reloadDb(); |   reloadDatabase(); | ||||||
|   serverConfSchema.parse(server); |   serverConfigSchema.parse(server); | ||||||
|   db.push(`/domains[${index}]`, server, true); |   database.push(`/domains[${index}]`, server, true); | ||||||
| } | } | ||||||
|  |  | ||||||
| export async function addDomain(server: { | export async function addDomain(server: { | ||||||
| @@ -74,20 +84,20 @@ export async function addDomain(server: { | |||||||
|   if (server.icon) { |   if (server.icon) { | ||||||
|     const localIconUrl = await saveServerIcon(server.icon); |     const localIconUrl = await saveServerIcon(server.icon); | ||||||
|     server.icon = localIconUrl; |     server.icon = localIconUrl; | ||||||
|     serverConfSchema.parse(server); |     serverConfigSchema.parse(server); | ||||||
|     db.push("/domains[]", server, true); |     database.push("/domains[]", server, true); | ||||||
|     reloadDb(); |     reloadDatabase(); | ||||||
|   } else { |   } else { | ||||||
|     server.icon = defaultIconUrl; |     server.icon = defaultIconSentinel; | ||||||
|     serverConfSchema.parse(server); |     serverConfigSchema.parse(server); | ||||||
|     db.push("/domains[]", server, true); |     database.push("/domains[]", server, true); | ||||||
|     reloadDb(); |     reloadDatabase(); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| export function removeDomains(): void { | export function removeDomains(): void { | ||||||
|   db.delete("/domains"); |   database.delete("/domains"); | ||||||
|   reloadDb(); |   reloadDatabase(); | ||||||
| } | } | ||||||
|  |  | ||||||
| export function removeDomain(index: number): boolean { | export function removeDomain(index: number): boolean { | ||||||
| @@ -95,8 +105,8 @@ export function removeDomain(index: number): boolean { | |||||||
|     return false; |     return false; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   db.delete(`/domains[${index}]`); |   database.delete(`/domains[${index}]`); | ||||||
|   reloadDb(); |   reloadDatabase(); | ||||||
|   return true; |   return true; | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -109,7 +119,7 @@ export function duplicateDomain(domain: string): boolean { | |||||||
| export async function checkDomain( | export async function checkDomain( | ||||||
|   domain: string, |   domain: string, | ||||||
|   silent = false, |   silent = false, | ||||||
| ): Promise<ServerConf> { | ): Promise<ServerConfig> { | ||||||
|   if (!silent && duplicateDomain(domain)) { |   if (!silent && duplicateDomain(domain)) { | ||||||
|     // Do not check duplicate in silent mode |     // Do not check duplicate in silent mode | ||||||
|     throw new Error("This server has been added."); |     throw new Error("This server has been added."); | ||||||
| @@ -124,36 +134,43 @@ export async function checkDomain( | |||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| async function getServerSettings(domain: string): Promise<ServerConf> { | async function getServerSettings(domain: string): Promise<ServerConfig> { | ||||||
|   return ipcRenderer.invoke("get-server-settings", domain); |   return ipcRenderer.invoke("get-server-settings", domain); | ||||||
| } | } | ||||||
|  |  | ||||||
| export async function saveServerIcon(iconURL: string): Promise<string> { | export async function saveServerIcon(iconURL: string): Promise<string> { | ||||||
|   return ipcRenderer.invoke("save-server-icon", iconURL); |   return ( | ||||||
|  |     (await ipcRenderer.invoke("save-server-icon", iconURL)) ?? | ||||||
|  |     defaultIconSentinel | ||||||
|  |   ); | ||||||
| } | } | ||||||
|  |  | ||||||
| export async function updateSavedServer( | export async function updateSavedServer( | ||||||
|   url: string, |   url: string, | ||||||
|   index: number, |   index: number, | ||||||
| ): Promise<void> { | ): Promise<ServerConfig> { | ||||||
|   // Does not promise successful update |   // Does not promise successful update | ||||||
|   const oldIcon = getDomain(index).icon; |   const serverConfig = getDomain(index); | ||||||
|  |   const oldIcon = serverConfig.icon; | ||||||
|   try { |   try { | ||||||
|     const newServerConf = await checkDomain(url, true); |     const newServerConfig = await checkDomain(url, true); | ||||||
|     const localIconUrl = await saveServerIcon(newServerConf.icon); |     const localIconUrl = await saveServerIcon(newServerConfig.icon); | ||||||
|     if (!oldIcon || localIconUrl !== "../renderer/img/icon.png") { |     if (!oldIcon || localIconUrl !== defaultIconSentinel) { | ||||||
|       newServerConf.icon = localIconUrl; |       newServerConfig.icon = localIconUrl; | ||||||
|       updateDomain(index, newServerConf); |       updateDomain(index, newServerConfig); | ||||||
|       reloadDb(); |       reloadDatabase(); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     return newServerConfig; | ||||||
|   } catch (error: unknown) { |   } catch (error: unknown) { | ||||||
|     logger.log("Could not update server icon."); |     logger.log("Could not update server icon."); | ||||||
|     logger.log(error); |     logger.log(error); | ||||||
|     Sentry.captureException(error); |     Sentry.captureException(error); | ||||||
|  |     return serverConfig; | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| function reloadDb(): void { | function reloadDatabase(): void { | ||||||
|   const domainJsonPath = path.join( |   const domainJsonPath = path.join( | ||||||
|     app.getPath("userData"), |     app.getPath("userData"), | ||||||
|     "config/domain.json", |     "config/domain.json", | ||||||
| @@ -165,9 +182,10 @@ function reloadDb(): void { | |||||||
|     if (fs.existsSync(domainJsonPath)) { |     if (fs.existsSync(domainJsonPath)) { | ||||||
|       fs.unlinkSync(domainJsonPath); |       fs.unlinkSync(domainJsonPath); | ||||||
|       dialog.showErrorBox( |       dialog.showErrorBox( | ||||||
|         "Error saving new organization", |         t.__("Error saving new organization"), | ||||||
|         "There seems to be error while saving new organization, " + |         t.__( | ||||||
|           "you may have to re-add your previous organizations back.", |           "There was an error while saving the new organization. You may have to add your previous organizations again.", | ||||||
|  |         ), | ||||||
|       ); |       ); | ||||||
|       logger.error("Error while JSON parsing domain.json: "); |       logger.error("Error while JSON parsing domain.json: "); | ||||||
|       logger.error(error); |       logger.error(error); | ||||||
| @@ -175,7 +193,7 @@ function reloadDb(): void { | |||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   db = new JsonDB(domainJsonPath, true, true); |   database = new JsonDB(domainJsonPath, true, true); | ||||||
| } | } | ||||||
|  |  | ||||||
| export function formatUrl(domain: string): string { | export function formatUrl(domain: string): string { | ||||||
| @@ -189,3 +207,30 @@ export function formatUrl(domain: string): string { | |||||||
|  |  | ||||||
|   return `https://${domain}`; |   return `https://${domain}`; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | export function getUnsupportedMessage( | ||||||
|  |   server: ServerConfig, | ||||||
|  | ): string | undefined { | ||||||
|  |   if (server.zulipFeatureLevel < 65 /* Zulip Server 4.0 */) { | ||||||
|  |     const realm = new URL(server.url).hostname; | ||||||
|  |     return t.__( | ||||||
|  |       "{{{server}}} runs an outdated Zulip Server version {{{version}}}. It may not fully work in this app.", | ||||||
|  |       {server: realm, version: server.zulipVersion}, | ||||||
|  |     ); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   return undefined; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | export function iconAsUrl(iconPath: string): string { | ||||||
|  |   if (iconPath === defaultIconSentinel) return defaultIcon; | ||||||
|  |  | ||||||
|  |   try { | ||||||
|  |     return `data:application/octet-stream;base64,${fs.readFileSync( | ||||||
|  |       iconPath, | ||||||
|  |       "base64", | ||||||
|  |     )}`; | ||||||
|  |   } catch { | ||||||
|  |     return defaultIcon; | ||||||
|  |   } | ||||||
|  | } | ||||||
|   | |||||||
| @@ -1,23 +1,21 @@ | |||||||
| import * as backoff from "backoff"; | import * as backoff from "backoff"; | ||||||
|  |  | ||||||
| import {html} from "../../../common/html"; | import {html} from "../../../common/html.js"; | ||||||
| import Logger from "../../../common/logger-util"; | import Logger from "../../../common/logger-util.js"; | ||||||
| import type WebView from "../components/webview"; | import type WebView from "../components/webview.js"; | ||||||
| import {ipcRenderer} from "../typed-ipc-renderer"; | import {ipcRenderer} from "../typed-ipc-renderer.js"; | ||||||
|  |  | ||||||
| const logger = new Logger({ | const logger = new Logger({ | ||||||
|   file: "domain-util.log", |   file: "domain-util.log", | ||||||
| }); | }); | ||||||
|  |  | ||||||
| export default class ReconnectUtil { | export default class ReconnectUtil { | ||||||
|   webview: WebView; |  | ||||||
|   url: string; |   url: string; | ||||||
|   alreadyReloaded: boolean; |   alreadyReloaded: boolean; | ||||||
|   fibonacciBackoff: backoff.Backoff; |   fibonacciBackoff: backoff.Backoff; | ||||||
|  |  | ||||||
|   constructor(webview: WebView) { |   constructor(webview: WebView) { | ||||||
|     this.webview = webview; |     this.url = webview.properties.url; | ||||||
|     this.url = webview.props.url; |  | ||||||
|     this.alreadyReloaded = false; |     this.alreadyReloaded = false; | ||||||
|     this.fibonacciBackoff = backoff.fibonacci({ |     this.fibonacciBackoff = backoff.fibonacci({ | ||||||
|       initialDelay: 5000, |       initialDelay: 5000, | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| import {ipcRenderer} from "../typed-ipc-renderer"; | import {ipcRenderer} from "../typed-ipc-renderer.js"; | ||||||
|  |  | ||||||
| export const connectivityError: string[] = [ | export const connectivityError: string[] = [ | ||||||
|   "ERR_INTERNET_DISCONNECTED", |   "ERR_INTERNET_DISCONNECTED", | ||||||
|   | |||||||
| @@ -1,56 +1,16 @@ | |||||||
| <!DOCTYPE html> | <!doctype html> | ||||||
| <html lang="en" class="responsive desktop"> | <html lang="en" class="responsive desktop"> | ||||||
|   <head> |   <head> | ||||||
|     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> |     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> | ||||||
|  |     <meta | ||||||
|  |       http-equiv="Content-Security-Policy" | ||||||
|  |       content="default-src 'none'; connect-src 'self'; font-src 'self'; img-src 'self' data:; script-src 'self'; style-src 'self' 'unsafe-inline'" | ||||||
|  |     /> | ||||||
|     <meta name="viewport" content="width=device-width" /> |     <meta name="viewport" content="width=device-width" /> | ||||||
|     <title>Zulip</title> |     <title>Zulip</title> | ||||||
|     <link rel="stylesheet" href="css/fonts.css" /> |     <link rel="stylesheet" href="css/fonts.css" /> | ||||||
|     <link rel="stylesheet" href="css/main.css" type="text/css" media="screen" /> |     <link rel="stylesheet" href="css/main.css" /> | ||||||
|   </head> |   </head> | ||||||
|  |  | ||||||
|   <body> |   <body></body> | ||||||
|     <div id="content"> |  | ||||||
|       <div class="popup"> |  | ||||||
|         <span class="popuptext hidden" id="fullscreen-popup"></span> |  | ||||||
|       </div> |  | ||||||
|       <div id="sidebar" class="toggle-sidebar"> |  | ||||||
|         <div id="view-controls-container"> |  | ||||||
|           <div id="tabs-container"></div> |  | ||||||
|           <div id="add-tab" class="tab functional-tab"> |  | ||||||
|             <div class="server-tab" id="add-action"> |  | ||||||
|               <i class="material-icons">add</i> |  | ||||||
|             </div> |  | ||||||
|             <span id="add-server-tooltip" style="display: none" |  | ||||||
|               >Add organization</span |  | ||||||
|             > |  | ||||||
|           </div> |  | ||||||
|         </div> |  | ||||||
|         <div id="actions-container"> |  | ||||||
|           <div class="action-button" id="dnd-action"> |  | ||||||
|             <i class="material-icons md-48">notifications</i> |  | ||||||
|             <span id="dnd-tooltip" style="display: none">Do Not Disturb</span> |  | ||||||
|           </div> |  | ||||||
|           <div class="action-button hidden" id="reload-action"> |  | ||||||
|             <i class="material-icons md-48">refresh</i> |  | ||||||
|             <span id="reload-tooltip" style="display: none">Reload</span> |  | ||||||
|           </div> |  | ||||||
|           <div class="action-button disable" id="loading-action"> |  | ||||||
|             <i class="refresh material-icons md-48">loop</i> |  | ||||||
|             <span id="loading-tooltip" style="display: none">Loading</span> |  | ||||||
|           </div> |  | ||||||
|           <div class="action-button disable" id="back-action"> |  | ||||||
|             <i class="material-icons md-48">arrow_back</i> |  | ||||||
|             <span id="back-tooltip" style="display: none">Go Back</span> |  | ||||||
|           </div> |  | ||||||
|           <div class="action-button" id="settings-action"> |  | ||||||
|             <i class="material-icons md-48">settings</i> |  | ||||||
|             <span id="setting-tooltip" style="display: none">Settings</span> |  | ||||||
|           </div> |  | ||||||
|         </div> |  | ||||||
|       </div> |  | ||||||
|       <div id="main-container"> |  | ||||||
|         <div id="webviews-container"></div> |  | ||||||
|       </div> |  | ||||||
|     </div> |  | ||||||
|   </body> |  | ||||||
| </html> | </html> | ||||||
|   | |||||||
| @@ -1,7 +1,11 @@ | |||||||
| <!DOCTYPE html> | <!doctype html> | ||||||
| <html lang="en" class="responsive desktop"> | <html lang="en" class="responsive desktop"> | ||||||
|   <head> |   <head> | ||||||
|     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> |     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> | ||||||
|  |     <meta | ||||||
|  |       http-equiv="Content-Security-Policy" | ||||||
|  |       content="default-src 'none'; connect-src 'self'; img-src 'self'; script-src 'self'; style-src 'self'" | ||||||
|  |     /> | ||||||
|     <meta name="viewport" content="width=device-width" /> |     <meta name="viewport" content="width=device-width" /> | ||||||
|     <title>Zulip - Network Troubleshooting</title> |     <title>Zulip - Network Troubleshooting</title> | ||||||
|     <link |     <link | ||||||
|   | |||||||
							
								
								
									
										10
									
								
								app/renderer/preference.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,10 @@ | |||||||
|  | <!doctype html> | ||||||
|  | <meta charset="UTF-8" /> | ||||||
|  | <link rel="stylesheet" href="css/fonts.css" /> | ||||||
|  | <link rel="stylesheet" href="css/preference.css" /> | ||||||
|  |  | ||||||
|  | <!-- Initially hidden to prevent FOUC --> | ||||||
|  | <div id="content" hidden> | ||||||
|  |   <div id="sidebar"></div> | ||||||
|  |   <div id="settings-container"></div> | ||||||
|  | </div> | ||||||
| @@ -1,119 +0,0 @@ | |||||||
| { |  | ||||||
| 	"About Zulip": "About Zulip", |  | ||||||
| 	"Actual Size": "Actual Size", |  | ||||||
| 	"Add Custom Certificates": "Add Custom Certificates", |  | ||||||
| 	"Add Organization": "Add Organization", |  | ||||||
| 	"Add a Zulip organization": "Add a Zulip organization", |  | ||||||
| 	"Add custom CSS": "Add custom CSS", |  | ||||||
| 	"Advanced": "Advanced", |  | ||||||
| 	"All the connected organizations will appear here": "All the connected organizations will appear here", |  | ||||||
| 	"Always start minimized": "Always start minimized", |  | ||||||
| 	"App Updates": "App Updates", |  | ||||||
| 	"Appearance": "Appearance", |  | ||||||
| 	"Application Shortcuts": "Application Shortcuts", |  | ||||||
| 	"Are you sure you want to disconnect this organization?": "Are you sure you want to disconnect this organization?", |  | ||||||
| 	"Auto hide Menu bar": "Auto hide Menu bar", |  | ||||||
| 	"Auto hide menu bar (Press Alt key to display)": "Auto hide menu bar (Press Alt key to display)", |  | ||||||
| 	"Back": "Back", |  | ||||||
| 	"Bounce dock on new private message": "Bounce dock on new private message", |  | ||||||
| 	"Certificate file": "Certificate file", |  | ||||||
| 	"Change": "Change", |  | ||||||
| 	"Check for Updates": "Check for Updates", |  | ||||||
| 	"Close": "Close", |  | ||||||
| 	"Connect": "Connect", |  | ||||||
| 	"Connect to another organization": "Connect to another organization", |  | ||||||
| 	"Connected organizations": "Connected organizations", |  | ||||||
| 	"Copy": "Copy", |  | ||||||
| 	"Copy Zulip URL": "Copy Zulip URL", |  | ||||||
| 	"Create a new organization": "Create a new organization", |  | ||||||
| 	"Cut": "Cut", |  | ||||||
| 	"Default download location": "Default download location", |  | ||||||
| 	"Delete": "Delete", |  | ||||||
| 	"Desktop App Settings": "Desktop App Settings", |  | ||||||
| 	"Desktop Notifications": "Desktop Notifications", |  | ||||||
| 	"Desktop Settings": "Desktop Settings", |  | ||||||
| 	"Disconnect": "Disconnect", |  | ||||||
| 	"Download App Logs": "Download App Logs", |  | ||||||
| 	"Edit": "Edit", |  | ||||||
| 	"Edit Shortcuts": "Edit Shortcuts", |  | ||||||
| 	"Enable auto updates": "Enable auto updates", |  | ||||||
| 	"Enable error reporting (requires restart)": "Enable error reporting (requires restart)", |  | ||||||
| 	"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)", |  | ||||||
| 	"Factory Reset": "Factory Reset", |  | ||||||
| 	"File": "File", |  | ||||||
| 	"Find accounts": "Find accounts", |  | ||||||
| 	"Find accounts by email": "Find accounts by email", |  | ||||||
| 	"Flash taskbar on new message": "Flash taskbar on new message", |  | ||||||
| 	"Forward": "Forward", |  | ||||||
| 	"Functionality": "Functionality", |  | ||||||
| 	"General": "General", |  | ||||||
| 	"Get beta updates": "Get beta updates", |  | ||||||
| 	"Hard Reload": "Hard Reload", |  | ||||||
| 	"Help": "Help", |  | ||||||
| 	"Help Center": "Help Center", |  | ||||||
| 	"History": "History", |  | ||||||
| 	"History Shortcuts": "History Shortcuts", |  | ||||||
| 	"Keyboard Shortcuts": "Keyboard Shortcuts", |  | ||||||
| 	"Log Out": "Log Out", |  | ||||||
| 	"Log Out of Organization": "Log Out of Organization", |  | ||||||
| 	"Manual proxy configuration": "Manual proxy configuration", |  | ||||||
| 	"Minimize": "Minimize", |  | ||||||
| 	"Mute all sounds from Zulip": "Mute all sounds from Zulip", |  | ||||||
| 	"NO": "NO", |  | ||||||
| 	"Network": "Network", |  | ||||||
| 	"OR": "OR", |  | ||||||
| 	"Organization URL": "Organization URL", |  | ||||||
| 	"Organizations": "Organizations", |  | ||||||
| 	"Paste": "Paste", |  | ||||||
| 	"Paste and Match Style": "Paste and Match Style", |  | ||||||
| 	"Proxy": "Proxy", |  | ||||||
| 	"Proxy bypass rules": "Proxy bypass rules", |  | ||||||
| 	"Proxy rules": "Proxy rules", |  | ||||||
| 	"Quit": "Quit", |  | ||||||
| 	"Quit Zulip": "Quit Zulip", |  | ||||||
| 	"Redo": "Redo", |  | ||||||
| 	"Release Notes": "Release Notes", |  | ||||||
| 	"Reload": "Reload", |  | ||||||
| 	"Report an Issue": "Report an Issue", |  | ||||||
| 	"Reset App Data": "Reset App Data", |  | ||||||
| 	"Reset App Settings": "Reset App Settings", |  | ||||||
| 	"Reset Application Data": "Reset Application Data", |  | ||||||
| 	"Save": "Save", |  | ||||||
| 	"Select All": "Select All", |  | ||||||
| 	"Settings": "Settings", |  | ||||||
| 	"Shortcuts": "Shortcuts", |  | ||||||
| 	"Show App Logs": "Show App Logs", |  | ||||||
| 	"Show app icon in system tray": "Show app icon in system tray", |  | ||||||
| 	"Show app unread badge": "Show app unread badge", |  | ||||||
| 	"Show desktop notifications": "Show desktop notifications", |  | ||||||
| 	"Show downloaded files in file manager": "Show downloaded files in file manager", |  | ||||||
| 	"Show sidebar": "Show sidebar", |  | ||||||
| 	"Start app at login": "Start app at login", |  | ||||||
| 	"Switch to Next Organization": "Switch to Next Organization", |  | ||||||
| 	"Switch to Previous Organization": "Switch to Previous Organization", |  | ||||||
| 	"These desktop app shortcuts extend the Zulip webapp's": "These desktop app shortcuts extend the Zulip webapp's", |  | ||||||
| 	"This will delete all application data including all added accounts and preferences": "This will delete all application data including all added accounts and preferences", |  | ||||||
| 	"Tip": "Tip", |  | ||||||
| 	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab", |  | ||||||
| 	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App", |  | ||||||
| 	"Toggle Do Not Disturb": "Toggle Do Not Disturb", |  | ||||||
| 	"Toggle Full Screen": "Toggle Full Screen", |  | ||||||
| 	"Toggle Sidebar": "Toggle Sidebar", |  | ||||||
| 	"Toggle Tray Icon": "Toggle Tray Icon", |  | ||||||
| 	"Tools": "Tools", |  | ||||||
| 	"Undo": "Undo", |  | ||||||
| 	"Upload": "Upload", |  | ||||||
| 	"Use system proxy settings (requires restart)": "Use system proxy settings (requires restart)", |  | ||||||
| 	"View": "View", |  | ||||||
| 	"View Shortcuts": "View Shortcuts", |  | ||||||
| 	"Window": "Window", |  | ||||||
| 	"Window Shortcuts": "Window Shortcuts", |  | ||||||
| 	"YES": "YES", |  | ||||||
| 	"Zoom In": "Zoom In", |  | ||||||
| 	"Zoom Out": "Zoom Out", |  | ||||||
| 	"Zulip Help": "Zulip Help", |  | ||||||
| 	"keyboard shortcuts": "keyboard shortcuts", |  | ||||||
| 	"script": "script", |  | ||||||
| 	"Quit when the window is closed": "Quit when the window is closed", |  | ||||||
| 	"Ask where to save files before downloading": "Ask where to save files before downloading" |  | ||||||
| } |  | ||||||
| @@ -1,134 +0,0 @@ | |||||||
| { |  | ||||||
| 	"About Zulip": "Acerca de Zulip", |  | ||||||
| 	"Actual Size": "Tamaño actual", |  | ||||||
| 	"Add Custom Certificates": "Añadir certificados personalizados", |  | ||||||
| 	"Add Organization": "Añadir organización", |  | ||||||
| 	"Add a Zulip organization": "Añadir una organización de Zulip", |  | ||||||
| 	"Add custom CSS": "Añadir CSS personalizado", |  | ||||||
| 	"Advanced": "Avanzado", |  | ||||||
| 	"All the connected organizations will appear here": "Todas las organizaciones conectadas aparecerán aquí", |  | ||||||
| 	"Always start minimized": "Iniciar siempre minimizado", |  | ||||||
| 	"App Updates": "Actualizaciones de la aplicación", |  | ||||||
| 	"Appearance": "Apariencia", |  | ||||||
| 	"Application Shortcuts": "Atajos de la aplicación", |  | ||||||
| 	"Are you sure you want to disconnect this organization?": "Estas seguro de desconectar esta organización?", |  | ||||||
| 	"Auto hide Menu bar": "Ocultar la barra de menú automáticamente", |  | ||||||
| 	"Auto hide menu bar (Press Alt key to display)": "Ocultar la barra de menú automáticamente (mantén tecla Alt para mostrar)", |  | ||||||
| 	"Back": "Atrás", |  | ||||||
| 	"Bounce dock on new private message": "Rebotar dock cuando se reciba un nuevo mensaje privado", |  | ||||||
| 	"Certificate file": "Archivo de certificado", |  | ||||||
| 	"Change": "Cambiar", |  | ||||||
| 	"Check for Updates": "Comprobar actualizaciones", |  | ||||||
| 	"Close": "Cerrar", |  | ||||||
| 	"Connect": "Conectar", |  | ||||||
| 	"Connect to another organization": "Conectar a otra organización", |  | ||||||
| 	"Connected organizations": "Organizaciones conectada", |  | ||||||
| 	"Copy": "Copiar", |  | ||||||
| 	"Copy Zulip URL": "Copiar URL de Zulip", |  | ||||||
| 	"Create a new organization": "Crear una nueva organización", |  | ||||||
| 	"Cut": "Cortar", |  | ||||||
| 	"Default download location": "Ubicación por defecto de descargas", |  | ||||||
| 	"Delete": "Eliminar", |  | ||||||
| 	"Desktop App Settings": "Ajustes de la aplicación de escritorio", |  | ||||||
| 	"Desktop Notifications": "Notificaciones de escritorio", |  | ||||||
| 	"Desktop Settings": "Ajustes de escritorio", |  | ||||||
| 	"Disconnect": "Desconectar", |  | ||||||
| 	"Download App Logs": "Descargar registros de la aplicación", |  | ||||||
| 	"Edit": "Editar", |  | ||||||
| 	"Edit Shortcuts": "Editar atajos", |  | ||||||
| 	"Enable auto updates": "Activar actualizaciones automáticas", |  | ||||||
| 	"Enable error reporting (requires restart)": "Activar reporte de fallos (necesita reinicio)", |  | ||||||
| 	"Enable spellchecker (requires restart)": "Activar corrector ortográfico (necesita reinicio)", |  | ||||||
| 	"Factory Reset": "Reinicio de fábrica", |  | ||||||
| 	"File": "Archivo", |  | ||||||
| 	"Find accounts": "Encontrar cuentas", |  | ||||||
| 	"Find accounts by email": "Encontrar cuentas por correo electrónico", |  | ||||||
| 	"Flash taskbar on new message": "Hacer que la barra de tareas parpadee cuando se reciba un mensaje nuevo", |  | ||||||
| 	"Forward": "Reenviar", |  | ||||||
| 	"Functionality": "Funcionalidad", |  | ||||||
| 	"General": "General", |  | ||||||
| 	"Get beta updates": "Obtener actualizaciones beta", |  | ||||||
| 	"Hard Reload": "Recarga forzosa", |  | ||||||
| 	"Help": "Ayuda", |  | ||||||
| 	"Help Center": "Centro de ayuda", |  | ||||||
| 	"History": "Historial", |  | ||||||
| 	"History Shortcuts": "Atajos del historial", |  | ||||||
| 	"Keyboard Shortcuts": "Atajos de teclado", |  | ||||||
| 	"Log Out": "Cerrar sesión", |  | ||||||
| 	"Log Out of Organization": "Cerrar sesión de organización", |  | ||||||
| 	"Manual proxy configuration": "Configuración de proxy manual", |  | ||||||
| 	"Minimize": "Minimizar", |  | ||||||
| 	"Mute all sounds from Zulip": "Silenciar todos los sonidos de Zulip", |  | ||||||
| 	"NO": "NO", |  | ||||||
| 	"Network": "Red", |  | ||||||
| 	"OR": "O", |  | ||||||
| 	"Organization URL": "URL de la organización", |  | ||||||
| 	"Organizations": "Organizaciones", |  | ||||||
| 	"Paste": "Pegar", |  | ||||||
| 	"Paste and Match Style": "Pegar y mantener estilo", |  | ||||||
| 	"Proxy": "Proxy", |  | ||||||
| 	"Proxy bypass rules": "Reglas para ignorar proxy", |  | ||||||
| 	"Proxy rules": "Reglas del proxy", |  | ||||||
| 	"Quit": "Cerrar", |  | ||||||
| 	"Quit Zulip": "Cerrar Zulip", |  | ||||||
| 	"Redo": "Rehacer", |  | ||||||
| 	"Release Notes": "Notas de la versión", |  | ||||||
| 	"Reload": "Recargar", |  | ||||||
| 	"Report an Issue": "Informar de un error", |  | ||||||
| 	"Save": "Guardar", |  | ||||||
| 	"Select All": "Seleccionar todo", |  | ||||||
| 	"Settings": "Ajustes", |  | ||||||
| 	"Shortcuts": "Atajos de teclado", |  | ||||||
| 	"Show App Logs": "Mostrar registros de la aplicación", |  | ||||||
| 	"Show app icon in system tray": "Mostrar un icono de la aplicación en la bandeja del sistema", |  | ||||||
| 	"Show app unread badge": "Mostrar un globo en el icono si hay mensajes sin leer", |  | ||||||
| 	"Show desktop notifications": "Mostrar notificaciones de escritorio", |  | ||||||
| 	"Show downloaded files in file manager": "Mostrar archivos descargados en el explorador", |  | ||||||
| 	"Show sidebar": "Mostrar barra lateral", |  | ||||||
| 	"Start app at login": "Lanzar aplicación al inicio", |  | ||||||
| 	"Switch to Next Organization": "Cambiar a la siguiente organización", |  | ||||||
| 	"Switch to Previous Organization": "Cambiar a la anterior organización", |  | ||||||
| 	"These desktop app shortcuts extend the Zulip webapp's": "Estos atajos de la aplicación de escritorio extienden los ya existentes en Zulip", |  | ||||||
| 	"This will delete all application data including all added accounts and preferences": "Esto borrará todos los datos de la aplicación, incluyendo cuentas añadidas y preferencia", |  | ||||||
| 	"Tip": "Consej", |  | ||||||
| 	"Toggle DevTools for Active Tab": "Activar/desactivar herramientas de desarrollador para la pestaña activa", |  | ||||||
| 	"Toggle DevTools for Zulip App": "Activar/desactivar herramientas de desarrollador para la aplicación de Zulip", |  | ||||||
| 	"Toggle Do Not Disturb": "Activar/desactivar no molestar", |  | ||||||
| 	"Toggle Full Screen": "Activar/desactivar pantalla completa", |  | ||||||
| 	"Toggle Sidebar": "Activar/desactivar barra lateral", |  | ||||||
| 	"Toggle Tray Icon": "Activar/desactivar icono en bandeja del sistema", |  | ||||||
| 	"Tools": "Herramientas", |  | ||||||
| 	"Undo": "Deshacer", |  | ||||||
| 	"Upload": "Subir", |  | ||||||
| 	"Use system proxy settings (requires restart)": "Usar ajustes de proxy del sistema (necesita reinicio)", |  | ||||||
| 	"View": "Ver", |  | ||||||
| 	"View Shortcuts": "Ver atajos", |  | ||||||
| 	"Window": "Ventana", |  | ||||||
| 	"Window Shortcuts": "Atajos de ventana", |  | ||||||
| 	"YES": "SÍ", |  | ||||||
| 	"Zoom In": "Aumentar zoom", |  | ||||||
| 	"Zoom Out": "Reducir zoom", |  | ||||||
| 	"Zulip Help": "Ayuda sobre Zulip", |  | ||||||
| 	"keyboard shortcuts": "atajos de teclado", |  | ||||||
| 	"script": "script", |  | ||||||
| 	"Quit when the window is closed": "Salir cuando la ventana se cierre", |  | ||||||
| 	"Ask where to save files before downloading": "Preguntar dónde guardar los archivos antes de descargar", |  | ||||||
| 	"Services": "Servicios", |  | ||||||
| 	"Hide": "Ocultar", |  | ||||||
| 	"Hide Others": "Ocultar otros", |  | ||||||
| 	"Unhide": "Dejar de ocultar", |  | ||||||
| 	"AddServer": "AddServer", |  | ||||||
| 	"App language (requires restart)": "Idioma de la aplicación (requiere reinicio)", |  | ||||||
| 	"Factory Reset Data": "Factory Reset Data", |  | ||||||
| 	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Reinicia la aplicación, borrando todas las organizaciones, cuentas y certificados conectados.", |  | ||||||
| 	"On macOS, the OS spellchecker is used.": "En macOS se utiliza la verificación ortográfica del sistema operativo.", |  | ||||||
| 	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Modifica el idioma en Preferencias del sistema → Teclado → Texto → Ortografía.", |  | ||||||
| 	"Copy Link": "Copiar enlace", |  | ||||||
| 	"Copy Image": "Copiar imagen", |  | ||||||
| 	"Copy Image URL": "Copiar URL de la imagen", |  | ||||||
| 	"No Suggestion Found": "No se encontró ninguna sugerencia", |  | ||||||
| 	"You can select a maximum of 3 languages for spellchecking.": "Puedes elegir un máximo de 3 idiomas para la verificación ortográfica.", |  | ||||||
| 	"Spellchecker Languages": "Idiomas de verificación ortográfica", |  | ||||||
| 	"Add to Dictionary": "Añadir al diccionario", |  | ||||||
| 	"Look Up": "Consultar" |  | ||||||
| } |  | ||||||
| @@ -1,134 +0,0 @@ | |||||||
| { |  | ||||||
| 	"About Zulip": "درباره Zulip ", |  | ||||||
| 	"Actual Size": "اندازه واقعی", |  | ||||||
| 	"Add Custom Certificates": "اضافه کردن مجوز دلخواه", |  | ||||||
| 	"Add Organization": "اضافه کردن سازمان", |  | ||||||
| 	"Add a Zulip organization": "اضافه کردن سازمان Zulip", |  | ||||||
| 	"Add custom CSS": "اضافه کردن CSS دلخواه", |  | ||||||
| 	"Advanced": "پیشرفته", |  | ||||||
| 	"All the connected organizations will appear here": "همه سازمانهای متصل شده اینجا نمایش داده میشوند", |  | ||||||
| 	"Always start minimized": "همواره به صورت کوچک شده اجرا شو", |  | ||||||
| 	"App Updates": "بهروزرسانیهای برنامه", |  | ||||||
| 	"Appearance": "شمایل", |  | ||||||
| 	"Application Shortcuts": "میانبرهای برنامه", |  | ||||||
| 	"Are you sure you want to disconnect this organization?": "آیا از قطع ارتباط از سازمان اطمینان دارید؟", |  | ||||||
| 	"Auto hide Menu bar": "مخفیسازی خودکار نوار منو", |  | ||||||
| 	"Auto hide menu bar (Press Alt key to display)": "مخفیسازی خودکار نوار منو (برای نمایش دکمه Alt را بزنید)", |  | ||||||
| 	"Back": "عقب", |  | ||||||
| 	"Bounce dock on new private message": "Bounce dock on new private message", |  | ||||||
| 	"Certificate file": "فایل مجوز", |  | ||||||
| 	"Change": "تغییر دادن", |  | ||||||
| 	"Check for Updates": "بررسی برای بهروزرسانی", |  | ||||||
| 	"Close": "بستن", |  | ||||||
| 	"Connect": "اتصال", |  | ||||||
| 	"Connect to another organization": "اتصال به یک سازمان دیگر", |  | ||||||
| 	"Connected organizations": "سازمانهای وصل شده", |  | ||||||
| 	"Copy": "رونوشت", |  | ||||||
| 	"Copy Zulip URL": "رونوشت از Zulip URL", |  | ||||||
| 	"Create a new organization": "ایجاد سازمان جدید", |  | ||||||
| 	"Cut": "بریدن", |  | ||||||
| 	"Default download location": "محل پیشفرض دانلود", |  | ||||||
| 	"Delete": "حذف", |  | ||||||
| 	"Desktop App Settings": "Desktop App Settings", |  | ||||||
| 	"Desktop Notifications": "اطلاعرسانیهای دسکتاپ", |  | ||||||
| 	"Desktop Settings": "تنظیمات دسکتاپ", |  | ||||||
| 	"Disconnect": "Disconnect", |  | ||||||
| 	"Download App Logs": "Download App Logs", |  | ||||||
| 	"Edit": "ویرایش", |  | ||||||
| 	"Edit Shortcuts": "ویرایش میانبرها", |  | ||||||
| 	"Enable auto updates": "Enable auto updates", |  | ||||||
| 	"Enable error reporting (requires restart)": "Enable error reporting (requires restart)", |  | ||||||
| 	"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)", |  | ||||||
| 	"Factory Reset": "Factory Reset", |  | ||||||
| 	"File": "فایل", |  | ||||||
| 	"Find accounts": "پیدا کردن حساب های کاربری ", |  | ||||||
| 	"Find accounts by email": "Find accounts by email", |  | ||||||
| 	"Flash taskbar on new message": "Flash taskbar on new message", |  | ||||||
| 	"Forward": "Forward", |  | ||||||
| 	"Functionality": "Functionality", |  | ||||||
| 	"General": "عمومی", |  | ||||||
| 	"Get beta updates": "Get beta updates", |  | ||||||
| 	"Hard Reload": "Hard Reload", |  | ||||||
| 	"Help": "کمک", |  | ||||||
| 	"Help Center": "مرکز کمک", |  | ||||||
| 	"History": "تاریخچه ", |  | ||||||
| 	"History Shortcuts": "تاریخچه میانبرها", |  | ||||||
| 	"Keyboard Shortcuts": "میانبرهای صفحهکلید", |  | ||||||
| 	"Log Out": "خروج", |  | ||||||
| 	"Log Out of Organization": "Log Out of Organization", |  | ||||||
| 	"Manual proxy configuration": "Manual proxy configuration", |  | ||||||
| 	"Minimize": "Minimize", |  | ||||||
| 	"Mute all sounds from Zulip": "Mute all sounds from Zulip", |  | ||||||
| 	"NO": "NO", |  | ||||||
| 	"Network": "Network", |  | ||||||
| 	"OR": "یا", |  | ||||||
| 	"Organization URL": "URL سازمان", |  | ||||||
| 	"Organizations": "Organizations", |  | ||||||
| 	"Paste": "Paste", |  | ||||||
| 	"Paste and Match Style": "Paste and Match Style", |  | ||||||
| 	"Proxy": "Proxy", |  | ||||||
| 	"Proxy bypass rules": "Proxy bypass rules", |  | ||||||
| 	"Proxy rules": "Proxy rules", |  | ||||||
| 	"Quit": "Quit", |  | ||||||
| 	"Quit Zulip": "Quit Zulip", |  | ||||||
| 	"Redo": "Redo", |  | ||||||
| 	"Release Notes": "Release Notes", |  | ||||||
| 	"Reload": "Reload", |  | ||||||
| 	"Report an Issue": "Report an Issue", |  | ||||||
| 	"Save": "ذخیره", |  | ||||||
| 	"Select All": "Select All", |  | ||||||
| 	"Settings": "تنظیمات", |  | ||||||
| 	"Shortcuts": "Shortcuts", |  | ||||||
| 	"Show App Logs": "Show App Logs", |  | ||||||
| 	"Show app icon in system tray": "Show app icon in system tray", |  | ||||||
| 	"Show app unread badge": "Show app unread badge", |  | ||||||
| 	"Show desktop notifications": "Show desktop notifications", |  | ||||||
| 	"Show downloaded files in file manager": "Show downloaded files in file manager", |  | ||||||
| 	"Show sidebar": "Show sidebar", |  | ||||||
| 	"Start app at login": "Start app at login", |  | ||||||
| 	"Switch to Next Organization": "Switch to Next Organization", |  | ||||||
| 	"Switch to Previous Organization": "Switch to Previous Organization", |  | ||||||
| 	"These desktop app shortcuts extend the Zulip webapp's": "These desktop app shortcuts extend the Zulip webapp's", |  | ||||||
| 	"This will delete all application data including all added accounts and preferences": "This will delete all application data including all added accounts and preferences", |  | ||||||
| 	"Tip": "Tip", |  | ||||||
| 	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab", |  | ||||||
| 	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App", |  | ||||||
| 	"Toggle Do Not Disturb": "Toggle Do Not Disturb", |  | ||||||
| 	"Toggle Full Screen": "Toggle Full Screen", |  | ||||||
| 	"Toggle Sidebar": "Toggle Sidebar", |  | ||||||
| 	"Toggle Tray Icon": "Toggle Tray Icon", |  | ||||||
| 	"Tools": "Tools", |  | ||||||
| 	"Undo": "Undo", |  | ||||||
| 	"Upload": "Upload", |  | ||||||
| 	"Use system proxy settings (requires restart)": "Use system proxy settings (requires restart)", |  | ||||||
| 	"View": "View", |  | ||||||
| 	"View Shortcuts": "View Shortcuts", |  | ||||||
| 	"Window": "Window", |  | ||||||
| 	"Window Shortcuts": "Window Shortcuts", |  | ||||||
| 	"YES": "YES", |  | ||||||
| 	"Zoom In": "Zoom In", |  | ||||||
| 	"Zoom Out": "Zoom Out", |  | ||||||
| 	"Zulip Help": "Zulip Help", |  | ||||||
| 	"keyboard shortcuts": "keyboard shortcuts", |  | ||||||
| 	"script": "script", |  | ||||||
| 	"Quit when the window is closed": "Quit when the window is closed", |  | ||||||
| 	"Ask where to save files before downloading": "Ask where to save files before downloading", |  | ||||||
| 	"Services": "Services", |  | ||||||
| 	"Hide": "Hide", |  | ||||||
| 	"Hide Others": "Hide Others", |  | ||||||
| 	"Unhide": "Unhide", |  | ||||||
| 	"AddServer": "AddServer", |  | ||||||
| 	"App language (requires restart)": "App language (requires restart)", |  | ||||||
| 	"Factory Reset Data": "Factory Reset Data", |  | ||||||
| 	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Reset the application, thus deleting all the connected organizations, accounts, and certificates.", |  | ||||||
| 	"On macOS, the OS spellchecker is used.": "On macOS, the OS spellchecker is used.", |  | ||||||
| 	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Change the language from System Preferences → Keyboard → Text → Spelling.", |  | ||||||
| 	"Copy Link": "Copy Link", |  | ||||||
| 	"Copy Image": "Copy Image", |  | ||||||
| 	"Copy Image URL": "Copy Image URL", |  | ||||||
| 	"No Suggestion Found": "No Suggestion Found", |  | ||||||
| 	"You can select a maximum of 3 languages for spellchecking.": "You can select a maximum of 3 languages for spellchecking.", |  | ||||||
| 	"Spellchecker Languages": "Spellchecker Languages", |  | ||||||
| 	"Add to Dictionary": "Add to Dictionary", |  | ||||||
| 	"Look Up": "Look Up" |  | ||||||
| } |  | ||||||
| @@ -1,134 +0,0 @@ | |||||||
| { |  | ||||||
| 	"About Zulip": "Tietoa Zulipista", |  | ||||||
| 	"Actual Size": "Varsinainen koko", |  | ||||||
| 	"Add Custom Certificates": "Lisää omia sertifikaatteja", |  | ||||||
| 	"Add Organization": "Lisää organisaatio", |  | ||||||
| 	"Add a Zulip organization": "Lisää Zulip-organisaatio", |  | ||||||
| 	"Add custom CSS": "Lisää oma CSS", |  | ||||||
| 	"Advanced": "Edistynyt", |  | ||||||
| 	"All the connected organizations will appear here": "All the connected organizations will appear here", |  | ||||||
| 	"Always start minimized": "Aloita aina pienennettynä", |  | ||||||
| 	"App Updates": "Sovellspäivitykset", |  | ||||||
| 	"Appearance": "Ulkonäkö", |  | ||||||
| 	"Application Shortcuts": "Sovellusoikotiet", |  | ||||||
| 	"Are you sure you want to disconnect this organization?": "Are you sure you want to disconnect this organization?", |  | ||||||
| 	"Auto hide Menu bar": "Auto hide Menu bar", |  | ||||||
| 	"Auto hide menu bar (Press Alt key to display)": "Auto hide menu bar (Press Alt key to display)", |  | ||||||
| 	"Back": "Back", |  | ||||||
| 	"Bounce dock on new private message": "Bounce dock on new private message", |  | ||||||
| 	"Certificate file": "Certificate file", |  | ||||||
| 	"Change": "Muuta", |  | ||||||
| 	"Check for Updates": "Check for Updates", |  | ||||||
| 	"Close": "Sulje", |  | ||||||
| 	"Connect": "Yhdistä", |  | ||||||
| 	"Connect to another organization": "Connect to another organization", |  | ||||||
| 	"Connected organizations": "Connected organizations", |  | ||||||
| 	"Copy": "Kopioi", |  | ||||||
| 	"Copy Zulip URL": "Kopioi Zulip-URL", |  | ||||||
| 	"Create a new organization": "Luo uusi organisaatio", |  | ||||||
| 	"Cut": "Leikkaa", |  | ||||||
| 	"Default download location": "Default download location", |  | ||||||
| 	"Delete": "Poista", |  | ||||||
| 	"Desktop App Settings": "Desktop App Settings", |  | ||||||
| 	"Desktop Notifications": "Desktop Notifications", |  | ||||||
| 	"Desktop Settings": "Desktop Settings", |  | ||||||
| 	"Disconnect": "Katkaise", |  | ||||||
| 	"Download App Logs": "Download App Logs", |  | ||||||
| 	"Edit": "Muokkaa", |  | ||||||
| 	"Edit Shortcuts": "Edit Shortcuts", |  | ||||||
| 	"Enable auto updates": "Enable auto updates", |  | ||||||
| 	"Enable error reporting (requires restart)": "Enable error reporting (requires restart)", |  | ||||||
| 	"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)", |  | ||||||
| 	"Factory Reset": "Factory Reset", |  | ||||||
| 	"File": "Tiedosto", |  | ||||||
| 	"Find accounts": "Löydä tilit", |  | ||||||
| 	"Find accounts by email": "Find accounts by email", |  | ||||||
| 	"Flash taskbar on new message": "Flash taskbar on new message", |  | ||||||
| 	"Forward": "Forward", |  | ||||||
| 	"Functionality": "Functionality", |  | ||||||
| 	"General": "General", |  | ||||||
| 	"Get beta updates": "Get beta updates", |  | ||||||
| 	"Hard Reload": "Hard Reload", |  | ||||||
| 	"Help": "Ohje", |  | ||||||
| 	"Help Center": "Tukikeskus", |  | ||||||
| 	"History": "History", |  | ||||||
| 	"History Shortcuts": "History Shortcuts", |  | ||||||
| 	"Keyboard Shortcuts": "Keyboard Shortcuts", |  | ||||||
| 	"Log Out": "Log Out", |  | ||||||
| 	"Log Out of Organization": "Log Out of Organization", |  | ||||||
| 	"Manual proxy configuration": "Manual proxy configuration", |  | ||||||
| 	"Minimize": "Minimize", |  | ||||||
| 	"Mute all sounds from Zulip": "Mute all sounds from Zulip", |  | ||||||
| 	"NO": "EI", |  | ||||||
| 	"Network": "Network", |  | ||||||
| 	"OR": "TAI", |  | ||||||
| 	"Organization URL": "Organisaation URL", |  | ||||||
| 	"Organizations": "Organisaatiot", |  | ||||||
| 	"Paste": "Liitä", |  | ||||||
| 	"Paste and Match Style": "Liitä ja täsmää tyylit", |  | ||||||
| 	"Proxy": "Välipalvelin", |  | ||||||
| 	"Proxy bypass rules": "Proxy bypass rules", |  | ||||||
| 	"Proxy rules": "Proxy rules", |  | ||||||
| 	"Quit": "Lopeta", |  | ||||||
| 	"Quit Zulip": "Lopeta Zulip", |  | ||||||
| 	"Redo": "Toista", |  | ||||||
| 	"Release Notes": "Release Notes", |  | ||||||
| 	"Reload": "Lataa uudelleen", |  | ||||||
| 	"Report an Issue": "Report an Issue", |  | ||||||
| 	"Save": "Tallenna", |  | ||||||
| 	"Select All": "Valitse kaikki", |  | ||||||
| 	"Settings": "Asetukset", |  | ||||||
| 	"Shortcuts": "Oikopolut", |  | ||||||
| 	"Show App Logs": "Show App Logs", |  | ||||||
| 	"Show app icon in system tray": "Show app icon in system tray", |  | ||||||
| 	"Show app unread badge": "Show app unread badge", |  | ||||||
| 	"Show desktop notifications": "Show desktop notifications", |  | ||||||
| 	"Show downloaded files in file manager": "Show downloaded files in file manager", |  | ||||||
| 	"Show sidebar": "Show sidebar", |  | ||||||
| 	"Start app at login": "Start app at login", |  | ||||||
| 	"Switch to Next Organization": "Switch to Next Organization", |  | ||||||
| 	"Switch to Previous Organization": "Switch to Previous Organization", |  | ||||||
| 	"These desktop app shortcuts extend the Zulip webapp's": "These desktop app shortcuts extend the Zulip webapp's", |  | ||||||
| 	"This will delete all application data including all added accounts and preferences": "This will delete all application data including all added accounts and preferences", |  | ||||||
| 	"Tip": "Vinkki", |  | ||||||
| 	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab", |  | ||||||
| 	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App", |  | ||||||
| 	"Toggle Do Not Disturb": "Toggle Do Not Disturb", |  | ||||||
| 	"Toggle Full Screen": "Toggle Full Screen", |  | ||||||
| 	"Toggle Sidebar": "Toggle Sidebar", |  | ||||||
| 	"Toggle Tray Icon": "Toggle Tray Icon", |  | ||||||
| 	"Tools": "Työkalut", |  | ||||||
| 	"Undo": "Peru", |  | ||||||
| 	"Upload": "Upload", |  | ||||||
| 	"Use system proxy settings (requires restart)": "Use system proxy settings (requires restart)", |  | ||||||
| 	"View": "Näytä", |  | ||||||
| 	"View Shortcuts": "View Shortcuts", |  | ||||||
| 	"Window": "Ikkuna", |  | ||||||
| 	"Window Shortcuts": "Window Shortcuts", |  | ||||||
| 	"YES": "KYLLÄ", |  | ||||||
| 	"Zoom In": "Zoom In", |  | ||||||
| 	"Zoom Out": "Zoom Out", |  | ||||||
| 	"Zulip Help": "Zulip Help", |  | ||||||
| 	"keyboard shortcuts": "keyboard shortcuts", |  | ||||||
| 	"script": "script", |  | ||||||
| 	"Quit when the window is closed": "Quit when the window is closed", |  | ||||||
| 	"Ask where to save files before downloading": "Ask where to save files before downloading", |  | ||||||
| 	"Services": "Services", |  | ||||||
| 	"Hide": "Hide", |  | ||||||
| 	"Hide Others": "Hide Others", |  | ||||||
| 	"Unhide": "Unhide", |  | ||||||
| 	"AddServer": "AddServer", |  | ||||||
| 	"App language (requires restart)": "App language (requires restart)", |  | ||||||
| 	"Factory Reset Data": "Factory Reset Data", |  | ||||||
| 	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Reset the application, thus deleting all the connected organizations, accounts, and certificates.", |  | ||||||
| 	"On macOS, the OS spellchecker is used.": "On macOS, the OS spellchecker is used.", |  | ||||||
| 	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Change the language from System Preferences → Keyboard → Text → Spelling.", |  | ||||||
| 	"Copy Link": "Copy Link", |  | ||||||
| 	"Copy Image": "Copy Image", |  | ||||||
| 	"Copy Image URL": "Copy Image URL", |  | ||||||
| 	"No Suggestion Found": "No Suggestion Found", |  | ||||||
| 	"You can select a maximum of 3 languages for spellchecking.": "You can select a maximum of 3 languages for spellchecking.", |  | ||||||
| 	"Spellchecker Languages": "Spellchecker Languages", |  | ||||||
| 	"Add to Dictionary": "Add to Dictionary", |  | ||||||
| 	"Look Up": "Look Up" |  | ||||||
| } |  | ||||||
| @@ -1,134 +0,0 @@ | |||||||
| { |  | ||||||
| 	"About Zulip": "Zulip에 대해", |  | ||||||
| 	"Actual Size": "실제 크기", |  | ||||||
| 	"Add Custom Certificates": "사용자 지정 인증서 추가", |  | ||||||
| 	"Add Organization": "조직 추가", |  | ||||||
| 	"Add a Zulip organization": "새로운 Zulip 조직 추가", |  | ||||||
| 	"Add custom CSS": "맞춤 CSS 추가", |  | ||||||
| 	"Advanced": "많은", |  | ||||||
| 	"All the connected organizations will appear here": "연결된 모든 조직이 여기에 표시됩니다.", |  | ||||||
| 	"Always start minimized": "항상 최소화 된 상태로 시작하십시오.", |  | ||||||
| 	"App Updates": "앱 업데이트", |  | ||||||
| 	"Appearance": "외관", |  | ||||||
| 	"Application Shortcuts": "애플리케이션 단축키", |  | ||||||
| 	"Are you sure you want to disconnect this organization?": "이 조직의 연결을 해제 하시겠습니까?", |  | ||||||
| 	"Auto hide Menu bar": "메뉴 바 자동 숨기기", |  | ||||||
| 	"Auto hide menu bar (Press Alt key to display)": "메뉴 바 자동 숨기기 (표시하려면 Alt 키를 누릅니다)", |  | ||||||
| 	"Back": "뒤로가기", |  | ||||||
| 	"Bounce dock on new private message": "새로운 비공개 메시지에 바운스 독", |  | ||||||
| 	"Certificate file": "인증서 파일", |  | ||||||
| 	"Change": "변화", |  | ||||||
| 	"Check for Updates": "업데이트 확인", |  | ||||||
| 	"Close": "닫기", |  | ||||||
| 	"Connect": "잇다", |  | ||||||
| 	"Connect to another organization": "다른 조직에 연결", |  | ||||||
| 	"Connected organizations": "연결된 조직", |  | ||||||
| 	"Copy": "복사", |  | ||||||
| 	"Copy Zulip URL": "Zulip URL 복사", |  | ||||||
| 	"Create a new organization": "새 조직 만들기", |  | ||||||
| 	"Cut": "절단", |  | ||||||
| 	"Default download location": "기본 다운로드 위치", |  | ||||||
| 	"Delete": "삭제", |  | ||||||
| 	"Desktop App Settings": "데스크톱 앱 설정", |  | ||||||
| 	"Desktop Notifications": "데스크톱 알림", |  | ||||||
| 	"Desktop Settings": "데스크톱 설정", |  | ||||||
| 	"Disconnect": "연결 끊기", |  | ||||||
| 	"Download App Logs": "앱 로그 다운로드", |  | ||||||
| 	"Edit": "편집하다", |  | ||||||
| 	"Edit Shortcuts": "바로 가기 편집", |  | ||||||
| 	"Enable auto updates": "자동 업데이트 사용", |  | ||||||
| 	"Enable error reporting (requires restart)": "오류보고 사용 (재시작 필요)", |  | ||||||
| 	"Enable spellchecker (requires restart)": "맞춤법 검사기 사용 (재시작 필요)", |  | ||||||
| 	"Factory Reset": "공장 초기화", |  | ||||||
| 	"File": "파일", |  | ||||||
| 	"Find accounts": "계정 찾기", |  | ||||||
| 	"Find accounts by email": "이메일을 통한 계정 찾기", |  | ||||||
| 	"Flash taskbar on new message": "새 메시지의 Flash 작업 표시 줄", |  | ||||||
| 	"Forward": "앞으로", |  | ||||||
| 	"Functionality": "기능", |  | ||||||
| 	"General": "일반", |  | ||||||
| 	"Get beta updates": "베타 업데이트 받기", |  | ||||||
| 	"Hard Reload": "하드 다시로드", |  | ||||||
| 	"Help": "도움", |  | ||||||
| 	"Help Center": "지원 센터", |  | ||||||
| 	"History": "역사", |  | ||||||
| 	"History Shortcuts": "연혁 단축키", |  | ||||||
| 	"Keyboard Shortcuts": "키보드 단축키", |  | ||||||
| 	"Log Out": "로그 아웃", |  | ||||||
| 	"Log Out of Organization": "조직에서 로그 아웃", |  | ||||||
| 	"Manual proxy configuration": "수동 프록시 구성", |  | ||||||
| 	"Minimize": "최소화", |  | ||||||
| 	"Mute all sounds from Zulip": "튤립에서 모든 소리를 음소거합니다.", |  | ||||||
| 	"NO": "아니", |  | ||||||
| 	"Network": "회로망", |  | ||||||
| 	"OR": "또는", |  | ||||||
| 	"Organization URL": "조직 URL", |  | ||||||
| 	"Organizations": "단체", |  | ||||||
| 	"Paste": "붙여넣기", |  | ||||||
| 	"Paste and Match Style": "붙여 넣기 및 스타일 일치", |  | ||||||
| 	"Proxy": "대리", |  | ||||||
| 	"Proxy bypass rules": "프록시 우회 규칙", |  | ||||||
| 	"Proxy rules": "프록시 규칙", |  | ||||||
| 	"Quit": "떠나다", |  | ||||||
| 	"Quit Zulip": "Zulip 을 종료하십시오.", |  | ||||||
| 	"Redo": "다시 하다", |  | ||||||
| 	"Release Notes": "릴리즈 노트", |  | ||||||
| 	"Reload": "다시로드", |  | ||||||
| 	"Report an Issue": "문제 신고", |  | ||||||
| 	"Save": "구하다", |  | ||||||
| 	"Select All": "모두 선택", |  | ||||||
| 	"Settings": "설정", |  | ||||||
| 	"Shortcuts": "바로 가기", |  | ||||||
| 	"Show App Logs": "앱 로그 보기", |  | ||||||
| 	"Show app icon in system tray": "시스템 트레이에 앱 아이콘 표시", |  | ||||||
| 	"Show app unread badge": "앱에 읽지 않은 배지 표시", |  | ||||||
| 	"Show desktop notifications": "바탕 화면 알림 표시", |  | ||||||
| 	"Show downloaded files in file manager": "파일 관리자에서 다운로드 한 파일 표시", |  | ||||||
| 	"Show sidebar": "사이드 바 표시", |  | ||||||
| 	"Start app at login": "로그인시 앱 시작", |  | ||||||
| 	"Switch to Next Organization": "다음 조직으로 전환", |  | ||||||
| 	"Switch to Previous Organization": "이전 조직으로 전환", |  | ||||||
| 	"These desktop app shortcuts extend the Zulip webapp's": "이러한 데스크톱 앱 바로 가기는 Zulip 웹 앱을 확장합니다.", |  | ||||||
| 	"This will delete all application data including all added accounts and preferences": "이렇게하면 추가 된 모든 계정 및 환경 설정을 포함한 모든 응용 프로그램 데이터가 삭제됩니다.", |  | ||||||
| 	"Tip": "팁", |  | ||||||
| 	"Toggle DevTools for Active Tab": "DevTools for Active Tab 토글", |  | ||||||
| 	"Toggle DevTools for Zulip App": "Zulip App 용 DevTools 토글", |  | ||||||
| 	"Toggle Do Not Disturb": "방해 금지 전환", |  | ||||||
| 	"Toggle Full Screen": "전체 화면 토글", |  | ||||||
| 	"Toggle Sidebar": "사이드 바 전환", |  | ||||||
| 	"Toggle Tray Icon": "트레이 아이콘 토글", |  | ||||||
| 	"Tools": "도구들", |  | ||||||
| 	"Undo": "끄르다", |  | ||||||
| 	"Upload": "업로드", |  | ||||||
| 	"Use system proxy settings (requires restart)": "시스템 프록시 설정 사용 (다시 시작해야 함)", |  | ||||||
| 	"View": "전망", |  | ||||||
| 	"View Shortcuts": "바로 가기보기", |  | ||||||
| 	"Window": "창문", |  | ||||||
| 	"Window Shortcuts": "창 바로 가기", |  | ||||||
| 	"YES": "예", |  | ||||||
| 	"Zoom In": "확대", |  | ||||||
| 	"Zoom Out": "축소", |  | ||||||
| 	"Zulip Help": "Zulip 도움말", |  | ||||||
| 	"keyboard shortcuts": "키보드 단축키", |  | ||||||
| 	"script": "스크립트", |  | ||||||
| 	"Quit when the window is closed": "윈도우가 닫히면 종료", |  | ||||||
| 	"Ask where to save files before downloading": "Ask where to save files before downloading", |  | ||||||
| 	"Services": "Services", |  | ||||||
| 	"Hide": "Hide", |  | ||||||
| 	"Hide Others": "Hide Others", |  | ||||||
| 	"Unhide": "Unhide", |  | ||||||
| 	"AddServer": "AddServer", |  | ||||||
| 	"App language (requires restart)": "App language (requires restart)", |  | ||||||
| 	"Factory Reset Data": "Factory Reset Data", |  | ||||||
| 	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Reset the application, thus deleting all the connected organizations, accounts, and certificates.", |  | ||||||
| 	"On macOS, the OS spellchecker is used.": "On macOS, the OS spellchecker is used.", |  | ||||||
| 	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Change the language from System Preferences → Keyboard → Text → Spelling.", |  | ||||||
| 	"Copy Link": "Copy Link", |  | ||||||
| 	"Copy Image": "Copy Image", |  | ||||||
| 	"Copy Image URL": "Copy Image URL", |  | ||||||
| 	"No Suggestion Found": "No Suggestion Found", |  | ||||||
| 	"You can select a maximum of 3 languages for spellchecking.": "You can select a maximum of 3 languages for spellchecking.", |  | ||||||
| 	"Spellchecker Languages": "Spellchecker Languages", |  | ||||||
| 	"Add to Dictionary": "Add to Dictionary", |  | ||||||
| 	"Look Up": "Look Up" |  | ||||||
| } |  | ||||||
| @@ -1,134 +0,0 @@ | |||||||
| { |  | ||||||
| 	"About Zulip": "Sobre o Zulip", |  | ||||||
| 	"Actual Size": "Tamanho atual", |  | ||||||
| 	"Add Custom Certificates": "Adicionar certificados personalizados", |  | ||||||
| 	"Add Organization": "Adicionar Organização", |  | ||||||
| 	"Add a Zulip organization": "Adicione uma organização Zulip", |  | ||||||
| 	"Add custom CSS": "Adicionar CSS personalizado", |  | ||||||
| 	"Advanced": "Avançado", |  | ||||||
| 	"All the connected organizations will appear here": "Todas as organizações conectadas aparecerão aqui", |  | ||||||
| 	"Always start minimized": "Começar sempre minimizado", |  | ||||||
| 	"App Updates": "Atualizações de aplicativos", |  | ||||||
| 	"Appearance": "Aparência", |  | ||||||
| 	"Application Shortcuts": "Atalhos de aplicativos", |  | ||||||
| 	"Are you sure you want to disconnect this organization?": "Tem certeza de que deseja desconectar essa organização?", |  | ||||||
| 	"Auto hide Menu bar": "Auto ocultar barra de Menu", |  | ||||||
| 	"Auto hide menu bar (Press Alt key to display)": "Ocultar barra de menu automaticamente (pressione a tecla Alt para exibir)", |  | ||||||
| 	"Back": "De volta", |  | ||||||
| 	"Bounce dock on new private message": "Bounce doca em nova mensagem privada", |  | ||||||
| 	"Certificate file": "Arquivo de certificado", |  | ||||||
| 	"Change": "mudança", |  | ||||||
| 	"Check for Updates": "Verificar se há atualizações", |  | ||||||
| 	"Close": "Fechar", |  | ||||||
| 	"Connect": "Conectar", |  | ||||||
| 	"Connect to another organization": "Conecte-se a outra organização", |  | ||||||
| 	"Connected organizations": "Organizações conectadas", |  | ||||||
| 	"Copy": "Copiar", |  | ||||||
| 	"Copy Zulip URL": "Copiar URL do Zulip", |  | ||||||
| 	"Create a new organization": "Crie uma nova organização", |  | ||||||
| 	"Cut": "Cortar", |  | ||||||
| 	"Default download location": "Local de download padrão", |  | ||||||
| 	"Delete": "Excluir", |  | ||||||
| 	"Desktop App Settings": "Configurações do aplicativo de desktop", |  | ||||||
| 	"Desktop Notifications": "Notificações da área de trabalho", |  | ||||||
| 	"Desktop Settings": "Configurações da área de trabalho", |  | ||||||
| 	"Disconnect": "desconectar", |  | ||||||
| 	"Download App Logs": "Download de registros de aplicativos", |  | ||||||
| 	"Edit": "Editar", |  | ||||||
| 	"Edit Shortcuts": "Editar atalhos", |  | ||||||
| 	"Enable auto updates": "Ativar atualizações automáticas", |  | ||||||
| 	"Enable error reporting (requires restart)": "Ativar relatório de erros (requer reinicialização)", |  | ||||||
| 	"Enable spellchecker (requires restart)": "Ativar verificação ortográfica (requer reinicialização)", |  | ||||||
| 	"Factory Reset": "Restauração de fábrica", |  | ||||||
| 	"File": "Arquivo", |  | ||||||
| 	"Find accounts": "Encontrar contas", |  | ||||||
| 	"Find accounts by email": "Encontre contas por email", |  | ||||||
| 	"Flash taskbar on new message": "Barra de tarefas em Flash na nova mensagem", |  | ||||||
| 	"Forward": "frente", |  | ||||||
| 	"Functionality": "Funcionalidade", |  | ||||||
| 	"General": "Geral", |  | ||||||
| 	"Get beta updates": "Receba atualizações beta", |  | ||||||
| 	"Hard Reload": "Hard Reload", |  | ||||||
| 	"Help": "Socorro", |  | ||||||
| 	"Help Center": "Centro de ajuda", |  | ||||||
| 	"History": "História", |  | ||||||
| 	"History Shortcuts": "Atalhos da História", |  | ||||||
| 	"Keyboard Shortcuts": "Atalhos do teclado", |  | ||||||
| 	"Log Out": "Sair", |  | ||||||
| 	"Log Out of Organization": "Sair da organização", |  | ||||||
| 	"Manual proxy configuration": "Configuração manual de proxy", |  | ||||||
| 	"Minimize": "Minimizar", |  | ||||||
| 	"Mute all sounds from Zulip": "Silencie todos os sons de Zulip", |  | ||||||
| 	"NO": "NÃO", |  | ||||||
| 	"Network": "Rede", |  | ||||||
| 	"OR": "OU", |  | ||||||
| 	"Organization URL": "URL da organização", |  | ||||||
| 	"Organizations": "Organizações", |  | ||||||
| 	"Paste": "Colar", |  | ||||||
| 	"Paste and Match Style": "Colar e combinar estilo", |  | ||||||
| 	"Proxy": "Procuração", |  | ||||||
| 	"Proxy bypass rules": "Regras de desvio de proxy", |  | ||||||
| 	"Proxy rules": "Regras de proxy", |  | ||||||
| 	"Quit": "Sair", |  | ||||||
| 	"Quit Zulip": "Saia de Zulip", |  | ||||||
| 	"Redo": "Refazer", |  | ||||||
| 	"Release Notes": "Notas de Lançamento", |  | ||||||
| 	"Reload": "recarregar", |  | ||||||
| 	"Report an Issue": "Comunicar um problema", |  | ||||||
| 	"Save": "Salve ", |  | ||||||
| 	"Select All": "Selecionar tudo", |  | ||||||
| 	"Settings": "Configurações", |  | ||||||
| 	"Shortcuts": "Atalhos", |  | ||||||
| 	"Show App Logs": "Mostrar registros do aplicativo", |  | ||||||
| 	"Show app icon in system tray": "Mostrar ícone do aplicativo na bandeja do sistema", |  | ||||||
| 	"Show app unread badge": "Mostrar crachá não lido do aplicativo", |  | ||||||
| 	"Show desktop notifications": "Mostrar notificações da área de trabalho", |  | ||||||
| 	"Show downloaded files in file manager": "Mostrar arquivos baixados no gerenciador de arquivos", |  | ||||||
| 	"Show sidebar": "Mostrar barra lateral", |  | ||||||
| 	"Start app at login": "Inicie o aplicativo no login", |  | ||||||
| 	"Switch to Next Organization": "Mudar para a próxima organização", |  | ||||||
| 	"Switch to Previous Organization": "Mudar para a organização anterior", |  | ||||||
| 	"These desktop app shortcuts extend the Zulip webapp's": "Esses atalhos para aplicativos de desktop estendem o aplicativo da web do Zulip", |  | ||||||
| 	"This will delete all application data including all added accounts and preferences": "Isso excluirá todos os dados do aplicativo, incluindo todas as contas e preferências adicionadas", |  | ||||||
| 	"Tip": "Gorjeta", |  | ||||||
| 	"Toggle DevTools for Active Tab": "Alternar DevTools para a guia ativa", |  | ||||||
| 	"Toggle DevTools for Zulip App": "Alternar DevTools para Zulip App", |  | ||||||
| 	"Toggle Do Not Disturb": "Alternar não perturbe", |  | ||||||
| 	"Toggle Full Screen": "Alternar para o modo tela cheia", |  | ||||||
| 	"Toggle Sidebar": "Alternar Barra Lateral", |  | ||||||
| 	"Toggle Tray Icon": "Alternar ícone da bandeja", |  | ||||||
| 	"Tools": "Ferramentas", |  | ||||||
| 	"Undo": "Desfazer", |  | ||||||
| 	"Upload": "Envio", |  | ||||||
| 	"Use system proxy settings (requires restart)": "Use as configurações de proxy do sistema (requer reinicialização)", |  | ||||||
| 	"View": "Visão", |  | ||||||
| 	"View Shortcuts": "Exibir atalhos", |  | ||||||
| 	"Window": "Janela", |  | ||||||
| 	"Window Shortcuts": "Atalhos de janela", |  | ||||||
| 	"YES": "SIM", |  | ||||||
| 	"Zoom In": "Mais Zoom", |  | ||||||
| 	"Zoom Out": "Reduzir o zoom", |  | ||||||
| 	"Zulip Help": "Zulip Ajuda", |  | ||||||
| 	"keyboard shortcuts": "atalhos do teclado", |  | ||||||
| 	"script": "roteiro", |  | ||||||
| 	"Quit when the window is closed": "Sair quando fechar a janela", |  | ||||||
| 	"Ask where to save files before downloading": "Ask where to save files before downloading", |  | ||||||
| 	"Services": "Services", |  | ||||||
| 	"Hide": "Hide", |  | ||||||
| 	"Hide Others": "Hide Others", |  | ||||||
| 	"Unhide": "Unhide", |  | ||||||
| 	"AddServer": "AddServer", |  | ||||||
| 	"App language (requires restart)": "App language (requires restart)", |  | ||||||
| 	"Factory Reset Data": "Factory Reset Data", |  | ||||||
| 	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Reset the application, thus deleting all the connected organizations, accounts, and certificates.", |  | ||||||
| 	"On macOS, the OS spellchecker is used.": "On macOS, the OS spellchecker is used.", |  | ||||||
| 	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Change the language from System Preferences → Keyboard → Text → Spelling.", |  | ||||||
| 	"Copy Link": "Copy Link", |  | ||||||
| 	"Copy Image": "Copy Image", |  | ||||||
| 	"Copy Image URL": "Copy Image URL", |  | ||||||
| 	"No Suggestion Found": "No Suggestion Found", |  | ||||||
| 	"You can select a maximum of 3 languages for spellchecking.": "You can select a maximum of 3 languages for spellchecking.", |  | ||||||
| 	"Spellchecker Languages": "Spellchecker Languages", |  | ||||||
| 	"Add to Dictionary": "Add to Dictionary", |  | ||||||
| 	"Look Up": "Look Up" |  | ||||||
| } |  | ||||||
| @@ -1,134 +0,0 @@ | |||||||
| { |  | ||||||
| 	"About Zulip": "О Zulip", |  | ||||||
| 	"Actual Size": "Актуальный размер", |  | ||||||
| 	"Add Custom Certificates": "Добавить собственные сертификаты", |  | ||||||
| 	"Add Organization": "Добавить организацию", |  | ||||||
| 	"Add a Zulip organization": "Добавить организацию Zulip", |  | ||||||
| 	"Add custom CSS": "Добавить собственный CSS", |  | ||||||
| 	"Advanced": "Дополнительно", |  | ||||||
| 	"All the connected organizations will appear here": "Все связанные организации будут появляться здесь", |  | ||||||
| 	"Always start minimized": "Запускать свернуто", |  | ||||||
| 	"App Updates": "Обновления", |  | ||||||
| 	"Appearance": "Вид", |  | ||||||
| 	"Application Shortcuts": "Горячие клавиши", |  | ||||||
| 	"Are you sure you want to disconnect this organization?": "Вы уверены, что хотите отключить эту организацию?", |  | ||||||
| 	"Auto hide Menu bar": "Скрывать меню", |  | ||||||
| 	"Auto hide menu bar (Press Alt key to display)": "Скрывать меню (для показа нажмите Alt)", |  | ||||||
| 	"Back": "Назад", |  | ||||||
| 	"Bounce dock on new private message": "Показывать док при поступлении нового личного сообщения", |  | ||||||
| 	"Certificate file": "Файл сертификата", |  | ||||||
| 	"Change": "Изменить", |  | ||||||
| 	"Check for Updates": "Проверить наличие обновлений", |  | ||||||
| 	"Close": "Закрыть", |  | ||||||
| 	"Connect": "Подключиться", |  | ||||||
| 	"Connect to another organization": "Подключиться к другой организации", |  | ||||||
| 	"Connected organizations": "Подключенные организации", |  | ||||||
| 	"Copy": "Копировать", |  | ||||||
| 	"Copy Zulip URL": "Скопировать ссылку на сервер Zulip", |  | ||||||
| 	"Create a new organization": "Создать новую организацию", |  | ||||||
| 	"Cut": "Вырезать", |  | ||||||
| 	"Default download location": "Папка для загрузки", |  | ||||||
| 	"Delete": "Удалить", |  | ||||||
| 	"Desktop App Settings": "Настройки приложения", |  | ||||||
| 	"Desktop Notifications": "Оповещения на рабочем столе", |  | ||||||
| 	"Desktop Settings": "Настройки рабочего стола", |  | ||||||
| 	"Disconnect": "Отключиться", |  | ||||||
| 	"Download App Logs": "Скачать логи приложения", |  | ||||||
| 	"Edit": "Изменить", |  | ||||||
| 	"Edit Shortcuts": "Редактировать горячие клавиши", |  | ||||||
| 	"Enable auto updates": "Включить автообновление", |  | ||||||
| 	"Enable error reporting (requires restart)": "Включить сообщения об ошибках (потребуется перезапуск)", |  | ||||||
| 	"Enable spellchecker (requires restart)": "Включить проверку орфографии (потребуется перезапуск)", |  | ||||||
| 	"Factory Reset": "Сброс настроек", |  | ||||||
| 	"File": "Файл", |  | ||||||
| 	"Find accounts": "Найти учетные записи", |  | ||||||
| 	"Find accounts by email": "Искать учетные записи по адресу электронной почты", |  | ||||||
| 	"Flash taskbar on new message": "Высвечивать панель задач при новом сообщении", |  | ||||||
| 	"Forward": "Вперед", |  | ||||||
| 	"Functionality": "Функциональность", |  | ||||||
| 	"General": "Общее", |  | ||||||
| 	"Get beta updates": "Получать бета-обновления", |  | ||||||
| 	"Hard Reload": "Жесткая перезагрузка", |  | ||||||
| 	"Help": "Помощь", |  | ||||||
| 	"Help Center": "Центр поддержки", |  | ||||||
| 	"History": "История", |  | ||||||
| 	"History Shortcuts": "Горячие клавишы по истории", |  | ||||||
| 	"Keyboard Shortcuts": "Горячие клавишы", |  | ||||||
| 	"Log Out": "Выйти из учетной записи", |  | ||||||
| 	"Log Out of Organization": "Выйти из организации", |  | ||||||
| 	"Manual proxy configuration": "Ручная настройка прокси", |  | ||||||
| 	"Minimize": "Свернуть", |  | ||||||
| 	"Mute all sounds from Zulip": "Выключить все звуки Zulip", |  | ||||||
| 	"NO": "НЕТ", |  | ||||||
| 	"Network": "Сеть", |  | ||||||
| 	"OR": "ИЛИ", |  | ||||||
| 	"Organization URL": "URL организации", |  | ||||||
| 	"Organizations": "Организации", |  | ||||||
| 	"Paste": "Вставить", |  | ||||||
| 	"Paste and Match Style": "Вставить с соблюдением стиля", |  | ||||||
| 	"Proxy": "Прокси", |  | ||||||
| 	"Proxy bypass rules": "Правила обхода прокси", |  | ||||||
| 	"Proxy rules": "Правила прокси", |  | ||||||
| 	"Quit": "Выход", |  | ||||||
| 	"Quit Zulip": "Выйти из Zulip", |  | ||||||
| 	"Redo": "Исправить", |  | ||||||
| 	"Release Notes": "Описание обновлений", |  | ||||||
| 	"Reload": "Перезагрузить", |  | ||||||
| 	"Report an Issue": "Сообщить об ошибке", |  | ||||||
| 	"Save": "Сохранить", |  | ||||||
| 	"Select All": "Выделить все", |  | ||||||
| 	"Settings": "Настройки", |  | ||||||
| 	"Shortcuts": "Горячие клавиши", |  | ||||||
| 	"Show App Logs": "Показать логи приложения", |  | ||||||
| 	"Show app icon in system tray": "Показывать приложение в области уведомлений", |  | ||||||
| 	"Show app unread badge": "Показывать значок о непрочитанных сообщениях", |  | ||||||
| 	"Show desktop notifications": "Показывать всплывающие оповещения", |  | ||||||
| 	"Show downloaded files in file manager": "Показать скаченные файлы в менеджере закачек", |  | ||||||
| 	"Show sidebar": "Показывать боковую панель", |  | ||||||
| 	"Start app at login": "Запускать приложение при входе в систему", |  | ||||||
| 	"Switch to Next Organization": "Перейти к следующей организации", |  | ||||||
| 	"Switch to Previous Organization": "Перейти к предыдущей организации", |  | ||||||
| 	"These desktop app shortcuts extend the Zulip webapp's": "Эти ярлыки приложения для рабочего стола дополняют функционал сетевого приложения Zulip", |  | ||||||
| 	"This will delete all application data including all added accounts and preferences": "Этим удаляются все данные приложения, включая данные всех подключенных аккаунтов и настройки.", |  | ||||||
| 	"Tip": "Совет", |  | ||||||
| 	"Toggle DevTools for Active Tab": "Переключить инструменты разработчика для активной вкладки", |  | ||||||
| 	"Toggle DevTools for Zulip App": "Переключить инструменты разработчика для приложения Zulip", |  | ||||||
| 	"Toggle Do Not Disturb": "Переключить режим \"не мешать\"", |  | ||||||
| 	"Toggle Full Screen": "Переключить полный экран", |  | ||||||
| 	"Toggle Sidebar": "Переключить боковую панель", |  | ||||||
| 	"Toggle Tray Icon": "Переключить иконку в области уведомлений", |  | ||||||
| 	"Tools": "Инструменты", |  | ||||||
| 	"Undo": "Отменить", |  | ||||||
| 	"Upload": "Загрузить", |  | ||||||
| 	"Use system proxy settings (requires restart)": "Использовать системные настройки прокси (необходима перезагрузка)", |  | ||||||
| 	"View": "Вид", |  | ||||||
| 	"View Shortcuts": "Посмотреть горячие клавишы", |  | ||||||
| 	"Window": "Окно", |  | ||||||
| 	"Window Shortcuts": "Ярлыки окна", |  | ||||||
| 	"YES": "ДА", |  | ||||||
| 	"Zoom In": "Увеличить масштаб", |  | ||||||
| 	"Zoom Out": "Уменьшить масштаб", |  | ||||||
| 	"Zulip Help": "Помощь по Zulip", |  | ||||||
| 	"keyboard shortcuts": "Горячие клавиши", |  | ||||||
| 	"script": "скрипт", |  | ||||||
| 	"Quit when the window is closed": "Выйти, когда окно будет закрыто", |  | ||||||
| 	"Ask where to save files before downloading": "Спрашивать, где сохранять файлы перед скачиванием", |  | ||||||
| 	"Services": "Сервисы", |  | ||||||
| 	"Hide": "Скрыть", |  | ||||||
| 	"Hide Others": "Скрыть другие", |  | ||||||
| 	"Unhide": "Не скрывать", |  | ||||||
| 	"AddServer": "Добавить Сервер", |  | ||||||
| 	"App language (requires restart)": "Язык приложения (требует перезапуска)", |  | ||||||
| 	"Factory Reset Data": "Сброс данных приложения", |  | ||||||
| 	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Сбросить все настройки приложения, и удалить все подключенные организации, учетные записи и сертификаты.", |  | ||||||
| 	"On macOS, the OS spellchecker is used.": "На macOS используется орфографический корректор OS.", |  | ||||||
| 	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Настройте язык, следуя меню Настройки системы → Клавиатура → Текст → Орфография.", |  | ||||||
| 	"Copy Link": "Скопировать ссылку", |  | ||||||
| 	"Copy Image": "Скопировать изображение", |  | ||||||
| 	"Copy Image URL": "Скопировать ссылку на изображение", |  | ||||||
| 	"No Suggestion Found": "Предложений не найдено", |  | ||||||
| 	"You can select a maximum of 3 languages for spellchecking.": "Вы можете выбрать не более 3-х языков для проверки орфографии.", |  | ||||||
| 	"Spellchecker Languages": "Языки для проверки орфографии", |  | ||||||
| 	"Add to Dictionary": "Добавить в словарь", |  | ||||||
| 	"Look Up": "Искать" |  | ||||||
| } |  | ||||||
| @@ -1,134 +0,0 @@ | |||||||
| { |  | ||||||
| 	"About Zulip": "О Зулипу", |  | ||||||
| 	"Actual Size": "Стварна величина", |  | ||||||
| 	"Add Custom Certificates": "Додајте прилагођене цертификате", |  | ||||||
| 	"Add Organization": "Додај организацију", |  | ||||||
| 	"Add a Zulip organization": "Додајте Зулип организацију", |  | ||||||
| 	"Add custom CSS": "Додајте прилагођени ЦСС", |  | ||||||
| 	"Advanced": "Напредно", |  | ||||||
| 	"All the connected organizations will appear here": "Овде ће се појавити све повезане организације", |  | ||||||
| 	"Always start minimized": "Увек започните минимизирано", |  | ||||||
| 	"App Updates": "Апп Упдатес", |  | ||||||
| 	"Appearance": "Изглед", |  | ||||||
| 	"Application Shortcuts": "Пречице за апликације", |  | ||||||
| 	"Are you sure you want to disconnect this organization?": "Јесте ли сигурни да желите прекинути везу с овом организацијом?", |  | ||||||
| 	"Auto hide Menu bar": "Ауто хиде Мену бар", |  | ||||||
| 	"Auto hide menu bar (Press Alt key to display)": "Аутоматско скривање траке менија (притисните тастер Алт да бисте приказали)", |  | ||||||
| 	"Back": "Назад", |  | ||||||
| 	"Bounce dock on new private message": "Одскочите у нову приватну поруку", |  | ||||||
| 	"Certificate file": "Датотека сертификата", |  | ||||||
| 	"Change": "Цханге", |  | ||||||
| 	"Check for Updates": "Провери ажурирања", |  | ||||||
| 	"Close": "Близу", |  | ||||||
| 	"Connect": "Повежи", |  | ||||||
| 	"Connect to another organization": "Повежите се са другом организацијом", |  | ||||||
| 	"Connected organizations": "Повезане организације", |  | ||||||
| 	"Copy": "Копирај", |  | ||||||
| 	"Copy Zulip URL": "Цопи Зулип УРЛ", |  | ||||||
| 	"Create a new organization": "Направите нову организацију", |  | ||||||
| 	"Cut": "Цут", |  | ||||||
| 	"Default download location": "Дефаулт довнлоад лоцатион", |  | ||||||
| 	"Delete": "Обриши", |  | ||||||
| 	"Desktop App Settings": "Подешавања апликације за десктоп рачунаре", |  | ||||||
| 	"Desktop Notifications": "Обавештења о радној површини", |  | ||||||
| 	"Desktop Settings": "Десктоп Сеттингс", |  | ||||||
| 	"Disconnect": "Дисцоннецт", |  | ||||||
| 	"Download App Logs": "Довнлоад Апп Логс", |  | ||||||
| 	"Edit": "Уредити", |  | ||||||
| 	"Edit Shortcuts": "Уреди пречице", |  | ||||||
| 	"Enable auto updates": "Омогући аутоматско ажурирање", |  | ||||||
| 	"Enable error reporting (requires restart)": "Омогући извештавање о грешкама (захтева поновно покретање)", |  | ||||||
| 	"Enable spellchecker (requires restart)": "Омогући провјеру правописа (захтијева поновно покретање)", |  | ||||||
| 	"Factory Reset": "Фацтори Ресет", |  | ||||||
| 	"File": "Филе", |  | ||||||
| 	"Find accounts": "Нађи рачуне", |  | ||||||
| 	"Find accounts by email": "Пронађите рачуне путем е-поште", |  | ||||||
| 	"Flash taskbar on new message": "Фласх трака задатака у новој поруци", |  | ||||||
| 	"Forward": "Напријед", |  | ||||||
| 	"Functionality": "Функционалност", |  | ||||||
| 	"General": "Генерал", |  | ||||||
| 	"Get beta updates": "Набавите бета ажурирања", |  | ||||||
| 	"Hard Reload": "Хард Релоад", |  | ||||||
| 	"Help": "Помоћ", |  | ||||||
| 	"Help Center": "Центар за помоћ", |  | ||||||
| 	"History": "Хистори", |  | ||||||
| 	"History Shortcuts": "Историјске пречице", |  | ||||||
| 	"Keyboard Shortcuts": "Пречице на тастатури", |  | ||||||
| 	"Log Out": "Одјавити се", |  | ||||||
| 	"Log Out of Organization": "Одјавите се из организације", |  | ||||||
| 	"Manual proxy configuration": "Мануал проки цонфигуратион", |  | ||||||
| 	"Minimize": "Минимизе", |  | ||||||
| 	"Mute all sounds from Zulip": "Искључите све звукове из Зулипа", |  | ||||||
| 	"NO": "НЕ", |  | ||||||
| 	"Network": "Мрежа", |  | ||||||
| 	"OR": "ОР", |  | ||||||
| 	"Organization URL": "УРЛ организације", |  | ||||||
| 	"Organizations": "Организације", |  | ||||||
| 	"Paste": "Пасте", |  | ||||||
| 	"Paste and Match Style": "Залепите и подесите стил", |  | ||||||
| 	"Proxy": "Заступник", |  | ||||||
| 	"Proxy bypass rules": "Проки бипасс правила", |  | ||||||
| 	"Proxy rules": "Проки рулес", |  | ||||||
| 	"Quit": "Одустати", |  | ||||||
| 	"Quit Zulip": "Куит Зулип", |  | ||||||
| 	"Redo": "Редо", |  | ||||||
| 	"Release Notes": "Релеасе Нотес", |  | ||||||
| 	"Reload": "Освежи", |  | ||||||
| 	"Report an Issue": "Пријавите проблем", |  | ||||||
| 	"Save": "сачувати", |  | ||||||
| 	"Select All": "Изабери све", |  | ||||||
| 	"Settings": "Подешавања", |  | ||||||
| 	"Shortcuts": "Пречице", |  | ||||||
| 	"Show App Logs": "Прикажи дневнике апликација", |  | ||||||
| 	"Show app icon in system tray": "Покажи икону апликације у системској палети", |  | ||||||
| 	"Show app unread badge": "Покажи непрочитану значку апликације", |  | ||||||
| 	"Show desktop notifications": "Прикажи обавештења радне површине", |  | ||||||
| 	"Show downloaded files in file manager": "Прикажи преузете датотеке у управитељу датотека", |  | ||||||
| 	"Show sidebar": "Схов сидебар", |  | ||||||
| 	"Start app at login": "Покрените апликацију приликом пријављивања", |  | ||||||
| 	"Switch to Next Organization": "Пребаци се на следећу организацију", |  | ||||||
| 	"Switch to Previous Organization": "Пребаци се на претходну организацију", |  | ||||||
| 	"These desktop app shortcuts extend the Zulip webapp's": "Пречице за десктоп апликације проширују Зулип вебаппове", |  | ||||||
| 	"This will delete all application data including all added accounts and preferences": "Ово ће избрисати све податке о апликацији, укључујући све додатне налоге и поставке", |  | ||||||
| 	"Tip": "Савет", |  | ||||||
| 	"Toggle DevTools for Active Tab": "Пребаци ДевТоолс за Ацтиве Таб", |  | ||||||
| 	"Toggle DevTools for Zulip App": "Пребаци ДевТоолс за Зулип Апп", |  | ||||||
| 	"Toggle Do Not Disturb": "Тоггле До Нот Дистурб", |  | ||||||
| 	"Toggle Full Screen": "Тоггле Фулл Сцреен", |  | ||||||
| 	"Toggle Sidebar": "Тоггле Сидебар", |  | ||||||
| 	"Toggle Tray Icon": "Тоггле Траи Ицон", |  | ||||||
| 	"Tools": "Алати", |  | ||||||
| 	"Undo": "Ундо", |  | ||||||
| 	"Upload": "Отпремити", |  | ||||||
| 	"Use system proxy settings (requires restart)": "Користи поставке системског прокија (потребно је поново покренути)", |  | ||||||
| 	"View": "Поглед", |  | ||||||
| 	"View Shortcuts": "Прикажи пречице", |  | ||||||
| 	"Window": "Прозор", |  | ||||||
| 	"Window Shortcuts": "Пречице за прозор", |  | ||||||
| 	"YES": "ДА", |  | ||||||
| 	"Zoom In": "Увеличати", |  | ||||||
| 	"Zoom Out": "Зоом Оут", |  | ||||||
| 	"Zulip Help": "Зулип Хелп", |  | ||||||
| 	"keyboard shortcuts": "пречице на тастатури", |  | ||||||
| 	"script": "скрипта", |  | ||||||
| 	"Quit when the window is closed": "Quit when the window is closed", |  | ||||||
| 	"Ask where to save files before downloading": "Ask where to save files before downloading", |  | ||||||
| 	"Services": "Services", |  | ||||||
| 	"Hide": "Hide", |  | ||||||
| 	"Hide Others": "Hide Others", |  | ||||||
| 	"Unhide": "Unhide", |  | ||||||
| 	"AddServer": "AddServer", |  | ||||||
| 	"App language (requires restart)": "App language (requires restart)", |  | ||||||
| 	"Factory Reset Data": "Factory Reset Data", |  | ||||||
| 	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Reset the application, thus deleting all the connected organizations, accounts, and certificates.", |  | ||||||
| 	"On macOS, the OS spellchecker is used.": "On macOS, the OS spellchecker is used.", |  | ||||||
| 	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Change the language from System Preferences → Keyboard → Text → Spelling.", |  | ||||||
| 	"Copy Link": "Copy Link", |  | ||||||
| 	"Copy Image": "Copy Image", |  | ||||||
| 	"Copy Image URL": "Copy Image URL", |  | ||||||
| 	"No Suggestion Found": "No Suggestion Found", |  | ||||||
| 	"You can select a maximum of 3 languages for spellchecking.": "You can select a maximum of 3 languages for spellchecking.", |  | ||||||
| 	"Spellchecker Languages": "Spellchecker Languages", |  | ||||||
| 	"Add to Dictionary": "Add to Dictionary", |  | ||||||
| 	"Look Up": "Look Up" |  | ||||||
| } |  | ||||||
| @@ -1,43 +0,0 @@ | |||||||
| { |  | ||||||
|     "ar": "عربى", |  | ||||||
|     "bg": "български", |  | ||||||
|     "ca": "català", |  | ||||||
|     "cs": "česky", |  | ||||||
|     "da": "Dansk", |  | ||||||
|     "de": "Deutsch", |  | ||||||
|     "el_GR": "Greek (Greece)", |  | ||||||
|     "el": "Ελληνικά", |  | ||||||
|     "en_GB": "English (UK)", |  | ||||||
|     "en": "English (US)", |  | ||||||
|     "es": "Español", |  | ||||||
|     "fa": "فارسی", |  | ||||||
|     "fi": "suomi", |  | ||||||
|     "fr": "français", |  | ||||||
|     "gl": "Galego", |  | ||||||
|     "hi": "हिन्दी", |  | ||||||
|     "hr": "Croata", |  | ||||||
|     "hu": "Magyar", |  | ||||||
|     "id_ID": "Indonesian (Indonesia)", |  | ||||||
|     "it": "Italiano", |  | ||||||
|     "ja": "日本語", |  | ||||||
|     "ko": "한국어" , |  | ||||||
|     "lt": "Lietuvis" , |  | ||||||
|     "ml": "മലയാളം", |  | ||||||
|     "nb_NO": "norsk (Norge)", |  | ||||||
|     "nl": "Nederlands", |  | ||||||
|     "pl": "Polski", |  | ||||||
|     "pt": "Português", |  | ||||||
|     "ro": "Română", |  | ||||||
|     "ru": "Русский", |  | ||||||
|     "sk": "Slovak", |  | ||||||
|     "sr": "српски", |  | ||||||
|     "sv": "svenska", |  | ||||||
|     "ta": "தமிழ்", |  | ||||||
|     "tr": "Türkçe", |  | ||||||
|     "uk": "Українська", |  | ||||||
|     "uz": "O'zbek", |  | ||||||
|     "vi": "Tiếng Việt", |  | ||||||
|     "zh_TW": "中文 (傳統的)", |  | ||||||
|     "zh-Hans": "简体中文", |  | ||||||
|     "zh-Hant": "繁體中文" |  | ||||||
| } |  | ||||||
| @@ -1,134 +0,0 @@ | |||||||
| { |  | ||||||
| 	"About Zulip": "Giới thiệu", |  | ||||||
| 	"Actual Size": "Kích thước thực", |  | ||||||
| 	"Add Custom Certificates": "Thêm chứng chỉ tự tùy chỉnh", |  | ||||||
| 	"Add Organization": "Thêm nhóm", |  | ||||||
| 	"Add a Zulip organization": "Thêm nhóm Zulip", |  | ||||||
| 	"Add custom CSS": "Thêm chỉnh sửa CSS", |  | ||||||
| 	"Advanced": "Nâng cao", |  | ||||||
| 	"All the connected organizations will appear here": "Tất cả các nhóm đã kết nối sẽ hiển thị tại đây", |  | ||||||
| 	"Always start minimized": "Luôn thu nhỏ", |  | ||||||
| 	"App Updates": "Cập nhật", |  | ||||||
| 	"Appearance": "Giao diện", |  | ||||||
| 	"Application Shortcuts": "Phím tắt", |  | ||||||
| 	"Are you sure you want to disconnect this organization?": "Bạn có chắc muốn ngừng kết nối với nhóm này?", |  | ||||||
| 	"Auto hide Menu bar": "Tự động ẩn thanh công cụ", |  | ||||||
| 	"Auto hide menu bar (Press Alt key to display)": "Tự động ẩn thanh công cụ (Ấn phím Alt để hiển thị)", |  | ||||||
| 	"Back": "Quay lại", |  | ||||||
| 	"Bounce dock on new private message": "Bounce dock trên tin nhắn mới", |  | ||||||
| 	"Certificate file": "Giấy chứng nhận", |  | ||||||
| 	"Change": "Thay đổi", |  | ||||||
| 	"Check for Updates": "Kiểm tra cập nhật", |  | ||||||
| 	"Close": "Tắt", |  | ||||||
| 	"Connect": "Kết nối", |  | ||||||
| 	"Connect to another organization": "Kết nối với tổ chức khác", |  | ||||||
| 	"Connected organizations": "Tổ chức kết nối", |  | ||||||
| 	"Copy": "Sao chép", |  | ||||||
| 	"Copy Zulip URL": "Sao chép đường dẫn", |  | ||||||
| 	"Create a new organization": "Tạo nhóm mới", |  | ||||||
| 	"Cut": "Cắt", |  | ||||||
| 	"Default download location": "Nơi lưu tập tin mặc định", |  | ||||||
| 	"Delete": "Xóa", |  | ||||||
| 	"Desktop App Settings": "Desktop App Settings", |  | ||||||
| 	"Desktop Notifications": "Thông báo trên giao diện máy tính", |  | ||||||
| 	"Desktop Settings": "Cài đặt ứng dụng", |  | ||||||
| 	"Disconnect": "Ngắt kết nối", |  | ||||||
| 	"Download App Logs": "Download App Logs", |  | ||||||
| 	"Edit": "Chỉnh sửa", |  | ||||||
| 	"Edit Shortcuts": "Edit Shortcuts", |  | ||||||
| 	"Enable auto updates": "Enable auto updates", |  | ||||||
| 	"Enable error reporting (requires restart)": "Enable error reporting (requires restart)", |  | ||||||
| 	"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)", |  | ||||||
| 	"Factory Reset": "Factory Reset", |  | ||||||
| 	"File": "File", |  | ||||||
| 	"Find accounts": "Find accounts", |  | ||||||
| 	"Find accounts by email": "Find accounts by email", |  | ||||||
| 	"Flash taskbar on new message": "Flash taskbar on new message", |  | ||||||
| 	"Forward": "Forward", |  | ||||||
| 	"Functionality": "Functionality", |  | ||||||
| 	"General": "General", |  | ||||||
| 	"Get beta updates": "Get beta updates", |  | ||||||
| 	"Hard Reload": "Hard Reload", |  | ||||||
| 	"Help": "Help", |  | ||||||
| 	"Help Center": "Help Center", |  | ||||||
| 	"History": "History", |  | ||||||
| 	"History Shortcuts": "History Shortcuts", |  | ||||||
| 	"Keyboard Shortcuts": "Keyboard Shortcuts", |  | ||||||
| 	"Log Out": "Log Out", |  | ||||||
| 	"Log Out of Organization": "Log Out of Organization", |  | ||||||
| 	"Manual proxy configuration": "Manual proxy configuration", |  | ||||||
| 	"Minimize": "Minimize", |  | ||||||
| 	"Mute all sounds from Zulip": "Mute all sounds from Zulip", |  | ||||||
| 	"NO": "NO", |  | ||||||
| 	"Network": "Network", |  | ||||||
| 	"OR": "OR", |  | ||||||
| 	"Organization URL": "Organization URL", |  | ||||||
| 	"Organizations": "Organizations", |  | ||||||
| 	"Paste": "Paste", |  | ||||||
| 	"Paste and Match Style": "Paste and Match Style", |  | ||||||
| 	"Proxy": "Proxy", |  | ||||||
| 	"Proxy bypass rules": "Proxy bypass rules", |  | ||||||
| 	"Proxy rules": "Proxy rules", |  | ||||||
| 	"Quit": "Thoát", |  | ||||||
| 	"Quit Zulip": "Thoát khỏi Zulip", |  | ||||||
| 	"Redo": "Thực hiện lại", |  | ||||||
| 	"Release Notes": "Release Notes", |  | ||||||
| 	"Reload": "Tải lại", |  | ||||||
| 	"Report an Issue": "Report an Issue", |  | ||||||
| 	"Save": "Lưu", |  | ||||||
| 	"Select All": "Select All", |  | ||||||
| 	"Settings": "Cài đặt", |  | ||||||
| 	"Shortcuts": "Shortcuts", |  | ||||||
| 	"Show App Logs": "Show App Logs", |  | ||||||
| 	"Show app icon in system tray": "Show app icon in system tray", |  | ||||||
| 	"Show app unread badge": "Show app unread badge", |  | ||||||
| 	"Show desktop notifications": "Show desktop notifications", |  | ||||||
| 	"Show downloaded files in file manager": "Show downloaded files in file manager", |  | ||||||
| 	"Show sidebar": "Show sidebar", |  | ||||||
| 	"Start app at login": "Start app at login", |  | ||||||
| 	"Switch to Next Organization": "Switch to Next Organization", |  | ||||||
| 	"Switch to Previous Organization": "Switch to Previous Organization", |  | ||||||
| 	"These desktop app shortcuts extend the Zulip webapp's": "These desktop app shortcuts extend the Zulip webapp's", |  | ||||||
| 	"This will delete all application data including all added accounts and preferences": "Mọi dữ liệu trong ứng dụng, bao gồm tất cả tài khoản và tùy chỉnh được thêm vào, sẽ bị xóa", |  | ||||||
| 	"Tip": "Mẹo", |  | ||||||
| 	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab", |  | ||||||
| 	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App", |  | ||||||
| 	"Toggle Do Not Disturb": "Toggle Do Not Disturb", |  | ||||||
| 	"Toggle Full Screen": "Toggle Full Screen", |  | ||||||
| 	"Toggle Sidebar": "Toggle Sidebar", |  | ||||||
| 	"Toggle Tray Icon": "Toggle Tray Icon", |  | ||||||
| 	"Tools": "Công cụ", |  | ||||||
| 	"Undo": "Hủy thay đổi", |  | ||||||
| 	"Upload": "Tải lên", |  | ||||||
| 	"Use system proxy settings (requires restart)": "Chọn cài đặt system proxy (Yêu cầu khởi động lại)", |  | ||||||
| 	"View": "Xem", |  | ||||||
| 	"View Shortcuts": "Hiển thị phím tắt", |  | ||||||
| 	"Window": "Ứng dụng Window", |  | ||||||
| 	"Window Shortcuts": "Phím tắt trong Windows", |  | ||||||
| 	"YES": "Có", |  | ||||||
| 	"Zoom In": "Phóng to", |  | ||||||
| 	"Zoom Out": "Thu nhỏ", |  | ||||||
| 	"Zulip Help": "Trợ giúp", |  | ||||||
| 	"keyboard shortcuts": "Phím tắt bàn phím", |  | ||||||
| 	"script": "script", |  | ||||||
| 	"Quit when the window is closed": "Thoát khi cửa sổ tắt", |  | ||||||
| 	"Ask where to save files before downloading": "Ask where to save files before downloading", |  | ||||||
| 	"Services": "Services", |  | ||||||
| 	"Hide": "Hide", |  | ||||||
| 	"Hide Others": "Hide Others", |  | ||||||
| 	"Unhide": "Unhide", |  | ||||||
| 	"AddServer": "AddServer", |  | ||||||
| 	"App language (requires restart)": "App language (requires restart)", |  | ||||||
| 	"Factory Reset Data": "Factory Reset Data", |  | ||||||
| 	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Reset the application, thus deleting all the connected organizations, accounts, and certificates.", |  | ||||||
| 	"On macOS, the OS spellchecker is used.": "On macOS, the OS spellchecker is used.", |  | ||||||
| 	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Change the language from System Preferences → Keyboard → Text → Spelling.", |  | ||||||
| 	"Copy Link": "Copy Link", |  | ||||||
| 	"Copy Image": "Copy Image", |  | ||||||
| 	"Copy Image URL": "Copy Image URL", |  | ||||||
| 	"No Suggestion Found": "No Suggestion Found", |  | ||||||
| 	"You can select a maximum of 3 languages for spellchecking.": "You can select a maximum of 3 languages for spellchecking.", |  | ||||||
| 	"Spellchecker Languages": "Spellchecker Languages", |  | ||||||
| 	"Add to Dictionary": "Add to Dictionary", |  | ||||||
| 	"Look Up": "Look Up" |  | ||||||
| } |  | ||||||
| @@ -1,134 +0,0 @@ | |||||||
| { |  | ||||||
| 	"About Zulip": "关于Zulip", |  | ||||||
| 	"Actual Size": "真实大小", |  | ||||||
| 	"Add Custom Certificates": "添加自定义证书\n\n", |  | ||||||
| 	"Add Organization": "添加组织\n\n", |  | ||||||
| 	"Add a Zulip organization": "添加Zulip组织\n\n", |  | ||||||
| 	"Add custom CSS": "添加自定义样式(CSS)", |  | ||||||
| 	"Advanced": "高级", |  | ||||||
| 	"All the connected organizations will appear here": "All the connected organizations will appear here", |  | ||||||
| 	"Always start minimized": "Always start minimized", |  | ||||||
| 	"App Updates": "应用更新", |  | ||||||
| 	"Appearance": "Appearance", |  | ||||||
| 	"Application Shortcuts": "快捷键", |  | ||||||
| 	"Are you sure you want to disconnect this organization?": "Are you sure you want to disconnect this organization?", |  | ||||||
| 	"Auto hide Menu bar": "Auto hide Menu bar", |  | ||||||
| 	"Auto hide menu bar (Press Alt key to display)": "Auto hide menu bar (Press Alt key to display)", |  | ||||||
| 	"Back": "后退", |  | ||||||
| 	"Bounce dock on new private message": "Bounce dock on new private message", |  | ||||||
| 	"Certificate file": "Certificate file", |  | ||||||
| 	"Change": "更改", |  | ||||||
| 	"Check for Updates": "检查更新...", |  | ||||||
| 	"Close": "关闭", |  | ||||||
| 	"Connect": "连接", |  | ||||||
| 	"Connect to another organization": "连接到另一个组织", |  | ||||||
| 	"Connected organizations": "连接的组织", |  | ||||||
| 	"Copy": "复制", |  | ||||||
| 	"Copy Zulip URL": "复制Zulip地址(URL)", |  | ||||||
| 	"Create a new organization": "创建新的组织", |  | ||||||
| 	"Cut": "剪切", |  | ||||||
| 	"Default download location": "缺省下载位置", |  | ||||||
| 	"Delete": "删除", |  | ||||||
| 	"Desktop App Settings": "Desktop App Settings", |  | ||||||
| 	"Desktop Notifications": "Desktop Notifications", |  | ||||||
| 	"Desktop Settings": "Desktop Settings", |  | ||||||
| 	"Disconnect": "断开", |  | ||||||
| 	"Download App Logs": "Download App Logs", |  | ||||||
| 	"Edit": "编辑", |  | ||||||
| 	"Edit Shortcuts": "Edit Shortcuts", |  | ||||||
| 	"Enable auto updates": "Enable auto updates", |  | ||||||
| 	"Enable error reporting (requires restart)": "Enable error reporting (requires restart)", |  | ||||||
| 	"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)", |  | ||||||
| 	"Factory Reset": "Factory Reset", |  | ||||||
| 	"File": "文件", |  | ||||||
| 	"Find accounts": "查找账户", |  | ||||||
| 	"Find accounts by email": "Find accounts by email", |  | ||||||
| 	"Flash taskbar on new message": "Flash taskbar on new message", |  | ||||||
| 	"Forward": "Forward", |  | ||||||
| 	"Functionality": "Functionality", |  | ||||||
| 	"General": "General", |  | ||||||
| 	"Get beta updates": "Get beta updates", |  | ||||||
| 	"Hard Reload": "Hard Reload", |  | ||||||
| 	"Help": "Help", |  | ||||||
| 	"Help Center": "Help Center", |  | ||||||
| 	"History": "历史消息", |  | ||||||
| 	"History Shortcuts": "History Shortcuts", |  | ||||||
| 	"Keyboard Shortcuts": "Keyboard Shortcuts", |  | ||||||
| 	"Log Out": "退出", |  | ||||||
| 	"Log Out of Organization": "Log Out of Organization", |  | ||||||
| 	"Manual proxy configuration": "Manual proxy configuration", |  | ||||||
| 	"Minimize": "最小化", |  | ||||||
| 	"Mute all sounds from Zulip": "Mute all sounds from Zulip", |  | ||||||
| 	"NO": "NO", |  | ||||||
| 	"Network": "Network", |  | ||||||
| 	"OR": "或", |  | ||||||
| 	"Organization URL": "社群网址", |  | ||||||
| 	"Organizations": "Organizations", |  | ||||||
| 	"Paste": "粘贴", |  | ||||||
| 	"Paste and Match Style": "粘贴并匹配格式", |  | ||||||
| 	"Proxy": "Proxy", |  | ||||||
| 	"Proxy bypass rules": "Proxy bypass rules", |  | ||||||
| 	"Proxy rules": "Proxy rules", |  | ||||||
| 	"Quit": "Quit", |  | ||||||
| 	"Quit Zulip": "Quit Zulip", |  | ||||||
| 	"Redo": "Redo", |  | ||||||
| 	"Release Notes": "Release Notes", |  | ||||||
| 	"Reload": "Reload", |  | ||||||
| 	"Report an Issue": "Report an Issue", |  | ||||||
| 	"Save": "保存", |  | ||||||
| 	"Select All": "全选", |  | ||||||
| 	"Settings": "设置", |  | ||||||
| 	"Shortcuts": "Shortcuts", |  | ||||||
| 	"Show App Logs": "Show App Logs", |  | ||||||
| 	"Show app icon in system tray": "Show app icon in system tray", |  | ||||||
| 	"Show app unread badge": "Show app unread badge", |  | ||||||
| 	"Show desktop notifications": "Show desktop notifications", |  | ||||||
| 	"Show downloaded files in file manager": "Show downloaded files in file manager", |  | ||||||
| 	"Show sidebar": "显示侧边栏", |  | ||||||
| 	"Start app at login": "Start app at login", |  | ||||||
| 	"Switch to Next Organization": "Switch to Next Organization", |  | ||||||
| 	"Switch to Previous Organization": "Switch to Previous Organization", |  | ||||||
| 	"These desktop app shortcuts extend the Zulip webapp's": "These desktop app shortcuts extend the Zulip webapp's", |  | ||||||
| 	"This will delete all application data including all added accounts and preferences": "This will delete all application data including all added accounts and preferences", |  | ||||||
| 	"Tip": "Tip", |  | ||||||
| 	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab", |  | ||||||
| 	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App", |  | ||||||
| 	"Toggle Do Not Disturb": "Toggle Do Not Disturb", |  | ||||||
| 	"Toggle Full Screen": "Toggle Full Screen", |  | ||||||
| 	"Toggle Sidebar": "Toggle Sidebar", |  | ||||||
| 	"Toggle Tray Icon": "Toggle Tray Icon", |  | ||||||
| 	"Tools": "工具", |  | ||||||
| 	"Undo": "撤销", |  | ||||||
| 	"Upload": "上传", |  | ||||||
| 	"Use system proxy settings (requires restart)": "Use system proxy settings (requires restart)", |  | ||||||
| 	"View": "View", |  | ||||||
| 	"View Shortcuts": "View Shortcuts", |  | ||||||
| 	"Window": "Window", |  | ||||||
| 	"Window Shortcuts": "Window Shortcuts", |  | ||||||
| 	"YES": "确认", |  | ||||||
| 	"Zoom In": "Zoom In", |  | ||||||
| 	"Zoom Out": "Zoom Out", |  | ||||||
| 	"Zulip Help": "Zulip Help", |  | ||||||
| 	"keyboard shortcuts": "keyboard shortcuts", |  | ||||||
| 	"script": "script", |  | ||||||
| 	"Quit when the window is closed": "Quit when the window is closed", |  | ||||||
| 	"Ask where to save files before downloading": "Ask where to save files before downloading", |  | ||||||
| 	"Services": "Services", |  | ||||||
| 	"Hide": "Hide", |  | ||||||
| 	"Hide Others": "Hide Others", |  | ||||||
| 	"Unhide": "Unhide", |  | ||||||
| 	"AddServer": "AddServer", |  | ||||||
| 	"App language (requires restart)": "App language (requires restart)", |  | ||||||
| 	"Factory Reset Data": "Factory Reset Data", |  | ||||||
| 	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Reset the application, thus deleting all the connected organizations, accounts, and certificates.", |  | ||||||
| 	"On macOS, the OS spellchecker is used.": "On macOS, the OS spellchecker is used.", |  | ||||||
| 	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Change the language from System Preferences → Keyboard → Text → Spelling.", |  | ||||||
| 	"Copy Link": "Copy Link", |  | ||||||
| 	"Copy Image": "Copy Image", |  | ||||||
| 	"Copy Image URL": "Copy Image URL", |  | ||||||
| 	"No Suggestion Found": "No Suggestion Found", |  | ||||||
| 	"You can select a maximum of 3 languages for spellchecking.": "You can select a maximum of 3 languages for spellchecking.", |  | ||||||
| 	"Spellchecker Languages": "Spellchecker Languages", |  | ||||||
| 	"Add to Dictionary": "Add to Dictionary", |  | ||||||
| 	"Look Up": "Look Up" |  | ||||||
| } |  | ||||||
| @@ -1,134 +0,0 @@ | |||||||
| { |  | ||||||
| 	"About Zulip": "關於 Zulip", |  | ||||||
| 	"Actual Size": "Actual Size", |  | ||||||
| 	"Add Custom Certificates": "Add Custom Certificates", |  | ||||||
| 	"Add Organization": "Add Organization", |  | ||||||
| 	"Add a Zulip organization": "Add a Zulip organization", |  | ||||||
| 	"Add custom CSS": "Add custom CSS", |  | ||||||
| 	"Advanced": "Advanced", |  | ||||||
| 	"All the connected organizations will appear here": "All the connected organizations will appear here", |  | ||||||
| 	"Always start minimized": "Always start minimized", |  | ||||||
| 	"App Updates": "App Updates", |  | ||||||
| 	"Appearance": "Appearance", |  | ||||||
| 	"Application Shortcuts": "Application Shortcuts", |  | ||||||
| 	"Are you sure you want to disconnect this organization?": "Are you sure you want to disconnect this organization?", |  | ||||||
| 	"Auto hide Menu bar": "Auto hide Menu bar", |  | ||||||
| 	"Auto hide menu bar (Press Alt key to display)": "Auto hide menu bar (Press Alt key to display)", |  | ||||||
| 	"Back": "Back", |  | ||||||
| 	"Bounce dock on new private message": "Bounce dock on new private message", |  | ||||||
| 	"Certificate file": "Certificate file", |  | ||||||
| 	"Change": "Change", |  | ||||||
| 	"Check for Updates": "Check for Updates", |  | ||||||
| 	"Close": "關閉", |  | ||||||
| 	"Connect": "Connect", |  | ||||||
| 	"Connect to another organization": "Connect to another organization", |  | ||||||
| 	"Connected organizations": "Connected organizations", |  | ||||||
| 	"Copy": "Copy", |  | ||||||
| 	"Copy Zulip URL": "Copy Zulip URL", |  | ||||||
| 	"Create a new organization": "Create a new organization", |  | ||||||
| 	"Cut": "Cut", |  | ||||||
| 	"Default download location": "Default download location", |  | ||||||
| 	"Delete": "Delete", |  | ||||||
| 	"Desktop App Settings": "Desktop App Settings", |  | ||||||
| 	"Desktop Notifications": "Desktop Notifications", |  | ||||||
| 	"Desktop Settings": "Desktop Settings", |  | ||||||
| 	"Disconnect": "Disconnect", |  | ||||||
| 	"Download App Logs": "Download App Logs", |  | ||||||
| 	"Edit": "Edit", |  | ||||||
| 	"Edit Shortcuts": "Edit Shortcuts", |  | ||||||
| 	"Enable auto updates": "Enable auto updates", |  | ||||||
| 	"Enable error reporting (requires restart)": "Enable error reporting (requires restart)", |  | ||||||
| 	"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)", |  | ||||||
| 	"Factory Reset": "Factory Reset", |  | ||||||
| 	"File": "File", |  | ||||||
| 	"Find accounts": "尋找帳戶", |  | ||||||
| 	"Find accounts by email": "Find accounts by email", |  | ||||||
| 	"Flash taskbar on new message": "Flash taskbar on new message", |  | ||||||
| 	"Forward": "Forward", |  | ||||||
| 	"Functionality": "Functionality", |  | ||||||
| 	"General": "General", |  | ||||||
| 	"Get beta updates": "Get beta updates", |  | ||||||
| 	"Hard Reload": "Hard Reload", |  | ||||||
| 	"Help": "Help", |  | ||||||
| 	"Help Center": "Help Center", |  | ||||||
| 	"History": "History", |  | ||||||
| 	"History Shortcuts": "History Shortcuts", |  | ||||||
| 	"Keyboard Shortcuts": "Keyboard Shortcuts", |  | ||||||
| 	"Log Out": "Log Out", |  | ||||||
| 	"Log Out of Organization": "Log Out of Organization", |  | ||||||
| 	"Manual proxy configuration": "Manual proxy configuration", |  | ||||||
| 	"Minimize": "Minimize", |  | ||||||
| 	"Mute all sounds from Zulip": "Mute all sounds from Zulip", |  | ||||||
| 	"NO": "NO", |  | ||||||
| 	"Network": "Network", |  | ||||||
| 	"OR": "OR", |  | ||||||
| 	"Organization URL": "Organization URL", |  | ||||||
| 	"Organizations": "Organizations", |  | ||||||
| 	"Paste": "Paste", |  | ||||||
| 	"Paste and Match Style": "Paste and Match Style", |  | ||||||
| 	"Proxy": "Proxy", |  | ||||||
| 	"Proxy bypass rules": "Proxy bypass rules", |  | ||||||
| 	"Proxy rules": "Proxy rules", |  | ||||||
| 	"Quit": "Quit", |  | ||||||
| 	"Quit Zulip": "Quit Zulip", |  | ||||||
| 	"Redo": "Redo", |  | ||||||
| 	"Release Notes": "Release Notes", |  | ||||||
| 	"Reload": "Reload", |  | ||||||
| 	"Report an Issue": "Report an Issue", |  | ||||||
| 	"Save": "Save", |  | ||||||
| 	"Select All": "Select All", |  | ||||||
| 	"Settings": "設定", |  | ||||||
| 	"Shortcuts": "Shortcuts", |  | ||||||
| 	"Show App Logs": "Show App Logs", |  | ||||||
| 	"Show app icon in system tray": "Show app icon in system tray", |  | ||||||
| 	"Show app unread badge": "Show app unread badge", |  | ||||||
| 	"Show desktop notifications": "Show desktop notifications", |  | ||||||
| 	"Show downloaded files in file manager": "Show downloaded files in file manager", |  | ||||||
| 	"Show sidebar": "Show sidebar", |  | ||||||
| 	"Start app at login": "Start app at login", |  | ||||||
| 	"Switch to Next Organization": "Switch to Next Organization", |  | ||||||
| 	"Switch to Previous Organization": "Switch to Previous Organization", |  | ||||||
| 	"These desktop app shortcuts extend the Zulip webapp's": "These desktop app shortcuts extend the Zulip webapp's", |  | ||||||
| 	"This will delete all application data including all added accounts and preferences": "This will delete all application data including all added accounts and preferences", |  | ||||||
| 	"Tip": "Tip", |  | ||||||
| 	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab", |  | ||||||
| 	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App", |  | ||||||
| 	"Toggle Do Not Disturb": "Toggle Do Not Disturb", |  | ||||||
| 	"Toggle Full Screen": "Toggle Full Screen", |  | ||||||
| 	"Toggle Sidebar": "Toggle Sidebar", |  | ||||||
| 	"Toggle Tray Icon": "Toggle Tray Icon", |  | ||||||
| 	"Tools": "Tools", |  | ||||||
| 	"Undo": "Undo", |  | ||||||
| 	"Upload": "Upload", |  | ||||||
| 	"Use system proxy settings (requires restart)": "Use system proxy settings (requires restart)", |  | ||||||
| 	"View": "View", |  | ||||||
| 	"View Shortcuts": "View Shortcuts", |  | ||||||
| 	"Window": "Window", |  | ||||||
| 	"Window Shortcuts": "Window Shortcuts", |  | ||||||
| 	"YES": "YES", |  | ||||||
| 	"Zoom In": "Zoom In", |  | ||||||
| 	"Zoom Out": "Zoom Out", |  | ||||||
| 	"Zulip Help": "Zulip Help", |  | ||||||
| 	"keyboard shortcuts": "keyboard shortcuts", |  | ||||||
| 	"script": "script", |  | ||||||
| 	"Quit when the window is closed": "Quit when the window is closed", |  | ||||||
| 	"Ask where to save files before downloading": "Ask where to save files before downloading", |  | ||||||
| 	"Services": "Services", |  | ||||||
| 	"Hide": "Hide", |  | ||||||
| 	"Hide Others": "Hide Others", |  | ||||||
| 	"Unhide": "Unhide", |  | ||||||
| 	"AddServer": "AddServer", |  | ||||||
| 	"App language (requires restart)": "App language (requires restart)", |  | ||||||
| 	"Factory Reset Data": "Factory Reset Data", |  | ||||||
| 	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Reset the application, thus deleting all the connected organizations, accounts, and certificates.", |  | ||||||
| 	"On macOS, the OS spellchecker is used.": "On macOS, the OS spellchecker is used.", |  | ||||||
| 	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Change the language from System Preferences → Keyboard → Text → Spelling.", |  | ||||||
| 	"Copy Link": "Copy Link", |  | ||||||
| 	"Copy Image": "Copy Image", |  | ||||||
| 	"Copy Image URL": "Copy Image URL", |  | ||||||
| 	"No Suggestion Found": "No Suggestion Found", |  | ||||||
| 	"You can select a maximum of 3 languages for spellchecking.": "You can select a maximum of 3 languages for spellchecking.", |  | ||||||
| 	"Spellchecker Languages": "Spellchecker Languages", |  | ||||||
| 	"Add to Dictionary": "Add to Dictionary", |  | ||||||
| 	"Look Up": "Look Up" |  | ||||||
| } |  | ||||||
| @@ -1,8 +0,0 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8"?> |  | ||||||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> |  | ||||||
| <plist version="1.0"> |  | ||||||
|   <dict> |  | ||||||
|     <key>com.apple.security.cs.allow-unsigned-executable-memory</key> |  | ||||||
|     <true/> |  | ||||||
|   </dict> |  | ||||||
| </plist> |  | ||||||
| @@ -1,16 +0,0 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8"?> |  | ||||||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> |  | ||||||
| <plist version="1.0"> |  | ||||||
| <dict> |  | ||||||
| 	<key>com.apple.security.app-sandbox</key> |  | ||||||
| 	<true/> |  | ||||||
| 	<key>com.apple.security.network.client</key> |  | ||||||
| 	<true/> |  | ||||||
| 	<key>com.apple.security.files.user-selected.read-only</key> |  | ||||||
| 	<true/> |  | ||||||
| 	<key>com.apple.security.files.user-selected.read-write</key> |  | ||||||
| 	<true/> |  | ||||||
| 	<key>com.apple.security.files.downloads.read-write</key> |  | ||||||
| 	<true/> |  | ||||||
| </dict> |  | ||||||
| </plist> |  | ||||||
							
								
								
									
										
											BIN
										
									
								
								build/icon-macos.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 20 KiB | 
							
								
								
									
										1
									
								
								build/icon-macos.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1 @@ | |||||||
|  | <svg xmlns="http://www.w3.org/2000/svg" viewBox="-100 -100 1024 1024"><defs><linearGradient id="a" x1="0" y1="0" x2="0" y2="1"><stop offset="0" stop-color="#50adff"/><stop offset="1" stop-color="#7877fc"/></linearGradient><mask id="b"><rect x="-100" y="-100" width="1024" height="1024" fill="#fff"/><path d="M566.66 527.25c0 33.03-24.23 60.05-53.84 60.05H260.29c-29.61 0-53.84-27.02-53.84-60.05 0-20.22 9.09-38.2 22.93-49.09l134.37-120c2.5-2.14 5.74 1.31 3.94 4.19l-49.29 98.69c-1.38 2.76.41 6.16 3.25 6.16h191.18c29.61 0 53.83 27.03 53.83 60.05zm0-281.39c0 20.22-9.09 38.2-22.93 49.09l-134.37 120c-2.5 2.14-5.74-1.31-3.94-4.19l49.29-98.69c1.38-2.76-.41-6.16-3.25-6.16H260.29c-29.61 0-53.84-27.02-53.84-60.05s24.23-60.05 53.84-60.05h252.54c29.61 0 53.83 27.02 53.83 60.05z" transform="scale(1.0658112582781456)" fill="#000"/></mask><path id="c" d="M824 257c0-64 0-104-14-141A173 173 0 00708 14C671 0 631 0 567 0H257C193 0 153 0 116 14A173 173 0 0014 116C0 153 0 193 0 257V567c0 64 0 104 14 141A173 173 0 00116 810c37 14 77 14 141 14H567c64 0 104 0 141-14A173 173 0 00810 708c14-37 14-77 14-141Z"/><filter id="d"><feGaussianBlur in="SourceGraphic" stdDeviation="10"/></filter><filter id="e"><feGaussianBlur in="SourceGraphic" stdDeviation="5"/></filter></defs><use href="#c" transform="translate(0 10)" fill-opacity="0.3" filter="url(#d)"/><rect x="120" y="120" width="584" height="584" fill="#fff" /><g filter="url(#e)"><rect x="120" y="120" width="584" height="584" fill="#32497f" mask="url(#b)" transform="translate(0 5)"/></g><use href="#c" mask="url(#b)" fill="url(#a)"/></svg> | ||||||
| After Width: | Height: | Size: 1.5 KiB | 
							
								
								
									
										
											BIN
										
									
								
								build/icon.icns
									
									
									
									
									
								
							
							
						
						| Before Width: | Height: | Size: 60 KiB | 
| Before Width: | Height: | Size: 4.4 KiB | 
| Before Width: | Height: | Size: 581 B | 
| Before Width: | Height: | Size: 797 B | 
| Before Width: | Height: | Size: 9.5 KiB | 
| Before Width: | Height: | Size: 1.1 KiB | 
| Before Width: | Height: | Size: 1.6 KiB | 
| Before Width: | Height: | Size: 13 KiB | 
| Before Width: | Height: | Size: 2.1 KiB | 
| Before Width: | Height: | Size: 3.2 KiB |