Compare commits
	
		
			105 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					d4d3805be8 | ||
| 
						 | 
					e853af40c4 | ||
| 
						 | 
					941200cf3b | ||
| 
						 | 
					cf1f659ebf | ||
| 
						 | 
					eb381a87bc | ||
| 
						 | 
					68bc0ae4a0 | ||
| 
						 | 
					178bc7f401 | ||
| 
						 | 
					0f1245b975 | ||
| 
						 | 
					960312a932 | ||
| 
						 | 
					0e00f3bbce | ||
| 
						 | 
					ec205f68a6 | ||
| 
						 | 
					5fe5989710 | ||
| 
						 | 
					69141b5395 | ||
| 
						 | 
					8d66f05924 | ||
| 
						 | 
					e7330dbff8 | ||
| 
						 | 
					67fa9cca8c | ||
| 
						 | 
					a90bf1af08 | ||
| 
						 | 
					cb145acc73 | ||
| 
						 | 
					099e10673c | ||
| 
						 | 
					4b3608fc1e | ||
| 
						 | 
					6128c0e12a | ||
| 
						 | 
					14a1f5d3e1 | ||
| 
						 | 
					9cf26f4890 | ||
| 
						 | 
					397a7381b8 | ||
| 
						 | 
					24b28f9ded | ||
| 
						 | 
					9ceabe02d5 | ||
| 
						 | 
					b207ee57de | ||
| 
						 | 
					cf9d0c8aa2 | ||
| 
						 | 
					e97ab2e6dd | ||
| 
						 | 
					6a7f26d7e8 | ||
| 
						 | 
					b6e11f623a | ||
| 
						 | 
					1c60c335fd | ||
| 
						 | 
					c9249b1724 | ||
| 
						 | 
					9e957ba704 | ||
| 
						 | 
					6c37e30233 | ||
| 
						 | 
					addfe2e414 | ||
| 
						 | 
					bda0dd29df | ||
| 
						 | 
					01926e1234 | ||
| 
						 | 
					9138bbfaf2 | ||
| 
						 | 
					596561b731 | ||
| 
						 | 
					5943c21814 | ||
| 
						 | 
					2456bba5ae | ||
| 
						 | 
					0fff6336c7 | ||
| 
						 | 
					4261874e29 | ||
| 
						 | 
					f976270d33 | ||
| 
						 | 
					4782f1cfd3 | ||
| 
						 | 
					2f70621255 | ||
| 
						 | 
					b6f4e2b83c | ||
| 
						 | 
					25f4c3aba8 | ||
| 
						 | 
					1b23468375 | ||
| 
						 | 
					5d775405d9 | ||
| 
						 | 
					7f13d9162a | ||
| 
						 | 
					e0013c22ff | ||
| 
						 | 
					5c41afdccd | ||
| 
						 | 
					99a3530238 | ||
| 
						 | 
					a5ceffc856 | ||
| 
						 | 
					f55570f2f5 | ||
| 
						 | 
					4f890c0316 | ||
| 
						 | 
					bf651dece0 | ||
| 
						 | 
					1babd8da42 | ||
| 
						 | 
					bfd146f2d9 | ||
| 
						 | 
					3126510245 | ||
| 
						 | 
					d661895545 | ||
| 
						 | 
					ca9ab6168e | ||
| 
						 | 
					bbdf2c6017 | ||
| 
						 | 
					109a9bbd10 | ||
| 
						 | 
					22d7ef5615 | ||
| 
						 | 
					e03de26137 | ||
| 
						 | 
					983254c310 | ||
| 
						 | 
					b6059077d8 | ||
| 
						 | 
					cafff9a008 | ||
| 
						 | 
					190204b2e5 | ||
| 
						 | 
					4c25c99abc | ||
| 
						 | 
					55be93b906 | ||
| 
						 | 
					34e2b3a3d0 | ||
| 
						 | 
					e5ece8db9e | ||
| 
						 | 
					40b26dbb0e | ||
| 
						 | 
					ae4f03f4ba | ||
| 
						 | 
					8ea32a7a96 | ||
| 
						 | 
					6b7cce0366 | ||
| 
						 | 
					73fec72e6d | ||
| 
						 | 
					920adfb169 | ||
| 
						 | 
					98174fdcaf | ||
| 
						 | 
					a0c033431e | ||
| 
						 | 
					82421d843a | ||
| 
						 | 
					d9afee3330 | ||
| 
						 | 
					a46f2ed618 | ||
| 
						 | 
					9f3b4ff408 | ||
| 
						 | 
					fb800f7862 | ||
| 
						 | 
					ba191c3699 | ||
| 
						 | 
					e49a880ed6 | ||
| 
						 | 
					4bfa7c9265 | ||
| 
						 | 
					39c6fa4ace | ||
| 
						 | 
					963c2e5388 | ||
| 
						 | 
					849df4adaf | ||
| 
						 | 
					fc6ff83485 | ||
| 
						 | 
					5ae2a717fa | ||
| 
						 | 
					cfdc08a038 | ||
| 
						 | 
					b76467529d | ||
| 
						 | 
					bb88a7b7a8 | ||
| 
						 | 
					0225778050 | ||
| 
						 | 
					2154b191c8 | ||
| 
						 | 
					4093304b4d | ||
| 
						 | 
					2e03f779e8 | ||
| 
						 | 
					9464390070 | 
							
								
								
									
										8
									
								
								.github/ISSUE_TEMPLATE.md
									
									
									
									
										vendored
									
									
								
							
							
						
						@@ -1,8 +0,0 @@
 | 
			
		||||
---
 | 
			
		||||
<!-- Please Include: -->
 | 
			
		||||
- **Operating System**:
 | 
			
		||||
  - [ ] Windows
 | 
			
		||||
  - [ ] Linux/Ubuntu
 | 
			
		||||
  - [ ] macOS
 | 
			
		||||
- **Clear steps to reproduce the issue**:
 | 
			
		||||
- **Relevant error messages and/or screenshots**:
 | 
			
		||||
							
								
								
									
										25
									
								
								.github/ISSUE_TEMPLATE/bug_report.md
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,25 @@
 | 
			
		||||
---
 | 
			
		||||
name: Bug report
 | 
			
		||||
about: Create a report to help us improve
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
**Describe the bug**
 | 
			
		||||
<!-- A clear and concise description of what the bug is. -->
 | 
			
		||||
 | 
			
		||||
**To Reproduce**
 | 
			
		||||
<!-- Clear steps to reproduce the issue. -->
 | 
			
		||||
 | 
			
		||||
**Expected behavior**
 | 
			
		||||
<!-- A clear and concise description of what you expected to happen. -->
 | 
			
		||||
 | 
			
		||||
**Screenshots**
 | 
			
		||||
<!-- If applicable, add screenshots to help explain your problem. -->
 | 
			
		||||
 | 
			
		||||
**Desktop (please complete the following information):**
 | 
			
		||||
 - Operating System: 
 | 
			
		||||
 <!-- (Platform and Version) e.g. macOS 10.13.6 / Windows 10 (1803) / Ubuntu 18.04 x64 -->
 | 
			
		||||
 - Zulip Desktop Version:
 | 
			
		||||
<!-- e.g. 5.2.0 --> 
 | 
			
		||||
 | 
			
		||||
**Additional context**
 | 
			
		||||
<!-- Add any other context about the problem here. -->
 | 
			
		||||
							
								
								
									
										6
									
								
								.github/ISSUE_TEMPLATE/custom.md
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,6 @@
 | 
			
		||||
---
 | 
			
		||||
name: Custom issue template
 | 
			
		||||
about: Describe this issue template's purpose here.
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										16
									
								
								.github/ISSUE_TEMPLATE/feature_request.md
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,16 @@
 | 
			
		||||
---
 | 
			
		||||
name: Feature request
 | 
			
		||||
about: Suggest an idea for this project
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
**Problem Description**
 | 
			
		||||
<!-- Please add a clear and concise description of what the problem is. -->
 | 
			
		||||
 | 
			
		||||
**Proposed Solution**
 | 
			
		||||
<!-- Describe the solution you'd like in a clear and concise manner -->
 | 
			
		||||
 | 
			
		||||
**Describe alternatives you've considered**
 | 
			
		||||
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
 | 
			
		||||
 | 
			
		||||
**Additional context**
 | 
			
		||||
<!-- Add any other context or screenshots about the feature request here. -->
 | 
			
		||||
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						@@ -4,6 +4,9 @@
 | 
			
		||||
# npm cache directory
 | 
			
		||||
.npm
 | 
			
		||||
 | 
			
		||||
# transifexrc - if user prefers it to be in working tree
 | 
			
		||||
.transifexrc
 | 
			
		||||
 | 
			
		||||
# Compiled binary build directory
 | 
			
		||||
dist/
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										5
									
								
								.mailmap
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,5 @@
 | 
			
		||||
Anders Kaseorg <anders@zulip.com> <anders@zulipchat.com>
 | 
			
		||||
Rishi Gupta <rishig@zulip.com> <rishig@zulipchat.com>
 | 
			
		||||
Rishi Gupta <rishig@zulip.com> <rishig@users.noreply.github.com>
 | 
			
		||||
Tim Abbott <tabbott@zulip.com> <tabbott@zulipchat.com>
 | 
			
		||||
Tim Abbott <tabbott@zulip.com> <tabbott@mit.edu>
 | 
			
		||||
							
								
								
									
										16
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						@@ -1,6 +1,3 @@
 | 
			
		||||
sudo: required
 | 
			
		||||
dist: trusty
 | 
			
		||||
 | 
			
		||||
os:
 | 
			
		||||
- osx
 | 
			
		||||
- linux
 | 
			
		||||
@@ -18,20 +15,9 @@ node_js:
 | 
			
		||||
- '10'
 | 
			
		||||
- '12'
 | 
			
		||||
 | 
			
		||||
before_install:
 | 
			
		||||
  - ./scripts/travis-xvfb.sh
 | 
			
		||||
  - npm install -g gulp
 | 
			
		||||
  - npm ci
 | 
			
		||||
 | 
			
		||||
cache:
 | 
			
		||||
  directories:
 | 
			
		||||
  - node_modules
 | 
			
		||||
 | 
			
		||||
script:
 | 
			
		||||
- npm run travis
 | 
			
		||||
notifications:
 | 
			
		||||
  webhooks:
 | 
			
		||||
    urls:
 | 
			
		||||
      - https://zulip.org/zulipbot/travis
 | 
			
		||||
    on_success: always
 | 
			
		||||
    on_failure: always
 | 
			
		||||
- npm run test
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										9
									
								
								.tx/config
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,9 @@
 | 
			
		||||
[main]
 | 
			
		||||
host = https://www.transifex.com
 | 
			
		||||
 | 
			
		||||
[zulip.desktopjson]
 | 
			
		||||
file_filter = app/translations/<lang>.json
 | 
			
		||||
minimum_perc = 0
 | 
			
		||||
source_file = app/translations/en.json
 | 
			
		||||
source_lang = en
 | 
			
		||||
type = KEYVALUEJSON
 | 
			
		||||
@@ -6,10 +6,11 @@
 | 
			
		||||
 | 
			
		||||
Desktop client for Zulip. Available for Mac, Linux, and Windows.
 | 
			
		||||
 | 
			
		||||
<img src="http://i.imgur.com/ChzTq4F.png"/>
 | 
			
		||||
<img src="https://i.imgur.com/s1o6TRA.png"/>
 | 
			
		||||
<img src="https://i.imgur.com/vekKnW4.png"/>
 | 
			
		||||
 | 
			
		||||
# Download
 | 
			
		||||
Please see the [installation guide](https://zulipchat.com/help/desktop-app-install-guide).
 | 
			
		||||
Please see the [installation guide](https://zulip.com/help/desktop-app-install-guide).
 | 
			
		||||
 | 
			
		||||
# Features
 | 
			
		||||
* Sign in to multiple organizations
 | 
			
		||||
 
 | 
			
		||||
@@ -1,20 +1,26 @@
 | 
			
		||||
import { app, dialog } from 'electron';
 | 
			
		||||
import { autoUpdater } from 'electron-updater';
 | 
			
		||||
import { linuxUpdateNotification } from './linuxupdater';	// Required only in case of linux
 | 
			
		||||
import {app, dialog, session} from 'electron';
 | 
			
		||||
import util from 'util';
 | 
			
		||||
 | 
			
		||||
import log from 'electron-log';
 | 
			
		||||
import isDev from 'electron-is-dev';
 | 
			
		||||
import log from 'electron-log';
 | 
			
		||||
import {UpdateDownloadedEvent, UpdateInfo, autoUpdater} from 'electron-updater';
 | 
			
		||||
 | 
			
		||||
import * as ConfigUtil from '../renderer/js/utils/config-util';
 | 
			
		||||
import * as LinkUtil from '../renderer/js/utils/link-util';
 | 
			
		||||
 | 
			
		||||
export function appUpdater(updateFromMenu = false): void {
 | 
			
		||||
import {linuxUpdateNotification} from './linuxupdater';	// Required only in case of linux
 | 
			
		||||
 | 
			
		||||
const sleep = util.promisify(setTimeout);
 | 
			
		||||
 | 
			
		||||
export async function appUpdater(updateFromMenu = false): Promise<void> {
 | 
			
		||||
	// Don't initiate auto-updates in development
 | 
			
		||||
	if (isDev) {
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (process.platform === 'linux' && !process.env.APPIMAGE) {
 | 
			
		||||
		linuxUpdateNotification();
 | 
			
		||||
		const ses = session.fromPartition('persist:webviewsession');
 | 
			
		||||
		await linuxUpdateNotification(ses);
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@@ -34,57 +40,59 @@ export function appUpdater(updateFromMenu = false): void {
 | 
			
		||||
	autoUpdater.allowPrerelease = isBetaUpdate || false;
 | 
			
		||||
 | 
			
		||||
	const eventsListenerRemove = ['update-available', 'update-not-available'];
 | 
			
		||||
	autoUpdater.on('update-available', info => {
 | 
			
		||||
	autoUpdater.on('update-available', async (info: UpdateInfo) => {
 | 
			
		||||
		if (updateFromMenu) {
 | 
			
		||||
			dialog.showMessageBox({
 | 
			
		||||
				message: `A new version ${info.version}, of Zulip Desktop is available`,
 | 
			
		||||
				detail: 'The update will be downloaded in the background. You will be notified when it is ready to be installed.'
 | 
			
		||||
			});
 | 
			
		||||
 | 
			
		||||
			updateAvailable = true;
 | 
			
		||||
 | 
			
		||||
			// This is to prevent removal of 'update-downloaded' and 'error' event listener.
 | 
			
		||||
			eventsListenerRemove.forEach(event => {
 | 
			
		||||
				autoUpdater.removeAllListeners(event);
 | 
			
		||||
			});
 | 
			
		||||
 | 
			
		||||
			await dialog.showMessageBox({
 | 
			
		||||
				message: `A new version ${info.version}, of Zulip Desktop is available`,
 | 
			
		||||
				detail: 'The update will be downloaded in the background. You will be notified when it is ready to be installed.'
 | 
			
		||||
			});
 | 
			
		||||
		}
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	autoUpdater.on('update-not-available', () => {
 | 
			
		||||
	autoUpdater.on('update-not-available', async () => {
 | 
			
		||||
		if (updateFromMenu) {
 | 
			
		||||
			dialog.showMessageBox({
 | 
			
		||||
			// Remove all autoUpdator listeners so that next time autoUpdator is manually called these
 | 
			
		||||
			// listeners don't trigger multiple times.
 | 
			
		||||
			autoUpdater.removeAllListeners();
 | 
			
		||||
 | 
			
		||||
			await dialog.showMessageBox({
 | 
			
		||||
				message: 'No updates available',
 | 
			
		||||
				detail: `You are running the latest version of Zulip Desktop.\nVersion: ${app.getVersion()}`
 | 
			
		||||
			});
 | 
			
		||||
			// Remove all autoUpdator listeners so that next time autoUpdator is manually called these
 | 
			
		||||
			// listeners don't trigger multiple times.
 | 
			
		||||
			autoUpdater.removeAllListeners();
 | 
			
		||||
		}
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	autoUpdater.on('error', async error => {
 | 
			
		||||
	autoUpdater.on('error', async (error: Error) => {
 | 
			
		||||
		if (updateFromMenu) {
 | 
			
		||||
			const messageText = (updateAvailable) ? ('Unable to download the updates') : ('Unable to check for updates');
 | 
			
		||||
			const { response } = await dialog.showMessageBox({
 | 
			
		||||
				type: 'error',
 | 
			
		||||
				buttons: ['Manual Download', 'Cancel'],
 | 
			
		||||
				message: messageText,
 | 
			
		||||
				detail: (error).toString() + `\n\nThe latest version of Zulip Desktop is available at -\nhttps://zulipchat.com/apps/.\n
 | 
			
		||||
				Current Version: ${app.getVersion()}`
 | 
			
		||||
			});
 | 
			
		||||
			if (response === 0) {
 | 
			
		||||
				LinkUtil.openBrowser(new URL('https://zulipchat.com/apps/'));
 | 
			
		||||
			}
 | 
			
		||||
			// Remove all autoUpdator listeners so that next time autoUpdator is manually called these
 | 
			
		||||
			// listeners don't trigger multiple times.
 | 
			
		||||
			autoUpdater.removeAllListeners();
 | 
			
		||||
 | 
			
		||||
			const messageText = (updateAvailable) ? ('Unable to download the updates') : ('Unable to check for updates');
 | 
			
		||||
			const {response} = await dialog.showMessageBox({
 | 
			
		||||
				type: 'error',
 | 
			
		||||
				buttons: ['Manual Download', 'Cancel'],
 | 
			
		||||
				message: messageText,
 | 
			
		||||
				detail: `Error: ${error.message}\n\nThe latest version of Zulip Desktop is available at -\nhttps://zulip.com/apps/.\n
 | 
			
		||||
				Current Version: ${app.getVersion()}`
 | 
			
		||||
			});
 | 
			
		||||
			if (response === 0) {
 | 
			
		||||
				await LinkUtil.openBrowser(new URL('https://zulip.com/apps/'));
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	// Ask the user if update is available
 | 
			
		||||
	autoUpdater.on('update-downloaded', async event => {
 | 
			
		||||
	autoUpdater.on('update-downloaded', async (event: UpdateDownloadedEvent) => {
 | 
			
		||||
		// Ask user to update the app
 | 
			
		||||
		const { response } = await dialog.showMessageBox({
 | 
			
		||||
		const {response} = await dialog.showMessageBox({
 | 
			
		||||
			type: 'question',
 | 
			
		||||
			buttons: ['Install and Relaunch', 'Install Later'],
 | 
			
		||||
			defaultId: 0,
 | 
			
		||||
@@ -92,13 +100,12 @@ export function appUpdater(updateFromMenu = false): void {
 | 
			
		||||
			detail: 'It will be installed the next time you restart the application'
 | 
			
		||||
		});
 | 
			
		||||
		if (response === 0) {
 | 
			
		||||
			setTimeout(() => {
 | 
			
		||||
				autoUpdater.quitAndInstall();
 | 
			
		||||
				// force app to quit. This is just a workaround, ideally autoUpdater.quitAndInstall() should relaunch the app.
 | 
			
		||||
				app.quit();
 | 
			
		||||
			}, 1000);
 | 
			
		||||
			await sleep(1000);
 | 
			
		||||
			autoUpdater.quitAndInstall();
 | 
			
		||||
			// Force app to quit. This is just a workaround, ideally autoUpdater.quitAndInstall() should relaunch the app.
 | 
			
		||||
			app.quit();
 | 
			
		||||
		}
 | 
			
		||||
	});
 | 
			
		||||
	// Init for updates
 | 
			
		||||
	autoUpdater.checkForUpdates();
 | 
			
		||||
	await autoUpdater.checkForUpdates();
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,22 +1,22 @@
 | 
			
		||||
import { sentryInit } from '../renderer/js/utils/sentry-util';
 | 
			
		||||
import { appUpdater } from './autoupdater';
 | 
			
		||||
import { setAutoLaunch } from './startup';
 | 
			
		||||
 | 
			
		||||
import electron, {app, dialog, ipcMain, session} from 'electron';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
 | 
			
		||||
import windowStateKeeper from 'electron-window-state';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import electron, { app, ipcMain, session, dialog } from 'electron';
 | 
			
		||||
 | 
			
		||||
import * as AppMenu from './menu';
 | 
			
		||||
import * as BadgeSettings from '../renderer/js/pages/preference/badge-settings';
 | 
			
		||||
import * as CertificateUtil from '../renderer/js/utils/certificate-util';
 | 
			
		||||
import * as ConfigUtil from '../renderer/js/utils/config-util';
 | 
			
		||||
import * as ProxyUtil from '../renderer/js/utils/proxy-util';
 | 
			
		||||
import {sentryInit} from '../renderer/js/utils/sentry-util';
 | 
			
		||||
 | 
			
		||||
interface PatchedGlobal extends NodeJS.Global {
 | 
			
		||||
	mainWindowState: windowStateKeeper.State;
 | 
			
		||||
}
 | 
			
		||||
import {appUpdater} from './autoupdater';
 | 
			
		||||
import * as AppMenu from './menu';
 | 
			
		||||
import {_getServerSettings, _saveServerIcon, _isOnline} from './request';
 | 
			
		||||
import {setAutoLaunch} from './startup';
 | 
			
		||||
 | 
			
		||||
const globalPatched = global as PatchedGlobal;
 | 
			
		||||
let mainWindowState: windowStateKeeper.State;
 | 
			
		||||
 | 
			
		||||
// Prevent window being garbage collected
 | 
			
		||||
let mainWindow: Electron.BrowserWindow;
 | 
			
		||||
@@ -42,13 +42,24 @@ if (singleInstanceLock) {
 | 
			
		||||
	app.quit();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const rendererCallbacks = new Map();
 | 
			
		||||
let nextRendererCallbackId = 0;
 | 
			
		||||
 | 
			
		||||
ipcMain.on('renderer-callback', (event: Event, rendererCallbackId: number, ...args: any[]) => {
 | 
			
		||||
	rendererCallbacks.get(rendererCallbackId)(...args);
 | 
			
		||||
	rendererCallbacks.delete(rendererCallbackId);
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
function makeRendererCallback(callback: (...args: any[]) => void): number {
 | 
			
		||||
	rendererCallbacks.set(nextRendererCallbackId, callback);
 | 
			
		||||
	return nextRendererCallbackId++;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const APP_ICON = path.join(__dirname, '../resources', 'Icon');
 | 
			
		||||
 | 
			
		||||
const iconPath = (): string => {
 | 
			
		||||
	return APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
 | 
			
		||||
};
 | 
			
		||||
const iconPath = (): string => APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
 | 
			
		||||
 | 
			
		||||
// toggle the app window
 | 
			
		||||
// Toggle the app window
 | 
			
		||||
const toggleApp = (): void => {
 | 
			
		||||
	if (!mainWindow.isVisible() || mainWindow.isMinimized()) {
 | 
			
		||||
		mainWindow.show();
 | 
			
		||||
@@ -65,9 +76,6 @@ function createMainWindow(): Electron.BrowserWindow {
 | 
			
		||||
		path: `${app.getPath('userData')}/config`
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	// Let's keep the window position global so that we can access it in other process
 | 
			
		||||
	globalPatched.mainWindowState = mainWindowState;
 | 
			
		||||
 | 
			
		||||
	const win = new electron.BrowserWindow({
 | 
			
		||||
		// This settings needs to be saved in config
 | 
			
		||||
		title: 'Zulip',
 | 
			
		||||
@@ -76,7 +84,7 @@ function createMainWindow(): Electron.BrowserWindow {
 | 
			
		||||
		y: mainWindowState.y,
 | 
			
		||||
		width: mainWindowState.width,
 | 
			
		||||
		height: mainWindowState.height,
 | 
			
		||||
		minWidth: 300,
 | 
			
		||||
		minWidth: 500,
 | 
			
		||||
		minHeight: 400,
 | 
			
		||||
		webPreferences: {
 | 
			
		||||
			plugins: true,
 | 
			
		||||
@@ -91,13 +99,14 @@ function createMainWindow(): Electron.BrowserWindow {
 | 
			
		||||
		win.webContents.send('focus');
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	win.loadURL(mainURL);
 | 
			
		||||
	(async () => win.loadURL(mainURL))();
 | 
			
		||||
 | 
			
		||||
	// Keep the app running in background on close event
 | 
			
		||||
	win.on('close', event => {
 | 
			
		||||
		if (ConfigUtil.getConfigItem('quitOnClose')) {
 | 
			
		||||
			app.quit();
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if (!isQuitting) {
 | 
			
		||||
			event.preventDefault();
 | 
			
		||||
 | 
			
		||||
@@ -141,16 +150,10 @@ app.disableHardwareAcceleration();
 | 
			
		||||
// More info here - https://github.com/electron/electron/issues/10732
 | 
			
		||||
app.commandLine.appendSwitch('force-color-profile', 'srgb');
 | 
			
		||||
 | 
			
		||||
// eslint-disable-next-line max-params
 | 
			
		||||
app.on('certificate-error', (event: Event, _webContents: Electron.WebContents, _url: string, _error: string, _certificate: any, callback) => {
 | 
			
		||||
	event.preventDefault();
 | 
			
		||||
	callback(true);
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
// this event is only available on macOS. Triggers when you click on the dock icon.
 | 
			
		||||
// This event is only available on macOS. Triggers when you click on the dock icon.
 | 
			
		||||
app.on('activate', () => {
 | 
			
		||||
	if (mainWindow) {
 | 
			
		||||
		// if there is already a window show it
 | 
			
		||||
		// If there is already a window show it
 | 
			
		||||
		mainWindow.show();
 | 
			
		||||
	} else {
 | 
			
		||||
		mainWindow = createMainWindow();
 | 
			
		||||
@@ -161,6 +164,9 @@ app.on('ready', () => {
 | 
			
		||||
	const ses = session.fromPartition('persist:webviewsession');
 | 
			
		||||
	ses.setUserAgent(`ZulipElectron/${app.getVersion()} ${ses.getUserAgent()}`);
 | 
			
		||||
 | 
			
		||||
	ipcMain.on('set-spellcheck-langs', () => {
 | 
			
		||||
		ses.setSpellCheckerLanguages(ConfigUtil.getConfigItem('spellcheckerLanguages'));
 | 
			
		||||
	});
 | 
			
		||||
	AppMenu.setMenu({
 | 
			
		||||
		tabs: []
 | 
			
		||||
	});
 | 
			
		||||
@@ -182,7 +188,7 @@ app.on('ready', () => {
 | 
			
		||||
	const isSystemProxy = ConfigUtil.getConfigItem('useSystemProxy');
 | 
			
		||||
 | 
			
		||||
	if (isSystemProxy) {
 | 
			
		||||
		ProxyUtil.resolveSystemProxy(mainWindow);
 | 
			
		||||
		(async () => ProxyUtil.resolveSystemProxy(mainWindow))();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const page = mainWindow.webContents;
 | 
			
		||||
@@ -199,32 +205,70 @@ app.on('ready', () => {
 | 
			
		||||
		event.returnValue = session.fromPartition('persist:webviewsession').getUserAgent();
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	page.once('did-frame-finish-load', () => {
 | 
			
		||||
	ipcMain.handle('get-server-settings', async (event, domain: string) => _getServerSettings(domain, ses));
 | 
			
		||||
 | 
			
		||||
	ipcMain.handle('save-server-icon', async (event, url: string) => _saveServerIcon(url, ses));
 | 
			
		||||
 | 
			
		||||
	ipcMain.handle('is-online', async (event, url: string) => _isOnline(url, ses));
 | 
			
		||||
 | 
			
		||||
	page.once('did-frame-finish-load', async () => {
 | 
			
		||||
		// Initiate auto-updates on MacOS and Windows
 | 
			
		||||
		if (ConfigUtil.getConfigItem('autoUpdate')) {
 | 
			
		||||
			appUpdater();
 | 
			
		||||
			await appUpdater();
 | 
			
		||||
		}
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	const permissionCallbacks = new Map();
 | 
			
		||||
	let nextPermissionId = 0;
 | 
			
		||||
	app.on('certificate-error', (
 | 
			
		||||
		event: Event,
 | 
			
		||||
		webContents: Electron.WebContents,
 | 
			
		||||
		urlString: string,
 | 
			
		||||
		error: string,
 | 
			
		||||
		certificate: Electron.Certificate,
 | 
			
		||||
		callback: (isTrusted: boolean) => void
 | 
			
		||||
	) /* eslint-disable-line max-params */ => {
 | 
			
		||||
		// TODO: The entire concept of selectively ignoring certificate errors
 | 
			
		||||
		// is ill-conceived, and this handler needs to be deleted.
 | 
			
		||||
 | 
			
		||||
		const url = new URL(urlString);
 | 
			
		||||
		if (url.protocol === 'wss:') {
 | 
			
		||||
			url.protocol = 'https:';
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		const filename = CertificateUtil.getCertificate(encodeURIComponent(url.origin));
 | 
			
		||||
		if (filename !== undefined) {
 | 
			
		||||
			try {
 | 
			
		||||
				const savedCertificate = fs.readFileSync(
 | 
			
		||||
					path.join(`${app.getPath('userData')}/certificates`, filename),
 | 
			
		||||
					'utf8'
 | 
			
		||||
				);
 | 
			
		||||
				if (certificate.data.replace(/[\r\n]/g, '') ===
 | 
			
		||||
					savedCertificate.replace(/[\r\n]/g, '')) {
 | 
			
		||||
					event.preventDefault();
 | 
			
		||||
					callback(true);
 | 
			
		||||
					return;
 | 
			
		||||
				}
 | 
			
		||||
			} catch (error) {
 | 
			
		||||
				console.error(`Error reading certificate file ${filename}:`, error);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		dialog.showErrorBox(
 | 
			
		||||
			'Certificate error',
 | 
			
		||||
			`The server presented an invalid certificate for ${url.origin}:
 | 
			
		||||
 | 
			
		||||
${error}`
 | 
			
		||||
		);
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	page.session.setPermissionRequestHandler((webContents, permission, callback, details) => {
 | 
			
		||||
		const {origin} = new URL(details.requestingUrl);
 | 
			
		||||
		permissionCallbacks.set(nextPermissionId, callback);
 | 
			
		||||
		page.send('permission-request', nextPermissionId, {
 | 
			
		||||
		page.send('permission-request', {
 | 
			
		||||
			webContentsId: webContents.id === mainWindow.webContents.id ?
 | 
			
		||||
				null :
 | 
			
		||||
				webContents.id,
 | 
			
		||||
			origin,
 | 
			
		||||
			permission
 | 
			
		||||
		});
 | 
			
		||||
		nextPermissionId++;
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	ipcMain.on('permission-response', (event: Event, permissionId: number, grant: boolean) => {
 | 
			
		||||
		permissionCallbacks.get(permissionId)(grant);
 | 
			
		||||
		permissionCallbacks.delete(permissionId);
 | 
			
		||||
		}, makeRendererCallback(callback));
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	// Temporarily remove this event
 | 
			
		||||
@@ -274,7 +318,7 @@ app.on('ready', () => {
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	ipcMain.on('clear-app-settings', () => {
 | 
			
		||||
		globalPatched.mainWindowState.unmanage();
 | 
			
		||||
		mainWindowState.unmanage();
 | 
			
		||||
		app.relaunch();
 | 
			
		||||
		app.exit();
 | 
			
		||||
	});
 | 
			
		||||
@@ -303,39 +347,30 @@ app.on('ready', () => {
 | 
			
		||||
		BadgeSettings.updateTaskbarIcon(data, text, mainWindow);
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	ipcMain.on('forward-message', (_event: Electron.IpcMainEvent, listener: string, ...parameters: any[]) => {
 | 
			
		||||
	ipcMain.on('forward-message', (_event: Electron.IpcMainEvent, listener: string, ...parameters: unknown[]) => {
 | 
			
		||||
		page.send(listener, ...parameters);
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	ipcMain.on('update-menu', (_event: Electron.IpcMainEvent, props: any) => {
 | 
			
		||||
	ipcMain.on('update-menu', (_event: Electron.IpcMainEvent, props: AppMenu.MenuProps) => {
 | 
			
		||||
		AppMenu.setMenu(props);
 | 
			
		||||
		const activeTab = props.tabs[props.activeTabIndex];
 | 
			
		||||
		if (activeTab) {
 | 
			
		||||
			mainWindow.setTitle(`Zulip - ${activeTab.webview.props.name}`);
 | 
			
		||||
			mainWindow.setTitle(`Zulip - ${activeTab.webviewName}`);
 | 
			
		||||
		}
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	ipcMain.on('toggleAutoLauncher', (_event: Electron.IpcMainEvent, AutoLaunchValue: boolean) => {
 | 
			
		||||
		setAutoLaunch(AutoLaunchValue);
 | 
			
		||||
	ipcMain.on('toggleAutoLauncher', async (_event: Electron.IpcMainEvent, AutoLaunchValue: boolean) => {
 | 
			
		||||
		await setAutoLaunch(AutoLaunchValue);
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	ipcMain.on('downloadFile', (_event: Electron.IpcMainEvent, url: string, downloadPath: string) => {
 | 
			
		||||
		page.downloadURL(url);
 | 
			
		||||
		page.session.once('will-download', async (_event: Event, item) => {
 | 
			
		||||
			let setFilePath: string;
 | 
			
		||||
			let shortFileName: string;
 | 
			
		||||
			if (ConfigUtil.getConfigItem('promptDownload', false)) {
 | 
			
		||||
				const showDialogOptions: object = {
 | 
			
		||||
				const showDialogOptions: electron.SaveDialogOptions = {
 | 
			
		||||
					defaultPath: path.join(downloadPath, item.getFilename())
 | 
			
		||||
				};
 | 
			
		||||
 | 
			
		||||
				const result = await dialog.showSaveDialog(mainWindow, showDialogOptions);
 | 
			
		||||
				if (result.canceled) {
 | 
			
		||||
					item.cancel();
 | 
			
		||||
					return;
 | 
			
		||||
				}
 | 
			
		||||
				setFilePath = result.filePath;
 | 
			
		||||
				shortFileName = path.basename(setFilePath);
 | 
			
		||||
				item.setSaveDialogOptions(showDialogOptions);
 | 
			
		||||
			} else {
 | 
			
		||||
				const getTimeStamp = (): number => {
 | 
			
		||||
					const date = new Date();
 | 
			
		||||
@@ -352,12 +387,10 @@ app.on('ready', () => {
 | 
			
		||||
 | 
			
		||||
				// Update the name and path of the file if it already exists
 | 
			
		||||
				const updatedFilePath = path.join(downloadPath, formatFile(filePath));
 | 
			
		||||
				setFilePath = fs.existsSync(filePath) ? updatedFilePath : filePath;
 | 
			
		||||
				shortFileName = fs.existsSync(filePath) ? formatFile(filePath) : item.getFilename();
 | 
			
		||||
				const setFilePath: string = fs.existsSync(filePath) ? updatedFilePath : filePath;
 | 
			
		||||
				item.setSavePath(setFilePath);
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			item.setSavePath(setFilePath);
 | 
			
		||||
 | 
			
		||||
			const updatedListener = (_event: Event, state: string): void => {
 | 
			
		||||
				switch (state) {
 | 
			
		||||
					case 'interrupted': {
 | 
			
		||||
@@ -366,26 +399,31 @@ app.on('ready', () => {
 | 
			
		||||
						item.cancel();
 | 
			
		||||
						break;
 | 
			
		||||
					}
 | 
			
		||||
 | 
			
		||||
					case 'progressing': {
 | 
			
		||||
						if (item.isPaused()) {
 | 
			
		||||
							item.cancel();
 | 
			
		||||
						}
 | 
			
		||||
 | 
			
		||||
						// This event can also be used to show progress in percentage in future.
 | 
			
		||||
						break;
 | 
			
		||||
					}
 | 
			
		||||
 | 
			
		||||
					default: {
 | 
			
		||||
						console.info('Unknown updated state of download item');
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			};
 | 
			
		||||
 | 
			
		||||
			item.on('updated', updatedListener);
 | 
			
		||||
			item.once('done', (_event: Event, state) => {
 | 
			
		||||
				if (state === 'completed') {
 | 
			
		||||
					page.send('downloadFileCompleted', item.getSavePath(), shortFileName);
 | 
			
		||||
					page.send('downloadFileCompleted', item.getSavePath(), path.basename(item.getSavePath()));
 | 
			
		||||
				} else {
 | 
			
		||||
					console.log('Download failed state:', state);
 | 
			
		||||
					page.send('downloadFileFailed');
 | 
			
		||||
					page.send('downloadFileFailed', state);
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				// To stop item for listening to updated events of this file
 | 
			
		||||
				item.removeListener('updated', updatedListener);
 | 
			
		||||
			});
 | 
			
		||||
 
 | 
			
		||||
@@ -1,48 +1,45 @@
 | 
			
		||||
import { app, Notification } from 'electron';
 | 
			
		||||
import {app, Notification, net} from 'electron';
 | 
			
		||||
 | 
			
		||||
import request from 'request';
 | 
			
		||||
import getStream from 'get-stream';
 | 
			
		||||
import semver from 'semver';
 | 
			
		||||
 | 
			
		||||
import * as ConfigUtil from '../renderer/js/utils/config-util';
 | 
			
		||||
import * as ProxyUtil from '../renderer/js/utils/proxy-util';
 | 
			
		||||
import * as LinuxUpdateUtil from '../renderer/js/utils/linux-update-util';
 | 
			
		||||
import Logger from '../renderer/js/utils/logger-util';
 | 
			
		||||
 | 
			
		||||
import {fetchResponse} from './request';
 | 
			
		||||
 | 
			
		||||
const logger = new Logger({
 | 
			
		||||
	file: 'linux-update-util.log',
 | 
			
		||||
	timestamp: true
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
export function linuxUpdateNotification(): void {
 | 
			
		||||
export async function linuxUpdateNotification(session: Electron.session): Promise<void> {
 | 
			
		||||
	let	url = 'https://api.github.com/repos/zulip/zulip-desktop/releases';
 | 
			
		||||
	url = ConfigUtil.getConfigItem('betaUpdate') ? url : url + '/latest';
 | 
			
		||||
	const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
 | 
			
		||||
 | 
			
		||||
	const options = {
 | 
			
		||||
		url,
 | 
			
		||||
		headers: {'User-Agent': 'request'},
 | 
			
		||||
		proxy: proxyEnabled ? ProxyUtil.getProxy(url) : '',
 | 
			
		||||
		ecdhCurve: 'auto'
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	request(options, (error: any, response: any, body: any) => {
 | 
			
		||||
		if (error) {
 | 
			
		||||
			logger.error('Linux update error.');
 | 
			
		||||
			logger.error(error);
 | 
			
		||||
	try {
 | 
			
		||||
		const response = await fetchResponse(net.request({url, session}));
 | 
			
		||||
		if (response.statusCode !== 200) {
 | 
			
		||||
			logger.log('Linux update response status: ', response.statusCode);
 | 
			
		||||
			return;
 | 
			
		||||
		}
 | 
			
		||||
		if (response.statusCode < 400) {
 | 
			
		||||
			const data = JSON.parse(body);
 | 
			
		||||
			const latestVersion = ConfigUtil.getConfigItem('betaUpdate') ? data[0].tag_name : data.tag_name;
 | 
			
		||||
 | 
			
		||||
			if (semver.gt(latestVersion, app.getVersion())) {
 | 
			
		||||
				const notified = LinuxUpdateUtil.getUpdateItem(latestVersion);
 | 
			
		||||
				if (notified === null) {
 | 
			
		||||
					new Notification({title: 'Zulip Update', body: 'A new version ' + latestVersion + ' is available. Please update using your package manager.'}).show();
 | 
			
		||||
					LinuxUpdateUtil.setUpdateItem(latestVersion, true);
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		} else {
 | 
			
		||||
			logger.log('Linux update response status: ', response.statusCode);
 | 
			
		||||
		const data = JSON.parse(await getStream(response));
 | 
			
		||||
		const latestVersion = ConfigUtil.getConfigItem('betaUpdate') ? data[0].tag_name : data.tag_name;
 | 
			
		||||
		if (typeof latestVersion !== 'string') {
 | 
			
		||||
			throw new TypeError('Expected string for tag_name');
 | 
			
		||||
		}
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
		if (semver.gt(latestVersion, app.getVersion())) {
 | 
			
		||||
			const notified = LinuxUpdateUtil.getUpdateItem(latestVersion);
 | 
			
		||||
			if (notified === null) {
 | 
			
		||||
				new Notification({title: 'Zulip Update', body: `A new version ${latestVersion} is available. Please update using your package manager.`}).show();
 | 
			
		||||
				LinuxUpdateUtil.setUpdateItem(latestVersion, true);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		logger.error('Linux update error.');
 | 
			
		||||
		logger.error(error);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										172
									
								
								app/main/menu.ts
									
									
									
									
									
								
							
							
						
						@@ -1,28 +1,29 @@
 | 
			
		||||
import { app, shell, BrowserWindow, Menu, dialog } from 'electron';
 | 
			
		||||
import { appUpdater } from './autoupdater';
 | 
			
		||||
import {app, shell, BrowserWindow, Menu} from 'electron';
 | 
			
		||||
 | 
			
		||||
import AdmZip from 'adm-zip';
 | 
			
		||||
import fs from 'fs-extra';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
import * as DNDUtil from '../renderer/js/utils/dnd-util';
 | 
			
		||||
import Logger from '../renderer/js/utils/logger-util';
 | 
			
		||||
 | 
			
		||||
import type {TabData} from '../renderer/js/main';
 | 
			
		||||
import * as ConfigUtil from '../renderer/js/utils/config-util';
 | 
			
		||||
import * as DNDUtil from '../renderer/js/utils/dnd-util';
 | 
			
		||||
import * as LinkUtil from '../renderer/js/utils/link-util';
 | 
			
		||||
import * as t from '../renderer/js/utils/translation-util';
 | 
			
		||||
 | 
			
		||||
const appName = app.name;
 | 
			
		||||
import {appUpdater} from './autoupdater';
 | 
			
		||||
 | 
			
		||||
const logger = new Logger({
 | 
			
		||||
	file: 'errors.log',
 | 
			
		||||
	timestamp: true
 | 
			
		||||
});
 | 
			
		||||
export interface MenuProps {
 | 
			
		||||
	tabs: TabData[];
 | 
			
		||||
	activeTabIndex?: number;
 | 
			
		||||
	enableMenu?: boolean;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const appName = app.name;
 | 
			
		||||
 | 
			
		||||
function getHistorySubmenu(enableMenu: boolean): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	return [{
 | 
			
		||||
		label: t.__('Back'),
 | 
			
		||||
		accelerator: process.platform === 'darwin' ? 'Command+Left' : 'Alt+Left',
 | 
			
		||||
		enabled: enableMenu,
 | 
			
		||||
		click(_item: any, focusedWindow: any) {
 | 
			
		||||
		click(_item, focusedWindow) {
 | 
			
		||||
			if (focusedWindow) {
 | 
			
		||||
				sendAction('back');
 | 
			
		||||
			}
 | 
			
		||||
@@ -31,7 +32,7 @@ function getHistorySubmenu(enableMenu: boolean): Electron.MenuItemConstructorOpt
 | 
			
		||||
		label: t.__('Forward'),
 | 
			
		||||
		accelerator: process.platform === 'darwin' ? 'Command+Right' : 'Alt+Right',
 | 
			
		||||
		enabled: enableMenu,
 | 
			
		||||
		click(_item: any, focusedWindow: any) {
 | 
			
		||||
		click(_item, focusedWindow) {
 | 
			
		||||
			if (focusedWindow) {
 | 
			
		||||
				sendAction('forward');
 | 
			
		||||
			}
 | 
			
		||||
@@ -42,26 +43,19 @@ function getHistorySubmenu(enableMenu: boolean): Electron.MenuItemConstructorOpt
 | 
			
		||||
function getToolsSubmenu(): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	return [{
 | 
			
		||||
		label: t.__('Check for Updates'),
 | 
			
		||||
		click() {
 | 
			
		||||
			checkForUpdate();
 | 
			
		||||
		async click() {
 | 
			
		||||
			await checkForUpdate();
 | 
			
		||||
		}
 | 
			
		||||
	},
 | 
			
		||||
	{
 | 
			
		||||
		label: t.__('Release Notes'),
 | 
			
		||||
		click() {
 | 
			
		||||
			LinkUtil.openBrowser(new URL(`https://github.com/zulip/zulip-desktop/releases/tag/v${app.getVersion()}`));
 | 
			
		||||
		async click() {
 | 
			
		||||
			await LinkUtil.openBrowser(new URL(`https://github.com/zulip/zulip-desktop/releases/tag/v${app.getVersion()}`));
 | 
			
		||||
		}
 | 
			
		||||
	},
 | 
			
		||||
	{
 | 
			
		||||
		type: 'separator'
 | 
			
		||||
	},
 | 
			
		||||
	{
 | 
			
		||||
		label: t.__('Factory Reset'),
 | 
			
		||||
		accelerator: process.platform === 'darwin' ? 'Command+Shift+D' : 'Ctrl+Shift+D',
 | 
			
		||||
		click() {
 | 
			
		||||
			resetAppSettings();
 | 
			
		||||
		}
 | 
			
		||||
	},
 | 
			
		||||
	{
 | 
			
		||||
		label: t.__('Download App Logs'),
 | 
			
		||||
		click() {
 | 
			
		||||
@@ -87,7 +81,7 @@ function getToolsSubmenu(): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	{
 | 
			
		||||
		label: t.__('Toggle DevTools for Zulip App'),
 | 
			
		||||
		accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
 | 
			
		||||
		click(_item: any, focusedWindow: any) {
 | 
			
		||||
		click(_item, focusedWindow) {
 | 
			
		||||
			if (focusedWindow) {
 | 
			
		||||
				focusedWindow.webContents.openDevTools({mode: 'undocked'});
 | 
			
		||||
			}
 | 
			
		||||
@@ -96,7 +90,7 @@ function getToolsSubmenu(): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	{
 | 
			
		||||
		label: t.__('Toggle DevTools for Active Tab'),
 | 
			
		||||
		accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U',
 | 
			
		||||
		click(_item: any, focusedWindow: any) {
 | 
			
		||||
		click(_item, focusedWindow) {
 | 
			
		||||
			if (focusedWindow) {
 | 
			
		||||
				sendAction('tab-devtools');
 | 
			
		||||
			}
 | 
			
		||||
@@ -108,7 +102,7 @@ function getViewSubmenu(): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	return [{
 | 
			
		||||
		label: t.__('Reload'),
 | 
			
		||||
		accelerator: 'CommandOrControl+R',
 | 
			
		||||
		click(_item: any, focusedWindow: any) {
 | 
			
		||||
		click(_item, focusedWindow) {
 | 
			
		||||
			if (focusedWindow) {
 | 
			
		||||
				sendAction('reload-current-viewer');
 | 
			
		||||
			}
 | 
			
		||||
@@ -116,7 +110,7 @@ function getViewSubmenu(): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Hard Reload'),
 | 
			
		||||
		accelerator: 'CommandOrControl+Shift+R',
 | 
			
		||||
		click(_item: any, focusedWindow: any) {
 | 
			
		||||
		click(_item, focusedWindow) {
 | 
			
		||||
			if (focusedWindow) {
 | 
			
		||||
				sendAction('hard-reload');
 | 
			
		||||
			}
 | 
			
		||||
@@ -128,26 +122,24 @@ function getViewSubmenu(): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
		role: 'togglefullscreen'
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Zoom In'),
 | 
			
		||||
		role: 'zoomIn',
 | 
			
		||||
		click(_item: any, focusedWindow: any) {
 | 
			
		||||
		accelerator: 'CommandOrControl+=',
 | 
			
		||||
		click(_item, focusedWindow) {
 | 
			
		||||
			if (focusedWindow) {
 | 
			
		||||
				sendAction('zoomIn');
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Zoom Out'),
 | 
			
		||||
		role: 'zoomOut',
 | 
			
		||||
		accelerator: 'CommandOrControl+-',
 | 
			
		||||
		click(_item: any, focusedWindow: any) {
 | 
			
		||||
		click(_item, focusedWindow) {
 | 
			
		||||
			if (focusedWindow) {
 | 
			
		||||
				sendAction('zoomOut');
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Actual Size'),
 | 
			
		||||
		role: 'resetZoom',
 | 
			
		||||
		accelerator: 'CommandOrControl+0',
 | 
			
		||||
		click(_item: any, focusedWindow: any) {
 | 
			
		||||
		click(_item, focusedWindow) {
 | 
			
		||||
			if (focusedWindow) {
 | 
			
		||||
				sendAction('zoomActualSize');
 | 
			
		||||
			}
 | 
			
		||||
@@ -156,7 +148,7 @@ function getViewSubmenu(): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
		type: 'separator'
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Toggle Tray Icon'),
 | 
			
		||||
		click(_item: any, focusedWindow: any) {
 | 
			
		||||
		click(_item, focusedWindow) {
 | 
			
		||||
			if (focusedWindow) {
 | 
			
		||||
				focusedWindow.webContents.send('toggletray');
 | 
			
		||||
			}
 | 
			
		||||
@@ -164,7 +156,7 @@ function getViewSubmenu(): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Toggle Sidebar'),
 | 
			
		||||
		accelerator: 'CommandOrControl+Shift+S',
 | 
			
		||||
		click(_item: any, focusedWindow: any) {
 | 
			
		||||
		click(_item, focusedWindow) {
 | 
			
		||||
			if (focusedWindow) {
 | 
			
		||||
				const newValue = !ConfigUtil.getConfigItem('showSidebar');
 | 
			
		||||
				focusedWindow.webContents.send('toggle-sidebar', newValue);
 | 
			
		||||
@@ -175,7 +167,7 @@ function getViewSubmenu(): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
		label: t.__('Auto hide Menu bar'),
 | 
			
		||||
		checked: ConfigUtil.getConfigItem('autoHideMenubar', false),
 | 
			
		||||
		visible: process.platform !== 'darwin',
 | 
			
		||||
		click(_item: any, focusedWindow: any) {
 | 
			
		||||
		click(_item, focusedWindow) {
 | 
			
		||||
			if (focusedWindow) {
 | 
			
		||||
				const newValue = !ConfigUtil.getConfigItem('autoHideMenubar');
 | 
			
		||||
				focusedWindow.autoHideMenuBar = newValue;
 | 
			
		||||
@@ -196,7 +188,7 @@ function getHelpSubmenu(): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			label: t.__('About Zulip'),
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('open-about');
 | 
			
		||||
				}
 | 
			
		||||
@@ -213,7 +205,7 @@ function getHelpSubmenu(): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
		{
 | 
			
		||||
			label: t.__('Report an Issue'),
 | 
			
		||||
			click() {
 | 
			
		||||
				// the goal is to notify the main.html BrowserWindow
 | 
			
		||||
				// The goal is to notify the main.html BrowserWindow
 | 
			
		||||
				// which may not be the focused window.
 | 
			
		||||
				BrowserWindow.getAllWindows().forEach(window => {
 | 
			
		||||
					window.webContents.send('open-feedback-modal');
 | 
			
		||||
@@ -223,7 +215,7 @@ function getHelpSubmenu(): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	];
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function getWindowSubmenu(tabs: any[], activeTabIndex: number, enableMenu: boolean): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
function getWindowSubmenu(tabs: TabData[], activeTabIndex: number): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	const initialSubmenu: Electron.MenuItemConstructorOptions[] = [{
 | 
			
		||||
		label: t.__('Minimize'),
 | 
			
		||||
		role: 'minimize'
 | 
			
		||||
@@ -239,17 +231,17 @@ function getWindowSubmenu(tabs: any[], activeTabIndex: number, enableMenu: boole
 | 
			
		||||
		});
 | 
			
		||||
		tabs.forEach(tab => {
 | 
			
		||||
			// Do not add functional tab settings to list of windows in menu bar
 | 
			
		||||
			if (tab.props.role === 'function' && tab.props.name === 'Settings') {
 | 
			
		||||
			if (tab.role === 'function' && tab.name === 'Settings') {
 | 
			
		||||
				return;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			initialSubmenu.push({
 | 
			
		||||
				label: tab.props.name,
 | 
			
		||||
				accelerator: tab.props.role === 'function' ? '' : `${ShortcutKey} + ${tab.props.index + 1}`,
 | 
			
		||||
				checked: tab.props.index === activeTabIndex,
 | 
			
		||||
				click(_item: any, focusedWindow: any) {
 | 
			
		||||
				label: tab.name,
 | 
			
		||||
				accelerator: tab.role === 'function' ? '' : `${ShortcutKey} + ${tab.index + 1}`,
 | 
			
		||||
				checked: tab.index === activeTabIndex,
 | 
			
		||||
				click(_item, focusedWindow) {
 | 
			
		||||
					if (focusedWindow) {
 | 
			
		||||
						sendAction('switch-server-tab', tab.props.index);
 | 
			
		||||
						sendAction('switch-server-tab', tab.index);
 | 
			
		||||
					}
 | 
			
		||||
				},
 | 
			
		||||
				type: 'checkbox'
 | 
			
		||||
@@ -262,7 +254,7 @@ function getWindowSubmenu(tabs: any[], activeTabIndex: number, enableMenu: boole
 | 
			
		||||
			label: t.__('Switch to Next Organization'),
 | 
			
		||||
			accelerator: 'Ctrl+Tab',
 | 
			
		||||
			enabled: tabs.length > 1,
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('switch-server-tab', getNextServer(tabs, activeTabIndex));
 | 
			
		||||
				}
 | 
			
		||||
@@ -271,7 +263,7 @@ function getWindowSubmenu(tabs: any[], activeTabIndex: number, enableMenu: boole
 | 
			
		||||
			label: t.__('Switch to Previous Organization'),
 | 
			
		||||
			accelerator: 'Ctrl+Shift+Tab',
 | 
			
		||||
			enabled: tabs.length > 1,
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('switch-server-tab', getPreviousServer(tabs, activeTabIndex));
 | 
			
		||||
				}
 | 
			
		||||
@@ -282,15 +274,15 @@ function getWindowSubmenu(tabs: any[], activeTabIndex: number, enableMenu: boole
 | 
			
		||||
	return initialSubmenu;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function getDarwinTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	const { tabs, activeTabIndex, enableMenu } = props;
 | 
			
		||||
function getDarwinTpl(props: MenuProps): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	const {tabs, activeTabIndex, enableMenu} = props;
 | 
			
		||||
 | 
			
		||||
	return [{
 | 
			
		||||
		label: app.name,
 | 
			
		||||
		submenu: [{
 | 
			
		||||
			label: t.__('Add Organization'),
 | 
			
		||||
			accelerator: 'Cmd+Shift+N',
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('new-server');
 | 
			
		||||
				}
 | 
			
		||||
@@ -305,7 +297,7 @@ function getDarwinTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
		}, {
 | 
			
		||||
			label: t.__('Desktop Settings'),
 | 
			
		||||
			accelerator: 'Cmd+,',
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('open-settings');
 | 
			
		||||
				}
 | 
			
		||||
@@ -314,7 +306,7 @@ function getDarwinTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
			label: t.__('Keyboard Shortcuts'),
 | 
			
		||||
			accelerator: 'Cmd+Shift+K',
 | 
			
		||||
			enabled: enableMenu,
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('shortcut');
 | 
			
		||||
				}
 | 
			
		||||
@@ -325,7 +317,7 @@ function getDarwinTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
			label: t.__('Copy Zulip URL'),
 | 
			
		||||
			accelerator: 'Cmd+Shift+C',
 | 
			
		||||
			enabled: enableMenu,
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('copy-zulip-url');
 | 
			
		||||
				}
 | 
			
		||||
@@ -334,7 +326,7 @@ function getDarwinTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
			label: t.__('Log Out of Organization'),
 | 
			
		||||
			accelerator: 'Cmd+L',
 | 
			
		||||
			enabled: enableMenu,
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('log-out');
 | 
			
		||||
				}
 | 
			
		||||
@@ -373,7 +365,7 @@ function getDarwinTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
		submenu: [{
 | 
			
		||||
			label: t.__('Undo'),
 | 
			
		||||
			accelerator: 'Cmd+Z',
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('undo');
 | 
			
		||||
				}
 | 
			
		||||
@@ -381,7 +373,7 @@ function getDarwinTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
		}, {
 | 
			
		||||
			label: t.__('Redo'),
 | 
			
		||||
			accelerator: 'Cmd+Shift+Z',
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('redo');
 | 
			
		||||
				}
 | 
			
		||||
@@ -412,7 +404,7 @@ function getDarwinTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
		submenu: getHistorySubmenu(enableMenu)
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Window'),
 | 
			
		||||
		submenu: getWindowSubmenu(tabs, activeTabIndex, enableMenu)
 | 
			
		||||
		submenu: getWindowSubmenu(tabs, activeTabIndex)
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Tools'),
 | 
			
		||||
		submenu: getToolsSubmenu()
 | 
			
		||||
@@ -423,14 +415,14 @@ function getDarwinTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	}];
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function getOtherTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	const { tabs, activeTabIndex, enableMenu } = props;
 | 
			
		||||
function getOtherTpl(props: MenuProps): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	const {tabs, activeTabIndex, enableMenu} = props;
 | 
			
		||||
	return [{
 | 
			
		||||
		label: t.__('File'),
 | 
			
		||||
		submenu: [{
 | 
			
		||||
			label: t.__('Add Organization'),
 | 
			
		||||
			accelerator: 'Ctrl+Shift+N',
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('new-server');
 | 
			
		||||
				}
 | 
			
		||||
@@ -447,7 +439,7 @@ function getOtherTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
		}, {
 | 
			
		||||
			label: t.__('Desktop Settings'),
 | 
			
		||||
			accelerator: 'Ctrl+,',
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('open-settings');
 | 
			
		||||
				}
 | 
			
		||||
@@ -456,7 +448,7 @@ function getOtherTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
			label: t.__('Keyboard Shortcuts'),
 | 
			
		||||
			accelerator: 'Ctrl+Shift+K',
 | 
			
		||||
			enabled: enableMenu,
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('shortcut');
 | 
			
		||||
				}
 | 
			
		||||
@@ -467,7 +459,7 @@ function getOtherTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
			label: t.__('Copy Zulip URL'),
 | 
			
		||||
			accelerator: 'Ctrl+Shift+C',
 | 
			
		||||
			enabled: enableMenu,
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('copy-zulip-url');
 | 
			
		||||
				}
 | 
			
		||||
@@ -476,7 +468,7 @@ function getOtherTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
			label: t.__('Log Out of Organization'),
 | 
			
		||||
			accelerator: 'Ctrl+L',
 | 
			
		||||
			enabled: enableMenu,
 | 
			
		||||
			click(_item: any, focusedWindow: any) {
 | 
			
		||||
			click(_item, focusedWindow) {
 | 
			
		||||
				if (focusedWindow) {
 | 
			
		||||
					sendAction('log-out');
 | 
			
		||||
				}
 | 
			
		||||
@@ -530,7 +522,7 @@ function getOtherTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
		submenu: getHistorySubmenu(enableMenu)
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Window'),
 | 
			
		||||
		submenu: getWindowSubmenu(tabs, activeTabIndex, enableMenu)
 | 
			
		||||
		submenu: getWindowSubmenu(tabs, activeTabIndex)
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Tools'),
 | 
			
		||||
		submenu: getToolsSubmenu()
 | 
			
		||||
@@ -541,7 +533,7 @@ function getOtherTpl(props: any): Electron.MenuItemConstructorOptions[] {
 | 
			
		||||
	}];
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function sendAction(action: string, ...parameters: any[]): void {
 | 
			
		||||
function sendAction(action: string, ...parameters: unknown[]): void {
 | 
			
		||||
	const win = BrowserWindow.getAllWindows()[0];
 | 
			
		||||
 | 
			
		||||
	if (process.platform === 'darwin') {
 | 
			
		||||
@@ -551,57 +543,29 @@ function sendAction(action: string, ...parameters: any[]): void {
 | 
			
		||||
	win.webContents.send(action, ...parameters);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function checkForUpdate(): void {
 | 
			
		||||
	appUpdater(true);
 | 
			
		||||
async function checkForUpdate(): Promise<void> {
 | 
			
		||||
	await appUpdater(true);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function getNextServer(tabs: any[], activeTabIndex: number): number {
 | 
			
		||||
function getNextServer(tabs: TabData[], activeTabIndex: number): number {
 | 
			
		||||
	do {
 | 
			
		||||
		activeTabIndex = (activeTabIndex + 1) % tabs.length;
 | 
			
		||||
	}
 | 
			
		||||
	while (tabs[activeTabIndex].props.role !== 'server');
 | 
			
		||||
	while (tabs[activeTabIndex].role !== 'server');
 | 
			
		||||
 | 
			
		||||
	return activeTabIndex;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function getPreviousServer(tabs: any[], activeTabIndex: number): number {
 | 
			
		||||
function getPreviousServer(tabs: TabData[], activeTabIndex: number): number {
 | 
			
		||||
	do {
 | 
			
		||||
		activeTabIndex = (activeTabIndex - 1 + tabs.length) % tabs.length;
 | 
			
		||||
	}
 | 
			
		||||
	while (tabs[activeTabIndex].props.role !== 'server');
 | 
			
		||||
	while (tabs[activeTabIndex].role !== 'server');
 | 
			
		||||
 | 
			
		||||
	return activeTabIndex;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
async function resetAppSettings(): Promise<void> {
 | 
			
		||||
	const resetAppSettingsMessage = 'By proceeding you will be removing all connected organizations and preferences from Zulip.';
 | 
			
		||||
 | 
			
		||||
	// We save App's settings/configurations in following files
 | 
			
		||||
	const settingFiles = ['config/window-state.json', 'config/domain.json', 'config/settings.json', 'config/certificates.json'];
 | 
			
		||||
 | 
			
		||||
	const { response } = await dialog.showMessageBox({
 | 
			
		||||
		type: 'warning',
 | 
			
		||||
		buttons: ['YES', 'NO'],
 | 
			
		||||
		defaultId: 0,
 | 
			
		||||
		message: 'Are you sure?',
 | 
			
		||||
		detail: resetAppSettingsMessage
 | 
			
		||||
	});
 | 
			
		||||
	if (response === 0) {
 | 
			
		||||
		settingFiles.forEach(settingFileName => {
 | 
			
		||||
			const getSettingFilesPath = path.join(app.getPath('appData'), appName, settingFileName);
 | 
			
		||||
			fs.access(getSettingFilesPath, (error: any) => {
 | 
			
		||||
				if (error) {
 | 
			
		||||
					logger.error('Error while resetting app settings.');
 | 
			
		||||
					logger.error(error);
 | 
			
		||||
				} else {
 | 
			
		||||
					fs.unlink(getSettingFilesPath, () => {
 | 
			
		||||
						sendAction('clear-app-data');
 | 
			
		||||
					});
 | 
			
		||||
				}
 | 
			
		||||
			});
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function setMenu(props: any): void {
 | 
			
		||||
export function setMenu(props: MenuProps): void {
 | 
			
		||||
	const tpl = process.platform === 'darwin' ? getDarwinTpl(props) : getOtherTpl(props);
 | 
			
		||||
	const menu = Menu.buildFromTemplate(tpl);
 | 
			
		||||
	Menu.setApplicationMenu(menu);
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										113
									
								
								app/main/request.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,113 @@
 | 
			
		||||
import {ClientRequest, IncomingMessage, app, net} from 'electron';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
import stream from 'stream';
 | 
			
		||||
import util from 'util';
 | 
			
		||||
 | 
			
		||||
import escape from 'escape-html';
 | 
			
		||||
import getStream from 'get-stream';
 | 
			
		||||
 | 
			
		||||
import {ServerConf} from '../renderer/js/utils/domain-util';
 | 
			
		||||
import Logger from '../renderer/js/utils/logger-util';
 | 
			
		||||
import * as Messages from '../resources/messages';
 | 
			
		||||
 | 
			
		||||
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 */
 | 
			
		||||
 | 
			
		||||
const defaultIconUrl = '../renderer/img/icon.png';
 | 
			
		||||
 | 
			
		||||
const logger = new Logger({
 | 
			
		||||
	file: 'domain-util.log',
 | 
			
		||||
	timestamp: true
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
const generateFilePath = (url: string): string => {
 | 
			
		||||
	const dir = `${app.getPath('userData')}/server-icons`;
 | 
			
		||||
	const extension = path.extname(url).split('?')[0];
 | 
			
		||||
 | 
			
		||||
	let hash = 5381;
 | 
			
		||||
	let {length} = url;
 | 
			
		||||
 | 
			
		||||
	while (length) {
 | 
			
		||||
		hash = (hash * 33) ^ url.charCodeAt(--length);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Create 'server-icons' directory if not existed
 | 
			
		||||
	if (!fs.existsSync(dir)) {
 | 
			
		||||
		fs.mkdirSync(dir);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return `${dir}/${hash >>> 0}${extension}`;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export const _getServerSettings = async (domain: string, session: Electron.session): Promise<ServerConf> => {
 | 
			
		||||
	const response = await fetchResponse(net.request({
 | 
			
		||||
		url: domain + '/api/v1/server_settings',
 | 
			
		||||
		session
 | 
			
		||||
	}));
 | 
			
		||||
	if (response.statusCode !== 200) {
 | 
			
		||||
		throw new Error(Messages.invalidZulipServerError(domain));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const {realm_name, realm_uri, realm_icon} = JSON.parse(await getStream(response));
 | 
			
		||||
	if (
 | 
			
		||||
		typeof realm_name !== 'string' ||
 | 
			
		||||
			typeof realm_uri !== 'string' ||
 | 
			
		||||
			typeof realm_icon !== 'string'
 | 
			
		||||
	) {
 | 
			
		||||
		throw new TypeError(Messages.noOrgsError(domain));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return {
 | 
			
		||||
		// Some Zulip Servers use absolute URL for server icon whereas others use relative URL
 | 
			
		||||
		// Following check handles both the cases
 | 
			
		||||
		icon: realm_icon.startsWith('/') ? realm_uri + realm_icon : realm_icon,
 | 
			
		||||
		url: realm_uri,
 | 
			
		||||
		alias: escape(realm_name)
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export const _saveServerIcon = async (url: string, session: Electron.session): Promise<string> => {
 | 
			
		||||
	try {
 | 
			
		||||
		const response = await fetchResponse(net.request({url, session}));
 | 
			
		||||
		if (response.statusCode !== 200) {
 | 
			
		||||
			logger.log('Could not get server icon.');
 | 
			
		||||
			return defaultIconUrl;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		const filePath = generateFilePath(url);
 | 
			
		||||
		await pipeline(response, fs.createWriteStream(filePath));
 | 
			
		||||
		return filePath;
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		logger.log('Could not get server icon.');
 | 
			
		||||
		logger.log(error);
 | 
			
		||||
		logger.reportSentry(error);
 | 
			
		||||
		return defaultIconUrl;
 | 
			
		||||
	}
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
/* Request: reconnect-util */
 | 
			
		||||
 | 
			
		||||
export const _isOnline = async (url: string, session: Electron.session): Promise<boolean> => {
 | 
			
		||||
	try {
 | 
			
		||||
		const response = await fetchResponse(net.request({
 | 
			
		||||
			url: `${url}/static/favicon.ico`,
 | 
			
		||||
			session
 | 
			
		||||
		}));
 | 
			
		||||
		const isValidResponse = response.statusCode >= 200 && response.statusCode < 400;
 | 
			
		||||
		return isValidResponse;
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		logger.log(error);
 | 
			
		||||
		return false;
 | 
			
		||||
	}
 | 
			
		||||
};
 | 
			
		||||
@@ -1,10 +1,11 @@
 | 
			
		||||
import { app } from 'electron';
 | 
			
		||||
import {app} from 'electron';
 | 
			
		||||
 | 
			
		||||
import AutoLaunch from 'auto-launch';
 | 
			
		||||
import isDev from 'electron-is-dev';
 | 
			
		||||
 | 
			
		||||
import * as ConfigUtil from '../renderer/js/utils/config-util';
 | 
			
		||||
 | 
			
		||||
export const setAutoLaunch = (AutoLaunchValue: boolean): void => {
 | 
			
		||||
export const setAutoLaunch = async (AutoLaunchValue: boolean): Promise<void> => {
 | 
			
		||||
	// Don't run this in development
 | 
			
		||||
	if (isDev) {
 | 
			
		||||
		return;
 | 
			
		||||
@@ -12,16 +13,16 @@ export const setAutoLaunch = (AutoLaunchValue: boolean): void => {
 | 
			
		||||
 | 
			
		||||
	const autoLaunchOption = ConfigUtil.getConfigItem('startAtLogin', AutoLaunchValue);
 | 
			
		||||
 | 
			
		||||
	// setLoginItemSettings doesn't support linux
 | 
			
		||||
	// `setLoginItemSettings` doesn't support linux
 | 
			
		||||
	if (process.platform === 'linux') {
 | 
			
		||||
		const ZulipAutoLauncher = new AutoLaunch({
 | 
			
		||||
			name: 'Zulip',
 | 
			
		||||
			isHidden: false
 | 
			
		||||
		});
 | 
			
		||||
		if (autoLaunchOption) {
 | 
			
		||||
			ZulipAutoLauncher.enable();
 | 
			
		||||
			await ZulipAutoLauncher.enable();
 | 
			
		||||
		} else {
 | 
			
		||||
			ZulipAutoLauncher.disable();
 | 
			
		||||
			await ZulipAutoLauncher.disable();
 | 
			
		||||
		}
 | 
			
		||||
	} else {
 | 
			
		||||
		app.setLoginItemSettings({
 | 
			
		||||
 
 | 
			
		||||
@@ -14,7 +14,7 @@
 | 
			
		||||
            <div class="maintenance-info">
 | 
			
		||||
                <p class="detail maintainer">
 | 
			
		||||
                    Maintained by
 | 
			
		||||
                    <a href="https://zulipchat.com" target="_blank" rel="noopener noreferrer">Zulip</a>
 | 
			
		||||
                    <a href="https://zulip.com" target="_blank" rel="noopener noreferrer">Zulip</a>
 | 
			
		||||
                </p>
 | 
			
		||||
                <p class="detail license">
 | 
			
		||||
                    Available under the
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										19
									
								
								app/renderer/css/feedback.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,19 @@
 | 
			
		||||
:host {
 | 
			
		||||
    --button-color: rgb(69, 166, 149);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
button:hover,
 | 
			
		||||
button:focus {
 | 
			
		||||
    border-color: var(--button-color);
 | 
			
		||||
    color: var(--button-color);
 | 
			
		||||
}
 | 
			
		||||
  
 | 
			
		||||
button:active {
 | 
			
		||||
    background-color: rgb(241, 241, 241);
 | 
			
		||||
    color: var(--button-color);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
button {
 | 
			
		||||
    background-color: var(--button-color);
 | 
			
		||||
    border-color: var(--button-color);
 | 
			
		||||
}
 | 
			
		||||
@@ -389,6 +389,10 @@ img.server-info-icon {
 | 
			
		||||
    margin: 6px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#note {
 | 
			
		||||
    font-size: 10px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.code {
 | 
			
		||||
    font-family: Courier New, Courier, monospace;
 | 
			
		||||
}
 | 
			
		||||
@@ -663,6 +667,26 @@ i.open-network-button {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* responsive grid */
 | 
			
		||||
@media (min-width: 500px) and (max-width: 720px) {
 | 
			
		||||
    #new-server-container {
 | 
			
		||||
        padding-left: 0px;
 | 
			
		||||
        width: 60vw;
 | 
			
		||||
        padding-right: 4vh;
 | 
			
		||||
    }
 | 
			
		||||
    .page-title {
 | 
			
		||||
        width: 60vw;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media (max-width: 500px) {
 | 
			
		||||
    #new-server-container {
 | 
			
		||||
        padding-left: 0px;
 | 
			
		||||
        width: 54%;
 | 
			
		||||
    }
 | 
			
		||||
    .page-title {
 | 
			
		||||
        width: 54%;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media (max-width: 650px) {
 | 
			
		||||
    .selected-css-path,
 | 
			
		||||
@@ -695,9 +719,6 @@ i.open-network-button {
 | 
			
		||||
        margin-right: 6px;
 | 
			
		||||
        width: 43%;
 | 
			
		||||
    }
 | 
			
		||||
    #new-server-container {
 | 
			
		||||
        padding-left: 0px;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media (max-width: 600px) {
 | 
			
		||||
 
 | 
			
		||||
| 
		 Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.6 KiB  | 
| 
		 Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.6 KiB  | 
| 
		 Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 14 KiB  | 
							
								
								
									
										82
									
								
								app/renderer/js/clipboard-decrypter.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,82 @@
 | 
			
		||||
import crypto from 'crypto';
 | 
			
		||||
import {clipboard} from 'electron';
 | 
			
		||||
 | 
			
		||||
// This helper is exposed via electron_bridge for use in the social
 | 
			
		||||
// login flow.
 | 
			
		||||
//
 | 
			
		||||
// It consists of a key and a promised token.  The in-app page sends
 | 
			
		||||
// the key to the server, and opens the user’s browser to a page where
 | 
			
		||||
// they can log in and get a token encrypted to that key.  When the
 | 
			
		||||
// user copies the encrypted token from their browser to the
 | 
			
		||||
// clipboard, we decrypt it and resolve the promise.  The in-app page
 | 
			
		||||
// then uses the decrypted token to log the user in within the app.
 | 
			
		||||
//
 | 
			
		||||
// The encryption is authenticated (AES-GCM) to guarantee that we
 | 
			
		||||
// don’t leak anything from the user’s clipboard other than the token
 | 
			
		||||
// intended for us.
 | 
			
		||||
 | 
			
		||||
export class ClipboardDecrypterImpl implements ClipboardDecrypter {
 | 
			
		||||
	version: number;
 | 
			
		||||
	key: Uint8Array;
 | 
			
		||||
	pasted: Promise<string>;
 | 
			
		||||
 | 
			
		||||
	constructor(_: number) {
 | 
			
		||||
		// At this time, the only version is 1.
 | 
			
		||||
		this.version = 1;
 | 
			
		||||
		this.key = crypto.randomBytes(32);
 | 
			
		||||
		this.pasted = new Promise(resolve => {
 | 
			
		||||
			let interval: NodeJS.Timeout | null = null;
 | 
			
		||||
			const startPolling = () => {
 | 
			
		||||
				if (interval === null) {
 | 
			
		||||
					interval = setInterval(poll, 1000);
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				poll();
 | 
			
		||||
			};
 | 
			
		||||
 | 
			
		||||
			const stopPolling = () => {
 | 
			
		||||
				if (interval !== null) {
 | 
			
		||||
					clearInterval(interval);
 | 
			
		||||
					interval = null;
 | 
			
		||||
				}
 | 
			
		||||
			};
 | 
			
		||||
 | 
			
		||||
			const poll = () => {
 | 
			
		||||
				let plaintext;
 | 
			
		||||
 | 
			
		||||
				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('blur', stopPolling);
 | 
			
		||||
				stopPolling();
 | 
			
		||||
				resolve(plaintext);
 | 
			
		||||
			};
 | 
			
		||||
 | 
			
		||||
			window.addEventListener('focus', startPolling);
 | 
			
		||||
			window.addEventListener('blur', stopPolling);
 | 
			
		||||
			if (document.hasFocus()) {
 | 
			
		||||
				startPolling();
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										115
									
								
								app/renderer/js/components/context-menu.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,115 @@
 | 
			
		||||
import {remote, ContextMenuParams} from 'electron';
 | 
			
		||||
 | 
			
		||||
import * as t from '../utils/translation-util';
 | 
			
		||||
 | 
			
		||||
const {clipboard, Menu} = remote;
 | 
			
		||||
 | 
			
		||||
export const contextMenu = (webContents: Electron.WebContents, event: Event, props: ContextMenuParams) => {
 | 
			
		||||
	const isText = props.selectionText !== '';
 | 
			
		||||
	const isLink = props.linkURL !== '';
 | 
			
		||||
	const linkURL = isLink ? new URL(props.linkURL) : undefined;
 | 
			
		||||
	const isEmailAddress = isLink ? linkURL.protocol === 'mailto:' : undefined;
 | 
			
		||||
 | 
			
		||||
	const makeSuggestion = (suggestion: string) => ({
 | 
			
		||||
		label: suggestion,
 | 
			
		||||
		visible: true,
 | 
			
		||||
		async click() {
 | 
			
		||||
			await webContents.insertText(suggestion);
 | 
			
		||||
		}
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	let menuTemplate: Electron.MenuItemConstructorOptions[] = [{
 | 
			
		||||
		label: t.__('Add to Dictionary'),
 | 
			
		||||
		visible: props.isEditable && isText && props.misspelledWord.length !== 0,
 | 
			
		||||
		click(_item) {
 | 
			
		||||
			webContents.session.addWordToSpellCheckerDictionary(props.misspelledWord);
 | 
			
		||||
		}
 | 
			
		||||
	}, {
 | 
			
		||||
		type: 'separator',
 | 
			
		||||
		visible: props.isEditable && isText && props.misspelledWord.length !== 0
 | 
			
		||||
	}, {
 | 
			
		||||
		label: `${t.__('Look Up')} "${props.selectionText}"`,
 | 
			
		||||
		visible: process.platform === 'darwin' && isText,
 | 
			
		||||
		click(_item) {
 | 
			
		||||
			webContents.showDefinitionForSelection();
 | 
			
		||||
		}
 | 
			
		||||
	}, {
 | 
			
		||||
		type: 'separator',
 | 
			
		||||
		visible: process.platform === 'darwin' && isText
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Cut'),
 | 
			
		||||
		visible: isText,
 | 
			
		||||
		enabled: props.isEditable,
 | 
			
		||||
		accelerator: 'CommandOrControl+X',
 | 
			
		||||
		click(_item) {
 | 
			
		||||
			webContents.cut();
 | 
			
		||||
		}
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Copy'),
 | 
			
		||||
		accelerator: 'CommandOrControl+C',
 | 
			
		||||
		enabled: props.editFlags.canCopy,
 | 
			
		||||
		click(_item) {
 | 
			
		||||
			webContents.copy();
 | 
			
		||||
		}
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Paste'), // Bug: Paste replaces text
 | 
			
		||||
		accelerator: 'CommandOrControl+V',
 | 
			
		||||
		enabled: props.isEditable,
 | 
			
		||||
		click() {
 | 
			
		||||
			webContents.paste();
 | 
			
		||||
		}
 | 
			
		||||
	}, {
 | 
			
		||||
		type: 'separator'
 | 
			
		||||
	}, {
 | 
			
		||||
		label: isEmailAddress ? t.__('Copy Email Address') : t.__('Copy Link'),
 | 
			
		||||
		visible: isLink,
 | 
			
		||||
		click(_item) {
 | 
			
		||||
			clipboard.write({
 | 
			
		||||
				bookmark: props.linkText,
 | 
			
		||||
				text: isEmailAddress ? linkURL.pathname : props.linkURL
 | 
			
		||||
			});
 | 
			
		||||
		}
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Copy Image'),
 | 
			
		||||
		visible: props.mediaType === 'image',
 | 
			
		||||
		click(_item) {
 | 
			
		||||
			webContents.copyImageAt(props.x, props.y);
 | 
			
		||||
		}
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Copy Image URL'),
 | 
			
		||||
		visible: props.mediaType === 'image',
 | 
			
		||||
		click(_item) {
 | 
			
		||||
			clipboard.write({
 | 
			
		||||
				bookmark: props.srcURL,
 | 
			
		||||
				text: props.srcURL
 | 
			
		||||
			});
 | 
			
		||||
		}
 | 
			
		||||
	}, {
 | 
			
		||||
		type: 'separator',
 | 
			
		||||
		visible: isLink || props.mediaType === 'image'
 | 
			
		||||
	}, {
 | 
			
		||||
		label: t.__('Services'),
 | 
			
		||||
		visible: process.platform === 'darwin',
 | 
			
		||||
		role: 'services'
 | 
			
		||||
	}];
 | 
			
		||||
 | 
			
		||||
	if (props.misspelledWord) {
 | 
			
		||||
		if (props.dictionarySuggestions.length > 0) {
 | 
			
		||||
			const suggestions: Electron.MenuItemConstructorOptions[] = props.dictionarySuggestions.map((suggestion: string) => makeSuggestion(suggestion));
 | 
			
		||||
			menuTemplate = suggestions.concat(menuTemplate);
 | 
			
		||||
		} else {
 | 
			
		||||
			menuTemplate.unshift({
 | 
			
		||||
				label: t.__('No Suggestion Found'),
 | 
			
		||||
				enabled: false
 | 
			
		||||
			});
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	// 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.
 | 
			
		||||
	// https://github.com/electron/electron/issues/5869
 | 
			
		||||
	// https://github.com/electron/electron/issues/6906
 | 
			
		||||
 | 
			
		||||
	const filteredMenuTemplate = menuTemplate.filter(menuItem => menuItem.visible ?? true);
 | 
			
		||||
	const menu = Menu.buildFromTemplate(filteredMenuTemplate);
 | 
			
		||||
	menu.popup();
 | 
			
		||||
};
 | 
			
		||||
@@ -1,7 +1,13 @@
 | 
			
		||||
import Tab, { TabProps } from './tab';
 | 
			
		||||
import Tab, {TabProps} from './tab';
 | 
			
		||||
 | 
			
		||||
export default class FunctionalTab extends Tab {
 | 
			
		||||
	$closeButton: Element;
 | 
			
		||||
 | 
			
		||||
	constructor(props: TabProps) {
 | 
			
		||||
		super(props);
 | 
			
		||||
		this.init();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	template(): string {
 | 
			
		||||
		return `<div class="tab functional-tab" data-tab-id="${this.props.tabIndex}">
 | 
			
		||||
					<div class="server-tab-badge close-button">
 | 
			
		||||
@@ -13,11 +19,6 @@ export default class FunctionalTab extends Tab {
 | 
			
		||||
				</div>`;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	constructor(props: TabProps) {
 | 
			
		||||
		super(props);
 | 
			
		||||
		this.init();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	init(): void {
 | 
			
		||||
		this.$el = this.generateNodeFromTemplate(this.template());
 | 
			
		||||
		if (this.props.name !== 'Settings') {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,10 +1,11 @@
 | 
			
		||||
import { ipcRenderer, remote } from 'electron';
 | 
			
		||||
import {ipcRenderer, remote} from 'electron';
 | 
			
		||||
 | 
			
		||||
import * as LinkUtil from '../utils/link-util';
 | 
			
		||||
import * as ConfigUtil from '../utils/config-util';
 | 
			
		||||
import * as LinkUtil from '../utils/link-util';
 | 
			
		||||
 | 
			
		||||
import type WebView from './webview';
 | 
			
		||||
 | 
			
		||||
const { shell, app } = remote;
 | 
			
		||||
const {shell, app} = remote;
 | 
			
		||||
 | 
			
		||||
const dingSound = new Audio('../resources/sounds/ding.ogg');
 | 
			
		||||
 | 
			
		||||
@@ -16,41 +17,45 @@ export default function handleExternalLink(this: WebView, event: Electron.NewWin
 | 
			
		||||
 | 
			
		||||
	if (LinkUtil.isUploadsUrl(this.props.url, url)) {
 | 
			
		||||
		ipcRenderer.send('downloadFile', url.href, downloadPath);
 | 
			
		||||
		ipcRenderer.once('downloadFileCompleted', (_event: Event, filePath: string, fileName: string) => {
 | 
			
		||||
		ipcRenderer.once('downloadFileCompleted', async (_event: Event, filePath: string, fileName: string) => {
 | 
			
		||||
			const downloadNotification = new Notification('Download Complete', {
 | 
			
		||||
				body: `Click to show ${fileName} in folder`,
 | 
			
		||||
				silent: true // We'll play our own sound - ding.ogg
 | 
			
		||||
			});
 | 
			
		||||
 | 
			
		||||
			// Play sound to indicate download complete
 | 
			
		||||
			if (!ConfigUtil.getConfigItem('silent')) {
 | 
			
		||||
				dingSound.play();
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			downloadNotification.addEventListener('click', () => {
 | 
			
		||||
				// Reveal file in download folder
 | 
			
		||||
				shell.showItemInFolder(filePath);
 | 
			
		||||
			});
 | 
			
		||||
			ipcRenderer.removeAllListeners('downloadFileFailed');
 | 
			
		||||
 | 
			
		||||
			// Play sound to indicate download complete
 | 
			
		||||
			if (!ConfigUtil.getConfigItem('silent')) {
 | 
			
		||||
				await dingSound.play();
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.once('downloadFileFailed', () => {
 | 
			
		||||
		ipcRenderer.once('downloadFileFailed', (_event: Event, state: string) => {
 | 
			
		||||
			// Automatic download failed, so show save dialog prompt and download
 | 
			
		||||
			// through webview
 | 
			
		||||
			// Only do this if it is the automatic download, otherwise show an error (so we aren't showing two save
 | 
			
		||||
			// prompts right after each other)
 | 
			
		||||
			if (ConfigUtil.getConfigItem('promptDownload', false)) {
 | 
			
		||||
				// We need to create a "new Notification" to display it, but just `Notification(...)` on its own
 | 
			
		||||
				// doesn't work
 | 
			
		||||
				new Notification('Download Complete', { // eslint-disable-line no-new
 | 
			
		||||
					body: 'Download failed'
 | 
			
		||||
				});
 | 
			
		||||
			} else {
 | 
			
		||||
				this.$el.downloadURL(url.href);
 | 
			
		||||
			// Check that the download is not cancelled by user
 | 
			
		||||
			if (state !== 'cancelled') {
 | 
			
		||||
				if (ConfigUtil.getConfigItem('promptDownload', false)) {
 | 
			
		||||
					// We need to create a "new Notification" to display it, but just `Notification(...)` on its own
 | 
			
		||||
					// doesn't work
 | 
			
		||||
					new Notification('Download Complete', { // eslint-disable-line no-new
 | 
			
		||||
						body: 'Download failed'
 | 
			
		||||
					});
 | 
			
		||||
				} else {
 | 
			
		||||
					this.$el.downloadURL(url.href);
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			ipcRenderer.removeAllListeners('downloadFileCompleted');
 | 
			
		||||
		});
 | 
			
		||||
	} else {
 | 
			
		||||
		LinkUtil.openBrowser(url);
 | 
			
		||||
		(async () => LinkUtil.openBrowser(url))();
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,11 +1,17 @@
 | 
			
		||||
import { ipcRenderer } from 'electron';
 | 
			
		||||
import {ipcRenderer} from 'electron';
 | 
			
		||||
 | 
			
		||||
import Tab, { TabProps } from './tab';
 | 
			
		||||
import * as SystemUtil from '../utils/system-util';
 | 
			
		||||
 | 
			
		||||
import Tab, {TabProps} from './tab';
 | 
			
		||||
 | 
			
		||||
export default class ServerTab extends Tab {
 | 
			
		||||
	$badge: Element;
 | 
			
		||||
 | 
			
		||||
	constructor(props: TabProps) {
 | 
			
		||||
		super(props);
 | 
			
		||||
		this.init();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	template(): string {
 | 
			
		||||
		return `<div class="tab" data-tab-id="${this.props.tabIndex}">
 | 
			
		||||
					<div class="server-tooltip" style="display:none">${this.props.name}</div>
 | 
			
		||||
@@ -17,11 +23,6 @@ export default class ServerTab extends Tab {
 | 
			
		||||
				</div>`;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	constructor(props: TabProps) {
 | 
			
		||||
		super(props);
 | 
			
		||||
		this.init();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	init(): void {
 | 
			
		||||
		this.$el = this.generateNodeFromTemplate(this.template());
 | 
			
		||||
		this.props.$root.append(this.$el);
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,5 @@
 | 
			
		||||
import WebView from './webview';
 | 
			
		||||
import BaseComponent from './base';
 | 
			
		||||
import WebView from './webview';
 | 
			
		||||
 | 
			
		||||
export interface TabProps {
 | 
			
		||||
	role: string;
 | 
			
		||||
@@ -48,7 +48,7 @@ export default class Tab extends BaseComponent {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	destroy(): void {
 | 
			
		||||
		this.$el.parentNode.removeChild(this.$el);
 | 
			
		||||
		this.webview.$el.parentNode.removeChild(this.webview.$el);
 | 
			
		||||
		this.$el.remove();
 | 
			
		||||
		this.webview.$el.remove();
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,13 +1,15 @@
 | 
			
		||||
import { ipcRenderer, remote } from 'electron';
 | 
			
		||||
 | 
			
		||||
import path from 'path';
 | 
			
		||||
import {ipcRenderer, remote} from 'electron';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
 | 
			
		||||
import * as ConfigUtil from '../utils/config-util';
 | 
			
		||||
import * as SystemUtil from '../utils/system-util';
 | 
			
		||||
 | 
			
		||||
import BaseComponent from './base';
 | 
			
		||||
import {contextMenu} from './context-menu';
 | 
			
		||||
import handleExternalLink from './handle-external-link';
 | 
			
		||||
 | 
			
		||||
const { app, dialog } = remote;
 | 
			
		||||
const {app, dialog} = remote;
 | 
			
		||||
 | 
			
		||||
const shouldSilentWebview = ConfigUtil.getConfigItem('silent');
 | 
			
		||||
 | 
			
		||||
@@ -15,15 +17,15 @@ interface WebViewProps {
 | 
			
		||||
	$root: Element;
 | 
			
		||||
	index: number;
 | 
			
		||||
	tabIndex: number;
 | 
			
		||||
	url: any;
 | 
			
		||||
	url: string;
 | 
			
		||||
	role: string;
 | 
			
		||||
	name: string;
 | 
			
		||||
	isActive: () => boolean;
 | 
			
		||||
	switchLoading: (loading: any, url: string) => void;
 | 
			
		||||
	switchLoading: (loading: boolean, url: string) => void;
 | 
			
		||||
	onNetworkError: (index: number) => void;
 | 
			
		||||
	nodeIntegration: boolean;
 | 
			
		||||
	preload: boolean;
 | 
			
		||||
	onTitleChange: any;
 | 
			
		||||
	onTitleChange: () => void;
 | 
			
		||||
	hasPermission?: (origin: string, permission: string) => boolean;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -37,10 +39,6 @@ export default class WebView extends BaseComponent {
 | 
			
		||||
	$el: Electron.WebviewTag;
 | 
			
		||||
	domReady?: Promise<void>;
 | 
			
		||||
 | 
			
		||||
	// This is required because in main.js we access WebView.method as
 | 
			
		||||
	// webview[method].
 | 
			
		||||
	[key: string]: any;
 | 
			
		||||
 | 
			
		||||
	constructor(props: WebViewProps) {
 | 
			
		||||
		super();
 | 
			
		||||
 | 
			
		||||
@@ -61,7 +59,11 @@ export default class WebView extends BaseComponent {
 | 
			
		||||
					${this.props.preload ? 'preload="js/preload.js"' : ''}
 | 
			
		||||
					partition="persist:webviewsession"
 | 
			
		||||
					name="${this.props.name}"
 | 
			
		||||
					webpreferences="${this.props.nodeIntegration ? '' : 'contextIsolation, '}javascript=yes">
 | 
			
		||||
					webpreferences="
 | 
			
		||||
						${this.props.nodeIntegration ? '' : 'contextIsolation,'}
 | 
			
		||||
						${ConfigUtil.getConfigItem('enableSpellchecker') ? 'spellcheck,' : ''}
 | 
			
		||||
						javascript
 | 
			
		||||
					">
 | 
			
		||||
				</webview>`;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@@ -87,7 +89,7 @@ export default class WebView extends BaseComponent {
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		this.$el.addEventListener('page-title-updated', event => {
 | 
			
		||||
			const { title } = event;
 | 
			
		||||
			const {title} = event;
 | 
			
		||||
			this.badgeCount = this.getBadgeCount(title);
 | 
			
		||||
			this.props.onTitleChange();
 | 
			
		||||
		});
 | 
			
		||||
@@ -97,6 +99,7 @@ export default class WebView extends BaseComponent {
 | 
			
		||||
			if (isSettingPage) {
 | 
			
		||||
				return;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			this.canGoBackButton();
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
@@ -105,14 +108,14 @@ export default class WebView extends BaseComponent {
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		this.$el.addEventListener('page-favicon-updated', event => {
 | 
			
		||||
			const { favicons } = event;
 | 
			
		||||
			const {favicons} = event;
 | 
			
		||||
 | 
			
		||||
			// This returns a string of favicons URL. If there is a PM counts in unread messages then the URL would be like
 | 
			
		||||
			// https://chat.zulip.org/static/images/favicon/favicon-pms.png
 | 
			
		||||
			if (favicons[0].indexOf('favicon-pms') > 0 && process.platform === 'darwin') {
 | 
			
		||||
				// This api is only supported on macOS
 | 
			
		||||
				app.dock.setBadge('●');
 | 
			
		||||
				// bounce the dock
 | 
			
		||||
				// Bounce the dock
 | 
			
		||||
				if (ConfigUtil.getConfigItem('dockBouncing')) {
 | 
			
		||||
					app.dock.bounce();
 | 
			
		||||
				}
 | 
			
		||||
@@ -120,9 +123,15 @@ export default class WebView extends BaseComponent {
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		this.$el.addEventListener('dom-ready', () => {
 | 
			
		||||
			const webContents = remote.webContents.fromId(this.$el.getWebContentsId());
 | 
			
		||||
			webContents.addListener('context-menu', (event, menuParameters) => {
 | 
			
		||||
				contextMenu(webContents, event, menuParameters);
 | 
			
		||||
			});
 | 
			
		||||
 | 
			
		||||
			if (this.props.role === 'server') {
 | 
			
		||||
				this.$el.classList.add('onload');
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			this.loading = false;
 | 
			
		||||
			this.props.switchLoading(false, this.props.url);
 | 
			
		||||
			this.show();
 | 
			
		||||
@@ -134,7 +143,7 @@ export default class WebView extends BaseComponent {
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		this.$el.addEventListener('did-fail-load', event => {
 | 
			
		||||
			const { errorDescription } = event;
 | 
			
		||||
			const {errorDescription} = event;
 | 
			
		||||
			const hasConnectivityErr = SystemUtil.connectivityERR.includes(errorDescription);
 | 
			
		||||
			if (hasConnectivityErr) {
 | 
			
		||||
				console.error('error', errorDescription);
 | 
			
		||||
@@ -188,9 +197,9 @@ export default class WebView extends BaseComponent {
 | 
			
		||||
		this.focus();
 | 
			
		||||
		this.props.onTitleChange();
 | 
			
		||||
		// Injecting preload css in webview to override some css rules
 | 
			
		||||
		this.$el.insertCSS(fs.readFileSync(path.join(__dirname, '/../../css/preload.css'), 'utf8'));
 | 
			
		||||
		(async () => this.$el.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
 | 
			
		||||
		this.customCSS = ConfigUtil.getConfigItem('customCSS');
 | 
			
		||||
		if (this.customCSS) {
 | 
			
		||||
			if (!fs.existsSync(this.customCSS)) {
 | 
			
		||||
@@ -202,13 +211,13 @@ export default class WebView extends BaseComponent {
 | 
			
		||||
				return;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			this.$el.insertCSS(fs.readFileSync(path.resolve(__dirname, this.customCSS), 'utf8'));
 | 
			
		||||
			(async () => this.$el.insertCSS(fs.readFileSync(path.resolve(__dirname, this.customCSS), 'utf8')))();
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	focus(): void {
 | 
			
		||||
		// focus Webview and it's contents when Window regain focus.
 | 
			
		||||
		const webContents = this.$el.getWebContents();
 | 
			
		||||
		// Focus Webview and it's contents when Window regain focus.
 | 
			
		||||
		const webContents = remote.webContents.fromId(this.$el.getWebContentsId());
 | 
			
		||||
		// HACK: webContents.isFocused() seems to be true even without the element
 | 
			
		||||
		// being in focus. So, we check against `document.activeElement`.
 | 
			
		||||
		if (webContents && this.$el !== document.activeElement) {
 | 
			
		||||
@@ -296,8 +305,8 @@ export default class WebView extends BaseComponent {
 | 
			
		||||
		this.init();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	async send(channel: string, ...parameters: any[]): Promise<void> {
 | 
			
		||||
	async send(channel: string, ...parameters: unknown[]): Promise<void> {
 | 
			
		||||
		await this.domReady;
 | 
			
		||||
		this.$el.send(channel, ...parameters);
 | 
			
		||||
		await this.$el.send(channel, ...parameters);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +1,12 @@
 | 
			
		||||
import { ipcRenderer } from 'electron';
 | 
			
		||||
import {ipcRenderer} from 'electron';
 | 
			
		||||
import {EventEmitter} from 'events';
 | 
			
		||||
 | 
			
		||||
import { EventEmitter } from 'events';
 | 
			
		||||
 | 
			
		||||
import { NotificationData, newNotification } from './notification';
 | 
			
		||||
import {ClipboardDecrypterImpl} from './clipboard-decrypter';
 | 
			
		||||
import {NotificationData, newNotification} from './notification';
 | 
			
		||||
 | 
			
		||||
type ListenerType = ((...args: any[]) => void);
 | 
			
		||||
 | 
			
		||||
class ElectronBridge extends EventEmitter {
 | 
			
		||||
class ElectronBridgeImpl extends EventEmitter implements ElectronBridge {
 | 
			
		||||
	send_notification_reply_message_supported: boolean;
 | 
			
		||||
	idle_on_system: boolean;
 | 
			
		||||
	last_active_on_system: number;
 | 
			
		||||
@@ -21,7 +21,7 @@ class ElectronBridge extends EventEmitter {
 | 
			
		||||
		this.last_active_on_system = Date.now();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	send_event = (eventName: string | symbol, ...args: any[]): void => {
 | 
			
		||||
	send_event = (eventName: string | symbol, ...args: unknown[]): void => {
 | 
			
		||||
		this.emit(eventName, ...args);
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
@@ -46,9 +46,12 @@ class ElectronBridge extends EventEmitter {
 | 
			
		||||
	set_send_notification_reply_message_supported = (value: boolean): void => {
 | 
			
		||||
		this.send_notification_reply_message_supported = value;
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	decrypt_clipboard = (version: number): ClipboardDecrypterImpl =>
 | 
			
		||||
		new ClipboardDecrypterImpl(version);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const electron_bridge = new ElectronBridge();
 | 
			
		||||
const electron_bridge = new ElectronBridgeImpl();
 | 
			
		||||
 | 
			
		||||
electron_bridge.on('total_unread_count', (...args) => {
 | 
			
		||||
	ipcRenderer.send('unread-count', ...args);
 | 
			
		||||
@@ -59,13 +62,17 @@ electron_bridge.on('realm_name', realmName => {
 | 
			
		||||
	ipcRenderer.send('realm-name-changed', serverURL, realmName);
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
electron_bridge.on('realm_icon_url', iconURL => {
 | 
			
		||||
electron_bridge.on('realm_icon_url', (iconURL: unknown) => {
 | 
			
		||||
	if (typeof iconURL !== 'string') {
 | 
			
		||||
		throw new TypeError('Expected string for iconURL');
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const serverURL = location.origin;
 | 
			
		||||
	iconURL = iconURL.includes('http') ? iconURL : `${serverURL}${iconURL}`;
 | 
			
		||||
	ipcRenderer.send('realm-icon-changed', serverURL, iconURL);
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
// 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
 | 
			
		||||
// functions zulip side will emit event using ElectronBrigde.send_event
 | 
			
		||||
// which is alias of .emit and on this side we can handle the data by adding
 | 
			
		||||
 
 | 
			
		||||
@@ -1,68 +1,34 @@
 | 
			
		||||
import { remote } from 'electron';
 | 
			
		||||
import {remote} from 'electron';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
 | 
			
		||||
import SendFeedback from '@electron-elements/send-feedback';
 | 
			
		||||
 | 
			
		||||
import path from 'path';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
 | 
			
		||||
const { app } = remote;
 | 
			
		||||
 | 
			
		||||
interface SendFeedback extends HTMLElement {
 | 
			
		||||
	[key: string]: any;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
type SendFeedbackType = SendFeedback;
 | 
			
		||||
 | 
			
		||||
// make the button color match zulip app's theme
 | 
			
		||||
SendFeedback.customStyles = `
 | 
			
		||||
button:hover, button:focus {
 | 
			
		||||
  border-color: #4EBFAC;
 | 
			
		||||
  color: #4EBFAC;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
button:active {
 | 
			
		||||
  background-color: #f1f1f1;
 | 
			
		||||
  color: #4EBFAC;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
button {
 | 
			
		||||
  background-color: #4EBFAC;
 | 
			
		||||
  border-color: #4EBFAC;
 | 
			
		||||
}
 | 
			
		||||
`;
 | 
			
		||||
const {app} = remote;
 | 
			
		||||
 | 
			
		||||
customElements.define('send-feedback', SendFeedback);
 | 
			
		||||
export const sendFeedback: SendFeedbackType = document.querySelector('send-feedback');
 | 
			
		||||
export const sendFeedback: SendFeedback = document.querySelector('send-feedback');
 | 
			
		||||
export const feedbackHolder = sendFeedback.parentElement;
 | 
			
		||||
 | 
			
		||||
/* eslint-disable no-multi-str */
 | 
			
		||||
// Make the button color match zulip app's theme
 | 
			
		||||
sendFeedback.customStylesheet = 'css/feedback.css';
 | 
			
		||||
 | 
			
		||||
// customize the fields of custom elements
 | 
			
		||||
// Customize the fields of custom elements
 | 
			
		||||
sendFeedback.title = 'Report Issue';
 | 
			
		||||
sendFeedback.titleLabel = 'Issue title:';
 | 
			
		||||
sendFeedback.titlePlaceholder = 'Enter issue title';
 | 
			
		||||
sendFeedback.textareaLabel = 'Describe the issue:';
 | 
			
		||||
sendFeedback.textareaPlaceholder = 'Succinctly describe your issue and steps to reproduce it...\n\n\
 | 
			
		||||
---\n\
 | 
			
		||||
<!-- Please Include: -->\n\
 | 
			
		||||
- **Operating System**:\n\
 | 
			
		||||
  - [ ] Windows\n\
 | 
			
		||||
  - [ ] Linux/Ubuntu\n\
 | 
			
		||||
  - [ ] macOS\n\
 | 
			
		||||
- **Clear steps to reproduce the issue**:\n\
 | 
			
		||||
- **Relevant error messages and/or screenshots**:\n\
 | 
			
		||||
';
 | 
			
		||||
 | 
			
		||||
/* eslint-enable no-multi-str */
 | 
			
		||||
sendFeedback.textareaPlaceholder = 'Succinctly describe your issue and steps to reproduce it...';
 | 
			
		||||
 | 
			
		||||
sendFeedback.buttonLabel = 'Report Issue';
 | 
			
		||||
sendFeedback.loaderSuccessText = '';
 | 
			
		||||
 | 
			
		||||
sendFeedback.useReporter('emailReporter', {
 | 
			
		||||
	email: 'akash@zulipchat.com'
 | 
			
		||||
	email: 'support@zulip.com'
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
feedbackHolder.addEventListener('click', (event: Event) => {
 | 
			
		||||
	// only remove the class if the grey out faded
 | 
			
		||||
	// Only remove the class if the grey out faded
 | 
			
		||||
	// part is clicked and not the feedback element itself
 | 
			
		||||
	if (event.target === event.currentTarget) {
 | 
			
		||||
		feedbackHolder.classList.remove('show');
 | 
			
		||||
@@ -75,6 +41,10 @@ sendFeedback.addEventListener('feedback-submitted', () => {
 | 
			
		||||
	}, 1000);
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
sendFeedback.addEventListener('feedback-cancelled', () => {
 | 
			
		||||
	feedbackHolder.classList.remove('show');
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
const dataDir = app.getPath('userData');
 | 
			
		||||
const logsDir = path.join(dataDir, '/Logs');
 | 
			
		||||
sendFeedback.logs.push(...fs.readdirSync(logsDir).map(file => path.join(logsDir, file)));
 | 
			
		||||
 
 | 
			
		||||
@@ -1,25 +1,36 @@
 | 
			
		||||
'use strict';
 | 
			
		||||
 | 
			
		||||
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: any;
 | 
			
		||||
		narrow: any;
 | 
			
		||||
		page_params: any;
 | 
			
		||||
		raw_electron_bridge: any;
 | 
			
		||||
		electron_bridge: CompatElectronBridge;
 | 
			
		||||
		narrow: {
 | 
			
		||||
			by_subject?: (target_id: number, opts: {trigger?: string}) => void;
 | 
			
		||||
			by_topic?: (target_id: number, opts: {trigger?: string}) => void;
 | 
			
		||||
		};
 | 
			
		||||
		page_params?: {
 | 
			
		||||
			default_language?: string;
 | 
			
		||||
		};
 | 
			
		||||
		raw_electron_bridge: ElectronBridge;
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	const electron_bridge = {
 | 
			
		||||
	const electron_bridge: CompatElectronBridge = {
 | 
			
		||||
		...zulipWindow.raw_electron_bridge,
 | 
			
		||||
 | 
			
		||||
		get idle_on_system() {
 | 
			
		||||
		get idle_on_system(): boolean {
 | 
			
		||||
			return this.get_idle_on_system();
 | 
			
		||||
		},
 | 
			
		||||
 | 
			
		||||
		get last_active_on_system() {
 | 
			
		||||
		get last_active_on_system(): number {
 | 
			
		||||
			return this.get_last_active_on_system();
 | 
			
		||||
		},
 | 
			
		||||
 | 
			
		||||
		get send_notification_reply_message_supported() {
 | 
			
		||||
		get send_notification_reply_message_supported(): boolean {
 | 
			
		||||
			return this.get_send_notification_reply_message_supported();
 | 
			
		||||
		},
 | 
			
		||||
 | 
			
		||||
@@ -39,18 +50,16 @@
 | 
			
		||||
			});
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		const { page_params } = zulipWindow;
 | 
			
		||||
		const {page_params} = zulipWindow;
 | 
			
		||||
		if (page_params) {
 | 
			
		||||
			electron_bridge.send_event('zulip-loaded', {
 | 
			
		||||
				serverLanguage: page_params.default_language
 | 
			
		||||
			});
 | 
			
		||||
			electron_bridge.send_event('zulip-loaded');
 | 
			
		||||
		}
 | 
			
		||||
	})();
 | 
			
		||||
 | 
			
		||||
	electron_bridge.on_event('narrow-by-topic', (id: string) => {
 | 
			
		||||
		const { narrow } = zulipWindow;
 | 
			
		||||
	electron_bridge.on_event('narrow-by-topic', (id: number) => {
 | 
			
		||||
		const {narrow} = zulipWindow;
 | 
			
		||||
		const narrowByTopic = narrow.by_topic || narrow.by_subject;
 | 
			
		||||
		narrowByTopic(id, { trigger: 'notification' });
 | 
			
		||||
		narrowByTopic(id, {trigger: 'notification'});
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	function attributeListener<T extends EventTarget>(type: string): PropertyDescriptor {
 | 
			
		||||
@@ -73,6 +82,7 @@
 | 
			
		||||
					if (!(symbol in this)) {
 | 
			
		||||
						this.addEventListener(type, listener);
 | 
			
		||||
					}
 | 
			
		||||
 | 
			
		||||
					(this as any)[symbol] = value;
 | 
			
		||||
				} else if (symbol in this) {
 | 
			
		||||
					this.removeEventListener(type, listener);
 | 
			
		||||
@@ -107,6 +117,7 @@
 | 
			
		||||
			if (callback) {
 | 
			
		||||
				callback(await Promise.resolve(NativeNotification.permission));
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			return NativeNotification.permission;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,26 +1,29 @@
 | 
			
		||||
import { ipcRenderer, remote, clipboard } from 'electron';
 | 
			
		||||
import { feedbackHolder } from './feedback';
 | 
			
		||||
 | 
			
		||||
import {ipcRenderer, remote, clipboard} from 'electron';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
import escape from 'escape-html';
 | 
			
		||||
 | 
			
		||||
import isDev from 'electron-is-dev';
 | 
			
		||||
const { session, app, Menu, dialog } = remote;
 | 
			
		||||
import escape from 'escape-html';
 | 
			
		||||
 | 
			
		||||
import * as Messages from '../../resources/messages';
 | 
			
		||||
 | 
			
		||||
import FunctionalTab from './components/functional-tab';
 | 
			
		||||
import ServerTab from './components/server-tab';
 | 
			
		||||
import WebView from './components/webview';
 | 
			
		||||
import {feedbackHolder} from './feedback';
 | 
			
		||||
import * as CommonUtil from './utils/common-util';
 | 
			
		||||
import * as ConfigUtil from './utils/config-util';
 | 
			
		||||
import * as DNDUtil from './utils/dnd-util';
 | 
			
		||||
import type {DNDSettings} from './utils/dnd-util';
 | 
			
		||||
import * as DomainUtil from './utils/domain-util';
 | 
			
		||||
import * as EnterpriseUtil from './utils/enterprise-util';
 | 
			
		||||
import * as LinkUtil from './utils/link-util';
 | 
			
		||||
import Logger from './utils/logger-util';
 | 
			
		||||
import ReconnectUtil from './utils/reconnect-util';
 | 
			
		||||
 | 
			
		||||
// eslint-disable-next-line import/no-unassigned-import
 | 
			
		||||
import './tray';
 | 
			
		||||
 | 
			
		||||
import * as DomainUtil from './utils/domain-util';
 | 
			
		||||
import WebView from './components/webview';
 | 
			
		||||
import ServerTab from './components/server-tab';
 | 
			
		||||
import FunctionalTab from './components/functional-tab';
 | 
			
		||||
import * as ConfigUtil from './utils/config-util';
 | 
			
		||||
import * as DNDUtil from './utils/dnd-util';
 | 
			
		||||
import ReconnectUtil from './utils/reconnect-util';
 | 
			
		||||
import Logger from './utils/logger-util';
 | 
			
		||||
import * as CommonUtil from './utils/common-util';
 | 
			
		||||
import * as EnterpriseUtil from './utils/enterprise-util';
 | 
			
		||||
import * as LinkUtil from './utils/link-util';
 | 
			
		||||
import * as Messages from '../../resources/messages';
 | 
			
		||||
const {session, app, Menu, dialog} = remote;
 | 
			
		||||
 | 
			
		||||
interface FunctionalTabProps {
 | 
			
		||||
	name: string;
 | 
			
		||||
@@ -28,11 +31,7 @@ interface FunctionalTabProps {
 | 
			
		||||
	url: string;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
interface AnyObject {
 | 
			
		||||
	[key: string]: any;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
interface SettingsOptions {
 | 
			
		||||
interface SettingsOptions extends DNDSettings {
 | 
			
		||||
	autoHideMenubar: boolean;
 | 
			
		||||
	trayIcon: boolean;
 | 
			
		||||
	useManualProxy: boolean;
 | 
			
		||||
@@ -42,25 +41,18 @@ interface SettingsOptions {
 | 
			
		||||
	startAtLogin: boolean;
 | 
			
		||||
	startMinimized: boolean;
 | 
			
		||||
	enableSpellchecker: boolean;
 | 
			
		||||
	showNotification: boolean;
 | 
			
		||||
	autoUpdate: boolean;
 | 
			
		||||
	betaUpdate: boolean;
 | 
			
		||||
	errorReporting: boolean;
 | 
			
		||||
	customCSS: boolean;
 | 
			
		||||
	silent: boolean;
 | 
			
		||||
	lastActiveTab: number;
 | 
			
		||||
	dnd: boolean;
 | 
			
		||||
	dndPreviousSettings: {
 | 
			
		||||
		showNotification: boolean;
 | 
			
		||||
		silent: boolean;
 | 
			
		||||
		flashTaskbarOnMessage?: boolean;
 | 
			
		||||
	};
 | 
			
		||||
	dndPreviousSettings: DNDSettings;
 | 
			
		||||
	downloadsPath: string;
 | 
			
		||||
	quitOnClose: boolean;
 | 
			
		||||
	promptDownload: boolean;
 | 
			
		||||
	flashTaskbarOnMessage?: boolean;
 | 
			
		||||
	dockBouncing?: boolean;
 | 
			
		||||
	loading?: AnyObject;
 | 
			
		||||
	spellcheckerLanguages?: string[];
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const logger = new Logger({
 | 
			
		||||
@@ -71,6 +63,13 @@ const logger = new Logger({
 | 
			
		||||
const rendererDirectory = path.resolve(__dirname, '..');
 | 
			
		||||
type ServerOrFunctionalTab = ServerTab | FunctionalTab;
 | 
			
		||||
 | 
			
		||||
export interface TabData {
 | 
			
		||||
	role: string;
 | 
			
		||||
	name: string;
 | 
			
		||||
	index: number;
 | 
			
		||||
	webviewName: string;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
class ServerManagerView {
 | 
			
		||||
	$addServerButton: HTMLButtonElement;
 | 
			
		||||
	$tabsContainer: Element;
 | 
			
		||||
@@ -90,10 +89,10 @@ class ServerManagerView {
 | 
			
		||||
	$sidebar: Element;
 | 
			
		||||
	$fullscreenPopup: Element;
 | 
			
		||||
	$fullscreenEscapeKey: string;
 | 
			
		||||
	loading: AnyObject;
 | 
			
		||||
	loading: Set<string>;
 | 
			
		||||
	activeTabIndex: number;
 | 
			
		||||
	tabs: ServerOrFunctionalTab[];
 | 
			
		||||
	functionalTabs: AnyObject;
 | 
			
		||||
	functionalTabs: Map<string, number>;
 | 
			
		||||
	tabIndex: number;
 | 
			
		||||
	presetOrgs: string[];
 | 
			
		||||
	constructor() {
 | 
			
		||||
@@ -128,11 +127,11 @@ class ServerManagerView {
 | 
			
		||||
		this.$fullscreenEscapeKey = process.platform === 'darwin' ? '^⌘F' : 'F11';
 | 
			
		||||
		this.$fullscreenPopup.innerHTML = `Press ${this.$fullscreenEscapeKey} to exit full screen`;
 | 
			
		||||
 | 
			
		||||
		this.loading = {};
 | 
			
		||||
		this.loading = new Set();
 | 
			
		||||
		this.activeTabIndex = -1;
 | 
			
		||||
		this.tabs = [];
 | 
			
		||||
		this.presetOrgs = [];
 | 
			
		||||
		this.functionalTabs = {};
 | 
			
		||||
		this.functionalTabs = new Map();
 | 
			
		||||
		this.tabIndex = 0;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@@ -141,12 +140,14 @@ class ServerManagerView {
 | 
			
		||||
		this.initDefaultSettings();
 | 
			
		||||
		this.initSidebar();
 | 
			
		||||
		this.removeUAfromDisk();
 | 
			
		||||
		if (EnterpriseUtil.configFile) {
 | 
			
		||||
			this.initPresetOrgs();
 | 
			
		||||
		if (EnterpriseUtil.hasConfigFile()) {
 | 
			
		||||
			await this.initPresetOrgs();
 | 
			
		||||
		}
 | 
			
		||||
		this.initTabs();
 | 
			
		||||
 | 
			
		||||
		await this.initTabs();
 | 
			
		||||
		this.initActions();
 | 
			
		||||
		this.registerIpcs();
 | 
			
		||||
		ipcRenderer.send('set-spellcheck-langs');
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	async loadProxy(): Promise<void> {
 | 
			
		||||
@@ -157,6 +158,7 @@ class ServerManagerView {
 | 
			
		||||
			if (proxyEnableOldState) {
 | 
			
		||||
				ConfigUtil.setConfigItem('useManualProxy', true);
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			ConfigUtil.removeConfigItem('useProxy');
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
@@ -188,7 +190,7 @@ class ServerManagerView {
 | 
			
		||||
			useSystemProxy: false,
 | 
			
		||||
			showSidebar: true,
 | 
			
		||||
			badgeOption: true,
 | 
			
		||||
			startAtLogin: true,
 | 
			
		||||
			startAtLogin: false,
 | 
			
		||||
			startMinimized: false,
 | 
			
		||||
			enableSpellchecker: true,
 | 
			
		||||
			showNotification: true,
 | 
			
		||||
@@ -223,10 +225,11 @@ class ServerManagerView {
 | 
			
		||||
 | 
			
		||||
		if (process.platform !== 'darwin') {
 | 
			
		||||
			settingOptions.autoHideMenubar = false;
 | 
			
		||||
			settingOptions.spellcheckerLanguages = ['en-US'];
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		for (const [setting, value] of Object.entries(settingOptions)) {
 | 
			
		||||
			// give preference to defaults defined in global_config.json
 | 
			
		||||
			// Give preference to defaults defined in global_config.json
 | 
			
		||||
			if (EnterpriseUtil.configItemExists(setting)) {
 | 
			
		||||
				ConfigUtil.setConfigItem(setting, EnterpriseUtil.getConfigItem(setting), true);
 | 
			
		||||
			} else if (ConfigUtil.getConfigItem(setting) === null) {
 | 
			
		||||
@@ -246,41 +249,43 @@ class ServerManagerView {
 | 
			
		||||
		ConfigUtil.removeConfigItem('userAgent');
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	async queueDomain(domain: any): Promise<boolean> {
 | 
			
		||||
		// allows us to start adding multiple domains to the app simultaneously
 | 
			
		||||
	async queueDomain(domain: string): Promise<boolean> {
 | 
			
		||||
		// Allows us to start adding multiple domains to the app simultaneously
 | 
			
		||||
		// promise of addition resolves in both cases, but we consider it rejected
 | 
			
		||||
		// if the resolved value is false
 | 
			
		||||
		try {
 | 
			
		||||
			const serverConf = await DomainUtil.checkDomain(domain);
 | 
			
		||||
			await DomainUtil.addDomain(serverConf);
 | 
			
		||||
			return true;
 | 
			
		||||
		} catch (err) {
 | 
			
		||||
			logger.error(err);
 | 
			
		||||
			logger.error('Could not add ' + domain + '. Please contact your system administrator.');
 | 
			
		||||
		} catch (error) {
 | 
			
		||||
			logger.error(error);
 | 
			
		||||
			logger.error(`Could not add ${domain}. Please contact your system administrator.`);
 | 
			
		||||
			return false;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	async initPresetOrgs(): Promise<void> {
 | 
			
		||||
		// read preset organizations from global_config.json and queues them
 | 
			
		||||
		// Read preset organizations from global_config.json and queues them
 | 
			
		||||
		// for addition to the app's domains
 | 
			
		||||
		const preAddedDomains = DomainUtil.getDomains();
 | 
			
		||||
		this.presetOrgs = EnterpriseUtil.getConfigItem('presetOrganizations', []);
 | 
			
		||||
		// set to true if at least one new domain is added
 | 
			
		||||
		// Set to true if at least one new domain is added
 | 
			
		||||
		const domainPromises = [];
 | 
			
		||||
		for (const url of this.presetOrgs) {
 | 
			
		||||
			if (DomainUtil.duplicateDomain(url)) {
 | 
			
		||||
				continue;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			domainPromises.push(this.queueDomain(url));
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		const domainsAdded = await Promise.all(domainPromises);
 | 
			
		||||
		if (domainsAdded.includes(true)) {
 | 
			
		||||
			// at least one domain was resolved
 | 
			
		||||
			// At least one domain was resolved
 | 
			
		||||
			if (preAddedDomains.length > 0) {
 | 
			
		||||
				// user already has servers added
 | 
			
		||||
				// User already has servers added
 | 
			
		||||
				// ask them before reloading the app
 | 
			
		||||
				const { response } = await dialog.showMessageBox({
 | 
			
		||||
				const {response} = await dialog.showMessageBox({
 | 
			
		||||
					type: 'question',
 | 
			
		||||
					buttons: ['Yes', 'Later'],
 | 
			
		||||
					defaultId: 0,
 | 
			
		||||
@@ -293,57 +298,62 @@ class ServerManagerView {
 | 
			
		||||
				ipcRenderer.send('reload-full-app');
 | 
			
		||||
			}
 | 
			
		||||
		} else if (domainsAdded.length > 0) {
 | 
			
		||||
			// find all orgs that failed
 | 
			
		||||
			// Find all orgs that failed
 | 
			
		||||
			const failedDomains: string[] = [];
 | 
			
		||||
			for (const org of this.presetOrgs) {
 | 
			
		||||
				if (DomainUtil.duplicateDomain(org)) {
 | 
			
		||||
					continue;
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				failedDomains.push(org);
 | 
			
		||||
			}
 | 
			
		||||
			const { title, content } = Messages.enterpriseOrgError(domainsAdded.length, failedDomains);
 | 
			
		||||
 | 
			
		||||
			const {title, content} = Messages.enterpriseOrgError(domainsAdded.length, failedDomains);
 | 
			
		||||
			dialog.showErrorBox(title, content);
 | 
			
		||||
			if (DomainUtil.getDomains().length === 0) {
 | 
			
		||||
				// no orgs present, stop showing loading gif
 | 
			
		||||
				// No orgs present, stop showing loading gif
 | 
			
		||||
				await this.openSettings('AddServer');
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	initTabs(): void {
 | 
			
		||||
	async initTabs(): Promise<void> {
 | 
			
		||||
		const servers = DomainUtil.getDomains();
 | 
			
		||||
		if (servers.length > 0) {
 | 
			
		||||
			for (const [i, server] of servers.entries()) {
 | 
			
		||||
				this.initServer(server, i);
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			// Open last active tab
 | 
			
		||||
			let lastActiveTab = ConfigUtil.getConfigItem('lastActiveTab');
 | 
			
		||||
			if (lastActiveTab >= servers.length) {
 | 
			
		||||
				lastActiveTab = 0;
 | 
			
		||||
			}
 | 
			
		||||
			// checkDomain() and webview.load() for lastActiveTab before the others
 | 
			
		||||
			DomainUtil.updateSavedServer(servers[lastActiveTab].url, lastActiveTab);
 | 
			
		||||
 | 
			
		||||
			// `checkDomain()` and `webview.load()` for lastActiveTab before the others
 | 
			
		||||
			await DomainUtil.updateSavedServer(servers[lastActiveTab].url, lastActiveTab);
 | 
			
		||||
			this.activateTab(lastActiveTab);
 | 
			
		||||
			for (const [i, server] of servers.entries()) {
 | 
			
		||||
				// after the lastActiveTab is activated, we load the others in the background
 | 
			
		||||
			await Promise.all(servers.map(async (server, i) => {
 | 
			
		||||
				// After the lastActiveTab is activated, we load the others in the background
 | 
			
		||||
				// without activating them, to prevent flashing of server icons
 | 
			
		||||
				if (i === lastActiveTab) {
 | 
			
		||||
					continue;
 | 
			
		||||
					return;
 | 
			
		||||
				}
 | 
			
		||||
				DomainUtil.updateSavedServer(server.url, i);
 | 
			
		||||
 | 
			
		||||
				await DomainUtil.updateSavedServer(server.url, i);
 | 
			
		||||
				this.tabs[i].webview.load();
 | 
			
		||||
			}
 | 
			
		||||
			}));
 | 
			
		||||
			// Remove focus from the settings icon at sidebar bottom
 | 
			
		||||
			this.$settingsButton.classList.remove('active');
 | 
			
		||||
		} else if (this.presetOrgs.length === 0) {
 | 
			
		||||
			// not attempting to add organisations in the background
 | 
			
		||||
			this.openSettings('AddServer');
 | 
			
		||||
			// Not attempting to add organisations in the background
 | 
			
		||||
			await this.openSettings('AddServer');
 | 
			
		||||
		} else {
 | 
			
		||||
			this.showLoading(true);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	initServer(server: any, index: number): void {
 | 
			
		||||
	initServer(server: DomainUtil.ServerConf, index: number): void {
 | 
			
		||||
		const tabIndex = this.getTabIndex();
 | 
			
		||||
		this.tabs.push(new ServerTab({
 | 
			
		||||
			role: 'server',
 | 
			
		||||
@@ -364,16 +374,15 @@ class ServerManagerView {
 | 
			
		||||
				name: CommonUtil.decodeString(server.alias),
 | 
			
		||||
				hasPermission: (origin: string, permission: string) =>
 | 
			
		||||
					origin === server.url && permission === 'notifications',
 | 
			
		||||
				isActive: () => {
 | 
			
		||||
					return index === this.activeTabIndex;
 | 
			
		||||
				},
 | 
			
		||||
				isActive: () => index === this.activeTabIndex,
 | 
			
		||||
				switchLoading: (loading: boolean, url: string) => {
 | 
			
		||||
					if (!loading && this.loading[url]) {
 | 
			
		||||
						this.loading[url] = false;
 | 
			
		||||
					} else if (loading && !this.loading[url]) {
 | 
			
		||||
						this.loading[url] = true;
 | 
			
		||||
					if (loading) {
 | 
			
		||||
						this.loading.add(url);
 | 
			
		||||
					} else {
 | 
			
		||||
						this.loading.delete(url);
 | 
			
		||||
					}
 | 
			
		||||
					this.showLoading(this.loading[this.tabs[this.activeTabIndex].webview.props.url]);
 | 
			
		||||
 | 
			
		||||
					this.showLoading(this.loading.has(this.tabs[this.activeTabIndex].webview.props.url));
 | 
			
		||||
				},
 | 
			
		||||
				onNetworkError: (index: number) => this.openNetworkTroubleshooting(index),
 | 
			
		||||
				onTitleChange: this.updateBadge.bind(this),
 | 
			
		||||
@@ -381,7 +390,7 @@ class ServerManagerView {
 | 
			
		||||
				preload: true
 | 
			
		||||
			})
 | 
			
		||||
		}));
 | 
			
		||||
		this.loading[server.url] = true;
 | 
			
		||||
		this.loading.add(server.url);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	initActions(): void {
 | 
			
		||||
@@ -397,6 +406,7 @@ class ServerManagerView {
 | 
			
		||||
			if ($serverImg.src.includes('img/icon.png')) {
 | 
			
		||||
				this.displayInitialCharLogo($serverImg, index);
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			$serverImg.addEventListener('error', () => {
 | 
			
		||||
				this.displayInitialCharLogo($serverImg, index);
 | 
			
		||||
			});
 | 
			
		||||
@@ -411,11 +421,11 @@ class ServerManagerView {
 | 
			
		||||
		this.$reloadButton.addEventListener('click', () => {
 | 
			
		||||
			this.tabs[this.activeTabIndex].webview.reload();
 | 
			
		||||
		});
 | 
			
		||||
		this.$addServerButton.addEventListener('click', () => {
 | 
			
		||||
			this.openSettings('AddServer');
 | 
			
		||||
		this.$addServerButton.addEventListener('click', async () => {
 | 
			
		||||
			await this.openSettings('AddServer');
 | 
			
		||||
		});
 | 
			
		||||
		this.$settingsButton.addEventListener('click', () => {
 | 
			
		||||
			this.openSettings('General');
 | 
			
		||||
		this.$settingsButton.addEventListener('click', async () => {
 | 
			
		||||
			await this.openSettings('General');
 | 
			
		||||
		});
 | 
			
		||||
		this.$backButton.addEventListener('click', () => {
 | 
			
		||||
			this.tabs[this.activeTabIndex].webview.back();
 | 
			
		||||
@@ -445,10 +455,9 @@ class ServerManagerView {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	displayInitialCharLogo($img: HTMLImageElement, index: number): void {
 | 
			
		||||
		/*
 | 
			
		||||
			index parameter needed because webview[data-tab-id] can increment
 | 
			
		||||
			beyond size of sidebar org array and throw error
 | 
			
		||||
		*/
 | 
			
		||||
		// The index parameter is needed because webview[data-tab-id] can
 | 
			
		||||
		// increment beyond the size of the sidebar org array and throw an
 | 
			
		||||
		// error
 | 
			
		||||
 | 
			
		||||
		const $altIcon = document.createElement('div');
 | 
			
		||||
		const $parent = $img.parentElement;
 | 
			
		||||
@@ -480,8 +489,8 @@ class ServerManagerView {
 | 
			
		||||
			// as that of its parent element.
 | 
			
		||||
			// This needs to handled only for the add server tooltip and not others.
 | 
			
		||||
			if (addServer) {
 | 
			
		||||
				const { top } = SidebarButton.getBoundingClientRect();
 | 
			
		||||
				SidebarTooltip.style.top = top + 'px';
 | 
			
		||||
				const {top} = SidebarButton.getBoundingClientRect();
 | 
			
		||||
				SidebarTooltip.style.top = `${top}px`;
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
		SidebarButton.addEventListener('mouseout', () => {
 | 
			
		||||
@@ -490,14 +499,14 @@ class ServerManagerView {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	onHover(index: number): void {
 | 
			
		||||
		// this.$serverIconTooltip[index].innerHTML already has realm name, so we are just
 | 
			
		||||
		// `this.$serverIconTooltip[index].innerHTML` already has realm name, so we are just
 | 
			
		||||
		// removing the style.
 | 
			
		||||
		this.$serverIconTooltip[index].removeAttribute('style');
 | 
			
		||||
		// To handle position of servers' tooltip due to scrolling of list of organizations
 | 
			
		||||
		// This could not be handled using CSS, hence the top of the tooltip is made same
 | 
			
		||||
		// as that of its parent element.
 | 
			
		||||
		const { top } = this.$serverIconTooltip[index].parentElement.getBoundingClientRect();
 | 
			
		||||
		this.$serverIconTooltip[index].style.top = top + 'px';
 | 
			
		||||
		const {top} = this.$serverIconTooltip[index].parentElement.getBoundingClientRect();
 | 
			
		||||
		this.$serverIconTooltip[index].style.top = `${top}px`;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	onHoverOut(index: number): void {
 | 
			
		||||
@@ -505,12 +514,12 @@ class ServerManagerView {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	openFunctionalTab(tabProps: FunctionalTabProps): void {
 | 
			
		||||
		if (this.functionalTabs[tabProps.name] !== undefined) {
 | 
			
		||||
			this.activateTab(this.functionalTabs[tabProps.name]);
 | 
			
		||||
		if (this.functionalTabs.has(tabProps.name)) {
 | 
			
		||||
			this.activateTab(this.functionalTabs.get(tabProps.name));
 | 
			
		||||
			return;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		this.functionalTabs[tabProps.name] = this.tabs.length;
 | 
			
		||||
		this.functionalTabs.set(tabProps.name, this.tabs.length);
 | 
			
		||||
 | 
			
		||||
		const tabIndex = this.getTabIndex();
 | 
			
		||||
 | 
			
		||||
@@ -519,27 +528,26 @@ class ServerManagerView {
 | 
			
		||||
			materialIcon: tabProps.materialIcon,
 | 
			
		||||
			name: tabProps.name,
 | 
			
		||||
			$root: this.$tabsContainer,
 | 
			
		||||
			index: this.functionalTabs[tabProps.name],
 | 
			
		||||
			index: this.functionalTabs.get(tabProps.name),
 | 
			
		||||
			tabIndex,
 | 
			
		||||
			onClick: this.activateTab.bind(this, this.functionalTabs[tabProps.name]),
 | 
			
		||||
			onDestroy: this.destroyTab.bind(this, tabProps.name, this.functionalTabs[tabProps.name]),
 | 
			
		||||
			onClick: this.activateTab.bind(this, this.functionalTabs.get(tabProps.name)),
 | 
			
		||||
			onDestroy: this.destroyTab.bind(this, tabProps.name, this.functionalTabs.get(tabProps.name)),
 | 
			
		||||
			webview: new WebView({
 | 
			
		||||
				$root: this.$webviewsContainer,
 | 
			
		||||
				index: this.functionalTabs[tabProps.name],
 | 
			
		||||
				index: this.functionalTabs.get(tabProps.name),
 | 
			
		||||
				tabIndex,
 | 
			
		||||
				url: tabProps.url,
 | 
			
		||||
				role: 'function',
 | 
			
		||||
				name: tabProps.name,
 | 
			
		||||
				isActive: () => {
 | 
			
		||||
					return this.functionalTabs[tabProps.name] === this.activeTabIndex;
 | 
			
		||||
				},
 | 
			
		||||
				switchLoading: (loading: AnyObject, url: string) => {
 | 
			
		||||
					if (!loading && this.loading[url]) {
 | 
			
		||||
						this.loading[url] = false;
 | 
			
		||||
					} else if (loading && !this.loading[url]) {
 | 
			
		||||
						this.loading[url] = true;
 | 
			
		||||
				isActive: () => this.functionalTabs.get(tabProps.name) === this.activeTabIndex,
 | 
			
		||||
				switchLoading: (loading: boolean, url: string) => {
 | 
			
		||||
					if (loading) {
 | 
			
		||||
						this.loading.add(url);
 | 
			
		||||
					} else {
 | 
			
		||||
						this.loading.delete(url);
 | 
			
		||||
					}
 | 
			
		||||
					this.showLoading(this.loading[this.tabs[this.activeTabIndex].webview.props.url]);
 | 
			
		||||
 | 
			
		||||
					this.showLoading(this.loading.has(this.tabs[this.activeTabIndex].webview.props.url));
 | 
			
		||||
				},
 | 
			
		||||
				onNetworkError: (index: number) => this.openNetworkTroubleshooting(index),
 | 
			
		||||
				onTitleChange: this.updateBadge.bind(this),
 | 
			
		||||
@@ -552,7 +560,7 @@ class ServerManagerView {
 | 
			
		||||
		// closed when the functional tab DOM is ready, handled in webview.js
 | 
			
		||||
		this.$webviewsContainer.classList.remove('loaded');
 | 
			
		||||
 | 
			
		||||
		this.activateTab(this.functionalTabs[tabProps.name]);
 | 
			
		||||
		this.activateTab(this.functionalTabs.get(tabProps.name));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	async openSettings(nav = 'General'): Promise<void> {
 | 
			
		||||
@@ -562,7 +570,7 @@ class ServerManagerView {
 | 
			
		||||
			url: `file://${rendererDirectory}/preference.html#${nav}`
 | 
			
		||||
		});
 | 
			
		||||
		this.$settingsButton.classList.add('active');
 | 
			
		||||
		await this.tabs[this.functionalTabs.Settings].webview.send('switch-settings-nav', nav);
 | 
			
		||||
		await this.tabs[this.functionalTabs.get('Settings')].webview.send('switch-settings-nav', nav);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	openAbout(): void {
 | 
			
		||||
@@ -587,23 +595,17 @@ class ServerManagerView {
 | 
			
		||||
		ipcRenderer.send('save-last-tab', index);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// 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
 | 
			
		||||
	// ipcRenderer. Something about webview, and props.webview
 | 
			
		||||
	// properties in ServerTab causes the app to crash.
 | 
			
		||||
	get tabsForIpc(): ServerOrFunctionalTab[] {
 | 
			
		||||
		const tabs: ServerOrFunctionalTab[] = [];
 | 
			
		||||
		this.tabs.forEach((tab: ServerOrFunctionalTab) => {
 | 
			
		||||
			const proto = Object.create(Object.getPrototypeOf(tab));
 | 
			
		||||
			const tabClone = Object.assign(proto, tab);
 | 
			
		||||
 | 
			
		||||
			tabClone.webview = { props: {} };
 | 
			
		||||
			tabClone.webview.props.name = tab.webview.props.name;
 | 
			
		||||
			delete tabClone.props.webview;
 | 
			
		||||
			tabs.push(tabClone);
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		return tabs;
 | 
			
		||||
	get tabsForIpc(): TabData[] {
 | 
			
		||||
		return this.tabs.map(tab => ({
 | 
			
		||||
			role: tab.props.role,
 | 
			
		||||
			name: tab.props.name,
 | 
			
		||||
			index: tab.props.index,
 | 
			
		||||
			webviewName: tab.webview.props.name
 | 
			
		||||
		}));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	activateTab(index: number, hideOldTab = true): void {
 | 
			
		||||
@@ -614,24 +616,27 @@ class ServerManagerView {
 | 
			
		||||
		if (this.activeTabIndex !== -1) {
 | 
			
		||||
			if (this.activeTabIndex === index) {
 | 
			
		||||
				return;
 | 
			
		||||
			} else if (hideOldTab) {
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			if (hideOldTab) {
 | 
			
		||||
				// If old tab is functional tab Settings, remove focus from the settings icon at sidebar bottom
 | 
			
		||||
				if (this.tabs[this.activeTabIndex].props.role === 'function' && this.tabs[this.activeTabIndex].props.name === 'Settings') {
 | 
			
		||||
					this.$settingsButton.classList.remove('active');
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				this.tabs[this.activeTabIndex].deactivate();
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		try {
 | 
			
		||||
			this.tabs[index].webview.canGoBackButton();
 | 
			
		||||
		} catch (err) {
 | 
			
		||||
		} catch {
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		this.activeTabIndex = index;
 | 
			
		||||
		this.tabs[index].activate();
 | 
			
		||||
 | 
			
		||||
		this.showLoading(this.loading[this.tabs[this.activeTabIndex].webview.props.url]);
 | 
			
		||||
		this.showLoading(this.loading.has(this.tabs[this.activeTabIndex].webview.props.url));
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.send('update-menu', {
 | 
			
		||||
			// JSON stringify this.tabs to avoid a crash
 | 
			
		||||
@@ -661,7 +666,7 @@ class ServerManagerView {
 | 
			
		||||
		this.tabs[index].destroy();
 | 
			
		||||
 | 
			
		||||
		delete this.tabs[index];
 | 
			
		||||
		delete this.functionalTabs[name];
 | 
			
		||||
		this.functionalTabs.delete(name);
 | 
			
		||||
 | 
			
		||||
		// Issue #188: If the functional tab was not focused, do not activate another tab.
 | 
			
		||||
		if (this.activeTabIndex === index) {
 | 
			
		||||
@@ -676,21 +681,21 @@ class ServerManagerView {
 | 
			
		||||
		// Clear global variables
 | 
			
		||||
		this.activeTabIndex = -1;
 | 
			
		||||
		this.tabs = [];
 | 
			
		||||
		this.functionalTabs = {};
 | 
			
		||||
		this.functionalTabs.clear();
 | 
			
		||||
 | 
			
		||||
		// Clear DOM elements
 | 
			
		||||
		this.$tabsContainer.innerHTML = '';
 | 
			
		||||
		this.$webviewsContainer.innerHTML = '';
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	reloadView(): void {
 | 
			
		||||
	async reloadView(): Promise<void> {
 | 
			
		||||
		// Save and remember the index of last active tab so that we can use it later
 | 
			
		||||
		const lastActiveTab = this.tabs[this.activeTabIndex].props.index;
 | 
			
		||||
		ConfigUtil.setConfigItem('lastActiveTab', lastActiveTab);
 | 
			
		||||
 | 
			
		||||
		// Destroy the current view and re-initiate it
 | 
			
		||||
		this.destroyView();
 | 
			
		||||
		this.initTabs();
 | 
			
		||||
		await this.initTabs();
 | 
			
		||||
		this.initServerActions();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@@ -713,9 +718,9 @@ class ServerManagerView {
 | 
			
		||||
		ipcRenderer.send('update-badge', messageCountAll);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	updateGeneralSettings(setting: string, value: any): void {
 | 
			
		||||
	updateGeneralSettings(setting: string, value: unknown): void {
 | 
			
		||||
		if (this.getActiveWebview()) {
 | 
			
		||||
			const webContents = this.getActiveWebview().getWebContents();
 | 
			
		||||
			const webContents = remote.webContents.fromId(this.getActiveWebview().getWebContentsId());
 | 
			
		||||
			webContents.send(setting, value);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
@@ -752,7 +757,7 @@ class ServerManagerView {
 | 
			
		||||
				{
 | 
			
		||||
					label: 'Disconnect organization',
 | 
			
		||||
					click: async () => {
 | 
			
		||||
						const { response } = await dialog.showMessageBox({
 | 
			
		||||
						const {response} = await dialog.showMessageBox({
 | 
			
		||||
							type: 'warning',
 | 
			
		||||
							buttons: ['YES', 'NO'],
 | 
			
		||||
							defaultId: 0,
 | 
			
		||||
@@ -762,7 +767,7 @@ class ServerManagerView {
 | 
			
		||||
							if (DomainUtil.removeDomain(index)) {
 | 
			
		||||
								ipcRenderer.send('reload-full-app');
 | 
			
		||||
							} else {
 | 
			
		||||
								const { title, content } = Messages.orgRemovalError(DomainUtil.getDomain(index).url);
 | 
			
		||||
								const {title, content} = Messages.orgRemovalError(DomainUtil.getDomain(index).url);
 | 
			
		||||
								dialog.showErrorBox(title, content);
 | 
			
		||||
							}
 | 
			
		||||
						}
 | 
			
		||||
@@ -772,7 +777,7 @@ class ServerManagerView {
 | 
			
		||||
					label: 'Notification settings',
 | 
			
		||||
					enabled: this.isLoggedIn(index),
 | 
			
		||||
					click: () => {
 | 
			
		||||
						// switch to tab whose icon was right-clicked
 | 
			
		||||
						// Switch to tab whose icon was right-clicked
 | 
			
		||||
						this.activateTab(index);
 | 
			
		||||
						this.tabs[index].webview.showNotificationSettings();
 | 
			
		||||
					}
 | 
			
		||||
@@ -785,69 +790,70 @@ class ServerManagerView {
 | 
			
		||||
				}
 | 
			
		||||
			];
 | 
			
		||||
			const contextMenu = Menu.buildFromTemplate(template);
 | 
			
		||||
			contextMenu.popup({ window: remote.getCurrentWindow() });
 | 
			
		||||
			contextMenu.popup({window: remote.getCurrentWindow()});
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	registerIpcs(): void {
 | 
			
		||||
		const webviewListeners: AnyObject = {
 | 
			
		||||
			'webview-reload': 'reload',
 | 
			
		||||
			back: 'back',
 | 
			
		||||
			focus: 'focus',
 | 
			
		||||
			forward: 'forward',
 | 
			
		||||
			zoomIn: 'zoomIn',
 | 
			
		||||
			zoomOut: 'zoomOut',
 | 
			
		||||
			zoomActualSize: 'zoomActualSize',
 | 
			
		||||
			'log-out': 'logOut',
 | 
			
		||||
			shortcut: 'showShortcut',
 | 
			
		||||
			'tab-devtools': 'openDevTools'
 | 
			
		||||
		};
 | 
			
		||||
		const webviewListeners: Array<[string, (webview: WebView) => void]> = [
 | 
			
		||||
			['webview-reload', webview => webview.reload()],
 | 
			
		||||
			['back', webview => webview.back()],
 | 
			
		||||
			['focus', webview => webview.focus()],
 | 
			
		||||
			['forward', webview => webview.forward()],
 | 
			
		||||
			['zoomIn', webview => webview.zoomIn()],
 | 
			
		||||
			['zoomOut', webview => webview.zoomOut()],
 | 
			
		||||
			['zoomActualSize', webview => webview.zoomActualSize()],
 | 
			
		||||
			['log-out', webview => webview.logOut()],
 | 
			
		||||
			['shortcut', webview => webview.showShortcut()],
 | 
			
		||||
			['tab-devtools', webview => webview.openDevTools()]
 | 
			
		||||
		];
 | 
			
		||||
 | 
			
		||||
		for (const [key, method] of Object.entries(webviewListeners)) {
 | 
			
		||||
			ipcRenderer.on(key, () => {
 | 
			
		||||
		for (const [channel, listener] of webviewListeners) {
 | 
			
		||||
			ipcRenderer.on(channel, () => {
 | 
			
		||||
				const activeWebview = this.tabs[this.activeTabIndex].webview;
 | 
			
		||||
				if (activeWebview) {
 | 
			
		||||
					activeWebview[method]();
 | 
			
		||||
					listener(activeWebview);
 | 
			
		||||
				}
 | 
			
		||||
			});
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('permission-request', (
 | 
			
		||||
			event: Event,
 | 
			
		||||
			permissionId: number,
 | 
			
		||||
			{webContentsId, origin, permission}: {
 | 
			
		||||
				webContentsId: number | null;
 | 
			
		||||
				origin: string;
 | 
			
		||||
				permission: string;
 | 
			
		||||
			}
 | 
			
		||||
			},
 | 
			
		||||
			rendererCallbackId: number
 | 
			
		||||
		) => {
 | 
			
		||||
			const grant = webContentsId === null ?
 | 
			
		||||
				origin === 'null' && permission === 'notifications' :
 | 
			
		||||
				this.tabs.some(
 | 
			
		||||
					({webview}) =>
 | 
			
		||||
						!webview.loading &&
 | 
			
		||||
						webview.$el.getWebContentsId() === webContentsId &&
 | 
			
		||||
					webview.props.hasPermission?.(origin, permission)
 | 
			
		||||
						webview.props.hasPermission?.(origin, permission)
 | 
			
		||||
				);
 | 
			
		||||
			console.log(
 | 
			
		||||
				grant ? 'Granted' : 'Denied', 'permissions request for',
 | 
			
		||||
				permission, 'from', origin
 | 
			
		||||
			);
 | 
			
		||||
			ipcRenderer.send('permission-response', permissionId, grant);
 | 
			
		||||
			ipcRenderer.send('renderer-callback', rendererCallbackId, grant);
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('show-network-error', (event: Event, index: number) => {
 | 
			
		||||
			this.openNetworkTroubleshooting(index);
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('open-settings', (event: Event, settingNav: string) => {
 | 
			
		||||
			this.openSettings(settingNav);
 | 
			
		||||
		ipcRenderer.on('open-settings', async (event: Event, settingNav: string) => {
 | 
			
		||||
			await this.openSettings(settingNav);
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('open-about', this.openAbout.bind(this));
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('open-help', () => {
 | 
			
		||||
		ipcRenderer.on('open-help', async () => {
 | 
			
		||||
			// Open help page of current active server
 | 
			
		||||
			LinkUtil.openBrowser(new URL('/help', this.getCurrentActiveServer()));
 | 
			
		||||
			await LinkUtil.openBrowser(new URL('https://zulip.com/help/'));
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('reload-viewer', this.reloadView.bind(this, this.tabs[this.activeTabIndex].props.index));
 | 
			
		||||
@@ -858,22 +864,21 @@ class ServerManagerView {
 | 
			
		||||
			ipcRenderer.send('reload-full-app');
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('clear-app-data', () => {
 | 
			
		||||
			ipcRenderer.send('clear-app-settings');
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('switch-server-tab', (event: Event, index: number) => {
 | 
			
		||||
			this.activateLastTab(index);
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('open-org-tab', () => {
 | 
			
		||||
			this.openSettings('AddServer');
 | 
			
		||||
		ipcRenderer.on('open-org-tab', async () => {
 | 
			
		||||
			await this.openSettings('AddServer');
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('reload-proxy', async (event: Event, showAlert: boolean) => {
 | 
			
		||||
			await this.loadProxy();
 | 
			
		||||
			if (showAlert) {
 | 
			
		||||
				alert('Proxy settings saved!');
 | 
			
		||||
				await dialog.showMessageBox({
 | 
			
		||||
					message: 'Proxy settings saved!',
 | 
			
		||||
					buttons: ['OK']
 | 
			
		||||
				});
 | 
			
		||||
				ipcRenderer.send('reload-full-app');
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
@@ -891,8 +896,8 @@ class ServerManagerView {
 | 
			
		||||
			webviews.forEach(webview => {
 | 
			
		||||
				try {
 | 
			
		||||
					webview.setAudioMuted(state);
 | 
			
		||||
				} catch (err) {
 | 
			
		||||
					// webview is not ready yet
 | 
			
		||||
				} catch {
 | 
			
		||||
					// Webview is not ready yet
 | 
			
		||||
					webview.addEventListener('dom-ready', () => {
 | 
			
		||||
						webview.setAudioMuted(state);
 | 
			
		||||
					});
 | 
			
		||||
@@ -908,13 +913,14 @@ class ServerManagerView {
 | 
			
		||||
				});
 | 
			
		||||
				return;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			this.updateGeneralSettings('toggle-menubar-setting', autoHideMenubar);
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('toggle-dnd', (event: Event, state: boolean, newSettings: SettingsOptions) => {
 | 
			
		||||
		ipcRenderer.on('toggle-dnd', (event: Event, state: boolean, newSettings: DNDSettings) => {
 | 
			
		||||
			this.toggleDNDButton(state);
 | 
			
		||||
			ipcRenderer.send('forward-message', 'toggle-silent', newSettings.silent);
 | 
			
		||||
			const webContents = this.getActiveWebview().getWebContents();
 | 
			
		||||
			const webContents = remote.webContents.fromId(this.getActiveWebview().getWebContentsId());
 | 
			
		||||
			webContents.send('toggle-dnd', state, newSettings);
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
@@ -928,8 +934,7 @@ class ServerManagerView {
 | 
			
		||||
					this.tabs[index].webview.props.name = realmName;
 | 
			
		||||
 | 
			
		||||
					domain.alias = escape(realmName);
 | 
			
		||||
					DomainUtil.db.push(`/domains[${index}]`, domain, true);
 | 
			
		||||
					DomainUtil.reloadDB();
 | 
			
		||||
					DomainUtil.updateDomain(index, domain);
 | 
			
		||||
					// Update the realm name also on the Window menu
 | 
			
		||||
					ipcRenderer.send('update-menu', {
 | 
			
		||||
						tabs: this.tabsForIpc,
 | 
			
		||||
@@ -950,8 +955,7 @@ class ServerManagerView {
 | 
			
		||||
					const serverImgs: NodeListOf<HTMLImageElement> = document.querySelectorAll(serverImgsSelector);
 | 
			
		||||
					serverImgs[index].src = localIconUrl;
 | 
			
		||||
					domain.icon = localIconUrl;
 | 
			
		||||
					DomainUtil.db.push(`/domains[${index}]`, domain, true);
 | 
			
		||||
					DomainUtil.reloadDB();
 | 
			
		||||
					DomainUtil.updateDomain(index, domain);
 | 
			
		||||
				}
 | 
			
		||||
			});
 | 
			
		||||
		});
 | 
			
		||||
@@ -968,7 +972,7 @@ class ServerManagerView {
 | 
			
		||||
		ipcRenderer.on('focus-webview-with-id', (event: Event, webviewId: number) => {
 | 
			
		||||
			const webviews: NodeListOf<Electron.WebviewTag> = document.querySelectorAll('webview');
 | 
			
		||||
			webviews.forEach(webview => {
 | 
			
		||||
				const currentId = webview.getWebContents().id;
 | 
			
		||||
				const currentId = webview.getWebContentsId();
 | 
			
		||||
				const tabId = webview.getAttribute('data-tab-id');
 | 
			
		||||
				const concurrentTab: HTMLButtonElement = document.querySelector(`div[data-tab-id="${tabId}"]`);
 | 
			
		||||
				if (currentId === webviewId) {
 | 
			
		||||
@@ -1001,8 +1005,10 @@ class ServerManagerView {
 | 
			
		||||
					ctx.font = '85px Helvetica';
 | 
			
		||||
					ctx.fillText(String(Math.min(99, messageCount)), 64, 90);
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				return canvas;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			ipcRenderer.send('update-taskbar-icon', createOverlayIcon(messageCount).toDataURL(), String(messageCount));
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
@@ -1014,50 +1020,41 @@ class ServerManagerView {
 | 
			
		||||
			clipboard.writeText(this.getCurrentActiveServer());
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('new-server', () => {
 | 
			
		||||
			this.openSettings('AddServer');
 | 
			
		||||
		ipcRenderer.on('new-server', async () => {
 | 
			
		||||
			await this.openSettings('AddServer');
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		// Redo and undo functionality since the default API doesn't work on macOS
 | 
			
		||||
		ipcRenderer.on('undo', () => {
 | 
			
		||||
			return this.getActiveWebview().undo();
 | 
			
		||||
		});
 | 
			
		||||
		ipcRenderer.on('undo', () => this.getActiveWebview().undo());
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('redo', () => {
 | 
			
		||||
			return this.getActiveWebview().redo();
 | 
			
		||||
		});
 | 
			
		||||
		ipcRenderer.on('redo', () => this.getActiveWebview().redo());
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('set-active', () => {
 | 
			
		||||
		ipcRenderer.on('set-active', async () => {
 | 
			
		||||
			const webviews: NodeListOf<Electron.WebviewTag> = document.querySelectorAll('webview');
 | 
			
		||||
			webviews.forEach(webview => {
 | 
			
		||||
				webview.send('set-active');
 | 
			
		||||
			});
 | 
			
		||||
			await Promise.all([...webviews].map(async webview => webview.send('set-active')));
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('set-idle', () => {
 | 
			
		||||
		ipcRenderer.on('set-idle', async () => {
 | 
			
		||||
			const webviews: NodeListOf<Electron.WebviewTag> = document.querySelectorAll('webview');
 | 
			
		||||
			webviews.forEach(webview => {
 | 
			
		||||
				webview.send('set-idle');
 | 
			
		||||
			});
 | 
			
		||||
			await Promise.all([...webviews].map(async webview => webview.send('set-idle')));
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('open-network-settings', () => {
 | 
			
		||||
			this.openSettings('Network');
 | 
			
		||||
		ipcRenderer.on('open-network-settings', async () => {
 | 
			
		||||
			await this.openSettings('Network');
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
window.addEventListener('load', () => {
 | 
			
		||||
	const serverManagerView = new ServerManagerView();
 | 
			
		||||
	serverManagerView.init();
 | 
			
		||||
	// only start electron-connect (auto reload on change) when its ran
 | 
			
		||||
	// from `npm run dev` or `gulp dev` and not from `npm start` when
 | 
			
		||||
	// app is started `npm start` main process's proces.argv will have
 | 
			
		||||
	// `--no-electron-connect`
 | 
			
		||||
	const mainProcessArgv = remote.getGlobal('process').argv;
 | 
			
		||||
	if (isDev && !mainProcessArgv.includes('--no-electron-connect')) {
 | 
			
		||||
		require('electron-connect').client.create();
 | 
			
		||||
window.addEventListener('load', async () => {
 | 
			
		||||
	// Only start electron-connect (auto reload on change) when its ran
 | 
			
		||||
	// from `npm run dev` or `gulp dev` and not from `npm start`
 | 
			
		||||
	if (isDev && remote.getGlobal('process').argv.includes('--electron-connect')) {
 | 
			
		||||
		// eslint-disable-next-line node/no-unsupported-features/es-syntax
 | 
			
		||||
		(await import('electron-connect')).client.create();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const serverManagerView = new ServerManagerView();
 | 
			
		||||
	await serverManagerView.init();
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
export {};
 | 
			
		||||
export { };
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +1,14 @@
 | 
			
		||||
import { ipcRenderer } from 'electron';
 | 
			
		||||
import {ipcRenderer} from 'electron';
 | 
			
		||||
 | 
			
		||||
import MacNotifier from 'node-mac-notifier';
 | 
			
		||||
 | 
			
		||||
import electron_bridge from '../electron-bridge';
 | 
			
		||||
import * as ConfigUtil from '../utils/config-util';
 | 
			
		||||
 | 
			
		||||
import {
 | 
			
		||||
	appId, customReply, focusCurrentServer, parseReply
 | 
			
		||||
} from './helpers';
 | 
			
		||||
 | 
			
		||||
import MacNotifier from 'node-mac-notifier';
 | 
			
		||||
import * as ConfigUtil from '../utils/config-util';
 | 
			
		||||
import electron_bridge from '../electron-bridge';
 | 
			
		||||
 | 
			
		||||
type ReplyHandler = (response: string) => void;
 | 
			
		||||
type ClickHandler = () => void;
 | 
			
		||||
let replyHandler: ReplyHandler;
 | 
			
		||||
@@ -17,14 +19,14 @@ interface NotificationHandlerArgs {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
class DarwinNotification {
 | 
			
		||||
	tag: string;
 | 
			
		||||
	tag: number;
 | 
			
		||||
 | 
			
		||||
	constructor(title: string, options: NotificationOptions) {
 | 
			
		||||
		const silent: boolean = ConfigUtil.getConfigItem('silent') || false;
 | 
			
		||||
		const { icon } = options;
 | 
			
		||||
		const {icon} = options;
 | 
			
		||||
		const profilePic = new URL(icon, location.href).href;
 | 
			
		||||
 | 
			
		||||
		this.tag = options.tag;
 | 
			
		||||
		this.tag = Number.parseInt(options.tag, 10);
 | 
			
		||||
		const notification = new MacNotifier(title, Object.assign(options, {
 | 
			
		||||
			bundleId: appId,
 | 
			
		||||
			canReply: true,
 | 
			
		||||
@@ -33,7 +35,7 @@ class DarwinNotification {
 | 
			
		||||
		}));
 | 
			
		||||
 | 
			
		||||
		notification.addEventListener('click', () => {
 | 
			
		||||
			// focus to the server who sent the
 | 
			
		||||
			// Focus to the server who sent the
 | 
			
		||||
			// notification if not focused already
 | 
			
		||||
			if (clickHandler) {
 | 
			
		||||
				clickHandler();
 | 
			
		||||
@@ -47,7 +49,7 @@ class DarwinNotification {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	static requestPermission(): void {
 | 
			
		||||
		return; // eslint-disable-line no-useless-return
 | 
			
		||||
		// Do nothing
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Override default Notification permission
 | 
			
		||||
@@ -71,7 +73,7 @@ class DarwinNotification {
 | 
			
		||||
		clickHandler = handler;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// not something that is common or
 | 
			
		||||
	// Not something that is common or
 | 
			
		||||
	// used by zulip server but added to be
 | 
			
		||||
	// future proff.
 | 
			
		||||
	addEventListener(event: string, handler: ClickHandler | ReplyHandler): void {
 | 
			
		||||
@@ -84,7 +86,7 @@ class DarwinNotification {
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	async notificationHandler({ response }: NotificationHandlerArgs): Promise<void> {
 | 
			
		||||
	async notificationHandler({response}: NotificationHandlerArgs): Promise<void> {
 | 
			
		||||
		response = await parseReply(response);
 | 
			
		||||
		focusCurrentServer();
 | 
			
		||||
		if (electron_bridge.send_notification_reply_message_supported) {
 | 
			
		||||
@@ -101,10 +103,10 @@ class DarwinNotification {
 | 
			
		||||
		customReply(response);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// method specific to notification api
 | 
			
		||||
	// Method specific to notification api
 | 
			
		||||
	// used by zulip
 | 
			
		||||
	close(): void {
 | 
			
		||||
		return; // eslint-disable-line no-useless-return
 | 
			
		||||
		// Do nothing
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,9 @@
 | 
			
		||||
import { ipcRenderer } from 'electron';
 | 
			
		||||
import { focusCurrentServer } from './helpers';
 | 
			
		||||
import {ipcRenderer} from 'electron';
 | 
			
		||||
 | 
			
		||||
import * as ConfigUtil from '../utils/config-util';
 | 
			
		||||
 | 
			
		||||
import {focusCurrentServer} from './helpers';
 | 
			
		||||
 | 
			
		||||
const NativeNotification = window.Notification;
 | 
			
		||||
export default class BaseNotification extends NativeNotification {
 | 
			
		||||
	constructor(title: string, options: NotificationOptions) {
 | 
			
		||||
@@ -10,7 +11,7 @@ export default class BaseNotification extends NativeNotification {
 | 
			
		||||
		super(title, options);
 | 
			
		||||
 | 
			
		||||
		this.addEventListener('click', () => {
 | 
			
		||||
			// focus to the server who sent the
 | 
			
		||||
			// Focus to the server who sent the
 | 
			
		||||
			// notification if not focused already
 | 
			
		||||
			focusCurrentServer();
 | 
			
		||||
			ipcRenderer.send('focus-app');
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import { remote } from 'electron';
 | 
			
		||||
import {remote} from 'electron';
 | 
			
		||||
 | 
			
		||||
import Logger from '../utils/logger-util';
 | 
			
		||||
 | 
			
		||||
@@ -14,16 +14,16 @@ export type BotListItem = [string, string];
 | 
			
		||||
const botsList: BotListItem[] = [];
 | 
			
		||||
let botsListLoaded = false;
 | 
			
		||||
 | 
			
		||||
// this function load list of bots from the server
 | 
			
		||||
// This function load list of bots from the server
 | 
			
		||||
// in case botsList isn't already completely loaded when required in parseRely
 | 
			
		||||
export async function loadBots(): Promise<void> {
 | 
			
		||||
	botsList.length = 0;
 | 
			
		||||
	const response = await fetch('/json/users');
 | 
			
		||||
	if (response.ok) {
 | 
			
		||||
		const { members } = await response.json();
 | 
			
		||||
		members.forEach((membersRow: any) => {
 | 
			
		||||
			if (membersRow.is_bot) {
 | 
			
		||||
				const bot = `@${membersRow.full_name}`;
 | 
			
		||||
		const {members} = await response.json();
 | 
			
		||||
		members.forEach(({is_bot, full_name}: {[key: string]: unknown}) => {
 | 
			
		||||
			if (is_bot && typeof full_name === 'string') {
 | 
			
		||||
				const bot = `@${full_name}`;
 | 
			
		||||
				const mention = `@**${bot.replace(/^@/, '')}**`;
 | 
			
		||||
				botsList.push([bot, mention]);
 | 
			
		||||
			}
 | 
			
		||||
@@ -35,7 +35,7 @@ export async function loadBots(): Promise<void> {
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function checkElements(...elements: any[]): boolean {
 | 
			
		||||
export function checkElements(...elements: unknown[]): boolean {
 | 
			
		||||
	let status = true;
 | 
			
		||||
	elements.forEach(element => {
 | 
			
		||||
		if (element === null || element === undefined) {
 | 
			
		||||
@@ -46,14 +46,14 @@ export function checkElements(...elements: any[]): boolean {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function customReply(reply: string): void {
 | 
			
		||||
	// server does not support notification reply yet.
 | 
			
		||||
	// Server does not support notification reply yet.
 | 
			
		||||
	const buttonSelector = '.messagebox #send_controls button[type=submit]';
 | 
			
		||||
	const messageboxSelector = '.selected_message .messagebox .messagebox-border .messagebox-content';
 | 
			
		||||
	const textarea: HTMLInputElement = document.querySelector('#compose-textarea');
 | 
			
		||||
	const messagebox: HTMLButtonElement = document.querySelector(messageboxSelector);
 | 
			
		||||
	const sendButton: HTMLButtonElement = document.querySelector(buttonSelector);
 | 
			
		||||
 | 
			
		||||
	// sanity check for old server versions
 | 
			
		||||
	// Sanity check for old server versions
 | 
			
		||||
	const elementsExists = checkElements(textarea, messagebox, sendButton);
 | 
			
		||||
	if (!elementsExists) {
 | 
			
		||||
		return;
 | 
			
		||||
@@ -68,12 +68,13 @@ const currentWindow = remote.getCurrentWindow();
 | 
			
		||||
const webContents = remote.getCurrentWebContents();
 | 
			
		||||
const webContentsId = webContents.id;
 | 
			
		||||
 | 
			
		||||
// this function will focus the server that sent
 | 
			
		||||
// This function will focus the server that sent
 | 
			
		||||
// the notification. Main function implemented in main.js
 | 
			
		||||
export function focusCurrentServer(): void {
 | 
			
		||||
	currentWindow.webContents.send('focus-webview-with-id', webContentsId);
 | 
			
		||||
}
 | 
			
		||||
// this function parses the reply from to notification
 | 
			
		||||
 | 
			
		||||
// This function parses the reply from to notification
 | 
			
		||||
// making it easier to reply from notification eg
 | 
			
		||||
// @username in reply will be converted to @**username**
 | 
			
		||||
// #stream in reply will be converted to #**stream**
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +1,9 @@
 | 
			
		||||
import { remote } from 'electron';
 | 
			
		||||
import electron_bridge from '../electron-bridge';
 | 
			
		||||
import { appId, loadBots } from './helpers';
 | 
			
		||||
import {remote} from 'electron';
 | 
			
		||||
 | 
			
		||||
import DefaultNotification from './default-notification';
 | 
			
		||||
const { app } = remote;
 | 
			
		||||
import {appId} from './helpers';
 | 
			
		||||
 | 
			
		||||
const {app} = remote;
 | 
			
		||||
 | 
			
		||||
// From https://github.com/felixrieseberg/electron-windows-notifications#appusermodelid
 | 
			
		||||
// On windows 8 we have to explicitly set the appUserModelId otherwise notification won't work.
 | 
			
		||||
@@ -16,7 +16,7 @@ if (process.platform === 'darwin') {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export interface NotificationData {
 | 
			
		||||
	close(): void;
 | 
			
		||||
	close: () => void;
 | 
			
		||||
	title: string;
 | 
			
		||||
	dir: NotificationDirection;
 | 
			
		||||
	lang: string;
 | 
			
		||||
@@ -47,6 +47,7 @@ export function newNotification(
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return {
 | 
			
		||||
		close: () => notification.close(),
 | 
			
		||||
		title: notification.title,
 | 
			
		||||
@@ -66,7 +67,3 @@ export function newNotification(
 | 
			
		||||
		actions: notification.actions
 | 
			
		||||
	};
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
electron_bridge.once('zulip-loaded', () => {
 | 
			
		||||
	loadBots();
 | 
			
		||||
});
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import { ipcRenderer } from 'electron';
 | 
			
		||||
import {ipcRenderer} from 'electron';
 | 
			
		||||
 | 
			
		||||
export function init($reconnectButton: Element, $settingsButton: Element): void {
 | 
			
		||||
	$reconnectButton.addEventListener('click', () => {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,6 @@
 | 
			
		||||
'use-strict';
 | 
			
		||||
 | 
			
		||||
import { remote, OpenDialogOptions } from 'electron';
 | 
			
		||||
 | 
			
		||||
import {remote, OpenDialogOptions} from 'electron';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
 | 
			
		||||
import BaseComponent from '../../components/base';
 | 
			
		||||
import * as CertificateUtil from '../../utils/certificate-util';
 | 
			
		||||
import * as DomainUtil from '../../utils/domain-util';
 | 
			
		||||
@@ -12,7 +10,7 @@ interface AddCertificateProps {
 | 
			
		||||
	$root: Element;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const { dialog } = remote;
 | 
			
		||||
const {dialog} = remote;
 | 
			
		||||
 | 
			
		||||
export default class AddCertificate extends BaseComponent {
 | 
			
		||||
	props: AddCertificateProps;
 | 
			
		||||
@@ -49,7 +47,7 @@ export default class AddCertificate extends BaseComponent {
 | 
			
		||||
		this.initListeners();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	validateAndAdd(): void {
 | 
			
		||||
	async validateAndAdd(): Promise<void> {
 | 
			
		||||
		const certificate = this._certFile;
 | 
			
		||||
		const serverUrl = this.serverUrl.value;
 | 
			
		||||
		if (certificate !== '' && serverUrl !== '') {
 | 
			
		||||
@@ -59,12 +57,13 @@ export default class AddCertificate extends BaseComponent {
 | 
			
		||||
			if (!copy) {
 | 
			
		||||
				return;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			CertificateUtil.setCertificate(server, fileName);
 | 
			
		||||
			dialog.showMessageBox({
 | 
			
		||||
			this.serverUrl.value = '';
 | 
			
		||||
			await dialog.showMessageBox({
 | 
			
		||||
				title: 'Success',
 | 
			
		||||
				message: 'Certificate saved!'
 | 
			
		||||
			});
 | 
			
		||||
			this.serverUrl.value = '';
 | 
			
		||||
		} else {
 | 
			
		||||
			dialog.showErrorBox('Error', `Please, ${serverUrl === '' ?
 | 
			
		||||
				'Enter an Organization URL' : 'Choose certificate file'}`);
 | 
			
		||||
@@ -75,23 +74,23 @@ export default class AddCertificate extends BaseComponent {
 | 
			
		||||
		const showDialogOptions: OpenDialogOptions = {
 | 
			
		||||
			title: 'Select file',
 | 
			
		||||
			properties: ['openFile'],
 | 
			
		||||
			filters: [{ name: 'crt, pem', extensions: ['crt', 'pem'] }]
 | 
			
		||||
			filters: [{name: 'crt, pem', extensions: ['crt', 'pem']}]
 | 
			
		||||
		};
 | 
			
		||||
		const { filePaths, canceled } = await dialog.showOpenDialog(showDialogOptions);
 | 
			
		||||
		const {filePaths, canceled} = await dialog.showOpenDialog(showDialogOptions);
 | 
			
		||||
		if (!canceled) {
 | 
			
		||||
			this._certFile = filePaths[0] || '';
 | 
			
		||||
			this.validateAndAdd();
 | 
			
		||||
			await this.validateAndAdd();
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	initListeners(): void {
 | 
			
		||||
		this.addCertificateButton.addEventListener('click', () => {
 | 
			
		||||
			this.addHandler();
 | 
			
		||||
		this.addCertificateButton.addEventListener('click', async () => {
 | 
			
		||||
			await this.addHandler();
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		this.serverUrl.addEventListener('keypress', event => {
 | 
			
		||||
		this.serverUrl.addEventListener('keypress', async event => {
 | 
			
		||||
			if (event.key === 'Enter') {
 | 
			
		||||
				this.addHandler();
 | 
			
		||||
				await this.addHandler();
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import electron, { app } from 'electron';
 | 
			
		||||
import electron, {app} from 'electron';
 | 
			
		||||
 | 
			
		||||
import * as ConfigUtil from '../../utils/config-util';
 | 
			
		||||
 | 
			
		||||
@@ -30,6 +30,7 @@ function updateOverlayIcon(messageCount: number, mainWindow: electron.BrowserWin
 | 
			
		||||
	if (!mainWindow.isFocused()) {
 | 
			
		||||
		mainWindow.flashFrame(ConfigUtil.getConfigItem('flashTaskbarOnMessage'));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (messageCount === 0) {
 | 
			
		||||
		mainWindow.setOverlayIcon(null, '');
 | 
			
		||||
	} else {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,5 @@
 | 
			
		||||
import { ipcRenderer } from 'electron';
 | 
			
		||||
import {ipcRenderer} from 'electron';
 | 
			
		||||
 | 
			
		||||
import escape from 'escape-html';
 | 
			
		||||
 | 
			
		||||
import BaseComponent from '../../components/base';
 | 
			
		||||
@@ -35,8 +36,9 @@ export default class BaseSection extends BaseComponent {
 | 
			
		||||
					</div>
 | 
			
		||||
				</div>
 | 
			
		||||
			`;
 | 
			
		||||
		} else {
 | 
			
		||||
			return `
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		return `
 | 
			
		||||
				<div class="action">
 | 
			
		||||
					<div class="switch">
 | 
			
		||||
					  <input class="toggle toggle-round" type="checkbox">
 | 
			
		||||
@@ -44,10 +46,9 @@ export default class BaseSection extends BaseComponent {
 | 
			
		||||
					</div>
 | 
			
		||||
				</div>
 | 
			
		||||
			`;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/* a method that in future can be used to create dropdown menus using <select> <option> tags.
 | 
			
		||||
	/* A method that in future can be used to create dropdown menus using <select> <option> tags.
 | 
			
		||||
		it needs an object which has ``key: value`` pairs and will return a string that can be appended to HTML
 | 
			
		||||
	*/
 | 
			
		||||
	generateSelectTemplate(options: {[key: string]: string}, className?: string, idName?: string): string {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +1,13 @@
 | 
			
		||||
import { ipcRenderer } from 'electron';
 | 
			
		||||
import {ipcRenderer} from 'electron';
 | 
			
		||||
 | 
			
		||||
import BaseSection from './base-section';
 | 
			
		||||
import * as DomainUtil from '../../utils/domain-util';
 | 
			
		||||
import ServerInfoForm from './server-info-form';
 | 
			
		||||
import AddCertificate from './add-certificate';
 | 
			
		||||
import FindAccounts from './find-accounts';
 | 
			
		||||
import * as t from '../../utils/translation-util';
 | 
			
		||||
 | 
			
		||||
import AddCertificate from './add-certificate';
 | 
			
		||||
import BaseSection from './base-section';
 | 
			
		||||
import FindAccounts from './find-accounts';
 | 
			
		||||
import ServerInfoForm from './server-info-form';
 | 
			
		||||
 | 
			
		||||
interface ConnectedOrgSectionProps {
 | 
			
		||||
	$root: Element;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,3 @@
 | 
			
		||||
'use-strict';
 | 
			
		||||
 | 
			
		||||
import BaseComponent from '../../components/base';
 | 
			
		||||
import * as LinkUtil from '../../utils/link-util';
 | 
			
		||||
import * as t from '../../utils/translation-util';
 | 
			
		||||
@@ -40,19 +38,21 @@ export default class FindAccounts extends BaseComponent {
 | 
			
		||||
		this.initListeners();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	findAccounts(url: string): void {
 | 
			
		||||
	async findAccounts(url: string): Promise<void> {
 | 
			
		||||
		if (!url) {
 | 
			
		||||
			return;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if (!url.startsWith('http')) {
 | 
			
		||||
			url = 'https://' + url;
 | 
			
		||||
		}
 | 
			
		||||
		LinkUtil.openBrowser(new URL('/accounts/find', url));
 | 
			
		||||
 | 
			
		||||
		await LinkUtil.openBrowser(new URL('/accounts/find', url));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	initListeners(): void {
 | 
			
		||||
		this.$findAccountsButton.addEventListener('click', () => {
 | 
			
		||||
			this.findAccounts(this.$serverUrlField.value);
 | 
			
		||||
		this.$findAccountsButton.addEventListener('click', async () => {
 | 
			
		||||
			await this.findAccounts(this.$serverUrlField.value);
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		this.$serverUrlField.addEventListener('click', () => {
 | 
			
		||||
@@ -61,9 +61,9 @@ export default class FindAccounts extends BaseComponent {
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		this.$serverUrlField.addEventListener('keypress', event => {
 | 
			
		||||
		this.$serverUrlField.addEventListener('keypress', async event => {
 | 
			
		||||
			if (event.key === 'Enter') {
 | 
			
		||||
				this.findAccounts(this.$serverUrlField.value);
 | 
			
		||||
				await this.findAccounts(this.$serverUrlField.value);
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,16 +1,19 @@
 | 
			
		||||
import { ipcRenderer, remote, OpenDialogOptions } from 'electron';
 | 
			
		||||
 | 
			
		||||
import {ipcRenderer, remote, OpenDialogOptions} from 'electron';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
 | 
			
		||||
import Tagify from '@yaireo/tagify';
 | 
			
		||||
import fs from 'fs-extra';
 | 
			
		||||
import ISO6391 from 'iso-639-1';
 | 
			
		||||
 | 
			
		||||
const { app, dialog } = remote;
 | 
			
		||||
const currentBrowserWindow = remote.getCurrentWindow();
 | 
			
		||||
 | 
			
		||||
import BaseSection from './base-section';
 | 
			
		||||
import supportedLocales from '../../../../translations/supported-locales.json';
 | 
			
		||||
import * as ConfigUtil from '../../utils/config-util';
 | 
			
		||||
import * as EnterpriseUtil from '../../utils/enterprise-util';
 | 
			
		||||
import * as t from '../../utils/translation-util';
 | 
			
		||||
import supportedLocales from '../../../../translations/supported-locales.json';
 | 
			
		||||
 | 
			
		||||
import BaseSection from './base-section';
 | 
			
		||||
 | 
			
		||||
const {app, dialog, session} = remote;
 | 
			
		||||
const currentBrowserWindow = remote.getCurrentWindow();
 | 
			
		||||
 | 
			
		||||
interface GeneralSectionProps {
 | 
			
		||||
	$root: Element;
 | 
			
		||||
@@ -93,7 +96,10 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
						<div class="setting-description">${t.__('Enable spellchecker (requires restart)')}</div>
 | 
			
		||||
						<div class="setting-control"></div>
 | 
			
		||||
					</div>
 | 
			
		||||
					<div class="setting-row" id="spellcheck-langs" style= "display:${process.platform === 'darwin' ? 'none' : ''}"></div>
 | 
			
		||||
					<div class="setting-row" id="note"></div>
 | 
			
		||||
				</div>
 | 
			
		||||
 | 
			
		||||
				<div class="title">${t.__('Advanced')}</div>
 | 
			
		||||
				<div class="settings-card">
 | 
			
		||||
 | 
			
		||||
@@ -115,7 +121,7 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
					</div>
 | 
			
		||||
					<div class="setting-row" id="remove-custom-css">
 | 
			
		||||
						<div class="setting-description">
 | 
			
		||||
							<div class="selected-css-path" id="custom-css-path">${ConfigUtil.getConfigItem('customCSS')}</div>
 | 
			
		||||
							<div class="selected-css-path" id="custom-css-path">${ConfigUtil.getConfigString('customCSS', '')}</div>
 | 
			
		||||
						</div>
 | 
			
		||||
						<div class="action red" id="css-delete-action">
 | 
			
		||||
							<i class="material-icons">indeterminate_check_box</i>
 | 
			
		||||
@@ -130,7 +136,7 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
					</div>
 | 
			
		||||
					<div class="setting-row">
 | 
			
		||||
						<div class="setting-description">
 | 
			
		||||
							<div class="download-folder-path">${ConfigUtil.getConfigItem('downloadsPath', `${app.getPath('downloads')}`)}</div>
 | 
			
		||||
							<div class="download-folder-path">${ConfigUtil.getConfigString('downloadsPath', app.getPath('downloads'))}</div>
 | 
			
		||||
						</div>
 | 
			
		||||
					</div>
 | 
			
		||||
					<div class="setting-row" id="prompt-download">
 | 
			
		||||
@@ -138,12 +144,12 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
						<div class="setting-control"></div>
 | 
			
		||||
					</div>
 | 
			
		||||
				</div>
 | 
			
		||||
				<div class="title">${t.__('Reset Application Data')}</div>
 | 
			
		||||
				<div class="title">${t.__('Factory Reset Data')}</div>
 | 
			
		||||
                <div class="settings-card">
 | 
			
		||||
					<div class="setting-row" id="resetdata-option">
 | 
			
		||||
						<div class="setting-description">${t.__('This will delete all application data including all added accounts and preferences')}
 | 
			
		||||
					<div class="setting-row" id="factory-reset-option">
 | 
			
		||||
						<div class="setting-description">${t.__('Reset the application, thus deleting all the connected organizations, accounts, and certificates.')}
 | 
			
		||||
						</div>
 | 
			
		||||
						<button class="reset-data-button red w-150">${t.__('Reset App Data')}</button>
 | 
			
		||||
						<button class="factory-reset-button red w-150">${t.__('Factory Reset')}</button>
 | 
			
		||||
					</div>
 | 
			
		||||
				</div>
 | 
			
		||||
			</div>
 | 
			
		||||
@@ -159,7 +165,7 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
		this.betaUpdateOption();
 | 
			
		||||
		this.updateSidebarOption();
 | 
			
		||||
		this.updateStartAtLoginOption();
 | 
			
		||||
		this.updateResetDataOption();
 | 
			
		||||
		this.factoryReset();
 | 
			
		||||
		this.showDesktopNotification();
 | 
			
		||||
		this.enableSpellchecker();
 | 
			
		||||
		this.minimizeOnStart();
 | 
			
		||||
@@ -171,6 +177,7 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
		this.updatePromptDownloadOption();
 | 
			
		||||
		this.enableErrorReporting();
 | 
			
		||||
		this.setLocale();
 | 
			
		||||
		this.initSpellChecker();
 | 
			
		||||
 | 
			
		||||
		// Platform specific settings
 | 
			
		||||
 | 
			
		||||
@@ -178,6 +185,7 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
		if (process.platform === 'win32') {
 | 
			
		||||
			this.updateFlashTaskbar();
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		// Dock bounce on macOS
 | 
			
		||||
		if (process.platform === 'darwin') {
 | 
			
		||||
			this.updateDockBouncing();
 | 
			
		||||
@@ -264,6 +272,7 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
					ConfigUtil.setConfigItem('betaUpdate', false);
 | 
			
		||||
					this.betaUpdateOption();
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				this.autoUpdateOption();
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
@@ -354,6 +363,10 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
				const newValue = !ConfigUtil.getConfigItem('enableSpellchecker');
 | 
			
		||||
				ConfigUtil.setConfigItem('enableSpellchecker', newValue);
 | 
			
		||||
				this.enableSpellchecker();
 | 
			
		||||
				const spellcheckerLanguageInput: HTMLElement = document.querySelector('#spellcheck-langs');
 | 
			
		||||
				const spellcheckerNote: HTMLElement = document.querySelector('#note');
 | 
			
		||||
				spellcheckerLanguageInput.style.display = spellcheckerLanguageInput.style.display === 'none' ? '' : 'none';
 | 
			
		||||
				spellcheckerNote.style.display = spellcheckerNote.style.display === 'none' ? '' : 'none';
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
@@ -370,55 +383,30 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	async clearAppDataDialog(): Promise<void> {
 | 
			
		||||
		const clearAppDataMessage = 'By clicking proceed you will be removing all added accounts and preferences from Zulip. When the application restarts, it will be as if you are starting Zulip for the first time.';
 | 
			
		||||
		const getAppPath = path.join(app.getPath('appData'), app.name);
 | 
			
		||||
 | 
			
		||||
		const { response } = await dialog.showMessageBox({
 | 
			
		||||
			type: 'warning',
 | 
			
		||||
			buttons: ['YES', 'NO'],
 | 
			
		||||
			defaultId: 0,
 | 
			
		||||
			message: 'Are you sure',
 | 
			
		||||
			detail: clearAppDataMessage
 | 
			
		||||
		});
 | 
			
		||||
		if (response === 0) {
 | 
			
		||||
			fs.remove(getAppPath);
 | 
			
		||||
			setTimeout(() => ipcRenderer.send('forward-message', 'hard-reload'), 1000);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	async customCssDialog(): Promise<void> {
 | 
			
		||||
		const showDialogOptions: OpenDialogOptions = {
 | 
			
		||||
			title: 'Select file',
 | 
			
		||||
			properties: ['openFile'],
 | 
			
		||||
			filters: [{ name: 'CSS file', extensions: ['css'] }]
 | 
			
		||||
			filters: [{name: 'CSS file', extensions: ['css']}]
 | 
			
		||||
		};
 | 
			
		||||
 | 
			
		||||
		const { filePaths, canceled } = await dialog.showOpenDialog(showDialogOptions);
 | 
			
		||||
		const {filePaths, canceled} = await dialog.showOpenDialog(showDialogOptions);
 | 
			
		||||
		if (!canceled) {
 | 
			
		||||
			ConfigUtil.setConfigItem('customCSS', filePaths[0]);
 | 
			
		||||
			ipcRenderer.send('forward-message', 'hard-reload');
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	updateResetDataOption(): void {
 | 
			
		||||
		const resetDataButton = document.querySelector('#resetdata-option .reset-data-button');
 | 
			
		||||
		resetDataButton.addEventListener('click', () => {
 | 
			
		||||
			this.clearAppDataDialog();
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	setLocale(): void {
 | 
			
		||||
		const langDiv: HTMLSelectElement = document.querySelector('.lang-div');
 | 
			
		||||
		// This path is for the JSON file that stores key: value pairs for supported locales
 | 
			
		||||
		const langList = this.generateSelectTemplate(supportedLocales, 'lang-menu');
 | 
			
		||||
		langDiv.innerHTML += langList;
 | 
			
		||||
		// langMenu is the select-option dropdown menu formed after executing the previous command
 | 
			
		||||
		// `langMenu` is the select-option dropdown menu formed after executing the previous command
 | 
			
		||||
		const langMenu: HTMLSelectElement = document.querySelector('.lang-menu');
 | 
			
		||||
 | 
			
		||||
		// The next three lines set the selected language visible on the dropdown button
 | 
			
		||||
		let language = ConfigUtil.getConfigItem('appLanguage');
 | 
			
		||||
		language = language && langMenu.options.namedItem(language) ? language : 'en-US';
 | 
			
		||||
		language = language && langMenu.options.namedItem(language) ? language : 'en';
 | 
			
		||||
		langMenu.options.namedItem(language).selected = true;
 | 
			
		||||
 | 
			
		||||
		langMenu.addEventListener('change', (event: Event) => {
 | 
			
		||||
@@ -440,8 +428,8 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
 | 
			
		||||
	addCustomCSS(): void {
 | 
			
		||||
		const customCSSButton = document.querySelector('#add-custom-css .custom-css-button');
 | 
			
		||||
		customCSSButton.addEventListener('click', () => {
 | 
			
		||||
			this.customCssDialog();
 | 
			
		||||
		customCSSButton.addEventListener('click', async () => {
 | 
			
		||||
			await this.customCssDialog();
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@@ -466,7 +454,7 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
			properties: ['openDirectory']
 | 
			
		||||
		};
 | 
			
		||||
 | 
			
		||||
		const { filePaths, canceled } = await dialog.showOpenDialog(showDialogOptions);
 | 
			
		||||
		const {filePaths, canceled} = await dialog.showOpenDialog(showDialogOptions);
 | 
			
		||||
		if (!canceled) {
 | 
			
		||||
			ConfigUtil.setConfigItem('downloadsPath', filePaths[0]);
 | 
			
		||||
			const downloadFolderPath: HTMLElement = document.querySelector('.download-folder-path');
 | 
			
		||||
@@ -476,8 +464,8 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
 | 
			
		||||
	downloadFolder(): void {
 | 
			
		||||
		const downloadFolder = document.querySelector('#download-folder .download-folder-button');
 | 
			
		||||
		downloadFolder.addEventListener('click', () => {
 | 
			
		||||
			this.downloadFolderDialog();
 | 
			
		||||
		downloadFolder.addEventListener('click', async () => {
 | 
			
		||||
			await this.downloadFolderDialog();
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@@ -492,4 +480,103 @@ export default class GeneralSection extends BaseSection {
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	async factoryResetSettings(): Promise<void> {
 | 
			
		||||
		const clearAppDataMessage = 'When the application restarts, it will be as if you have just downloaded Zulip app.';
 | 
			
		||||
		const getAppPath = path.join(app.getPath('appData'), app.name);
 | 
			
		||||
 | 
			
		||||
		const {response} = await dialog.showMessageBox({
 | 
			
		||||
			type: 'warning',
 | 
			
		||||
			buttons: ['YES', 'NO'],
 | 
			
		||||
			defaultId: 0,
 | 
			
		||||
			message: 'Are you sure?',
 | 
			
		||||
			detail: clearAppDataMessage
 | 
			
		||||
		});
 | 
			
		||||
		if (response === 0) {
 | 
			
		||||
			await fs.remove(getAppPath);
 | 
			
		||||
			setTimeout(() => ipcRenderer.send('clear-app-settings'), 1000);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	factoryReset(): void {
 | 
			
		||||
		const factoryResetButton = document.querySelector('#factory-reset-option .factory-reset-button');
 | 
			
		||||
		factoryResetButton.addEventListener('click', async () => {
 | 
			
		||||
			await this.factoryResetSettings();
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	initSpellChecker(): void {
 | 
			
		||||
		// The elctron API is a no-op on macOS and macOS default spellchecker is used.
 | 
			
		||||
		if (process.platform === 'darwin') {
 | 
			
		||||
			const note: HTMLElement = document.querySelector('#note');
 | 
			
		||||
			note.append(t.__('On macOS, the OS spellchecker is used.'));
 | 
			
		||||
			note.append(document.createElement('br'));
 | 
			
		||||
			note.append(t.__('Change the language from System Preferences → Keyboard → Text → Spelling.'));
 | 
			
		||||
		} else {
 | 
			
		||||
			const note: HTMLElement = document.querySelector('#note');
 | 
			
		||||
			note.append(t.__('You can select a maximum of 3 languages for spellchecking.'));
 | 
			
		||||
			const spellDiv: HTMLElement = document.querySelector('#spellcheck-langs');
 | 
			
		||||
			spellDiv.innerHTML += `
 | 
			
		||||
				<div class="setting-description">${t.__('Spellchecker Languages')}</div>
 | 
			
		||||
				<input name='spellcheck' placeholder='Enter Languages'>`;
 | 
			
		||||
 | 
			
		||||
			const availableLanguages = session.fromPartition('persist:webviewsession').availableSpellCheckerLanguages;
 | 
			
		||||
			let languagePairs: Map<string, string> = new Map();
 | 
			
		||||
			availableLanguages.forEach((l: string) => {
 | 
			
		||||
				if (ISO6391.validate(l)) {
 | 
			
		||||
					languagePairs.set(ISO6391.getName(l), 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].sort((a, b) => ((a[0] < b[0]) ? -1 : 1)));
 | 
			
		||||
 | 
			
		||||
			const tagField: HTMLElement = document.querySelector('input[name=spellcheck]');
 | 
			
		||||
			const tagify = new Tagify(tagField, {
 | 
			
		||||
				whitelist: [...languagePairs.keys()],
 | 
			
		||||
				enforceWhitelist: true,
 | 
			
		||||
				maxTags: 3,
 | 
			
		||||
				dropdown: {
 | 
			
		||||
					enabled: 0,
 | 
			
		||||
					maxItems: Infinity,
 | 
			
		||||
					closeOnSelect: false,
 | 
			
		||||
					highlightFirst: true
 | 
			
		||||
				}
 | 
			
		||||
			});
 | 
			
		||||
 | 
			
		||||
			const configuredLanguages: string[] = ConfigUtil.getConfigItem('spellcheckerLanguages').map((code: string) => [...languagePairs].filter(pair => (pair[1] === code))[0][0]);
 | 
			
		||||
			tagify.addTags(configuredLanguages);
 | 
			
		||||
 | 
			
		||||
			tagField.addEventListener('change', event => {
 | 
			
		||||
				if ((event.target as HTMLInputElement).value.length === 0) {
 | 
			
		||||
					ConfigUtil.setConfigItem('spellcheckerLanguages', []);
 | 
			
		||||
					ipcRenderer.send('set-spellcheck-langs');
 | 
			
		||||
				} else {
 | 
			
		||||
					const spellLangs: string[] = [...JSON.parse((event.target as HTMLInputElement).value).values()].map(elt => languagePairs.get(elt.value));
 | 
			
		||||
					ConfigUtil.setConfigItem('spellcheckerLanguages', spellLangs);
 | 
			
		||||
					ipcRenderer.send('set-spellcheck-langs');
 | 
			
		||||
				}
 | 
			
		||||
			});
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		// Do not display the spellchecker input and note if it is disabled
 | 
			
		||||
		if (!ConfigUtil.getConfigItem('enableSpellchecker')) {
 | 
			
		||||
			const spellcheckerLanguageInput: HTMLElement = document.querySelector('#spellcheck-langs');
 | 
			
		||||
			const spellcheckerNote: HTMLElement = document.querySelector('#note');
 | 
			
		||||
			spellcheckerLanguageInput.style.display = 'none';
 | 
			
		||||
			spellcheckerNote.style.display = 'none';
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +1,10 @@
 | 
			
		||||
import { ipcRenderer } from 'electron';
 | 
			
		||||
import {ipcRenderer} from 'electron';
 | 
			
		||||
 | 
			
		||||
import BaseSection from './base-section';
 | 
			
		||||
import * as ConfigUtil from '../../utils/config-util';
 | 
			
		||||
import * as t from '../../utils/translation-util';
 | 
			
		||||
 | 
			
		||||
import BaseSection from './base-section';
 | 
			
		||||
 | 
			
		||||
interface NetworkSectionProps {
 | 
			
		||||
	$root: Element;
 | 
			
		||||
}
 | 
			
		||||
@@ -105,11 +106,13 @@ export default class NetworkSection extends BaseSection {
 | 
			
		||||
					ConfigUtil.setConfigItem('useManualProxy', !manualProxyValue);
 | 
			
		||||
					this.toggleManualProxySettings(!manualProxyValue);
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				if (!newValue) {
 | 
			
		||||
					// Remove proxy system proxy settings
 | 
			
		||||
					ConfigUtil.setConfigItem('proxyRules', '');
 | 
			
		||||
					ipcRenderer.send('forward-message', 'reload-proxy', false);
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				ConfigUtil.setConfigItem('useSystemProxy', newValue);
 | 
			
		||||
				this.updateProxyOption();
 | 
			
		||||
			}
 | 
			
		||||
@@ -124,6 +127,7 @@ export default class NetworkSection extends BaseSection {
 | 
			
		||||
				if (systemProxyValue && newValue) {
 | 
			
		||||
					ConfigUtil.setConfigItem('useSystemProxy', !systemProxyValue);
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				ConfigUtil.setConfigItem('proxyRules', '');
 | 
			
		||||
				ConfigUtil.setConfigItem('useManualProxy', newValue);
 | 
			
		||||
				// Reload app only when turning manual proxy off, hence !newValue
 | 
			
		||||
 
 | 
			
		||||
@@ -1,10 +1,12 @@
 | 
			
		||||
import { ipcRenderer } from 'electron';
 | 
			
		||||
import {ipcRenderer, remote} from 'electron';
 | 
			
		||||
 | 
			
		||||
import BaseComponent from '../../components/base';
 | 
			
		||||
import * as DomainUtil from '../../utils/domain-util';
 | 
			
		||||
import * as LinkUtil from '../../utils/link-util';
 | 
			
		||||
import * as t from '../../utils/translation-util';
 | 
			
		||||
 | 
			
		||||
const {dialog} = remote;
 | 
			
		||||
 | 
			
		||||
interface NewServerFormProps {
 | 
			
		||||
	$root: Element;
 | 
			
		||||
	onChange: () => void;
 | 
			
		||||
@@ -66,20 +68,25 @@ export default class NewServerForm extends BaseComponent {
 | 
			
		||||
		let serverConf;
 | 
			
		||||
		try {
 | 
			
		||||
			serverConf = await DomainUtil.checkDomain(this.$newServerUrl.value);
 | 
			
		||||
		} catch (errorMessage) {
 | 
			
		||||
		} catch (error) {
 | 
			
		||||
			this.$saveServerButton.innerHTML = 'Connect';
 | 
			
		||||
			alert(errorMessage);
 | 
			
		||||
			await dialog.showMessageBox({
 | 
			
		||||
				type: 'error',
 | 
			
		||||
				message: error.toString(),
 | 
			
		||||
				buttons: ['OK']
 | 
			
		||||
			});
 | 
			
		||||
			return;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		await DomainUtil.addDomain(serverConf);
 | 
			
		||||
		this.props.onChange();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	openCreateNewOrgExternalLink(): void {
 | 
			
		||||
		const link = 'https://zulipchat.com/new/';
 | 
			
		||||
		const link = 'https://zulip.com/new/';
 | 
			
		||||
		const externalCreateNewOrgElement = document.querySelector('#open-create-org-link');
 | 
			
		||||
		externalCreateNewOrgElement.addEventListener('click', () => {
 | 
			
		||||
			LinkUtil.openBrowser(new URL(link));
 | 
			
		||||
		externalCreateNewOrgElement.addEventListener('click', async () => {
 | 
			
		||||
			await LinkUtil.openBrowser(new URL(link));
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@@ -89,15 +96,15 @@ export default class NewServerForm extends BaseComponent {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	initActions(): void {
 | 
			
		||||
		this.$saveServerButton.addEventListener('click', () => {
 | 
			
		||||
			this.submitFormHandler();
 | 
			
		||||
		this.$saveServerButton.addEventListener('click', async () => {
 | 
			
		||||
			await this.submitFormHandler();
 | 
			
		||||
		});
 | 
			
		||||
		this.$newServerUrl.addEventListener('keypress', event => {
 | 
			
		||||
		this.$newServerUrl.addEventListener('keypress', async event => {
 | 
			
		||||
			if (event.key === 'Enter') {
 | 
			
		||||
				this.submitFormHandler();
 | 
			
		||||
				await this.submitFormHandler();
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
		// open create new org link in default browser
 | 
			
		||||
		// Open create new org link in default browser
 | 
			
		||||
		this.openCreateNewOrgExternalLink();
 | 
			
		||||
		this.networkSettingsLink();
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,11 +1,13 @@
 | 
			
		||||
import { ipcRenderer } from 'electron';
 | 
			
		||||
import {ipcRenderer} from 'electron';
 | 
			
		||||
 | 
			
		||||
import BaseComponent from '../../components/base';
 | 
			
		||||
import Nav from './nav';
 | 
			
		||||
import ServersSection from './servers-section';
 | 
			
		||||
import GeneralSection from './general-section';
 | 
			
		||||
import NetworkSection from './network-section';
 | 
			
		||||
import type {DNDSettings} from '../../utils/dnd-util';
 | 
			
		||||
 | 
			
		||||
import ConnectedOrgSection from './connected-org-section';
 | 
			
		||||
import GeneralSection from './general-section';
 | 
			
		||||
import Nav from './nav';
 | 
			
		||||
import NetworkSection from './network-section';
 | 
			
		||||
import ServersSection from './servers-section';
 | 
			
		||||
import ShortcutsSection from './shortcuts-section';
 | 
			
		||||
 | 
			
		||||
type Section = ServersSection | GeneralSection | NetworkSection | ConnectedOrgSection | ShortcutsSection;
 | 
			
		||||
@@ -37,6 +39,7 @@ export default class PreferenceView extends BaseComponent {
 | 
			
		||||
		if (hasTag) {
 | 
			
		||||
			nav = hasTag.slice(1);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		this.handleNavigation(nav);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@@ -49,32 +52,38 @@ export default class PreferenceView extends BaseComponent {
 | 
			
		||||
				});
 | 
			
		||||
				break;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			case 'General': {
 | 
			
		||||
				this.section = new GeneralSection({
 | 
			
		||||
					$root: this.$settingsContainer
 | 
			
		||||
				});
 | 
			
		||||
				break;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			case 'Organizations': {
 | 
			
		||||
				this.section = new ConnectedOrgSection({
 | 
			
		||||
					$root: this.$settingsContainer
 | 
			
		||||
				});
 | 
			
		||||
				break;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			case 'Network': {
 | 
			
		||||
				this.section = new NetworkSection({
 | 
			
		||||
					$root: this.$settingsContainer
 | 
			
		||||
				});
 | 
			
		||||
				break;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			case 'Shortcuts': {
 | 
			
		||||
				this.section = new ShortcutsSection({
 | 
			
		||||
					$root: this.$settingsContainer
 | 
			
		||||
				});
 | 
			
		||||
				break;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			default: break;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		this.section.init();
 | 
			
		||||
		window.location.hash = `#${navItem}`;
 | 
			
		||||
	}
 | 
			
		||||
@@ -105,7 +114,7 @@ export default class PreferenceView extends BaseComponent {
 | 
			
		||||
			this.handleToggle('tray-option', state);
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		ipcRenderer.on('toggle-dnd', (_event: Event, _state: boolean, newSettings: any) => {
 | 
			
		||||
		ipcRenderer.on('toggle-dnd', (_event: Event, _state: boolean, newSettings: DNDSettings) => {
 | 
			
		||||
			this.handleToggle('show-notification-option', newSettings.showNotification);
 | 
			
		||||
			this.handleToggle('silent-option', newSettings.silent);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,11 +1,11 @@
 | 
			
		||||
import { remote, ipcRenderer } from 'electron';
 | 
			
		||||
import {remote, ipcRenderer} from 'electron';
 | 
			
		||||
 | 
			
		||||
import * as Messages from '../../../../resources/messages';
 | 
			
		||||
import BaseComponent from '../../components/base';
 | 
			
		||||
import * as DomainUtil from '../../utils/domain-util';
 | 
			
		||||
import * as Messages from '../../../../resources/messages';
 | 
			
		||||
import * as t from '../../utils/translation-util';
 | 
			
		||||
 | 
			
		||||
const { dialog } = remote;
 | 
			
		||||
const {dialog} = remote;
 | 
			
		||||
 | 
			
		||||
interface ServerInfoFormProps {
 | 
			
		||||
	$root: Element;
 | 
			
		||||
@@ -66,7 +66,7 @@ export default class ServerInfoForm extends BaseComponent {
 | 
			
		||||
 | 
			
		||||
	initActions(): void {
 | 
			
		||||
		this.$deleteServerButton.addEventListener('click', async () => {
 | 
			
		||||
			const { response } = await dialog.showMessageBox({
 | 
			
		||||
			const {response} = await dialog.showMessageBox({
 | 
			
		||||
				type: 'warning',
 | 
			
		||||
				buttons: [t.__('YES'), t.__('NO')],
 | 
			
		||||
				defaultId: 0,
 | 
			
		||||
@@ -76,7 +76,7 @@ export default class ServerInfoForm extends BaseComponent {
 | 
			
		||||
				if (DomainUtil.removeDomain(this.props.index)) {
 | 
			
		||||
					ipcRenderer.send('reload-full-app');
 | 
			
		||||
				} else {
 | 
			
		||||
					const { title, content } = Messages.orgRemovalError(DomainUtil.getDomain(this.props.index).url);
 | 
			
		||||
					const {title, content} = Messages.orgRemovalError(DomainUtil.getDomain(this.props.index).url);
 | 
			
		||||
					dialog.showErrorBox(title, content);
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,7 @@
 | 
			
		||||
import * as t from '../../utils/translation-util';
 | 
			
		||||
 | 
			
		||||
import BaseSection from './base-section';
 | 
			
		||||
import NewServerForm from './new-server-form';
 | 
			
		||||
import * as t from '../../utils/translation-util';
 | 
			
		||||
 | 
			
		||||
interface ServersSectionProps {
 | 
			
		||||
	$root: Element;
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,8 @@
 | 
			
		||||
import BaseSection from './base-section';
 | 
			
		||||
import * as LinkUtil from '../../utils/link-util';
 | 
			
		||||
import * as t from '../../utils/translation-util';
 | 
			
		||||
 | 
			
		||||
import BaseSection from './base-section';
 | 
			
		||||
 | 
			
		||||
interface ShortcutsSectionProps {
 | 
			
		||||
	$root: Element;
 | 
			
		||||
}
 | 
			
		||||
@@ -330,10 +331,10 @@ export default class ShortcutsSection extends BaseSection {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	openHotkeysExternalLink(): void {
 | 
			
		||||
		const link = 'https://zulipchat.com/help/keyboard-shortcuts';
 | 
			
		||||
		const link = 'https://zulip.com/help/keyboard-shortcuts';
 | 
			
		||||
		const externalCreateNewOrgElement = document.querySelector('#open-hotkeys-link');
 | 
			
		||||
		externalCreateNewOrgElement.addEventListener('click', () => {
 | 
			
		||||
			LinkUtil.openBrowser(new URL(link));
 | 
			
		||||
		externalCreateNewOrgElement.addEventListener('click', async () => {
 | 
			
		||||
			await LinkUtil.openBrowser(new URL(link));
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,21 +1,22 @@
 | 
			
		||||
import { contextBridge, ipcRenderer, webFrame } from 'electron';
 | 
			
		||||
import {contextBridge, ipcRenderer, webFrame} from 'electron';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import * as SetupSpellChecker from './spellchecker';
 | 
			
		||||
 | 
			
		||||
import isDev from 'electron-is-dev';
 | 
			
		||||
 | 
			
		||||
import electron_bridge from './electron-bridge';
 | 
			
		||||
import {loadBots} from './notification/helpers';
 | 
			
		||||
import * as NetworkError from './pages/network';
 | 
			
		||||
 | 
			
		||||
// eslint-disable-next-line import/no-unassigned-import
 | 
			
		||||
import './notification';
 | 
			
		||||
 | 
			
		||||
// Prevent drag and drop event in main process which prevents remote code executaion
 | 
			
		||||
// eslint-disable-next-line import/no-unassigned-import
 | 
			
		||||
import './shared/preventdrag';
 | 
			
		||||
 | 
			
		||||
import electron_bridge from './electron-bridge';
 | 
			
		||||
contextBridge.exposeInMainWorld('raw_electron_bridge', electron_bridge);
 | 
			
		||||
 | 
			
		||||
electron_bridge.once('zulip-loaded', async () => {
 | 
			
		||||
	await loadBots();
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
ipcRenderer.on('logout', () => {
 | 
			
		||||
	// Create the menu for the below
 | 
			
		||||
	const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
 | 
			
		||||
@@ -48,19 +49,14 @@ ipcRenderer.on('show-notification-settings', () => {
 | 
			
		||||
 | 
			
		||||
	const notificationItem: NodeListOf<HTMLElement> = document.querySelectorAll('.normal-settings-list li div');
 | 
			
		||||
 | 
			
		||||
	// wait until the notification dom element shows up
 | 
			
		||||
	// Wait until the notification dom element shows up
 | 
			
		||||
	setTimeout(() => {
 | 
			
		||||
		notificationItem[2].click();
 | 
			
		||||
	}, 100);
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
electron_bridge.once('zulip-loaded', ({ serverLanguage }) => {
 | 
			
		||||
	// Get the default language of the server
 | 
			
		||||
	if (serverLanguage) {
 | 
			
		||||
		// Init spellchecker
 | 
			
		||||
		SetupSpellChecker.init(serverLanguage);
 | 
			
		||||
	}
 | 
			
		||||
	// redirect users to network troubleshooting page
 | 
			
		||||
electron_bridge.once('zulip-loaded', () => {
 | 
			
		||||
	// Redirect users to network troubleshooting page
 | 
			
		||||
	const getRestartButton = document.querySelector('.restart_get_events_button');
 | 
			
		||||
	if (getRestartButton) {
 | 
			
		||||
		getRestartButton.addEventListener('click', () => {
 | 
			
		||||
@@ -69,22 +65,17 @@ electron_bridge.once('zulip-loaded', ({ serverLanguage }) => {
 | 
			
		||||
	}
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
// Clean up spellchecker events after you navigate away from this page;
 | 
			
		||||
// otherwise, you may experience errors
 | 
			
		||||
window.addEventListener('beforeunload', (): void => {
 | 
			
		||||
	SetupSpellChecker.unsubscribeSpellChecker();
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
window.addEventListener('load', (event: any): void => {
 | 
			
		||||
	if (!event.target.URL.includes('app/renderer/network.html')) {
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const $reconnectButton = document.querySelector('#reconnect');
 | 
			
		||||
	const $settingsButton = document.querySelector('#settings');
 | 
			
		||||
	NetworkError.init($reconnectButton, $settingsButton);
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
// electron's globalShortcut can cause unexpected results
 | 
			
		||||
// Electron's globalShortcut can cause unexpected results
 | 
			
		||||
// so adding the reload shortcut in the old-school way
 | 
			
		||||
// Zoom from numpad keys is not supported by electron, so adding it through listeners.
 | 
			
		||||
document.addEventListener('keydown', event => {
 | 
			
		||||
@@ -105,6 +96,7 @@ ipcRenderer.on('set-active', () => {
 | 
			
		||||
	if (isDev) {
 | 
			
		||||
		console.log('active');
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	electron_bridge.idle_on_system = false;
 | 
			
		||||
	electron_bridge.last_active_on_system = Date.now();
 | 
			
		||||
});
 | 
			
		||||
@@ -114,9 +106,10 @@ ipcRenderer.on('set-idle', () => {
 | 
			
		||||
	if (isDev) {
 | 
			
		||||
		console.log('idle');
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	electron_bridge.idle_on_system = true;
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
webFrame.executeJavaScript(
 | 
			
		||||
(async () => webFrame.executeJavaScript(
 | 
			
		||||
	fs.readFileSync(require.resolve('./injected'), 'utf8')
 | 
			
		||||
);
 | 
			
		||||
))();
 | 
			
		||||
 
 | 
			
		||||
@@ -1,59 +0,0 @@
 | 
			
		||||
import type { Subject } from 'rxjs';
 | 
			
		||||
import { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } from 'electron-spellchecker';
 | 
			
		||||
 | 
			
		||||
import * as ConfigUtil from './utils/config-util';
 | 
			
		||||
import Logger from './utils/logger-util';
 | 
			
		||||
 | 
			
		||||
declare module 'electron-spellchecker' {
 | 
			
		||||
	interface SpellCheckHandler {
 | 
			
		||||
		currentSpellcheckerChanged: Subject<true>;
 | 
			
		||||
		currentSpellcheckerLanguage: string;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const logger = new Logger({
 | 
			
		||||
	file: 'errors.log',
 | 
			
		||||
	timestamp: true
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
let spellCheckHandler: SpellCheckHandler;
 | 
			
		||||
let contextMenuListener: ContextMenuListener;
 | 
			
		||||
 | 
			
		||||
export function init(serverLanguage: string): void {
 | 
			
		||||
	if (ConfigUtil.getConfigItem('enableSpellchecker')) {
 | 
			
		||||
		enableSpellChecker();
 | 
			
		||||
	}
 | 
			
		||||
	enableContextMenu(serverLanguage);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function enableSpellChecker(): void {
 | 
			
		||||
	try {
 | 
			
		||||
		spellCheckHandler = new SpellCheckHandler();
 | 
			
		||||
	} catch (err) {
 | 
			
		||||
		logger.error(err);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function enableContextMenu(serverLanguage: string): void {
 | 
			
		||||
	if (spellCheckHandler) {
 | 
			
		||||
		spellCheckHandler.attachToInput();
 | 
			
		||||
		spellCheckHandler.switchLanguage(serverLanguage);
 | 
			
		||||
		spellCheckHandler.currentSpellcheckerChanged.subscribe(() => {
 | 
			
		||||
			spellCheckHandler.switchLanguage(spellCheckHandler.currentSpellcheckerLanguage);
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const contextMenuBuilder = new ContextMenuBuilder(spellCheckHandler);
 | 
			
		||||
	contextMenuListener = new ContextMenuListener(info => {
 | 
			
		||||
		contextMenuBuilder.showPopupMenu(info);
 | 
			
		||||
	});
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function unsubscribeSpellChecker(): void {
 | 
			
		||||
	if (spellCheckHandler) {
 | 
			
		||||
		spellCheckHandler.unsubscribe();
 | 
			
		||||
	}
 | 
			
		||||
	if (contextMenuListener) {
 | 
			
		||||
		contextMenuListener.unsubscribe();
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,16 +1,13 @@
 | 
			
		||||
import { ipcRenderer, remote, WebviewTag, NativeImage } from 'electron';
 | 
			
		||||
 | 
			
		||||
import {ipcRenderer, remote, WebviewTag, NativeImage} from 'electron';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
 | 
			
		||||
import * as ConfigUtil from './utils/config-util';
 | 
			
		||||
 | 
			
		||||
const { Tray, Menu, nativeImage, BrowserWindow, nativeTheme } = remote;
 | 
			
		||||
const {Tray, Menu, nativeImage, BrowserWindow} = remote;
 | 
			
		||||
 | 
			
		||||
let tray: Electron.Tray;
 | 
			
		||||
 | 
			
		||||
// get the theme on macOS
 | 
			
		||||
const theme = nativeTheme.shouldUseDarkColors ? 'dark' : 'light';
 | 
			
		||||
 | 
			
		||||
const ICON_DIR = process.platform === 'darwin' ? `../../resources/tray/${theme}` : '../../resources/tray';
 | 
			
		||||
const ICON_DIR = '../../resources/tray';
 | 
			
		||||
 | 
			
		||||
const TRAY_SUFFIX = 'tray';
 | 
			
		||||
 | 
			
		||||
@@ -20,7 +17,8 @@ const iconPath = (): string => {
 | 
			
		||||
	if (process.platform === 'linux') {
 | 
			
		||||
		return APP_ICON + 'linux.png';
 | 
			
		||||
	}
 | 
			
		||||
	return APP_ICON + (process.platform === 'win32' ? 'win.ico' : 'osx.png');
 | 
			
		||||
 | 
			
		||||
	return APP_ICON + (process.platform === 'win32' ? 'win.ico' : 'macOSTemplate.png');
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
let unread = 0;
 | 
			
		||||
@@ -92,6 +90,7 @@ const renderCanvas = function (arg: number): HTMLCanvasElement {
 | 
			
		||||
 | 
			
		||||
	return canvas;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Renders the tray icon as a native image
 | 
			
		||||
 * @param arg: Unread count
 | 
			
		||||
@@ -168,6 +167,7 @@ ipcRenderer.on('tray', (_event: Event, arg: number): void => {
 | 
			
		||||
	if (!tray) {
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// 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 (arg === 0) {
 | 
			
		||||
@@ -178,7 +178,7 @@ ipcRenderer.on('tray', (_event: Event, arg: number): void => {
 | 
			
		||||
			unread = arg;
 | 
			
		||||
			const image = renderNativeImage(arg);
 | 
			
		||||
			tray.setImage(image);
 | 
			
		||||
			tray.setToolTip(arg + ' unread messages');
 | 
			
		||||
			tray.setToolTip(`${arg} unread messages`);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
});
 | 
			
		||||
@@ -191,6 +191,7 @@ function toggleTray(): void {
 | 
			
		||||
		if (tray.isDestroyed()) {
 | 
			
		||||
			tray = null;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		ConfigUtil.setConfigItem('trayIcon', false);
 | 
			
		||||
	} else {
 | 
			
		||||
		state = true;
 | 
			
		||||
@@ -198,13 +199,15 @@ function toggleTray(): void {
 | 
			
		||||
		if (process.platform === 'linux' || process.platform === 'win32') {
 | 
			
		||||
			const image = renderNativeImage(unread);
 | 
			
		||||
			tray.setImage(image);
 | 
			
		||||
			tray.setToolTip(unread + ' unread messages');
 | 
			
		||||
			tray.setToolTip(`${unread} unread messages`);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		ConfigUtil.setConfigItem('trayIcon', true);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const selector = 'webview:not([class*=disabled])';
 | 
			
		||||
	const webview: WebviewTag = document.querySelector(selector);
 | 
			
		||||
	const webContents = webview.getWebContents();
 | 
			
		||||
	const webContents = remote.webContents.fromId(webview.getWebContentsId());
 | 
			
		||||
	webContents.send('toggletray', state);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +1,14 @@
 | 
			
		||||
import { remote } from 'electron';
 | 
			
		||||
import { JsonDB } from 'node-json-db';
 | 
			
		||||
import { initSetUp } from './default-util';
 | 
			
		||||
 | 
			
		||||
import electron from 'electron';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
 | 
			
		||||
import {JsonDB} from 'node-json-db';
 | 
			
		||||
 | 
			
		||||
import {initSetUp} from './default-util';
 | 
			
		||||
import Logger from './logger-util';
 | 
			
		||||
 | 
			
		||||
const { app, dialog } = remote;
 | 
			
		||||
const {app, dialog} =
 | 
			
		||||
	process.type === 'renderer' ? electron.remote : electron;
 | 
			
		||||
 | 
			
		||||
initSetUp();
 | 
			
		||||
 | 
			
		||||
@@ -21,14 +23,9 @@ let db: JsonDB;
 | 
			
		||||
 | 
			
		||||
reloadDB();
 | 
			
		||||
 | 
			
		||||
export function getCertificate(server: string, defaultValue: any = null): any {
 | 
			
		||||
export function getCertificate(server: string): string | undefined {
 | 
			
		||||
	reloadDB();
 | 
			
		||||
	const value = db.getData('/')[server];
 | 
			
		||||
	if (value === undefined) {
 | 
			
		||||
		return defaultValue;
 | 
			
		||||
	} else {
 | 
			
		||||
		return value;
 | 
			
		||||
	}
 | 
			
		||||
	return db.getData('/')[server];
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Function to copy the certificate to userData folder
 | 
			
		||||
@@ -38,14 +35,15 @@ export function copyCertificate(_server: string, location: string, fileName: str
 | 
			
		||||
	try {
 | 
			
		||||
		fs.copyFileSync(location, filePath);
 | 
			
		||||
		copied = true;
 | 
			
		||||
	} catch (err) {
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		dialog.showErrorBox(
 | 
			
		||||
			'Error saving certificate',
 | 
			
		||||
			'We encountered error while saving the certificate.'
 | 
			
		||||
		);
 | 
			
		||||
		logger.error('Error while copying the certificate to certificates folder.');
 | 
			
		||||
		logger.error(err);
 | 
			
		||||
		logger.error(error);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return copied;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -65,7 +63,7 @@ function reloadDB(): void {
 | 
			
		||||
	try {
 | 
			
		||||
		const file = fs.readFileSync(settingsJsonPath, 'utf8');
 | 
			
		||||
		JSON.parse(file);
 | 
			
		||||
	} catch (err) {
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		if (fs.existsSync(settingsJsonPath)) {
 | 
			
		||||
			fs.unlinkSync(settingsJsonPath);
 | 
			
		||||
			dialog.showErrorBox(
 | 
			
		||||
@@ -73,8 +71,9 @@ function reloadDB(): void {
 | 
			
		||||
				'We encountered error while saving the certificate.'
 | 
			
		||||
			);
 | 
			
		||||
			logger.error('Error while JSON parsing certificates.json: ');
 | 
			
		||||
			logger.error(err);
 | 
			
		||||
			logger.error(error);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	db = new JsonDB(settingsJsonPath, true, true);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
// unescape already encoded/escaped strings
 | 
			
		||||
// Unescape already encoded/escaped strings
 | 
			
		||||
export function decodeString(stringInput: string): string {
 | 
			
		||||
	const parser = new DOMParser();
 | 
			
		||||
	const dom = parser.parseFromString(
 | 
			
		||||
 
 | 
			
		||||
@@ -1,10 +1,11 @@
 | 
			
		||||
import { JsonDB } from 'node-json-db';
 | 
			
		||||
 | 
			
		||||
import electron from 'electron';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
import electron from 'electron';
 | 
			
		||||
import Logger from './logger-util';
 | 
			
		||||
 | 
			
		||||
import {JsonDB} from 'node-json-db';
 | 
			
		||||
 | 
			
		||||
import * as EnterpriseUtil from './enterprise-util';
 | 
			
		||||
import Logger from './logger-util';
 | 
			
		||||
 | 
			
		||||
const logger = new Logger({
 | 
			
		||||
	file: 'config-util.log',
 | 
			
		||||
@@ -16,7 +17,7 @@ let app: Electron.App = null;
 | 
			
		||||
 | 
			
		||||
/* To make the util runnable in both main and renderer process */
 | 
			
		||||
if (process.type === 'renderer') {
 | 
			
		||||
	const { remote } = electron;
 | 
			
		||||
	const {remote} = electron;
 | 
			
		||||
	dialog = remote.dialog;
 | 
			
		||||
	app = remote.app;
 | 
			
		||||
} else {
 | 
			
		||||
@@ -28,39 +29,52 @@ let db: JsonDB;
 | 
			
		||||
 | 
			
		||||
reloadDB();
 | 
			
		||||
 | 
			
		||||
export function getConfigItem(key: string, defaultValue: any = null): any {
 | 
			
		||||
export function getConfigItem(key: string, defaultValue: unknown = null): any {
 | 
			
		||||
	try {
 | 
			
		||||
		db.reload();
 | 
			
		||||
	} catch (err) {
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		logger.error('Error while reloading settings.json: ');
 | 
			
		||||
		logger.error(err);
 | 
			
		||||
		logger.error(error);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const value = db.getData('/')[key];
 | 
			
		||||
	if (value === undefined) {
 | 
			
		||||
		setConfigItem(key, defaultValue);
 | 
			
		||||
		return defaultValue;
 | 
			
		||||
	} else {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return value;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function getConfigString(key: string, defaultValue: string): string {
 | 
			
		||||
	const value = getConfigItem(key, defaultValue);
 | 
			
		||||
	if (typeof value === 'string') {
 | 
			
		||||
		return value;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	setConfigItem(key, defaultValue);
 | 
			
		||||
	return defaultValue;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// This function returns whether a key exists in the configuration file (settings.json)
 | 
			
		||||
export function isConfigItemExists(key: string): boolean {
 | 
			
		||||
	try {
 | 
			
		||||
		db.reload();
 | 
			
		||||
	} catch (err) {
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		logger.error('Error while reloading settings.json: ');
 | 
			
		||||
		logger.error(err);
 | 
			
		||||
		logger.error(error);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const value = db.getData('/')[key];
 | 
			
		||||
	return (value !== undefined);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function setConfigItem(key: string, value: any, override? : boolean): void {
 | 
			
		||||
export function setConfigItem(key: string, value: unknown, override? : boolean): void {
 | 
			
		||||
	if (EnterpriseUtil.configItemExists(key) && !override) {
 | 
			
		||||
		// if item is in global config and we're not trying to override
 | 
			
		||||
		// If item is in global config and we're not trying to override
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	db.push(`/${key}`, value, true);
 | 
			
		||||
	db.save();
 | 
			
		||||
}
 | 
			
		||||
@@ -75,7 +89,7 @@ function reloadDB(): void {
 | 
			
		||||
	try {
 | 
			
		||||
		const file = fs.readFileSync(settingsJsonPath, 'utf8');
 | 
			
		||||
		JSON.parse(file);
 | 
			
		||||
	} catch (err) {
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		if (fs.existsSync(settingsJsonPath)) {
 | 
			
		||||
			fs.unlinkSync(settingsJsonPath);
 | 
			
		||||
			dialog.showErrorBox(
 | 
			
		||||
@@ -83,9 +97,10 @@ function reloadDB(): void {
 | 
			
		||||
				'We encountered an error while saving the settings.'
 | 
			
		||||
			);
 | 
			
		||||
			logger.error('Error while JSON parsing settings.json: ');
 | 
			
		||||
			logger.error(err);
 | 
			
		||||
			logger.reportSentry(err);
 | 
			
		||||
			logger.error(error);
 | 
			
		||||
			logger.reportSentry(error);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	db = new JsonDB(settingsJsonPath, true, true);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -14,7 +14,7 @@ const logDir = `${zulipDir}/Logs/`;
 | 
			
		||||
const certificatesDir = `${zulipDir}/certificates/`;
 | 
			
		||||
const configDir = `${zulipDir}/config/`;
 | 
			
		||||
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
 | 
			
		||||
	// avoid errors
 | 
			
		||||
	if (!setupCompleted) {
 | 
			
		||||
@@ -63,7 +63,7 @@ export const initSetUp = (): void => {
 | 
			
		||||
					fs.unlinkSync(data.path);
 | 
			
		||||
				}
 | 
			
		||||
			});
 | 
			
		||||
			// window-state.json is only deleted not moved, as the electron-window-state
 | 
			
		||||
			// `window-state.json` is only deleted not moved, as the electron-window-state
 | 
			
		||||
			// package will recreate the file in the config folder.
 | 
			
		||||
			if (fs.existsSync(windowStateJson)) {
 | 
			
		||||
				fs.unlinkSync(windowStateJson);
 | 
			
		||||
 
 | 
			
		||||
@@ -1,28 +1,28 @@
 | 
			
		||||
import * as ConfigUtil from './config-util';
 | 
			
		||||
 | 
			
		||||
// TODO: TypeScript - add to Setting interface
 | 
			
		||||
// the list of settings since we have fixed amount of them
 | 
			
		||||
// We want to do this by creating a new module that exports
 | 
			
		||||
// this interface
 | 
			
		||||
interface Setting {
 | 
			
		||||
	[key: string]: boolean;
 | 
			
		||||
type SettingName = 'showNotification' | 'silent' | 'flashTaskbarOnMessage';
 | 
			
		||||
 | 
			
		||||
export interface DNDSettings {
 | 
			
		||||
	showNotification?: boolean;
 | 
			
		||||
	silent?: boolean;
 | 
			
		||||
	flashTaskbarOnMessage?: boolean;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
interface Toggle {
 | 
			
		||||
	dnd: boolean;
 | 
			
		||||
	newSettings: Setting;
 | 
			
		||||
	newSettings: DNDSettings;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function toggle(): Toggle {
 | 
			
		||||
	const dnd = !ConfigUtil.getConfigItem('dnd', false);
 | 
			
		||||
	const dndSettingList = ['showNotification', 'silent'];
 | 
			
		||||
	const dndSettingList: SettingName[] = ['showNotification', 'silent'];
 | 
			
		||||
	if (process.platform === 'win32') {
 | 
			
		||||
		dndSettingList.push('flashTaskbarOnMessage');
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	let newSettings: Setting;
 | 
			
		||||
	let newSettings: DNDSettings;
 | 
			
		||||
	if (dnd) {
 | 
			
		||||
		const oldSettings: Setting = {};
 | 
			
		||||
		const oldSettings: DNDSettings = {};
 | 
			
		||||
		newSettings = {};
 | 
			
		||||
 | 
			
		||||
		// Iterate through the dndSettingList.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,23 +1,20 @@
 | 
			
		||||
import { JsonDB } from 'node-json-db';
 | 
			
		||||
 | 
			
		||||
import escape from 'escape-html';
 | 
			
		||||
import request from 'request';
 | 
			
		||||
import {remote, ipcRenderer} from 'electron';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
import Logger from './logger-util';
 | 
			
		||||
import { remote } from 'electron';
 | 
			
		||||
 | 
			
		||||
import * as RequestUtil from './request-util';
 | 
			
		||||
import * as EnterpriseUtil from './enterprise-util';
 | 
			
		||||
import {JsonDB} from 'node-json-db';
 | 
			
		||||
 | 
			
		||||
import * as Messages from '../../../resources/messages';
 | 
			
		||||
 | 
			
		||||
const { app, dialog } = remote;
 | 
			
		||||
import * as EnterpriseUtil from './enterprise-util';
 | 
			
		||||
import Logger from './logger-util';
 | 
			
		||||
 | 
			
		||||
const {app, dialog} = remote;
 | 
			
		||||
 | 
			
		||||
export interface ServerConf {
 | 
			
		||||
	url: string;
 | 
			
		||||
	alias?: string;
 | 
			
		||||
	icon?: string;
 | 
			
		||||
	ignoreCerts?: boolean;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const logger = new Logger({
 | 
			
		||||
@@ -27,25 +24,27 @@ const logger = new Logger({
 | 
			
		||||
 | 
			
		||||
const defaultIconUrl = '../renderer/img/icon.png';
 | 
			
		||||
 | 
			
		||||
export let db: JsonDB;
 | 
			
		||||
let db: JsonDB;
 | 
			
		||||
 | 
			
		||||
reloadDB();
 | 
			
		||||
// Migrate from old schema
 | 
			
		||||
if (db.getData('/').domain) {
 | 
			
		||||
	addDomain({
 | 
			
		||||
		alias: 'Zulip',
 | 
			
		||||
		url: db.getData('/domain')
 | 
			
		||||
	});
 | 
			
		||||
	db.delete('/domain');
 | 
			
		||||
	(async () => {
 | 
			
		||||
		await addDomain({
 | 
			
		||||
			alias: 'Zulip',
 | 
			
		||||
			url: db.getData('/domain')
 | 
			
		||||
		});
 | 
			
		||||
		db.delete('/domain');
 | 
			
		||||
	})();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function getDomains(): ServerConf[] {
 | 
			
		||||
	reloadDB();
 | 
			
		||||
	if (db.getData('/').domains === undefined) {
 | 
			
		||||
		return [];
 | 
			
		||||
	} else {
 | 
			
		||||
		return db.getData('/domains');
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return db.getData('/domains');
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function getDomain(index: number): ServerConf {
 | 
			
		||||
@@ -53,25 +52,14 @@ export function getDomain(index: number): ServerConf {
 | 
			
		||||
	return db.getData(`/domains[${index}]`);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function shouldIgnoreCerts(url: string): boolean {
 | 
			
		||||
	const domains = getDomains();
 | 
			
		||||
	for (const domain of domains) {
 | 
			
		||||
		if (domain.url === url) {
 | 
			
		||||
			return domain.ignoreCerts;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	return null;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function updateDomain(index: number, server: ServerConf): void {
 | 
			
		||||
export function updateDomain(index: number, server: ServerConf): void {
 | 
			
		||||
	reloadDB();
 | 
			
		||||
	db.push(`/domains[${index}]`, server, true);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export async function addDomain(server: ServerConf): Promise<void> {
 | 
			
		||||
	const { ignoreCerts } = server;
 | 
			
		||||
	if (server.icon) {
 | 
			
		||||
		const localIconUrl = await saveServerIcon(server, ignoreCerts);
 | 
			
		||||
		const localIconUrl = await saveServerIcon(server);
 | 
			
		||||
		server.icon = localIconUrl;
 | 
			
		||||
		db.push('/domains[]', server, true);
 | 
			
		||||
		reloadDB();
 | 
			
		||||
@@ -91,6 +79,7 @@ export function removeDomain(index: number): boolean {
 | 
			
		||||
	if (EnterpriseUtil.isPresetOrg(getDomain(index).url)) {
 | 
			
		||||
		return false;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	db.delete(`/domains[${index}]`);
 | 
			
		||||
	reloadDB();
 | 
			
		||||
	return true;
 | 
			
		||||
@@ -102,44 +91,28 @@ export function duplicateDomain(domain: string): boolean {
 | 
			
		||||
	return getDomains().some(server => server.url === domain);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
async function checkCertError(domain: string, serverConf: ServerConf, error: string, silent: boolean): Promise<ServerConf> {
 | 
			
		||||
async function checkCertError(domain: string, serverConf: ServerConf, error: any, silent: boolean): Promise<ServerConf> {
 | 
			
		||||
	if (silent) {
 | 
			
		||||
		// since getting server settings has already failed
 | 
			
		||||
		// Since getting server settings has already failed
 | 
			
		||||
		return serverConf;
 | 
			
		||||
	} else {
 | 
			
		||||
		// Report error to sentry to get idea of possible certificate errors
 | 
			
		||||
		// users get when adding the servers
 | 
			
		||||
		logger.reportSentry(new Error(error).toString());
 | 
			
		||||
		const certErrorMessage = Messages.certErrorMessage(domain, error);
 | 
			
		||||
		const certErrorDetail = Messages.certErrorDetail();
 | 
			
		||||
 | 
			
		||||
		const { response } = await dialog.showMessageBox({
 | 
			
		||||
			type: 'warning',
 | 
			
		||||
			buttons: ['Yes', 'No'],
 | 
			
		||||
			defaultId: 1,
 | 
			
		||||
			message: certErrorMessage,
 | 
			
		||||
			detail: certErrorDetail
 | 
			
		||||
		});
 | 
			
		||||
		if (response === 0) {
 | 
			
		||||
			// set ignoreCerts parameter to true in case user responds with yes
 | 
			
		||||
			serverConf.ignoreCerts = true;
 | 
			
		||||
			try {
 | 
			
		||||
				return await getServerSettings(domain, serverConf.ignoreCerts);
 | 
			
		||||
			} catch (_) {
 | 
			
		||||
				if (error === Messages.noOrgsError(domain)) {
 | 
			
		||||
					throw new Error(error);
 | 
			
		||||
				}
 | 
			
		||||
				return serverConf;
 | 
			
		||||
			}
 | 
			
		||||
		} else {
 | 
			
		||||
			throw new Error('Untrusted certificate.');
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Report error to sentry to get idea of possible certificate errors
 | 
			
		||||
	// users get when adding the servers
 | 
			
		||||
	logger.reportSentry(error);
 | 
			
		||||
	const certErrorMessage = Messages.certErrorMessage(domain, error);
 | 
			
		||||
	const certErrorDetail = Messages.certErrorDetail();
 | 
			
		||||
 | 
			
		||||
	await dialog.showMessageBox({
 | 
			
		||||
		type: 'error',
 | 
			
		||||
		buttons: ['OK'],
 | 
			
		||||
		message: certErrorMessage,
 | 
			
		||||
		detail: certErrorDetail
 | 
			
		||||
	});
 | 
			
		||||
	throw new Error('Untrusted certificate.');
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// ignoreCerts parameter helps in fetching server icon and
 | 
			
		||||
// other server details when user chooses to ignore certificate warnings
 | 
			
		||||
export async function checkDomain(domain: string, ignoreCerts = false, silent = false): Promise<ServerConf> {
 | 
			
		||||
export async function checkDomain(domain: string, silent = false): Promise<ServerConf> {
 | 
			
		||||
	if (!silent && duplicateDomain(domain)) {
 | 
			
		||||
		// Do not check duplicate in silent mode
 | 
			
		||||
		throw new Error('This server has been added.');
 | 
			
		||||
@@ -150,120 +123,58 @@ export async function checkDomain(domain: string, ignoreCerts = false, silent =
 | 
			
		||||
	const serverConf = {
 | 
			
		||||
		icon: defaultIconUrl,
 | 
			
		||||
		url: domain,
 | 
			
		||||
		alias: domain,
 | 
			
		||||
		ignoreCerts
 | 
			
		||||
		alias: domain
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	try {
 | 
			
		||||
		return await getServerSettings(domain, serverConf.ignoreCerts);
 | 
			
		||||
	} catch (err) {
 | 
			
		||||
		return await getServerSettings(domain);
 | 
			
		||||
	} catch (error_) {
 | 
			
		||||
		// Make sure that error is an error or string not undefined
 | 
			
		||||
		// so validation does not throw error.
 | 
			
		||||
		const error = err || '';
 | 
			
		||||
		const error = error_ || '';
 | 
			
		||||
 | 
			
		||||
		const certsError = error.toString().includes('certificate');
 | 
			
		||||
		if (certsError) {
 | 
			
		||||
			const result = await checkCertError(domain, serverConf, error, silent);
 | 
			
		||||
			return result;
 | 
			
		||||
		} else {
 | 
			
		||||
			throw new Error(Messages.invalidZulipServerError(domain));
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		throw new Error(Messages.invalidZulipServerError(domain));
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
async function getServerSettings(domain: string, ignoreCerts = false): Promise<ServerConf> {
 | 
			
		||||
	const serverSettingsOptions = {
 | 
			
		||||
		url: domain + '/api/v1/server_settings',
 | 
			
		||||
		...RequestUtil.requestOptions(domain, ignoreCerts)
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	return new Promise((resolve, reject) => {
 | 
			
		||||
		request(serverSettingsOptions, (error: string, response: any) => {
 | 
			
		||||
			if (!error && response.statusCode === 200) {
 | 
			
		||||
				const data = JSON.parse(response.body);
 | 
			
		||||
				if (Object.prototype.hasOwnProperty.call(data, 'realm_icon') && data.realm_icon) {
 | 
			
		||||
					resolve({
 | 
			
		||||
						// Some Zulip Servers use absolute URL for server icon whereas others use relative URL
 | 
			
		||||
						// Following check handles both the cases
 | 
			
		||||
						icon: data.realm_icon.startsWith('/') ? data.realm_uri + data.realm_icon : data.realm_icon,
 | 
			
		||||
						url: data.realm_uri,
 | 
			
		||||
						alias: escape(data.realm_name),
 | 
			
		||||
						ignoreCerts
 | 
			
		||||
					});
 | 
			
		||||
				} else {
 | 
			
		||||
					reject(Messages.noOrgsError(domain));
 | 
			
		||||
				}
 | 
			
		||||
			} else {
 | 
			
		||||
				reject(response);
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
	});
 | 
			
		||||
async function getServerSettings(domain: string): Promise<ServerConf> {
 | 
			
		||||
	return ipcRenderer.invoke('get-server-settings', domain);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export async function saveServerIcon(server: ServerConf, ignoreCerts = false): Promise<string> {
 | 
			
		||||
	const url = server.icon;
 | 
			
		||||
	const domain = server.url;
 | 
			
		||||
 | 
			
		||||
	const serverIconOptions = {
 | 
			
		||||
		url,
 | 
			
		||||
		...RequestUtil.requestOptions(domain, ignoreCerts)
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	// The save will always succeed. If url is invalid, downgrade to default icon.
 | 
			
		||||
	return new Promise(resolve => {
 | 
			
		||||
		const filePath = generateFilePath(url);
 | 
			
		||||
		const file = fs.createWriteStream(filePath);
 | 
			
		||||
		try {
 | 
			
		||||
			request(serverIconOptions).on('response', (response: any) => {
 | 
			
		||||
				response.on('error', (err: string) => {
 | 
			
		||||
					logger.log('Could not get server icon.');
 | 
			
		||||
					logger.log(err);
 | 
			
		||||
					logger.reportSentry(err);
 | 
			
		||||
					resolve(defaultIconUrl);
 | 
			
		||||
				});
 | 
			
		||||
				response.pipe(file).on('finish', () => {
 | 
			
		||||
					resolve(filePath);
 | 
			
		||||
				});
 | 
			
		||||
			}).on('error', (err: string) => {
 | 
			
		||||
				logger.log('Could not get server icon.');
 | 
			
		||||
				logger.log(err);
 | 
			
		||||
				logger.reportSentry(err);
 | 
			
		||||
				resolve(defaultIconUrl);
 | 
			
		||||
			});
 | 
			
		||||
		} catch (err) {
 | 
			
		||||
			logger.log('Could not get server icon.');
 | 
			
		||||
			logger.log(err);
 | 
			
		||||
			logger.reportSentry(err);
 | 
			
		||||
			resolve(defaultIconUrl);
 | 
			
		||||
		}
 | 
			
		||||
	});
 | 
			
		||||
export async function saveServerIcon(server: ServerConf): Promise<string> {
 | 
			
		||||
	return ipcRenderer.invoke('save-server-icon', server.icon);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export async function updateSavedServer(url: string, index: number): Promise<void> {
 | 
			
		||||
	// Does not promise successful update
 | 
			
		||||
	const oldIcon = getDomain(index).icon;
 | 
			
		||||
	const { ignoreCerts } = getDomain(index);
 | 
			
		||||
	try {
 | 
			
		||||
		const newServerConf = await checkDomain(url, ignoreCerts, true);
 | 
			
		||||
		const localIconUrl = await saveServerIcon(newServerConf, ignoreCerts);
 | 
			
		||||
		const newServerConf = await checkDomain(url, true);
 | 
			
		||||
		const localIconUrl = await saveServerIcon(newServerConf);
 | 
			
		||||
		if (!oldIcon || localIconUrl !== '../renderer/img/icon.png') {
 | 
			
		||||
			newServerConf.icon = localIconUrl;
 | 
			
		||||
			updateDomain(index, newServerConf);
 | 
			
		||||
			reloadDB();
 | 
			
		||||
		}
 | 
			
		||||
	} catch (err) {
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		logger.log('Could not update server icon.');
 | 
			
		||||
		logger.log(err);
 | 
			
		||||
		logger.reportSentry(err);
 | 
			
		||||
		logger.log(error);
 | 
			
		||||
		logger.reportSentry(error);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function reloadDB(): void {
 | 
			
		||||
function reloadDB(): void {
 | 
			
		||||
	const domainJsonPath = path.join(app.getPath('userData'), 'config/domain.json');
 | 
			
		||||
	try {
 | 
			
		||||
		const file = fs.readFileSync(domainJsonPath, 'utf8');
 | 
			
		||||
		JSON.parse(file);
 | 
			
		||||
	} catch (err) {
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		if (fs.existsSync(domainJsonPath)) {
 | 
			
		||||
			fs.unlinkSync(domainJsonPath);
 | 
			
		||||
			dialog.showErrorBox(
 | 
			
		||||
@@ -272,38 +183,22 @@ export function reloadDB(): void {
 | 
			
		||||
				'you may have to re-add your previous organizations back.'
 | 
			
		||||
			);
 | 
			
		||||
			logger.error('Error while JSON parsing domain.json: ');
 | 
			
		||||
			logger.error(err);
 | 
			
		||||
			logger.reportSentry(err);
 | 
			
		||||
			logger.error(error);
 | 
			
		||||
			logger.reportSentry(error);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	db = new JsonDB(domainJsonPath, true, true);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function generateFilePath(url: string): string {
 | 
			
		||||
	const dir = `${app.getPath('userData')}/server-icons`;
 | 
			
		||||
	const extension = path.extname(url).split('?')[0];
 | 
			
		||||
 | 
			
		||||
	let hash = 5381;
 | 
			
		||||
	let { length } = url;
 | 
			
		||||
 | 
			
		||||
	while (length) {
 | 
			
		||||
		hash = (hash * 33) ^ url.charCodeAt(--length);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Create 'server-icons' directory if not existed
 | 
			
		||||
	if (!fs.existsSync(dir)) {
 | 
			
		||||
		fs.mkdirSync(dir);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return `${dir}/${hash >>> 0}${extension}`;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function formatUrl(domain: string): string {
 | 
			
		||||
	if (domain.startsWith('http://') || domain.startsWith('https://')) {
 | 
			
		||||
		return domain;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (domain.startsWith('localhost:')) {
 | 
			
		||||
		return `http://${domain}`;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return `https://${domain}`;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -8,9 +8,9 @@ const logger = new Logger({
 | 
			
		||||
	timestamp: true
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
// todo: replace enterpriseSettings type with an interface once settings are final
 | 
			
		||||
export let enterpriseSettings: any;
 | 
			
		||||
export let configFile: boolean;
 | 
			
		||||
// TODO: replace enterpriseSettings type with an interface once settings are final
 | 
			
		||||
let enterpriseSettings: {[key: string]: unknown};
 | 
			
		||||
let configFile: boolean;
 | 
			
		||||
 | 
			
		||||
reloadDB();
 | 
			
		||||
 | 
			
		||||
@@ -26,23 +26,29 @@ function reloadDB(): void {
 | 
			
		||||
		try {
 | 
			
		||||
			const file = fs.readFileSync(enterpriseFile, 'utf8');
 | 
			
		||||
			enterpriseSettings = JSON.parse(file);
 | 
			
		||||
		} catch (err) {
 | 
			
		||||
		} catch (error) {
 | 
			
		||||
			logger.log('Error while JSON parsing global_config.json: ');
 | 
			
		||||
			logger.log(err);
 | 
			
		||||
			logger.log(error);
 | 
			
		||||
		}
 | 
			
		||||
	} else {
 | 
			
		||||
		configFile = false;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function getConfigItem(key: string, defaultValue?: any): any {
 | 
			
		||||
export function hasConfigFile(): boolean {
 | 
			
		||||
	return configFile;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function getConfigItem(key: string, defaultValue?: unknown): any {
 | 
			
		||||
	reloadDB();
 | 
			
		||||
	if (!configFile) {
 | 
			
		||||
		return defaultValue;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (defaultValue === undefined) {
 | 
			
		||||
		defaultValue = null;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return configItemExists(key) ? enterpriseSettings[key] : defaultValue;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -51,6 +57,7 @@ export function configItemExists(key: string): boolean {
 | 
			
		||||
	if (!configFile) {
 | 
			
		||||
		return false;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return (enterpriseSettings[key] !== undefined);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -58,11 +65,17 @@ export function isPresetOrg(url: string): boolean {
 | 
			
		||||
	if (!configFile || !configItemExists('presetOrganizations')) {
 | 
			
		||||
		return false;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const presetOrgs = enterpriseSettings.presetOrganizations;
 | 
			
		||||
	if (!Array.isArray(presetOrgs)) {
 | 
			
		||||
		throw new TypeError('Expected array for presetOrgs');
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	for (const org of presetOrgs) {
 | 
			
		||||
		if (url.includes(org)) {
 | 
			
		||||
			return true;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return false;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,16 +1,17 @@
 | 
			
		||||
import { shell } from 'electron';
 | 
			
		||||
import escape from 'escape-html';
 | 
			
		||||
import {shell} from 'electron';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import os from 'os';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
 | 
			
		||||
import escape from 'escape-html';
 | 
			
		||||
 | 
			
		||||
export function isUploadsUrl(server: string, url: URL): boolean {
 | 
			
		||||
	return url.origin === server && url.pathname.startsWith('/user_uploads/');
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function openBrowser(url: URL): void {
 | 
			
		||||
export async function openBrowser(url: URL): Promise<void> {
 | 
			
		||||
	if (['http:', 'https:', 'mailto:'].includes(url.protocol)) {
 | 
			
		||||
		shell.openExternal(url.href);
 | 
			
		||||
		await shell.openExternal(url.href);
 | 
			
		||||
	} else {
 | 
			
		||||
		// For security, indirect links to non-whitelisted protocols
 | 
			
		||||
		// through a real web browser via a local HTML file.
 | 
			
		||||
@@ -36,7 +37,7 @@ export function openBrowser(url: URL): void {
 | 
			
		||||
    </body>
 | 
			
		||||
</html>
 | 
			
		||||
`);
 | 
			
		||||
		shell.openItem(file);
 | 
			
		||||
		await shell.openPath(file);
 | 
			
		||||
		setTimeout(() => {
 | 
			
		||||
			fs.unlinkSync(file);
 | 
			
		||||
			fs.rmdirSync(dir);
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,9 @@
 | 
			
		||||
import { JsonDB } from 'node-json-db';
 | 
			
		||||
 | 
			
		||||
import electron from 'electron';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
import electron from 'electron';
 | 
			
		||||
 | 
			
		||||
import {JsonDB} from 'node-json-db';
 | 
			
		||||
 | 
			
		||||
import Logger from './logger-util';
 | 
			
		||||
 | 
			
		||||
const remote =
 | 
			
		||||
@@ -14,24 +15,24 @@ const logger = new Logger({
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
/* To make the util runnable in both main and renderer process */
 | 
			
		||||
const { dialog, app } = remote;
 | 
			
		||||
const {dialog, app} = remote;
 | 
			
		||||
 | 
			
		||||
let db: JsonDB;
 | 
			
		||||
 | 
			
		||||
reloadDB();
 | 
			
		||||
 | 
			
		||||
export function getUpdateItem(key: string, defaultValue: any = null): any {
 | 
			
		||||
export function getUpdateItem(key: string, defaultValue: unknown = null): any {
 | 
			
		||||
	reloadDB();
 | 
			
		||||
	const value = db.getData('/')[key];
 | 
			
		||||
	if (value === undefined) {
 | 
			
		||||
		setUpdateItem(key, defaultValue);
 | 
			
		||||
		return defaultValue;
 | 
			
		||||
	} else {
 | 
			
		||||
		return value;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return value;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function setUpdateItem(key: string, value: any): void {
 | 
			
		||||
export function setUpdateItem(key: string, value: unknown): void {
 | 
			
		||||
	db.push(`/${key}`, value, true);
 | 
			
		||||
	reloadDB();
 | 
			
		||||
}
 | 
			
		||||
@@ -46,7 +47,7 @@ function reloadDB(): void {
 | 
			
		||||
	try {
 | 
			
		||||
		const file = fs.readFileSync(linuxUpdateJsonPath, 'utf8');
 | 
			
		||||
		JSON.parse(file);
 | 
			
		||||
	} catch (err) {
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		if (fs.existsSync(linuxUpdateJsonPath)) {
 | 
			
		||||
			fs.unlinkSync(linuxUpdateJsonPath);
 | 
			
		||||
			dialog.showErrorBox(
 | 
			
		||||
@@ -54,8 +55,9 @@ function reloadDB(): void {
 | 
			
		||||
				'We encountered an error while saving the update notifications.'
 | 
			
		||||
			);
 | 
			
		||||
			logger.error('Error while JSON parsing updates.json: ');
 | 
			
		||||
			logger.error(err);
 | 
			
		||||
			logger.error(error);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	db = new JsonDB(linuxUpdateJsonPath, true, true);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,16 +1,12 @@
 | 
			
		||||
import { Console as NodeConsole } from 'console'; // eslint-disable-line node/prefer-global/console
 | 
			
		||||
import { initSetUp } from './default-util';
 | 
			
		||||
import { sentryInit, captureException } from './sentry-util';
 | 
			
		||||
 | 
			
		||||
import {Console} from 'console'; // eslint-disable-line node/prefer-global/console
 | 
			
		||||
import electron from 'electron';
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import os from 'os';
 | 
			
		||||
 | 
			
		||||
import isDev from 'electron-is-dev';
 | 
			
		||||
import electron from 'electron';
 | 
			
		||||
// this interface adds [key: string]: any so
 | 
			
		||||
// we can do console[type] later on in the code
 | 
			
		||||
interface PatchedConsole extends Console {
 | 
			
		||||
	[key: string]: any;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
import {initSetUp} from './default-util';
 | 
			
		||||
import {sentryInit, captureException} from './sentry-util';
 | 
			
		||||
 | 
			
		||||
interface LoggerOptions {
 | 
			
		||||
	timestamp?: true | (() => string);
 | 
			
		||||
@@ -29,9 +25,9 @@ if (process.type === 'renderer') {
 | 
			
		||||
	// Report Errors to Sentry only if it is enabled in settings
 | 
			
		||||
	// Gets the value of reportErrors from config-util for renderer process
 | 
			
		||||
	// For main process, sentryInit() is handled in index.js
 | 
			
		||||
	const { ipcRenderer } = electron;
 | 
			
		||||
	const {ipcRenderer} = electron;
 | 
			
		||||
	ipcRenderer.send('error-reporting');
 | 
			
		||||
	ipcRenderer.on('error-reporting-val', (_event: any, errorReporting: boolean) => {
 | 
			
		||||
	ipcRenderer.on('error-reporting-val', (_event: Event, errorReporting: boolean) => {
 | 
			
		||||
		reportErrors = errorReporting;
 | 
			
		||||
		if (reportErrors) {
 | 
			
		||||
			sentryInit();
 | 
			
		||||
@@ -41,15 +37,23 @@ if (process.type === 'renderer') {
 | 
			
		||||
	app = electron.app;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const browserConsole: PatchedConsole = console;
 | 
			
		||||
const logDir = `${app.getPath('userData')}/Logs`;
 | 
			
		||||
 | 
			
		||||
type Level = 'log' | 'debug' | 'info' | 'warn' | 'error';
 | 
			
		||||
const levels: Level[] = ['log', 'debug', 'info', 'warn', 'error'];
 | 
			
		||||
type LogMethod = (...args: unknown[]) => void;
 | 
			
		||||
 | 
			
		||||
export default class Logger {
 | 
			
		||||
	nodeConsole: PatchedConsole;
 | 
			
		||||
	log: LogMethod;
 | 
			
		||||
	debug: LogMethod;
 | 
			
		||||
	info: LogMethod;
 | 
			
		||||
	warn: LogMethod;
 | 
			
		||||
	error: LogMethod;
 | 
			
		||||
 | 
			
		||||
	nodeConsole: Console;
 | 
			
		||||
	timestamp?: () => string;
 | 
			
		||||
	level: boolean;
 | 
			
		||||
	logInDevMode: boolean;
 | 
			
		||||
	[key: string]: any;
 | 
			
		||||
 | 
			
		||||
	constructor(options: LoggerOptions = {}) {
 | 
			
		||||
		let {
 | 
			
		||||
@@ -71,8 +75,8 @@ export default class Logger {
 | 
			
		||||
			process.nextTick(() => this.trimLog(file));
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		const fileStream = fs.createWriteStream(file, { flags: 'a' });
 | 
			
		||||
		const nodeConsole = new NodeConsole(fileStream);
 | 
			
		||||
		const fileStream = fs.createWriteStream(file, {flags: 'a'});
 | 
			
		||||
		const nodeConsole = new Console(fileStream);
 | 
			
		||||
 | 
			
		||||
		this.nodeConsole = nodeConsole;
 | 
			
		||||
		this.timestamp = timestamp;
 | 
			
		||||
@@ -81,42 +85,38 @@ export default class Logger {
 | 
			
		||||
		this.setUpConsole();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	_log(type: string, ...args: any[]): void {
 | 
			
		||||
	_log(type: Level, ...args: unknown[]): void {
 | 
			
		||||
		const {
 | 
			
		||||
			nodeConsole, timestamp, level, logInDevMode
 | 
			
		||||
		} = this;
 | 
			
		||||
		let nodeConsoleLog;
 | 
			
		||||
 | 
			
		||||
		/* eslint-disable no-fallthrough */
 | 
			
		||||
		switch (true) {
 | 
			
		||||
			case typeof timestamp === 'function':
 | 
			
		||||
				args.unshift(timestamp() + ' |\t');
 | 
			
		||||
				// Fall through
 | 
			
		||||
 | 
			
		||||
			case (level):
 | 
			
		||||
				args.unshift(type.toUpperCase() + ' |');
 | 
			
		||||
				// Fall through
 | 
			
		||||
 | 
			
		||||
			case isDev || logInDevMode:
 | 
			
		||||
				nodeConsoleLog = nodeConsole[type] || nodeConsole.log;
 | 
			
		||||
				nodeConsoleLog.apply(null, args); // eslint-disable-line prefer-spread
 | 
			
		||||
				nodeConsole[type](...args);
 | 
			
		||||
				break;
 | 
			
		||||
 | 
			
		||||
			default: break;
 | 
			
		||||
			default:
 | 
			
		||||
		}
 | 
			
		||||
		/* eslint-enable no-fallthrough */
 | 
			
		||||
 | 
			
		||||
		browserConsole[type].apply(null, args);
 | 
			
		||||
		console[type](...args);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	setUpConsole(): void {
 | 
			
		||||
		for (const type of Object.keys(browserConsole)) {
 | 
			
		||||
		for (const type of levels) {
 | 
			
		||||
			this.setupConsoleMethod(type);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	setupConsoleMethod(type: string): void {
 | 
			
		||||
		this[type] = (...args: any[]) => {
 | 
			
		||||
			const log = this._log.bind(this, type, ...args);
 | 
			
		||||
			log();
 | 
			
		||||
		};
 | 
			
		||||
	setupConsoleMethod(type: Level): void {
 | 
			
		||||
		this[type] = (...args: unknown[]) => this._log(type, ...args);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	getTimestamp(): string {
 | 
			
		||||
@@ -127,7 +127,7 @@ export default class Logger {
 | 
			
		||||
		return timestamp;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	reportSentry(err: string): void {
 | 
			
		||||
	reportSentry(err: unknown): void {
 | 
			
		||||
		if (reportErrors) {
 | 
			
		||||
			captureException(err);
 | 
			
		||||
		}
 | 
			
		||||
@@ -138,6 +138,7 @@ export default class Logger {
 | 
			
		||||
			if (err) {
 | 
			
		||||
				throw err;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			const MAX_LOG_FILE_LINES = 500;
 | 
			
		||||
			const logs = data.split(os.EOL);
 | 
			
		||||
			const logLength = logs.length - 1;
 | 
			
		||||
 
 | 
			
		||||
@@ -5,45 +5,6 @@ export interface ProxyRule {
 | 
			
		||||
	port?: number;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Return proxy to be used for a particular uri, to be used for request
 | 
			
		||||
export function getProxy(_uri: string): ProxyRule | void {
 | 
			
		||||
	let uri;
 | 
			
		||||
	try {
 | 
			
		||||
		uri = new URL(_uri);
 | 
			
		||||
	} catch (err) {
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const proxyRules = ConfigUtil.getConfigItem('proxyRules', '').split(';');
 | 
			
		||||
	// If SPS is on and system uses no proxy then request should not try to use proxy from
 | 
			
		||||
	// environment. NO_PROXY = '*' makes request ignore all environment proxy variables.
 | 
			
		||||
	if (proxyRules[0] === '') {
 | 
			
		||||
		process.env.NO_PROXY = '*';
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const proxyRule: any = {};
 | 
			
		||||
	if (uri.protocol === 'http:') {
 | 
			
		||||
		proxyRules.forEach((proxy: string) => {
 | 
			
		||||
			if (proxy.includes('http=')) {
 | 
			
		||||
				proxyRule.hostname = proxy.split('http=')[1].trim().split(':')[0];
 | 
			
		||||
				proxyRule.port = proxy.split('http=')[1].trim().split(':')[1];
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
		return proxyRule;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (uri.protocol === 'https:') {
 | 
			
		||||
		proxyRules.forEach((proxy: string) => {
 | 
			
		||||
			if (proxy.includes('https=')) {
 | 
			
		||||
				proxyRule.hostname = proxy.split('https=')[1].trim().split(':')[0];
 | 
			
		||||
				proxyRule.port = proxy.split('https=')[1].trim().split(':')[1];
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
		return proxyRule;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// TODO: Refactor to async function
 | 
			
		||||
export async function resolveSystemProxy(mainWindow: Electron.BrowserWindow): Promise<void> {
 | 
			
		||||
	const page = mainWindow.webContents;
 | 
			
		||||
@@ -55,12 +16,13 @@ export async function resolveSystemProxy(mainWindow: Electron.BrowserWindow): Pr
 | 
			
		||||
		const proxy = await ses.resolveProxy('http://' + resolveProxyUrl);
 | 
			
		||||
		let httpString = '';
 | 
			
		||||
		if (proxy !== 'DIRECT') {
 | 
			
		||||
			// in case of proxy HTTPS url:port, windows gives first word as HTTPS while linux gives PROXY
 | 
			
		||||
			// In case of proxy HTTPS url:port, windows gives first word as HTTPS while linux gives PROXY
 | 
			
		||||
			// for all other HTTP or direct url:port both uses PROXY
 | 
			
		||||
			if (proxy.includes('PROXY') || proxy.includes('HTTPS')) {
 | 
			
		||||
				httpString = 'http=' + proxy.split('PROXY')[1] + ';';
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		return httpString;
 | 
			
		||||
	})();
 | 
			
		||||
	// Check HTTPS Proxy
 | 
			
		||||
@@ -68,12 +30,13 @@ export async function resolveSystemProxy(mainWindow: Electron.BrowserWindow): Pr
 | 
			
		||||
		const proxy = await ses.resolveProxy('https://' + resolveProxyUrl);
 | 
			
		||||
		let httpsString = '';
 | 
			
		||||
		if (proxy !== 'DIRECT' || proxy.includes('HTTPS')) {
 | 
			
		||||
			// in case of proxy HTTPS url:port, windows gives first word as HTTPS while linux gives PROXY
 | 
			
		||||
			// In case of proxy HTTPS url:port, windows gives first word as HTTPS while linux gives PROXY
 | 
			
		||||
			// for all other HTTP or direct url:port both uses PROXY
 | 
			
		||||
			if (proxy.includes('PROXY') || proxy.includes('HTTPS')) {
 | 
			
		||||
				httpsString += 'https=' + proxy.split('PROXY')[1] + ';';
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		return httpsString;
 | 
			
		||||
	})();
 | 
			
		||||
 | 
			
		||||
@@ -86,6 +49,7 @@ export async function resolveSystemProxy(mainWindow: Electron.BrowserWindow): Pr
 | 
			
		||||
				ftpString += 'ftp=' + proxy.split('PROXY')[1] + ';';
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		return ftpString;
 | 
			
		||||
	})();
 | 
			
		||||
 | 
			
		||||
@@ -102,6 +66,7 @@ export async function resolveSystemProxy(mainWindow: Electron.BrowserWindow): Pr
 | 
			
		||||
				socksString += 'socks=' + proxy.split('PROXY')[1] + ';';
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		return socksString;
 | 
			
		||||
	})();
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,11 +1,10 @@
 | 
			
		||||
import { ipcRenderer } from 'electron';
 | 
			
		||||
import {ipcRenderer} from 'electron';
 | 
			
		||||
 | 
			
		||||
import backoff from 'backoff';
 | 
			
		||||
 | 
			
		||||
import type WebView from '../components/webview';
 | 
			
		||||
import backoff from 'backoff';
 | 
			
		||||
import request from 'request';
 | 
			
		||||
 | 
			
		||||
import Logger from './logger-util';
 | 
			
		||||
import * as RequestUtil from './request-util';
 | 
			
		||||
import * as DomainUtil from './domain-util';
 | 
			
		||||
 | 
			
		||||
const logger = new Logger({
 | 
			
		||||
	file: 'domain-util.log',
 | 
			
		||||
@@ -33,27 +32,7 @@ export default class ReconnectUtil {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	async isOnline(): Promise<boolean> {
 | 
			
		||||
		return new Promise(resolve => {
 | 
			
		||||
			try {
 | 
			
		||||
				const ignoreCerts = DomainUtil.shouldIgnoreCerts(this.url);
 | 
			
		||||
				if (ignoreCerts === null) {
 | 
			
		||||
					return;
 | 
			
		||||
				}
 | 
			
		||||
				request(
 | 
			
		||||
					{
 | 
			
		||||
						url: `${this.url}/static/favicon.ico`,
 | 
			
		||||
						...RequestUtil.requestOptions(this.url, ignoreCerts)
 | 
			
		||||
					},
 | 
			
		||||
					(error: Error, response: any) => {
 | 
			
		||||
						const isValidResponse =
 | 
			
		||||
							!error && response.statusCode >= 200 && response.statusCode < 400;
 | 
			
		||||
						resolve(isValidResponse);
 | 
			
		||||
					}
 | 
			
		||||
				);
 | 
			
		||||
			} catch (err) {
 | 
			
		||||
				logger.log(err);
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
		return ipcRenderer.invoke('is-online', this.url);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	pollInternetAndReload(): void {
 | 
			
		||||
@@ -71,11 +50,13 @@ export default class ReconnectUtil {
 | 
			
		||||
		if (this.alreadyReloaded) {
 | 
			
		||||
			return true;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if (await this.isOnline()) {
 | 
			
		||||
			ipcRenderer.send('forward-message', 'reload-viewer');
 | 
			
		||||
			logger.log('You\'re back online.');
 | 
			
		||||
			return true;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		logger.log('There is no internet connection, try checking network cables, modem and router.');
 | 
			
		||||
		const errorMessageHolder = document.querySelector('#description');
 | 
			
		||||
		if (errorMessageHolder) {
 | 
			
		||||
@@ -83,6 +64,7 @@ export default class ReconnectUtil {
 | 
			
		||||
						<div>Your internet connection doesn't seem to work properly!</div>
 | 
			
		||||
						<div>Verify that it works and then click try again.</div>`;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		return false;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,70 +0,0 @@
 | 
			
		||||
import { remote } from 'electron';
 | 
			
		||||
 | 
			
		||||
import fs from 'fs';
 | 
			
		||||
import path from 'path';
 | 
			
		||||
import * as ConfigUtil from './config-util';
 | 
			
		||||
import Logger from './logger-util';
 | 
			
		||||
import * as ProxyUtil from './proxy-util';
 | 
			
		||||
import * as CertificateUtil from './certificate-util';
 | 
			
		||||
import * as SystemUtil from './system-util';
 | 
			
		||||
 | 
			
		||||
const { app } = remote;
 | 
			
		||||
 | 
			
		||||
const logger = new Logger({
 | 
			
		||||
	file: 'request-util.log',
 | 
			
		||||
	timestamp: true
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
interface RequestUtilResponse {
 | 
			
		||||
	ca: string;
 | 
			
		||||
	proxy: string | void | ProxyUtil.ProxyRule;
 | 
			
		||||
	ecdhCurve: 'auto';
 | 
			
		||||
	headers: { 'User-Agent': string };
 | 
			
		||||
	rejectUnauthorized: boolean;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// ignoreCerts parameter helps in fetching server icon and
 | 
			
		||||
// other server details when user chooses to ignore certificate warnings
 | 
			
		||||
export function requestOptions(domain: string, ignoreCerts: boolean): RequestUtilResponse {
 | 
			
		||||
	domain = formatUrl(domain);
 | 
			
		||||
	const certificate = CertificateUtil.getCertificate(
 | 
			
		||||
		encodeURIComponent(domain)
 | 
			
		||||
	);
 | 
			
		||||
 | 
			
		||||
	let certificateFile = null;
 | 
			
		||||
	if (certificate?.includes('/')) {
 | 
			
		||||
		// certificate saved using old app version
 | 
			
		||||
		certificateFile = certificate;
 | 
			
		||||
	} else if (certificate) {
 | 
			
		||||
		certificateFile = path.join(`${app.getPath('userData')}/certificates`, certificate);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	let certificateLocation = '';
 | 
			
		||||
	if (certificate) {
 | 
			
		||||
		// To handle case where certificate has been moved from the location in certificates.json
 | 
			
		||||
		try {
 | 
			
		||||
			certificateLocation = fs.readFileSync(certificateFile, 'utf8');
 | 
			
		||||
		} catch (err) {
 | 
			
		||||
			logger.warn(`Error while trying to get certificate: ${err}`);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
 | 
			
		||||
	// If certificate for the domain exists add it as a ca key in the request's parameter else consider only domain as the parameter for request
 | 
			
		||||
	// Add proxy as a parameter if it is being used.
 | 
			
		||||
	return {
 | 
			
		||||
		ca: certificateLocation ? certificateLocation : '',
 | 
			
		||||
		proxy: proxyEnabled ? ProxyUtil.getProxy(domain) : '',
 | 
			
		||||
		ecdhCurve: 'auto',
 | 
			
		||||
		headers: { 'User-Agent': SystemUtil.getUserAgent() },
 | 
			
		||||
		rejectUnauthorized: !ignoreCerts
 | 
			
		||||
	};
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function formatUrl(domain: string): string {
 | 
			
		||||
	const hasPrefix = domain.startsWith('http', 0);
 | 
			
		||||
	if (hasPrefix) {
 | 
			
		||||
		return domain;
 | 
			
		||||
	} else {
 | 
			
		||||
		return domain.includes('localhost:') ? `http://${domain}` : `https://${domain}`;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,5 +1,4 @@
 | 
			
		||||
import { init } from '@sentry/electron';
 | 
			
		||||
 | 
			
		||||
import {init} from '@sentry/electron';
 | 
			
		||||
import isDev from 'electron-is-dev';
 | 
			
		||||
 | 
			
		||||
export const sentryInit = (): void => {
 | 
			
		||||
@@ -10,9 +9,9 @@ export const sentryInit = (): void => {
 | 
			
		||||
			// This error mainly comes from the console logs.
 | 
			
		||||
			// This is a temp solution until Sentry supports disabling the console logs
 | 
			
		||||
			ignoreErrors: ['does not appear to be a valid Zulip server']
 | 
			
		||||
			// sendTimeout: 30 // wait 30 seconds before considering the sending capture to have failed, default is 1 second
 | 
			
		||||
			/// sendTimeout: 30 // wait 30 seconds before considering the sending capture to have failed, default is 1 second
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export { captureException } from '@sentry/electron';
 | 
			
		||||
export {captureException} from '@sentry/electron';
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,4 @@
 | 
			
		||||
import { ipcRenderer } from 'electron';
 | 
			
		||||
 | 
			
		||||
import {ipcRenderer} from 'electron';
 | 
			
		||||
import os from 'os';
 | 
			
		||||
 | 
			
		||||
export const connectivityERR: string[] = [
 | 
			
		||||
@@ -17,18 +16,23 @@ export function getOS(): string {
 | 
			
		||||
	const platform = os.platform();
 | 
			
		||||
	if (platform === 'darwin') {
 | 
			
		||||
		return 'Mac';
 | 
			
		||||
	} else if (platform === 'linux') {
 | 
			
		||||
		return 'Linux';
 | 
			
		||||
	} else if (platform === 'win32') {
 | 
			
		||||
		if (parseFloat(os.release()) < 6.2) {
 | 
			
		||||
			return 'Windows 7';
 | 
			
		||||
		} else {
 | 
			
		||||
			return 'Windows 10';
 | 
			
		||||
		}
 | 
			
		||||
	} else {
 | 
			
		||||
		return '';
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (platform === 'linux') {
 | 
			
		||||
		return 'Linux';
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (platform === 'win32') {
 | 
			
		||||
		if (Number.parseFloat(os.release()) < 6.2) {
 | 
			
		||||
			return 'Windows 7';
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		return 'Windows 10';
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return '';
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function getUserAgent(): string {
 | 
			
		||||
	return userAgent;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,15 +1,18 @@
 | 
			
		||||
import path from 'path';
 | 
			
		||||
 | 
			
		||||
import i18n from 'i18n';
 | 
			
		||||
 | 
			
		||||
import * as ConfigUtil from './config-util';
 | 
			
		||||
 | 
			
		||||
i18n.configure({
 | 
			
		||||
	directory: path.join(__dirname, '../../../translations/')
 | 
			
		||||
	directory: path.join(__dirname, '../../../translations/'),
 | 
			
		||||
	updateFiles: false
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
/* fetches the current appLocale from settings.json */
 | 
			
		||||
/* Fetches the current appLocale from settings.json */
 | 
			
		||||
const appLocale = ConfigUtil.getConfigItem('appLanguage');
 | 
			
		||||
 | 
			
		||||
/* if no locale present in the json, en is set default */
 | 
			
		||||
/* If no locale present in the json, en is set default */
 | 
			
		||||
export function __(phrase: string): string {
 | 
			
		||||
	return i18n.__({ phrase, locale: appLocale ? appLocale : 'en' });
 | 
			
		||||
	return i18n.__({phrase, locale: appLocale ? appLocale : 'en'});
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -52,7 +52,7 @@
 | 
			
		||||
        </div>
 | 
			
		||||
 | 
			
		||||
        <div id="feedback-modal">
 | 
			
		||||
            <send-feedback></send-feedback>
 | 
			
		||||
            <send-feedback show-cancel-button="show"></send-feedback>
 | 
			
		||||
        </div>
 | 
			
		||||
    </body>
 | 
			
		||||
    
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,7 @@
 | 
			
		||||
        <meta name="viewport" content="width=device-width">
 | 
			
		||||
        <title>Zulip - Settings</title>
 | 
			
		||||
        <link rel="stylesheet" href="css/preference.css" type="text/css" media="screen">
 | 
			
		||||
        <link id="tagify-css" rel="stylesheet" href="data:text/css,">
 | 
			
		||||
    </head>
 | 
			
		||||
    <body>
 | 
			
		||||
        <div id="content">
 | 
			
		||||
@@ -13,6 +14,7 @@
 | 
			
		||||
        </div>
 | 
			
		||||
    </body>
 | 
			
		||||
    <script>
 | 
			
		||||
        document.querySelector('#tagify-css').href = require.resolve('@yaireo/tagify/dist/tagify.css');
 | 
			
		||||
        require('./js/pages/preference/preference.js');
 | 
			
		||||
        require('./js/shared/preventdrag.js')
 | 
			
		||||
    </script>
 | 
			
		||||
 
 | 
			
		||||
| 
		 Before Width: | Height: | Size: 361 KiB After Width: | Height: | Size: 106 KiB  | 
| 
		 Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.6 KiB  | 
@@ -19,14 +19,12 @@ export function noOrgsError(domain: string): string {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function certErrorMessage(domain: string, error: string): string {
 | 
			
		||||
	return `Do you trust certificate from ${domain}? \n ${error}`;
 | 
			
		||||
	return `Certificate error for ${domain}\n${error}`;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function certErrorDetail(): string {
 | 
			
		||||
	return `The organization you're connecting to is either someone impersonating the Zulip server you entered, or the server you're trying to connect to is configured in an insecure way.
 | 
			
		||||
	\nIf you have a valid certificate please add it from Settings>Organizations and try to add the organization again.
 | 
			
		||||
	\nUnless you have a good reason to believe otherwise, you should not proceed.
 | 
			
		||||
	\nYou can click here if you'd like to proceed with the connection.`;
 | 
			
		||||
	\nIf you have a valid certificate please add it from Settings>Organizations and try to add the organization again.`;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function enterpriseOrgError(length: number, domains: string[]): DialogBoxError {
 | 
			
		||||
@@ -34,6 +32,7 @@ export function enterpriseOrgError(length: number, domains: string[]): DialogBox
 | 
			
		||||
	for (const domain of domains) {
 | 
			
		||||
		domainList += `• ${domain}\n`;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return {
 | 
			
		||||
		title: `Could not add the following ${length === 1 ? 'organization' : 'organizations'}`,
 | 
			
		||||
		content: `${domainList}\nPlease contact your system administrator.`
 | 
			
		||||
 
 | 
			
		||||
| 
		 Before Width: | Height: | Size: 436 B  | 
| 
		 Before Width: | Height: | Size: 900 B  | 
| 
		 Before Width: | Height: | Size: 1.4 KiB  | 
| 
		 Before Width: | Height: | Size: 1.4 KiB  | 
| 
		 Before Width: | Height: | Size: 737 B  | 
| 
		 Before Width: | Height: | Size: 1.7 KiB  | 
| 
		 Before Width: | Height: | Size: 2.8 KiB  | 
| 
		 Before Width: | Height: | Size: 3.8 KiB  | 
| 
		 Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.6 KiB  | 
							
								
								
									
										
											BIN
										
									
								
								app/resources/tray/traymacOSTemplate.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| 
		 After Width: | Height: | Size: 321 B  | 
							
								
								
									
										
											BIN
										
									
								
								app/resources/tray/traymacOSTemplate@2x.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| 
		 After Width: | Height: | Size: 631 B  | 
							
								
								
									
										
											BIN
										
									
								
								app/resources/tray/traymacOSTemplate@3x.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| 
		 After Width: | Height: | Size: 932 B  | 
							
								
								
									
										
											BIN
										
									
								
								app/resources/tray/traymacOSTemplate@4x.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| 
		 After Width: | Height: | Size: 1.3 KiB  | 
| 
		 Before Width: | Height: | Size: 361 KiB After Width: | Height: | Size: 106 KiB  | 
| 
		 Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 13 KiB  | 
							
								
								
									
										134
									
								
								app/translations/ar.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,134 @@
 | 
			
		||||
{
 | 
			
		||||
	"About Zulip": "حول \"زوليب\"",
 | 
			
		||||
	"Actual Size": "الحجم الفعلي",
 | 
			
		||||
	"Add Custom Certificates": "إضافة رخصة معدلة",
 | 
			
		||||
	"Add Organization": "إضافة منظمة",
 | 
			
		||||
	"Add a Zulip organization": "إضافة منظمة \"زوليب\"",
 | 
			
		||||
	"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": "نسخ رابط زوليب",
 | 
			
		||||
	"Create a new organization": "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)": "Enable spellchecker (requires restart)",
 | 
			
		||||
	"Factory Reset": "إعادة ضبط المصنع",
 | 
			
		||||
	"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",
 | 
			
		||||
	"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",
 | 
			
		||||
	"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,5 +1,5 @@
 | 
			
		||||
{
 | 
			
		||||
	"About Zulip": "За Zulip",
 | 
			
		||||
	"About Zulip": "Относно Zulip",
 | 
			
		||||
	"Actual Size": "Действителен размер",
 | 
			
		||||
	"Add Custom Certificates": "Добавяне на персонализирани сертификати",
 | 
			
		||||
	"Add Organization": "Добавяне на организация",
 | 
			
		||||
@@ -75,9 +75,6 @@
 | 
			
		||||
	"Release Notes": "Бележки към изданието",
 | 
			
		||||
	"Reload": "Презареди",
 | 
			
		||||
	"Report an Issue": "Подаване на сигнал за проблем",
 | 
			
		||||
	"Reset App Data": "Нулиране на данни за приложения",
 | 
			
		||||
	"Reset App Settings": "Нулиране на настройките на приложението",
 | 
			
		||||
	"Reset Application Data": "Нулиране на данните на приложението",
 | 
			
		||||
	"Save": "Запази",
 | 
			
		||||
	"Select All": "Избери всички",
 | 
			
		||||
	"Settings": "Настройки",
 | 
			
		||||
@@ -113,5 +110,25 @@
 | 
			
		||||
	"Zoom Out": "Отдалечавам",
 | 
			
		||||
	"Zulip Help": "Помощ за Zulip",
 | 
			
		||||
	"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"
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										134
									
								
								app/translations/ca.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,134 @@
 | 
			
		||||
{
 | 
			
		||||
	"About Zulip": "Quant a 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": "Tancar",
 | 
			
		||||
	"Connect": "Connect",
 | 
			
		||||
	"Connect to another organization": "Connect to another organization",
 | 
			
		||||
	"Connected organizations": "Connected organizations",
 | 
			
		||||
	"Copy": "Copia",
 | 
			
		||||
	"Copy Zulip URL": "Copy Zulip URL",
 | 
			
		||||
	"Create a new organization": "Crea una nova organització",
 | 
			
		||||
	"Cut": "Cut",
 | 
			
		||||
	"Default download location": "Default download location",
 | 
			
		||||
	"Delete": "Elimina",
 | 
			
		||||
	"Desktop App Settings": "Configuració de l'aplicació d'escriptori",
 | 
			
		||||
	"Desktop Notifications": "Desktop Notifications",
 | 
			
		||||
	"Desktop Settings": "Configuració d'escriptori",
 | 
			
		||||
	"Disconnect": "Disconnect",
 | 
			
		||||
	"Download App Logs": "Download App Logs",
 | 
			
		||||
	"Edit": "Edita",
 | 
			
		||||
	"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": "Fitxer",
 | 
			
		||||
	"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": "Centre d'ajuda",
 | 
			
		||||
	"History": "Historial",
 | 
			
		||||
	"History Shortcuts": "Dreceres d'historial",
 | 
			
		||||
	"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": "Silencia tots els sons de Zulip",
 | 
			
		||||
	"NO": "NO",
 | 
			
		||||
	"Network": "Network",
 | 
			
		||||
	"OR": "OR",
 | 
			
		||||
	"Organization URL": "URL d'organització",
 | 
			
		||||
	"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": "Guardar",
 | 
			
		||||
	"Select All": "Select All",
 | 
			
		||||
	"Settings": "Configuració",
 | 
			
		||||
	"Shortcuts": "Shortcuts",
 | 
			
		||||
	"Show App Logs": "Show App Logs",
 | 
			
		||||
	"Show app icon in system tray": "Show app icon in system tray",
 | 
			
		||||
	"Show app unread badge": "Mostrar una marca en la icona si hi ha missatges no llegits",
 | 
			
		||||
	"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": "Pujada",
 | 
			
		||||
	"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,117 +1,134 @@
 | 
			
		||||
{
 | 
			
		||||
	"About Zulip": "O uživateli Zulip",
 | 
			
		||||
	"Actual Size": "Aktuální velikost",
 | 
			
		||||
	"About Zulip": "O Zulipu",
 | 
			
		||||
	"Actual Size": "Skutečná velikost",
 | 
			
		||||
	"Add Custom Certificates": "Přidat vlastní certifikáty",
 | 
			
		||||
	"Add Organization": "Přidat organizaci",
 | 
			
		||||
	"Add a Zulip organization": "Přidejte organizaci Zulip",
 | 
			
		||||
	"Add a Zulip organization": "Přidat organizaci Zulip",
 | 
			
		||||
	"Add custom CSS": "Přidat vlastní CSS",
 | 
			
		||||
	"Advanced": "Pokročilý",
 | 
			
		||||
	"All the connected organizations will appear here": "Zde se zobrazí všechny připojené organizace",
 | 
			
		||||
	"Always start minimized": "Vždy začněte minimalizovat",
 | 
			
		||||
	"App Updates": "Aktualizace aplikací",
 | 
			
		||||
	"Advanced": "Rozšířené",
 | 
			
		||||
	"All the connected organizations will appear here": "Všechny připojené organizace se objeví zde",
 | 
			
		||||
	"Always start minimized": "Vždy spouštět minimalizované",
 | 
			
		||||
	"App Updates": "Aktualizace aplikace",
 | 
			
		||||
	"Appearance": "Vzhled",
 | 
			
		||||
	"Application Shortcuts": "Zkratky aplikací",
 | 
			
		||||
	"Are you sure you want to disconnect this organization?": "Opravdu chcete tuto organizaci odpojit?",
 | 
			
		||||
	"Auto hide Menu bar": "Auto hide Menu bar",
 | 
			
		||||
	"Auto hide menu bar (Press Alt key to display)": "Automaticky skrýt lištu menu (stiskněte klávesu Alt pro zobrazení)",
 | 
			
		||||
	"Back": "Zadní",
 | 
			
		||||
	"Bounce dock on new private message": "Bounce dock na nové soukromé zprávy",
 | 
			
		||||
	"Certificate file": "Soubor certifikátu",
 | 
			
		||||
	"Change": "Změna",
 | 
			
		||||
	"Check for Updates": "Kontrola aktualizací",
 | 
			
		||||
	"Application Shortcuts": "Zkratky programu",
 | 
			
		||||
	"Are you sure you want to disconnect this organization?": "Opravdu chcete odpojit tuto organizaci?",
 | 
			
		||||
	"Auto hide Menu bar": "Automaticky skrývat menu",
 | 
			
		||||
	"Auto hide menu bar (Press Alt key to display)": "Automaticky skrývat menu (pro zobrazení stiskněte klávesu Alt)",
 | 
			
		||||
	"Back": "Zpět",
 | 
			
		||||
	"Bounce dock on new private message": "Poskakování ikony v docku po obdržení nové soukromé zprávy",
 | 
			
		||||
	"Certificate file": "Soubor s certifikátem",
 | 
			
		||||
	"Change": "Změnit",
 | 
			
		||||
	"Check for Updates": "Zkontrolovat aktualizace",
 | 
			
		||||
	"Close": "Zavřít",
 | 
			
		||||
	"Connect": "Připojit",
 | 
			
		||||
	"Connect to another organization": "Připojte se k jiné organizaci",
 | 
			
		||||
	"Connect": "Připojit se",
 | 
			
		||||
	"Connect to another organization": "Připojit se k jiné organizaci",
 | 
			
		||||
	"Connected organizations": "Připojené organizace",
 | 
			
		||||
	"Copy": "kopírovat",
 | 
			
		||||
	"Copy Zulip URL": "Kopírovat adresu URL aplikace Zulip",
 | 
			
		||||
	"Copy": "Kopírovat",
 | 
			
		||||
	"Copy Zulip URL": "Kopírovat adresu (URL) Zulipu",
 | 
			
		||||
	"Create a new organization": "Vytvořit novou organizaci",
 | 
			
		||||
	"Cut": "Střih",
 | 
			
		||||
	"Cut": "Vyjmout",
 | 
			
		||||
	"Default download location": "Výchozí umístění stahování",
 | 
			
		||||
	"Delete": "Smazat",
 | 
			
		||||
	"Desktop App Settings": "Nastavení aplikace Desktop",
 | 
			
		||||
	"Desktop Notifications": "Oznámení o pracovní ploše",
 | 
			
		||||
	"Desktop App Settings": "Nastavení desktopové aplikace",
 | 
			
		||||
	"Desktop Notifications": "Oznámení na ploše",
 | 
			
		||||
	"Desktop Settings": "Nastavení plochy",
 | 
			
		||||
	"Disconnect": "Odpojit",
 | 
			
		||||
	"Download App Logs": "Stáhnout App Logs",
 | 
			
		||||
	"Download App Logs": "Stáhnout záznamy programu",
 | 
			
		||||
	"Edit": "Upravit",
 | 
			
		||||
	"Edit Shortcuts": "Upravit zkratky",
 | 
			
		||||
	"Enable auto updates": "Povolit automatické aktualizace",
 | 
			
		||||
	"Enable error reporting (requires restart)": "Povolit hlášení chyb (vyžaduje restart)",
 | 
			
		||||
	"Enable spellchecker (requires restart)": "Povolit kontrolu pravopisu (vyžaduje restartování)",
 | 
			
		||||
	"Factory Reset": "Tovární nastavení",
 | 
			
		||||
	"Enable error reporting (requires restart)": "Povolit hlášení chyb (vyžaduje opětovné spuštění programu)",
 | 
			
		||||
	"Enable spellchecker (requires restart)": "Povolit kontrolu pravopisu (vyžaduje opětovné spuštění programu)",
 | 
			
		||||
	"Factory Reset": "Obnovení do továrního nastavení",
 | 
			
		||||
	"File": "Soubor",
 | 
			
		||||
	"Find accounts": "Najít účty",
 | 
			
		||||
	"Find accounts by email": "Najít účty e-mailem",
 | 
			
		||||
	"Flash taskbar on new message": "Hlavní panel Flash na nové zprávě",
 | 
			
		||||
	"Find accounts by email": "Najít účty podle adresy elektronické pošty",
 | 
			
		||||
	"Flash taskbar on new message": "Blikání ikony v hlavním panelu při obdržení nové zprávy",
 | 
			
		||||
	"Forward": "Vpřed",
 | 
			
		||||
	"Functionality": "Funkčnost",
 | 
			
		||||
	"General": "Všeobecné",
 | 
			
		||||
	"Get beta updates": "Získejte aktualizace beta",
 | 
			
		||||
	"Hard Reload": "Hard Reload",
 | 
			
		||||
	"Help": "Pomoc",
 | 
			
		||||
	"Functionality": "Funkce",
 | 
			
		||||
	"General": "Obecné",
 | 
			
		||||
	"Get beta updates": "Dostávat beta aktualizace",
 | 
			
		||||
	"Hard Reload": "Tvrdé znovunahrání",
 | 
			
		||||
	"Help": "Nápověda",
 | 
			
		||||
	"Help Center": "Centrum nápovědy",
 | 
			
		||||
	"History": "Dějiny",
 | 
			
		||||
	"History Shortcuts": "Zkratky historie",
 | 
			
		||||
	"History": "Historie",
 | 
			
		||||
	"History Shortcuts": "Zkratky pro historii",
 | 
			
		||||
	"Keyboard Shortcuts": "Klávesové zkratky",
 | 
			
		||||
	"Log Out": "Odhlásit se",
 | 
			
		||||
	"Log Out of Organization": "Odhlásit se z organizace",
 | 
			
		||||
	"Manual proxy configuration": "Ruční konfigurace proxy",
 | 
			
		||||
	"Manual proxy configuration": "Ruční nastavení proxy",
 | 
			
		||||
	"Minimize": "Minimalizovat",
 | 
			
		||||
	"Mute all sounds from Zulip": "Vypněte všechny zvuky ze Zulipu",
 | 
			
		||||
	"Mute all sounds from Zulip": "Ztlumit všechny zvuky ze Zulipu",
 | 
			
		||||
	"NO": "NE",
 | 
			
		||||
	"Network": "Síť",
 | 
			
		||||
	"OR": "NEBO",
 | 
			
		||||
	"Organization URL": "URL organizace",
 | 
			
		||||
	"Organization URL": "Adresa organizace",
 | 
			
		||||
	"Organizations": "Organizace",
 | 
			
		||||
	"Paste": "Vložit",
 | 
			
		||||
	"Paste and Match Style": "Vložit a shodit styl",
 | 
			
		||||
	"Paste and Match Style": "Vložit a ponechat styl",
 | 
			
		||||
	"Proxy": "Proxy",
 | 
			
		||||
	"Proxy bypass rules": "Proxy bypass pravidla",
 | 
			
		||||
	"Proxy rules": "Proxy pravidla",
 | 
			
		||||
	"Quit": "Přestat",
 | 
			
		||||
	"Quit Zulip": "Ukončete Zulip",
 | 
			
		||||
	"Redo": "Předělat",
 | 
			
		||||
	"Release Notes": "Poznámky k vydání",
 | 
			
		||||
	"Reload": "Znovu načíst",
 | 
			
		||||
	"Proxy bypass rules": "Pravidla pro obejití Proxy",
 | 
			
		||||
	"Proxy rules": "Pravidla Proxy",
 | 
			
		||||
	"Quit": "Ukončit",
 | 
			
		||||
	"Quit Zulip": "Ukončit Zulip",
 | 
			
		||||
	"Redo": "Znovu",
 | 
			
		||||
	"Release Notes": "Poznámky k této verzi",
 | 
			
		||||
	"Reload": "Nahrát znovu",
 | 
			
		||||
	"Report an Issue": "Nahlásit problém",
 | 
			
		||||
	"Reset App Data": "Resetovat data aplikace",
 | 
			
		||||
	"Reset App Settings": "Obnovit nastavení aplikace",
 | 
			
		||||
	"Reset Application Data": "Resetovat data aplikace",
 | 
			
		||||
	"Save": "Uložit",
 | 
			
		||||
	"Select All": "Vybrat vše",
 | 
			
		||||
	"Settings": "Nastavení",
 | 
			
		||||
	"Shortcuts": "Zkratky",
 | 
			
		||||
	"Show App Logs": "Zobrazit protokoly aplikací",
 | 
			
		||||
	"Show app icon in system tray": "Zobrazit ikonu aplikace v systémové liště",
 | 
			
		||||
	"Show app unread badge": "Zobrazit nepřečtený odznak aplikace",
 | 
			
		||||
	"Show desktop notifications": "Zobrazit oznámení na ploše",
 | 
			
		||||
	"Show App Logs": "Zobrazit záznamy programu",
 | 
			
		||||
	"Show app icon in system tray": "Zobrazovat ikonu programu v oznamovací oblasti panelu",
 | 
			
		||||
	"Show app unread badge": "Zobrazovat u ikony aplikace symbol nepřečteno",
 | 
			
		||||
	"Show desktop notifications": "Zobrazovat oznámení na ploše",
 | 
			
		||||
	"Show downloaded files in file manager": "Zobrazit stažené soubory ve správci souborů",
 | 
			
		||||
	"Show sidebar": "Zobrazit postranní panel",
 | 
			
		||||
	"Start app at login": "Spuštění aplikace při přihlášení",
 | 
			
		||||
	"Show sidebar": "Zobrazovat postranní panel",
 | 
			
		||||
	"Start app at login": "Spustit program při přihlášení",
 | 
			
		||||
	"Switch to Next Organization": "Přepnout na další organizaci",
 | 
			
		||||
	"Switch to Previous Organization": "Přepněte na předchozí organizaci",
 | 
			
		||||
	"These desktop app shortcuts extend the Zulip webapp's": "Tyto klávesové zkratky pro aplikaci na ploše rozšiřují aplikaci Zulip webapp",
 | 
			
		||||
	"This will delete all application data including all added accounts and preferences": "Tím odstraníte všechna data aplikace včetně všech přidaných účtů a předvoleb",
 | 
			
		||||
	"Switch to Previous Organization": "Přepnout na předchozí organizaci",
 | 
			
		||||
	"These desktop app shortcuts extend the Zulip webapp's": "Tyto zkratky rozšiřují webovou aplikaci Zulipu",
 | 
			
		||||
	"This will delete all application data including all added accounts and preferences": "Toto smaže všechna data programu včetně všech přidaných účtů a nastavení",
 | 
			
		||||
	"Tip": "Tip",
 | 
			
		||||
	"Toggle DevTools for Active Tab": "Přepnout DevTools pro Active Tab",
 | 
			
		||||
	"Toggle DevTools for Zulip App": "Přepnout DevTools pro Zulip App",
 | 
			
		||||
	"Toggle Do Not Disturb": "Přepnout Do Nerušit",
 | 
			
		||||
	"Toggle DevTools for Active Tab": "Přepnout vývojářské nástroje pro aktivní kartu",
 | 
			
		||||
	"Toggle DevTools for Zulip App": "Přepnout vývojářské nástroje pro program Zulip",
 | 
			
		||||
	"Toggle Do Not Disturb": "Přepnout mód Nerušit",
 | 
			
		||||
	"Toggle Full Screen": "Přepnout na celou obrazovku",
 | 
			
		||||
	"Toggle Sidebar": "Přepnout postranní panel",
 | 
			
		||||
	"Toggle Tray Icon": "Přepnout ikonu zásobníku",
 | 
			
		||||
	"Toggle Sidebar": "Přepnout zobrazení postranního panelu",
 | 
			
		||||
	"Toggle Tray Icon": "Přepnout ikonu v oznamovací oblasti panelu",
 | 
			
		||||
	"Tools": "Nástroje",
 | 
			
		||||
	"Undo": "vrátit",
 | 
			
		||||
	"Upload": "nahrát",
 | 
			
		||||
	"Use system proxy settings (requires restart)": "Použít nastavení proxy serveru (vyžaduje restart)",
 | 
			
		||||
	"View": "Pohled",
 | 
			
		||||
	"View Shortcuts": "Zobrazit zástupce",
 | 
			
		||||
	"Undo": "Zpět",
 | 
			
		||||
	"Upload": "Nahrát",
 | 
			
		||||
	"Use system proxy settings (requires restart)": "Použít systémová nastavení proxy (vyžaduje opětovné spuštění programu)",
 | 
			
		||||
	"View": "Zobrazení",
 | 
			
		||||
	"View Shortcuts": "Zobrazit zkratky",
 | 
			
		||||
	"Window": "Okno",
 | 
			
		||||
	"Window Shortcuts": "Klávesové zkratky",
 | 
			
		||||
	"Window Shortcuts": "Zkratky pro okno",
 | 
			
		||||
	"YES": "ANO",
 | 
			
		||||
	"Zoom In": "Přiblížit",
 | 
			
		||||
	"Zoom Out": "Oddálit",
 | 
			
		||||
	"Zulip Help": "Nápověda Zulip",
 | 
			
		||||
	"Zulip Help": "Nápověda Zulipu",
 | 
			
		||||
	"keyboard shortcuts": "klávesové zkratky",
 | 
			
		||||
	"script": "skript"
 | 
			
		||||
	"script": "skript",
 | 
			
		||||
	"Quit when the window is closed": "Ukončit, když je okno zavřeno",
 | 
			
		||||
	"Ask where to save files before downloading": "Před stažením se zeptat kam uložit soubory",
 | 
			
		||||
	"Services": "Služby",
 | 
			
		||||
	"Hide": "Skrýt",
 | 
			
		||||
	"Hide Others": "Skrýt jiné",
 | 
			
		||||
	"Unhide": "Zobrazit",
 | 
			
		||||
	"AddServer": "Přidat server",
 | 
			
		||||
	"App language (requires restart)": "Jazyk programu (vyžaduje opětovné spuštění programu)",
 | 
			
		||||
	"Factory Reset Data": "Obnovení dat do továrního nastavení",
 | 
			
		||||
	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Obnovit program do výchozího nastavení. čili smazat všechny připojené organizace, účty a certifikáty.",
 | 
			
		||||
	"On macOS, the OS spellchecker is used.": "Na macOS se používá kontrola pravopisu OS.",
 | 
			
		||||
	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Změnit jazyk v Nastavení systému → Klávesnice → Text → Kontrola pravopisu.",
 | 
			
		||||
	"Copy Link": "Kopírovat odkaz",
 | 
			
		||||
	"Copy Image": "Kopírovat obrázek",
 | 
			
		||||
	"Copy Image URL": "Kopírovat adresu (URL) obrázku",
 | 
			
		||||
	"No Suggestion Found": "Nenalezen žádný návrh",
 | 
			
		||||
	"You can select a maximum of 3 languages for spellchecking.": "Pro kontrolu pravopisu můžete vybrat nejvíce 3 jazyky.",
 | 
			
		||||
	"Spellchecker Languages": "Kontrola pravopisu jazyků",
 | 
			
		||||
	"Add to Dictionary": "Přidat do slovníku",
 | 
			
		||||
	"Look Up": "Vyhledat"
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										134
									
								
								app/translations/da.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,134 @@
 | 
			
		||||
{
 | 
			
		||||
	"About Zulip": "Om Zulip",
 | 
			
		||||
	"Actual Size": "Faktisk størrelse",
 | 
			
		||||
	"Add Custom Certificates": "Tilføj egne certifikater",
 | 
			
		||||
	"Add Organization": "Opret organisation",
 | 
			
		||||
	"Add a Zulip organization": "Opret en Zulip organisation",
 | 
			
		||||
	"Add custom CSS": "Tilføj egen CSS",
 | 
			
		||||
	"Advanced": "Avanceret",
 | 
			
		||||
	"All the connected organizations will appear here": "Alle de tilsluttede organisationer vil blive vist her",
 | 
			
		||||
	"Always start minimized": "Start altid minimeret",
 | 
			
		||||
	"App Updates": "App-opdateringer",
 | 
			
		||||
	"Appearance": "Udseende",
 | 
			
		||||
	"Application Shortcuts": "Genveje",
 | 
			
		||||
	"Are you sure you want to disconnect this organization?": "Er du sikker på du vil frakoble denne organisation? ",
 | 
			
		||||
	"Auto hide Menu bar": "Skjul menu automatisk",
 | 
			
		||||
	"Auto hide menu bar (Press Alt key to display)": "Skjul menu automatisk (tryk på Alt-tasten for at vise)",
 | 
			
		||||
	"Back": "Tilbage",
 | 
			
		||||
	"Bounce dock on new private message": "Bounce dock on new private message",
 | 
			
		||||
	"Certificate file": "Certifikat-fil",
 | 
			
		||||
	"Change": "Skift",
 | 
			
		||||
	"Check for Updates": "Tjek for opdateringer",
 | 
			
		||||
	"Close": "Luk",
 | 
			
		||||
	"Connect": "Tilslut",
 | 
			
		||||
	"Connect to another organization": "Forbind til en anden organisation",
 | 
			
		||||
	"Connected organizations": "Tilsluttede organisationer",
 | 
			
		||||
	"Copy": "Kopiér",
 | 
			
		||||
	"Copy Zulip URL": "Kopiér Zulip URL",
 | 
			
		||||
	"Create a new organization": "Opret ny organisation",
 | 
			
		||||
	"Cut": "Klip",
 | 
			
		||||
	"Default download location": "Default download placering",
 | 
			
		||||
	"Delete": "Slet",
 | 
			
		||||
	"Desktop App Settings": "Desktop app-indstillinger",
 | 
			
		||||
	"Desktop Notifications": "Desktop-notifikationer",
 | 
			
		||||
	"Desktop Settings": "Desktop-indstillinger",
 | 
			
		||||
	"Disconnect": "Frakobl",
 | 
			
		||||
	"Download App Logs": "Download app-logfiler",
 | 
			
		||||
	"Edit": "Redigér",
 | 
			
		||||
	"Edit Shortcuts": "Redigér genveje",
 | 
			
		||||
	"Enable auto updates": "Aktivér auto-opdateringer",
 | 
			
		||||
	"Enable error reporting (requires restart)": "Aktivér fejlrapportering (kræver genstart)",
 | 
			
		||||
	"Enable spellchecker (requires restart)": "Aktivér stavekontrol (kræver genstart)",
 | 
			
		||||
	"Factory Reset": "Nulstil til fabriksindstillinger",
 | 
			
		||||
	"File": "Fil",
 | 
			
		||||
	"Find accounts": "Find konti",
 | 
			
		||||
	"Find accounts by email": "Find accounts by email",
 | 
			
		||||
	"Flash taskbar on new message": "Flash taskbar on new message",
 | 
			
		||||
	"Forward": "Forward",
 | 
			
		||||
	"Functionality": "Funktionalitet",
 | 
			
		||||
	"General": "Generelt",
 | 
			
		||||
	"Get beta updates": "Få beta opdateringer",
 | 
			
		||||
	"Hard Reload": "Hård reload",
 | 
			
		||||
	"Help": "Hjælp",
 | 
			
		||||
	"Help Center": "Hjælpecenter",
 | 
			
		||||
	"History": "Historik",
 | 
			
		||||
	"History Shortcuts": "Historik genveje",
 | 
			
		||||
	"Keyboard Shortcuts": "Tastatur genveje",
 | 
			
		||||
	"Log Out": "Log ud",
 | 
			
		||||
	"Log Out of Organization": "Log ud af organisation",
 | 
			
		||||
	"Manual proxy configuration": "Manuel proxy opsætning",
 | 
			
		||||
	"Minimize": "Minimér",
 | 
			
		||||
	"Mute all sounds from Zulip": "Mute all sounds from Zulip",
 | 
			
		||||
	"NO": "NEJ",
 | 
			
		||||
	"Network": "Netværk",
 | 
			
		||||
	"OR": "ELLER",
 | 
			
		||||
	"Organization URL": "Organisation URL",
 | 
			
		||||
	"Organizations": "Organisationer",
 | 
			
		||||
	"Paste": "Indsæt",
 | 
			
		||||
	"Paste and Match Style": "Indsæt med samme formattering",
 | 
			
		||||
	"Proxy": "Proxy",
 | 
			
		||||
	"Proxy bypass rules": "Proxy bypass regler",
 | 
			
		||||
	"Proxy rules": "Proxy regler",
 | 
			
		||||
	"Quit": "Luk",
 | 
			
		||||
	"Quit Zulip": "Luk Zulip",
 | 
			
		||||
	"Redo": "Redo",
 | 
			
		||||
	"Release Notes": "Release Notes",
 | 
			
		||||
	"Reload": "Reload",
 | 
			
		||||
	"Report an Issue": "Report an Issue",
 | 
			
		||||
	"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",
 | 
			
		||||
	"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,117 +1,134 @@
 | 
			
		||||
{
 | 
			
		||||
	"About Zulip": "Über Zulip",
 | 
			
		||||
	"Actual Size": "Tatsächliche Größe",
 | 
			
		||||
	"Add Custom Certificates": "Benutzerdefinierte Zertifikate hinzufügen",
 | 
			
		||||
	"Add Custom Certificates": "Eigene Zertifikate hinzufügen",
 | 
			
		||||
	"Add Organization": "Organisation hinzufügen",
 | 
			
		||||
	"Add a Zulip organization": "Fügen Sie eine Zulip-Organisation hinzu",
 | 
			
		||||
	"Add custom CSS": "Fügen Sie benutzerdefiniertes CSS hinzu",
 | 
			
		||||
	"Advanced": "Fortgeschritten",
 | 
			
		||||
	"All the connected organizations will appear here": "Alle verbundenen Organisationen werden hier angezeigt",
 | 
			
		||||
	"Always start minimized": "Immer minimiert anfangen",
 | 
			
		||||
	"App Updates": "App-Updates",
 | 
			
		||||
	"Appearance": "Aussehen",
 | 
			
		||||
	"Application Shortcuts": "Anwendungsverknüpfungen",
 | 
			
		||||
	"Are you sure you want to disconnect this organization?": "Möchten Sie diese Organisation wirklich trennen?",
 | 
			
		||||
	"Auto hide Menu bar": "Menüleiste automatisch ausblenden",
 | 
			
		||||
	"Auto hide menu bar (Press Alt key to display)": "Menüleiste automatisch ausblenden (Drücken Sie die Alt-Taste, um anzuzeigen)",
 | 
			
		||||
	"Add a Zulip organization": "Zulip-Organisation hinzufügen",
 | 
			
		||||
	"Add custom CSS": "Eigenes CSS hinzufügen",
 | 
			
		||||
	"Advanced": "Erweitert",
 | 
			
		||||
	"All the connected organizations will appear here": "Alle verbundenen Organisationen erscheinen hier",
 | 
			
		||||
	"Always start minimized": "Immer minimiert öffnen",
 | 
			
		||||
	"App Updates": "App Updates",
 | 
			
		||||
	"Appearance": "Erscheinungsbild",
 | 
			
		||||
	"Application Shortcuts": "App-Verknüpfungen",
 | 
			
		||||
	"Are you sure you want to disconnect this organization?": "Bist du dir sicher, dass du die Verbindung zur Organisation trennen möchtest?",
 | 
			
		||||
	"Auto hide Menu bar": "Menü automatisch verstecken",
 | 
			
		||||
	"Auto hide menu bar (Press Alt key to display)": "Menü automatisch verstecken (zum Anzeigen die Alt-Taste drücken)",
 | 
			
		||||
	"Back": "Zurück",
 | 
			
		||||
	"Bounce dock on new private message": "Bounce-Dock für neue private Nachricht",
 | 
			
		||||
	"Bounce dock on new private message": "Im Dock hüpfen, wenn neue private Nachrichten eingehen",
 | 
			
		||||
	"Certificate file": "Zertifikatsdatei",
 | 
			
		||||
	"Change": "Veränderung",
 | 
			
		||||
	"Change": "Ändern",
 | 
			
		||||
	"Check for Updates": "Auf Updates prüfen",
 | 
			
		||||
	"Close": "Schließen",
 | 
			
		||||
	"Connect": "Verbinden",
 | 
			
		||||
	"Connect to another organization": "Stellen Sie eine Verbindung zu einer anderen Organisation her",
 | 
			
		||||
	"Connect to another organization": "Mit einer anderen Organisation verbinden",
 | 
			
		||||
	"Connected organizations": "Verbundene Organisationen",
 | 
			
		||||
	"Copy": "Kopieren",
 | 
			
		||||
	"Copy Zulip URL": "Zulip-URL kopieren",
 | 
			
		||||
	"Create a new organization": "Erstellen Sie eine neue Organisation",
 | 
			
		||||
	"Cut": "Schnitt",
 | 
			
		||||
	"Default download location": "Standard-Download-Speicherort",
 | 
			
		||||
	"Create a new organization": "Eine neue Organisation erstellen",
 | 
			
		||||
	"Cut": "Ausschneiden",
 | 
			
		||||
	"Default download location": "Voreingestelltes Ziel für Downloads",
 | 
			
		||||
	"Delete": "Löschen",
 | 
			
		||||
	"Desktop App Settings": "Desktop App-Einstellungen",
 | 
			
		||||
	"Desktop Notifications": "Desktop-Benachrichtigungen",
 | 
			
		||||
	"Desktop App Settings": "Einstellungen für Desktop-App",
 | 
			
		||||
	"Desktop Notifications": "Desktopbenachrichtigungen",
 | 
			
		||||
	"Desktop Settings": "Desktop-Einstellungen",
 | 
			
		||||
	"Disconnect": "Trennen",
 | 
			
		||||
	"Download App Logs": "App-Protokolle herunterladen",
 | 
			
		||||
	"Disconnect": "Verbindung trennen",
 | 
			
		||||
	"Download App Logs": "Logdateien der App herunterladen",
 | 
			
		||||
	"Edit": "Bearbeiten",
 | 
			
		||||
	"Edit Shortcuts": "Verknüpfungen bearbeiten",
 | 
			
		||||
	"Enable auto updates": "Automatische Updates aktivieren",
 | 
			
		||||
	"Enable error reporting (requires restart)": "Fehlerberichterstattung aktivieren (Neustart erforderlich)",
 | 
			
		||||
	"Enable spellchecker (requires restart)": "Rechtschreibprüfung aktivieren (Neustart erforderlich)",
 | 
			
		||||
	"Factory Reset": "Werkseinstellungen zurückgesetzt",
 | 
			
		||||
	"Edit Shortcuts": "Tastenkürzel bearbeiten",
 | 
			
		||||
	"Enable auto updates": "Automatisch aktualisieren",
 | 
			
		||||
	"Enable error reporting (requires restart)": "Fehlerberichte aktivieren (erfordert Neustart)",
 | 
			
		||||
	"Enable spellchecker (requires restart)": "Rechtschreibprüfung aktivieren (erfordert Neustart)",
 | 
			
		||||
	"Factory Reset": "Alle Einstellungen auf Standardwerte zurücksetzen",
 | 
			
		||||
	"File": "Datei",
 | 
			
		||||
	"Find accounts": "Konten suchen",
 | 
			
		||||
	"Find accounts by email": "Finden Sie Konten per E-Mail",
 | 
			
		||||
	"Flash taskbar on new message": "Flash-Taskleiste bei neuer Nachricht",
 | 
			
		||||
	"Forward": "Nach vorne",
 | 
			
		||||
	"Find accounts": "Accounts finden",
 | 
			
		||||
	"Find accounts by email": "Accounts anhand E-Mail-Adresse finden",
 | 
			
		||||
	"Flash taskbar on new message": "Farbliche Hervorhebung in Taskbar bei neuen Nachrichten",
 | 
			
		||||
	"Forward": "Weiter",
 | 
			
		||||
	"Functionality": "Funktionalität",
 | 
			
		||||
	"General": "Allgemeines",
 | 
			
		||||
	"Get beta updates": "Erhalten Sie Beta-Updates",
 | 
			
		||||
	"Hard Reload": "Festes Nachladen",
 | 
			
		||||
	"General": "Allgemein",
 | 
			
		||||
	"Get beta updates": "Auf Betaversionen aktualisieren",
 | 
			
		||||
	"Hard Reload": "Komplett neu laden",
 | 
			
		||||
	"Help": "Hilfe",
 | 
			
		||||
	"Help Center": "Hilfezentrum",
 | 
			
		||||
	"History": "Geschichte",
 | 
			
		||||
	"History Shortcuts": "Verlaufsverknüpfungen",
 | 
			
		||||
	"Keyboard Shortcuts": "Tastatürkürzel",
 | 
			
		||||
	"Log Out": "Ausloggen",
 | 
			
		||||
	"Log Out of Organization": "Aus Organisation ausloggen",
 | 
			
		||||
	"Help Center": "Hilfe-Zentrum",
 | 
			
		||||
	"History": "Verlauf",
 | 
			
		||||
	"History Shortcuts": "Kurzbefehle für Verlauf",
 | 
			
		||||
	"Keyboard Shortcuts": "Tastenkürzel",
 | 
			
		||||
	"Log Out": "Abmelden",
 | 
			
		||||
	"Log Out of Organization": "Von Organisation abmelden",
 | 
			
		||||
	"Manual proxy configuration": "Manuelle Proxy-Konfiguration",
 | 
			
		||||
	"Minimize": "Minimieren",
 | 
			
		||||
	"Mute all sounds from Zulip": "Schaltet alle Sounds von Zulip stumm",
 | 
			
		||||
	"Mute all sounds from Zulip": "Alle Zulip-Klänge stummschalten",
 | 
			
		||||
	"NO": "NEIN",
 | 
			
		||||
	"Network": "Netzwerk",
 | 
			
		||||
	"OR": "ODER",
 | 
			
		||||
	"Organization URL": "Organisations-URL",
 | 
			
		||||
	"Organization URL": "URL der Organisation",
 | 
			
		||||
	"Organizations": "Organisationen",
 | 
			
		||||
	"Paste": "Einfügen",
 | 
			
		||||
	"Paste and Match Style": "Einfügen und Format anpassen",
 | 
			
		||||
	"Paste and Match Style": "Ohne Formatierung einfügen",
 | 
			
		||||
	"Proxy": "Proxy",
 | 
			
		||||
	"Proxy bypass rules": "Proxy-Umgehungsregeln",
 | 
			
		||||
	"Proxy bypass rules": "Proxy-Ausnahmen",
 | 
			
		||||
	"Proxy rules": "Proxy-Regeln",
 | 
			
		||||
	"Quit": "Verlassen",
 | 
			
		||||
	"Quit Zulip": "Beenden Sie Zulip",
 | 
			
		||||
	"Redo": "Redo",
 | 
			
		||||
	"Release Notes": "Versionshinweise",
 | 
			
		||||
	"Quit": "Beenden",
 | 
			
		||||
	"Quit Zulip": "Zulip beenden",
 | 
			
		||||
	"Redo": "Wiederholen",
 | 
			
		||||
	"Release Notes": "Hinweise zur Versionsfreigabe",
 | 
			
		||||
	"Reload": "Neu laden",
 | 
			
		||||
	"Report an Issue": "Ein Problem melden",
 | 
			
		||||
	"Reset App Data": "App-Daten zurücksetzen",
 | 
			
		||||
	"Reset App Settings": "App-Einstellungen zurücksetzen",
 | 
			
		||||
	"Reset Application Data": "Anwendungsdaten zurücksetzen",
 | 
			
		||||
	"Save": "sparen",
 | 
			
		||||
	"Select All": "Wählen Sie Alle",
 | 
			
		||||
	"Settings": "die Einstellungen",
 | 
			
		||||
	"Shortcuts": "Verknüpfungen",
 | 
			
		||||
	"Show App Logs": "App-Protokolle anzeigen",
 | 
			
		||||
	"Show app icon in system tray": "App-Symbol in der Taskleiste anzeigen",
 | 
			
		||||
	"Show app unread badge": "Zeige App ungelesenen Badge",
 | 
			
		||||
	"Show desktop notifications": "Desktop-Benachrichtigungen anzeigen",
 | 
			
		||||
	"Show downloaded files in file manager": "Heruntergeladene Dateien im Dateimanager anzeigen",
 | 
			
		||||
	"Save": "Speichern",
 | 
			
		||||
	"Select All": "Alles auswählen",
 | 
			
		||||
	"Settings": "Einstellungen",
 | 
			
		||||
	"Shortcuts": "Kurzbefehle",
 | 
			
		||||
	"Show App Logs": "Logdateien der App anzeigen",
 | 
			
		||||
	"Show app icon in system tray": "App-Icon in Systemleiste anzeigen",
 | 
			
		||||
	"Show app unread badge": "Anzahl ungelesener Nachrichten in App-Icon einblenden",
 | 
			
		||||
	"Show desktop notifications": "Desktopbenachrichtigungen anzeigen",
 | 
			
		||||
	"Show downloaded files in file manager": "Heruntergeladene Dateien in Dateimanager anzeigen",
 | 
			
		||||
	"Show sidebar": "Seitenleiste anzeigen",
 | 
			
		||||
	"Start app at login": "App beim Login starten",
 | 
			
		||||
	"Switch to Next Organization": "Wechseln Sie zur nächsten Organisation",
 | 
			
		||||
	"Switch to Previous Organization": "Zur vorherigen Organisation wechseln",
 | 
			
		||||
	"These desktop app shortcuts extend the Zulip webapp's": "Diese Desktop-App-Verknüpfungen erweitern die Zulip-Webanwendungen",
 | 
			
		||||
	"This will delete all application data including all added accounts and preferences": "Dadurch werden alle Anwendungsdaten einschließlich aller hinzugefügten Konten und Einstellungen gelöscht",
 | 
			
		||||
	"Tip": "Spitze",
 | 
			
		||||
	"Toggle DevTools for Active Tab": "DevTools für aktive Registerkarte umschalten",
 | 
			
		||||
	"Toggle DevTools for Zulip App": "DevTools für Zulip App umschalten",
 | 
			
		||||
	"Toggle Do Not Disturb": "Nicht stören umschalten",
 | 
			
		||||
	"Toggle Full Screen": "Vollbild umschalten",
 | 
			
		||||
	"Start app at login": "App beim Login automatisch starten",
 | 
			
		||||
	"Switch to Next Organization": "Zur nächsten Organisation wechseln",
 | 
			
		||||
	"Switch to Previous Organization": "Zur vorhergehenden Organisation wechseln",
 | 
			
		||||
	"These desktop app shortcuts extend the Zulip webapp's": "Dies sind zusätzliche Kurzbefehle in der Desktop-App gegenüber der Web-App",
 | 
			
		||||
	"This will delete all application data including all added accounts and preferences": "Hiermit werden alle Anwendungsdaten einschließlich aller Accounts und Einstellungen gelöscht",
 | 
			
		||||
	"Tip": "Tipp",
 | 
			
		||||
	"Toggle DevTools for Active Tab": "Entwickler-Tools für aktiven Tab umschalten",
 | 
			
		||||
	"Toggle DevTools for Zulip App": "Entwickler-Tools für Zulip-App umschalten",
 | 
			
		||||
	"Toggle Do Not Disturb": "Nicht-Stören-Modus umschalten",
 | 
			
		||||
	"Toggle Full Screen": "Vollbildschirm umschalten",
 | 
			
		||||
	"Toggle Sidebar": "Seitenleiste umschalten",
 | 
			
		||||
	"Toggle Tray Icon": "Taskleistensymbol umschalten",
 | 
			
		||||
	"Tools": "Werkzeuge",
 | 
			
		||||
	"Undo": "Rückgängig machen",
 | 
			
		||||
	"Toggle Tray Icon": "Tray-Icon umschalten",
 | 
			
		||||
	"Tools": "Extras",
 | 
			
		||||
	"Undo": "Rückgängig",
 | 
			
		||||
	"Upload": "Hochladen",
 | 
			
		||||
	"Use system proxy settings (requires restart)": "System-Proxy-Einstellungen verwenden (Neustart erforderlich)",
 | 
			
		||||
	"View": "Aussicht",
 | 
			
		||||
	"View Shortcuts": "Verknüpfungen anzeigen",
 | 
			
		||||
	"Use system proxy settings (requires restart)": "Systemweite Proxy-Einstellungen verwenden (erfordert Neustart)",
 | 
			
		||||
	"View": "Ansicht",
 | 
			
		||||
	"View Shortcuts": "Tastenkürzel anzeigen",
 | 
			
		||||
	"Window": "Fenster",
 | 
			
		||||
	"Window Shortcuts": "Fensterverknüpfungen",
 | 
			
		||||
	"Window Shortcuts": "Kurzbefehle für Fenster",
 | 
			
		||||
	"YES": "JA",
 | 
			
		||||
	"Zoom In": "Hineinzoomen",
 | 
			
		||||
	"Zoom Out": "Rauszoomen",
 | 
			
		||||
	"Zulip Help": "Zulip-Hilfe",
 | 
			
		||||
	"keyboard shortcuts": "Tastatürkürzel",
 | 
			
		||||
	"script": "Skript"
 | 
			
		||||
	"Zoom In": "Vergrößern",
 | 
			
		||||
	"Zoom Out": "Verkleinern",
 | 
			
		||||
	"Zulip Help": "Hilfe zu Zulip",
 | 
			
		||||
	"keyboard shortcuts": "Tastenkürzel",
 | 
			
		||||
	"script": "Skript",
 | 
			
		||||
	"Quit when the window is closed": "Beim Schließen des Fensters beenden",
 | 
			
		||||
	"Ask where to save files before downloading": "Fragen, wo heruntergeladene Dateien gespeichert werden sollen",
 | 
			
		||||
	"Services": "Dienste",
 | 
			
		||||
	"Hide": "Verbergen",
 | 
			
		||||
	"Hide Others": "Andere verbergen",
 | 
			
		||||
	"Unhide": "Nicht mehr verbergen",
 | 
			
		||||
	"AddServer": "ServerHinzufügen",
 | 
			
		||||
	"App language (requires restart)": "Sprache der App (benötigt Neustart)",
 | 
			
		||||
	"Factory Reset Data": "Auf Werkseinstellung zurücksetzen",
 | 
			
		||||
	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Die App wird zurückgesetzt, somit werden alle verbundenen Organisationen, Konten und Zertifikate gelöscht.",
 | 
			
		||||
	"On macOS, the OS spellchecker is used.": "In macOS wird die OS Rechtschreibprüfung verwendet.",
 | 
			
		||||
	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Ändere die Spracheinstellung über Systemeinstellungen → Tastatur → Text → Rechtschreibung.",
 | 
			
		||||
	"Copy Link": "Link kopieren",
 | 
			
		||||
	"Copy Image": "Bild kopieren",
 | 
			
		||||
	"Copy Image URL": "Bild-URL kopieren",
 | 
			
		||||
	"No Suggestion Found": "Keine Vorschläge gefunden",
 | 
			
		||||
	"You can select a maximum of 3 languages for spellchecking.": "Du kannst höchstens 3 Sprachen für die Rechtschreibprüfung auswählen.",
 | 
			
		||||
	"Spellchecker Languages": "Sprachen für die Rechtschreibprüfung",
 | 
			
		||||
	"Add to Dictionary": "Zum Wörterbuch hinzufügen",
 | 
			
		||||
	"Look Up": "Nachschlagen"
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,119 +1,134 @@
 | 
			
		||||
{
 | 
			
		||||
	"File": "File",
 | 
			
		||||
	"About Zulip": "About Zulip",
 | 
			
		||||
	"Actual Size": "Actual Size",
 | 
			
		||||
	"Add Custom Certificates": "Add Custom Certificates",
 | 
			
		||||
	"Add Organization": "Add Organization",
 | 
			
		||||
	"Toggle Do Not Disturb": "Toggle Do Not Disturb",
 | 
			
		||||
	"Desktop Settings": "Desktop Settings",
 | 
			
		||||
	"Keyboard Shortcuts": "Keyboard Shortcuts",
 | 
			
		||||
	"Copy Zulip URL": "Copy Zulip URL",
 | 
			
		||||
	"Log Out of Organization": "Log Out of Organization",
 | 
			
		||||
	"Minimize": "Minimize",
 | 
			
		||||
	"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",
 | 
			
		||||
	"Quit": "Quit",
 | 
			
		||||
	"Edit": "Edit",
 | 
			
		||||
	"Undo": "Undo",
 | 
			
		||||
	"Redo": "Redo",
 | 
			
		||||
	"Cut": "Cut",
 | 
			
		||||
	"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",
 | 
			
		||||
	"Select All": "Select All",
 | 
			
		||||
	"View": "View",
 | 
			
		||||
	"Reload": "Reload",
 | 
			
		||||
	"Hard Reload": "Hard Reload",
 | 
			
		||||
	"Toggle Full Screen": "Toggle Full Screen",
 | 
			
		||||
	"Zoom In": "Zoom In",
 | 
			
		||||
	"Zoom Out": "Zoom Out",
 | 
			
		||||
	"Actual Size": "Actual Size",
 | 
			
		||||
	"Toggle Tray Icon": "Toggle Tray Icon",
 | 
			
		||||
	"Toggle Sidebar": "Toggle Sidebar",
 | 
			
		||||
	"Auto hide Menu bar": "Auto hide Menu bar",
 | 
			
		||||
	"History": "History",
 | 
			
		||||
	"Back": "Back",
 | 
			
		||||
	"Forward": "Forward",
 | 
			
		||||
	"Window": "Window",
 | 
			
		||||
	"Tools": "Tools",
 | 
			
		||||
	"Check for Updates": "Check for Updates",
 | 
			
		||||
	"Proxy": "Proxy",
 | 
			
		||||
	"Proxy bypass rules": "Proxy bypass rules",
 | 
			
		||||
	"Proxy rules": "Proxy rules",
 | 
			
		||||
	"Quit": "Quit",
 | 
			
		||||
	"Quit Zulip": "Quit Zulip",
 | 
			
		||||
	"Redo": "Redo",
 | 
			
		||||
	"Release Notes": "Release Notes",
 | 
			
		||||
	"Factory Reset": "Factory Reset",
 | 
			
		||||
	"Download App Logs": "Download App Logs",
 | 
			
		||||
	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App",
 | 
			
		||||
	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab",
 | 
			
		||||
	"Help": "Help",
 | 
			
		||||
	"About Zulip": "About Zulip",
 | 
			
		||||
	"Help Center": "Help Center",
 | 
			
		||||
	"Reload": "Reload",
 | 
			
		||||
	"Report an Issue": "Report an Issue",
 | 
			
		||||
	"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",
 | 
			
		||||
	"General": "General",
 | 
			
		||||
	"Network": "Network",
 | 
			
		||||
	"AddServer": "AddServer",
 | 
			
		||||
	"Organizations": "Organizations",
 | 
			
		||||
	"Shortcuts": "Shortcuts",
 | 
			
		||||
	"Appearance": "Appearance",
 | 
			
		||||
	"Show app icon in system tray": "Show app icon in system tray",
 | 
			
		||||
	"Auto hide menu bar (Press Alt key to display)": "Auto hide menu bar (Press Alt key to display)",
 | 
			
		||||
	"Show sidebar": "Show sidebar",
 | 
			
		||||
	"Show app unread badge": "Show app unread badge",
 | 
			
		||||
	"Bounce dock on new private message": "Bounce dock on new private message",
 | 
			
		||||
	"Flash taskbar on new message": "Flash taskbar on new message",
 | 
			
		||||
	"Desktop Notifications": "Desktop Notifications",
 | 
			
		||||
	"Show desktop notifications": "Show desktop notifications",
 | 
			
		||||
	"Mute all sounds from Zulip": "Mute all sounds from Zulip",
 | 
			
		||||
	"App Updates": "App Updates",
 | 
			
		||||
	"Enable auto updates": "Enable auto updates",
 | 
			
		||||
	"Get beta updates": "Get beta updates",
 | 
			
		||||
	"Functionality": "Functionality",
 | 
			
		||||
	"Start app at login": "Start app at login",
 | 
			
		||||
	"Always start minimized": "Always start minimized",
 | 
			
		||||
	"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)",
 | 
			
		||||
	"Advanced": "Advanced",
 | 
			
		||||
	"Enable error reporting (requires restart)": "Enable error reporting (requires restart)",
 | 
			
		||||
	"Show downloaded files in file manager": "Show downloaded files in file manager",
 | 
			
		||||
	"Add custom CSS": "Add custom CSS",
 | 
			
		||||
	"Upload": "Upload",
 | 
			
		||||
	"Delete": "Delete",
 | 
			
		||||
	"Default download location": "Default download location",
 | 
			
		||||
	"Change": "Change",
 | 
			
		||||
	"Reset Application Data": "Reset Application Data",
 | 
			
		||||
	"This will delete all application data including all added accounts and preferences": "This will delete all application data including all added accounts and preferences",
 | 
			
		||||
	"Reset App Data": "Reset App Data",
 | 
			
		||||
	"Proxy": "Proxy",
 | 
			
		||||
	"Use system proxy settings (requires restart)": "Use system proxy settings (requires restart)",
 | 
			
		||||
	"Manual proxy configuration": "Manual proxy configuration",
 | 
			
		||||
	"script": "script",
 | 
			
		||||
	"Proxy rules": "Proxy rules",
 | 
			
		||||
	"Proxy bypass rules": "Proxy bypass rules",
 | 
			
		||||
	"Save": "Save",
 | 
			
		||||
	"Connected organizations": "Connected organizations",
 | 
			
		||||
	"All the connected orgnizations will appear here.": "All the connected orgnizations will appear here.",
 | 
			
		||||
	"Connect to another organization": "Connect to another organization",
 | 
			
		||||
	"Add Custom Certificates": "Add Custom Certificates",
 | 
			
		||||
	"Find accounts by email": "Find accounts by email",
 | 
			
		||||
	"All the connected orgnizations will appear here": "All the connected orgnizations will appear here",
 | 
			
		||||
	"Disconnect": "Disconnect",
 | 
			
		||||
	"Organization URL": "Organization URL",
 | 
			
		||||
	"Certificate file": "Certificate file",
 | 
			
		||||
	"Find accounts": "Find accounts",
 | 
			
		||||
	"Tip": "Tip",
 | 
			
		||||
	"These desktop app shortcuts extend the Zulip webapp's": "These desktop app shortcuts extend the Zulip webapp's",
 | 
			
		||||
	"keyboard shortcuts": "keyboard shortcuts",
 | 
			
		||||
	"Application Shortcuts": "Application Shortcuts",
 | 
			
		||||
	"Settings": "Settings",
 | 
			
		||||
	"Log Out": "Log Out",
 | 
			
		||||
	"Quit Zulip": "Quit Zulip",
 | 
			
		||||
	"Edit Shortcuts": "Edit Shortcuts",
 | 
			
		||||
	"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",
 | 
			
		||||
	"History Shortcuts": "History Shortcuts",
 | 
			
		||||
	"Window": "Window",
 | 
			
		||||
	"Window Shortcuts": "Window Shortcuts",
 | 
			
		||||
	"Quit when the window is closed": "Quit when the window is closed",
 | 
			
		||||
	"Force social login in app instead of browser": "Force social login in app instead of browser",
 | 
			
		||||
	"Ask where to save files before downloading": "Ask where to save files before downloading",
 | 
			
		||||
	"Add a Zulip organization": "Add a Zulip organization",
 | 
			
		||||
	"Connect": "Connect",
 | 
			
		||||
	"OR": "OR",
 | 
			
		||||
	"Create a new organization": "Create a new organization",
 | 
			
		||||
	"Network and Proxy Settings": "Network and Proxy Settings",
 | 
			
		||||
	"YES": "YES",
 | 
			
		||||
	"NO": "NO",
 | 
			
		||||
	"Are you sure you want to disconnect this organization?": "Are you sure you want to disconnect this organization?"
 | 
			
		||||
	"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,122 +1,134 @@
 | 
			
		||||
{
 | 
			
		||||
	"About Zulip": "About Zulip",
 | 
			
		||||
	"Actual Size": "Actual Size",
 | 
			
		||||
	"Add Custom Certificates": "Add Custom Certificates",
 | 
			
		||||
	"Add Organization": "Add Organization",
 | 
			
		||||
	"Toggle Do Not Disturb": "Toggle Do Not Disturb",
 | 
			
		||||
	"Desktop Settings": "Desktop Settings",
 | 
			
		||||
	"Keyboard Shortcuts": "Keyboard Shortcuts",
 | 
			
		||||
	"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",
 | 
			
		||||
	"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",
 | 
			
		||||
	"Services": "Services",
 | 
			
		||||
	"Hide": "Hide",
 | 
			
		||||
	"Hide Others": "Hide Others",
 | 
			
		||||
	"Unhide": "Unhide",
 | 
			
		||||
	"Minimize": "Minimize",
 | 
			
		||||
	"Close": "Close",
 | 
			
		||||
	"Quit": "Quit",
 | 
			
		||||
	"Edit": "Edit",
 | 
			
		||||
	"Undo": "Undo",
 | 
			
		||||
	"Redo": "Redo",
 | 
			
		||||
	"Cut": "Cut",
 | 
			
		||||
	"Copy": "Copy",
 | 
			
		||||
	"Paste": "Paste",
 | 
			
		||||
	"Paste and Match Style": "Paste and Match Style",
 | 
			
		||||
	"Select All": "Select All",
 | 
			
		||||
	"View": "View",
 | 
			
		||||
	"Reload": "Reload",
 | 
			
		||||
	"Hard Reload": "Hard Reload",
 | 
			
		||||
	"Toggle Full Screen": "Toggle Full Screen",
 | 
			
		||||
	"Zoom In": "Zoom In",
 | 
			
		||||
	"Zoom Out": "Zoom Out",
 | 
			
		||||
	"Actual Size": "Actual Size",
 | 
			
		||||
	"Toggle Tray Icon": "Toggle Tray Icon",
 | 
			
		||||
	"Toggle Sidebar": "Toggle Sidebar",
 | 
			
		||||
	"Auto hide Menu bar": "Auto hide Menu bar",
 | 
			
		||||
	"History": "History",
 | 
			
		||||
	"Back": "Back",
 | 
			
		||||
	"Forward": "Forward",
 | 
			
		||||
	"Window": "Window",
 | 
			
		||||
	"Tools": "Tools",
 | 
			
		||||
	"Check for Updates": "Check for Updates",
 | 
			
		||||
	"Release Notes": "Release Notes",
 | 
			
		||||
	"Factory Reset": "Factory Reset",
 | 
			
		||||
	"Download App Logs": "Download App Logs",
 | 
			
		||||
	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App",
 | 
			
		||||
	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab",
 | 
			
		||||
	"Help": "Help",
 | 
			
		||||
	"About Zulip": "About Zulip",
 | 
			
		||||
	"Help Center": "Help Center",
 | 
			
		||||
	"Report an Issue": "Report an Issue",
 | 
			
		||||
	"Switch to Next Organization": "Switch to Next Organization",
 | 
			
		||||
	"Switch to Previous Organization": "Switch to Previous Organization",
 | 
			
		||||
	"General": "General",
 | 
			
		||||
	"Network": "Network",
 | 
			
		||||
	"AddServer": "AddServer",
 | 
			
		||||
	"Organizations": "Organizations",
 | 
			
		||||
	"Shortcuts": "Shortcuts",
 | 
			
		||||
	"Settings": "Settings",
 | 
			
		||||
	"Add a Zulip organization": "Add a Zulip organization",
 | 
			
		||||
	"Organization URL": "Organization URL",
 | 
			
		||||
	"Connect": "Connect",
 | 
			
		||||
	"OR": "OR",
 | 
			
		||||
	"Create a new organization": "Create a new organization",
 | 
			
		||||
	"Proxy": "Proxy",
 | 
			
		||||
	"Use system proxy settings (requires restart)": "Use system proxy settings (requires restart)",
 | 
			
		||||
	"Manual proxy configuration": "Manual proxy configuration",
 | 
			
		||||
	"script": "script",
 | 
			
		||||
	"Proxy rules": "Proxy rules",
 | 
			
		||||
	"Proxy bypass rules": "Proxy bypass rules",
 | 
			
		||||
	"Save": "Save",
 | 
			
		||||
	"Appearance": "Appearance",
 | 
			
		||||
	"Show app icon in system tray": "Show app icon in system tray",
 | 
			
		||||
	"Auto hide menu bar (Press Alt key to display)": "Auto hide menu bar (Press Alt key to display)",
 | 
			
		||||
	"Show sidebar": "Show sidebar",
 | 
			
		||||
	"Show app unread badge": "Show app unread badge",
 | 
			
		||||
	"Bounce dock on new private message": "Bounce dock on new private message",
 | 
			
		||||
	"Flash taskbar on new message": "Flash taskbar on new message",
 | 
			
		||||
	"Desktop Notifications": "Desktop Notifications",
 | 
			
		||||
	"Show desktop notifications": "Show desktop notifications",
 | 
			
		||||
	"Mute all sounds from Zulip": "Mute all sounds from Zulip",
 | 
			
		||||
	"App Updates": "App Updates",
 | 
			
		||||
	"Enable auto updates": "Enable auto updates",
 | 
			
		||||
	"Get beta updates": "Get beta updates",
 | 
			
		||||
	"Functionality": "Functionality",
 | 
			
		||||
	"Start app at login": "Start app at login",
 | 
			
		||||
	"Always start minimized": "Always start minimized",
 | 
			
		||||
	"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)",
 | 
			
		||||
	"Advanced": "Advanced",
 | 
			
		||||
	"Enable error reporting (requires restart)": "Enable error reporting (requires restart)",
 | 
			
		||||
	"Show downloaded files in file manager": "Show downloaded files in file manager",
 | 
			
		||||
	"Add custom CSS": "Add custom CSS",
 | 
			
		||||
	"Upload": "Upload",
 | 
			
		||||
	"Delete": "Delete",
 | 
			
		||||
	"Default download location": "Default download location",
 | 
			
		||||
	"Change": "Change",
 | 
			
		||||
	"Reset Application Data": "Reset Application Data",
 | 
			
		||||
	"This will delete all application data including all added accounts and preferences": "This will delete all application data including all added accounts and preferences",
 | 
			
		||||
	"Reset App Data": "Reset App Data",
 | 
			
		||||
	"Connected organizations": "Connected organizations",
 | 
			
		||||
	"All the connected orgnizations will appear here.": "All the connected orgnizations will appear here.",
 | 
			
		||||
	"Connect to another organization": "Connect to another organization",
 | 
			
		||||
	"Add Custom Certificates": "Add Custom Certificates",
 | 
			
		||||
	"Find accounts by email": "Find accounts by email",
 | 
			
		||||
	"All the connected orgnizations will appear here": "All the connected orgnizations will appear here",
 | 
			
		||||
	"Disconnect": "Disconnect",
 | 
			
		||||
	"Certificate file": "Certificate file",
 | 
			
		||||
	"Find accounts": "Find accounts",
 | 
			
		||||
	"Tip": "Tip",
 | 
			
		||||
	"These desktop app shortcuts extend the Zulip webapp's": "These desktop app shortcuts extend the Zulip webapp's",
 | 
			
		||||
	"keyboard shortcuts": "keyboard shortcuts",
 | 
			
		||||
	"Application Shortcuts": "Application Shortcuts",
 | 
			
		||||
	"Reset App Settings": "Reset App Settings",
 | 
			
		||||
	"Log Out": "Log Out",
 | 
			
		||||
	"Hide Zulip": "Hide Zulip",
 | 
			
		||||
	"Quit Zulip": "Quit Zulip",
 | 
			
		||||
	"Edit Shortcuts": "Edit Shortcuts",
 | 
			
		||||
	"Emoji & Symbols": "Emoji & Symbols",
 | 
			
		||||
	"View Shortcuts": "View Shortcuts",
 | 
			
		||||
	"Enter Full Screen": "Enter Full Screen",
 | 
			
		||||
	"History Shortcuts": "History Shortcuts",
 | 
			
		||||
	"Quit when the window is closed": "Quit when the window is closed",
 | 
			
		||||
	"File": "File",
 | 
			
		||||
	"Network and Proxy Settings": "Network and Proxy Settings",
 | 
			
		||||
	"Ask where to save files before downloading": "Ask where to save files before downloading"
 | 
			
		||||
	"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"
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										134
									
								
								app/translations/en_GB.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,134 @@
 | 
			
		||||
{
 | 
			
		||||
	"About Zulip": "About Zulip",
 | 
			
		||||
	"Actual Size": "Actual Size",
 | 
			
		||||
	"Add Custom Certificates": "Add Custom Certificates",
 | 
			
		||||
	"Add Organization": "Add Organisation",
 | 
			
		||||
	"Add a Zulip organization": "Add a Zulip organisation",
 | 
			
		||||
	"Add custom CSS": "Add custom CSS",
 | 
			
		||||
	"Advanced": "Advanced",
 | 
			
		||||
	"All the connected organizations will appear here": "All the connected organisations 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 organisation?",
 | 
			
		||||
	"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 organisation",
 | 
			
		||||
	"Connected organizations": "Connected organisations",
 | 
			
		||||
	"Copy": "Copy",
 | 
			
		||||
	"Copy Zulip URL": "Copy Zulip URL",
 | 
			
		||||
	"Create a new organization": "Create a new organisation",
 | 
			
		||||
	"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 Organisation",
 | 
			
		||||
	"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": "Organisation URL",
 | 
			
		||||
	"Organizations": "Organisations",
 | 
			
		||||
	"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": "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 Organisation",
 | 
			
		||||
	"Switch to Previous Organization": "Switch to Previous Organisation",
 | 
			
		||||
	"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 organisations, 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,117 +1,134 @@
 | 
			
		||||
{
 | 
			
		||||
	"About Zulip": "Acerca de Zulip",
 | 
			
		||||
	"Actual Size": "Tamaño real",
 | 
			
		||||
	"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 Zulip",
 | 
			
		||||
	"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": "Siempre empezar minimizado",
 | 
			
		||||
	"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 aplicación",
 | 
			
		||||
	"Are you sure you want to disconnect this organization?": "¿Estás seguro de que quieres desconectar esta organización?",
 | 
			
		||||
	"Auto hide Menu bar": "Ocultar automáticamente la barra de menú",
 | 
			
		||||
	"Auto hide menu bar (Press Alt key to display)": "Ocultar automáticamente la barra de menú (presionar la tecla Alt para mostrar)",
 | 
			
		||||
	"Back": "Espalda",
 | 
			
		||||
	"Bounce dock on new private message": "Bounce dock en nuevo mensaje privado",
 | 
			
		||||
	"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": "Cambio",
 | 
			
		||||
	"Check for Updates": "Buscar actualizaciones",
 | 
			
		||||
	"Change": "Cambiar",
 | 
			
		||||
	"Check for Updates": "Comprobar actualizaciones",
 | 
			
		||||
	"Close": "Cerrar",
 | 
			
		||||
	"Connect": "Conectar",
 | 
			
		||||
	"Connect to another organization": "Conectarse a otra organización",
 | 
			
		||||
	"Connected organizations": "Organizaciones conectadas",
 | 
			
		||||
	"Copy": "Dupdo",
 | 
			
		||||
	"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 de descarga predeterminada",
 | 
			
		||||
	"Delete": "Borrar",
 | 
			
		||||
	"Desktop App Settings": "Configuración de la aplicación de escritorio",
 | 
			
		||||
	"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": "Configuraciones de escritorio",
 | 
			
		||||
	"Desktop Settings": "Ajustes de escritorio",
 | 
			
		||||
	"Disconnect": "Desconectar",
 | 
			
		||||
	"Download App Logs": "Descargar App Logs",
 | 
			
		||||
	"Download App Logs": "Descargar registros de la aplicación",
 | 
			
		||||
	"Edit": "Editar",
 | 
			
		||||
	"Edit Shortcuts": "Editar accesos directos",
 | 
			
		||||
	"Enable auto updates": "Habilitar actualizaciones automáticas",
 | 
			
		||||
	"Enable error reporting (requires restart)": "Habilitar informes de errores (requiere reinicio)",
 | 
			
		||||
	"Enable spellchecker (requires restart)": "Habilitar el corrector ortográfico (requiere reinicio)",
 | 
			
		||||
	"Factory Reset": "Restablecimiento de fábrica",
 | 
			
		||||
	"File": "Expediente",
 | 
			
		||||
	"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": "Encuentra cuentas por correo electrónico",
 | 
			
		||||
	"Flash taskbar on new message": "Flash barra de tareas en nuevo mensaje",
 | 
			
		||||
	"Forward": "Adelante",
 | 
			
		||||
	"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": "Recibe actualizaciones beta",
 | 
			
		||||
	"Hard Reload": "Recarga dura",
 | 
			
		||||
	"Get beta updates": "Obtener actualizaciones beta",
 | 
			
		||||
	"Hard Reload": "Recarga forzosa",
 | 
			
		||||
	"Help": "Ayuda",
 | 
			
		||||
	"Help Center": "Centro de ayuda",
 | 
			
		||||
	"History": "Historia",
 | 
			
		||||
	"History Shortcuts": "Atajos de historia",
 | 
			
		||||
	"History": "Historial",
 | 
			
		||||
	"History Shortcuts": "Atajos del historial",
 | 
			
		||||
	"Keyboard Shortcuts": "Atajos de teclado",
 | 
			
		||||
	"Log Out": "Cerrar sesión",
 | 
			
		||||
	"Log Out of Organization": "Salir de la organizació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": "Silencia todos los sonidos de Zulip",
 | 
			
		||||
	"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 combinar estilo",
 | 
			
		||||
	"Proxy": "Apoderado",
 | 
			
		||||
	"Proxy bypass rules": "Reglas de omisión de proxy",
 | 
			
		||||
	"Proxy rules": "Reglas de proxy",
 | 
			
		||||
	"Quit": "Dejar",
 | 
			
		||||
	"Quit Zulip": "Dejar Zulip",
 | 
			
		||||
	"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 lanzamiento",
 | 
			
		||||
	"Release Notes": "Notas de la versión",
 | 
			
		||||
	"Reload": "Recargar",
 | 
			
		||||
	"Report an Issue": "Reportar un problema",
 | 
			
		||||
	"Reset App Data": "Restablecer datos de la aplicación",
 | 
			
		||||
	"Reset App Settings": "Restablecer la configuración de la aplicación",
 | 
			
		||||
	"Reset Application Data": "Restablecer datos de aplicación",
 | 
			
		||||
	"Save": "Salvar",
 | 
			
		||||
	"Report an Issue": "Informar de un error",
 | 
			
		||||
	"Save": "Guardar",
 | 
			
		||||
	"Select All": "Seleccionar todo",
 | 
			
		||||
	"Settings": "Ajustes",
 | 
			
		||||
	"Shortcuts": "Atajos",
 | 
			
		||||
	"Show App Logs": "Mostrar registros de aplicaciones",
 | 
			
		||||
	"Show app icon in system tray": "Mostrar icono de la aplicación en la bandeja del sistema",
 | 
			
		||||
	"Show app unread badge": "Mostrar la aplicación de placa sin leer",
 | 
			
		||||
	"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 los archivos descargados en el administrador de archivos",
 | 
			
		||||
	"Show downloaded files in file manager": "Mostrar archivos descargados en el explorador",
 | 
			
		||||
	"Show sidebar": "Mostrar barra lateral",
 | 
			
		||||
	"Start app at login": "Iniciar la aplicación al iniciar sesión",
 | 
			
		||||
	"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 organización anterior",
 | 
			
		||||
	"These desktop app shortcuts extend the Zulip webapp's": "Estos accesos directos de aplicaciones de escritorio extienden las aplicaciones web de Zulip.",
 | 
			
		||||
	"This will delete all application data including all added accounts and preferences": "Esto eliminará todos los datos de la aplicación, incluidas todas las cuentas y preferencias agregadas.",
 | 
			
		||||
	"Tip": "Propina",
 | 
			
		||||
	"Toggle DevTools for Active Tab": "Alternar DevTools para Active Tab",
 | 
			
		||||
	"Toggle DevTools for Zulip App": "Alternar DevTools para Zulip App",
 | 
			
		||||
	"Toggle Do Not Disturb": "Alternar No molestar",
 | 
			
		||||
	"Toggle Full Screen": "Alternar pantalla completa",
 | 
			
		||||
	"Toggle Sidebar": "Alternar barra lateral",
 | 
			
		||||
	"Toggle Tray Icon": "Icono de bandeja de palanca",
 | 
			
		||||
	"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 la configuración del proxy del sistema (requiere reinicio)",
 | 
			
		||||
	"Use system proxy settings (requires restart)": "Usar ajustes de proxy del sistema (necesita reinicio)",
 | 
			
		||||
	"View": "Ver",
 | 
			
		||||
	"View Shortcuts": "Ver accesos directos",
 | 
			
		||||
	"View Shortcuts": "Ver atajos",
 | 
			
		||||
	"Window": "Ventana",
 | 
			
		||||
	"Window Shortcuts": "Atajos de ventana",
 | 
			
		||||
	"YES": "SÍ",
 | 
			
		||||
	"Zoom In": "Acercarse",
 | 
			
		||||
	"Zoom Out": "Disminuir el zoom",
 | 
			
		||||
	"Zulip Help": "Ayuda de Zulip",
 | 
			
		||||
	"Zoom In": "Aumentar zoom",
 | 
			
		||||
	"Zoom Out": "Reducir zoom",
 | 
			
		||||
	"Zulip Help": "Ayuda sobre Zulip",
 | 
			
		||||
	"keyboard shortcuts": "atajos de teclado",
 | 
			
		||||
	"script": "guión"
 | 
			
		||||
	"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"
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										134
									
								
								app/translations/fa.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,134 @@
 | 
			
		||||
{
 | 
			
		||||
	"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"
 | 
			
		||||
}
 | 
			
		||||