release: New release v5.5.0.

Signed-off-by: Anders Kaseorg <anders@zulip.com>

README.md

@@ -1,12 +1,13 @@
 # Zulip Desktop Client
-[![Build Status](https://travis-ci.org/zulip/zulip-desktop.svg?branch=master)](https://travis-ci.org/zulip/zulip-desktop)
+[![Build Status](https://travis-ci.com/zulip/zulip-desktop.svg?branch=master)](https://travis-ci.com/github/zulip/zulip-desktop)
 [![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-desktop?branch=master&svg=true)](https://ci.appveyor.com/project/zulip/zulip-desktop/branch/master)
 [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
 [![project chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://chat.zulip.org)
 
 Desktop client for Zulip. Available for Mac, Linux, and Windows.
 
-<img src="http://i.imgur.com/ChzTq4F.png"/>
+![screenshot](https://i.imgur.com/s1o6TRA.png)
+![screenshot](https://i.imgur.com/vekKnW4.png)
 
 # Download
 Please see the [installation guide](https://zulip.com/help/desktop-app-install-guide).

app/main/autoupdater.ts

@@ -1,20 +1,26 @@
-import {app, dialog} from 'electron';
-import {UpdateDownloadedEvent, UpdateInfo, 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;
 	}
 
@@ -94,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
-	(async () => autoUpdater.checkForUpdates())();
+	await autoUpdater.checkForUpdates();
 }

app/main/index.ts

@@ -1,23 +1,21 @@
-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, dialog, ipcMain, session} 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;
@@ -71,15 +69,12 @@ const toggleApp = (): void => {
 
 function createMainWindow(): Electron.BrowserWindow {
 	// Load the previous state with fallback to defaults
-	const mainWindowState: windowStateKeeper.State = windowStateKeeper({
+	mainWindowState = windowStateKeeper({
 		defaultWidth: 1100,
 		defaultHeight: 720,
 		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',
@@ -91,7 +86,8 @@ function createMainWindow(): Electron.BrowserWindow {
 		minWidth: 500,
 		minHeight: 400,
 		webPreferences: {
-			plugins: true,
+			contextIsolation: false,
+			enableRemoteModule: true,
 			nodeIntegration: true,
 			partition: 'persist:webviewsession',
 			webviewTag: true
@@ -167,6 +163,7 @@ app.on('activate', () => {
 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'));
 	});
@@ -208,46 +205,29 @@ 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();
 		}
 	});
 
 	app.on('certificate-error', (
 		event: Event,
 		webContents: Electron.WebContents,
-		url: 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 {origin} = new URL(url);
-		const filename = CertificateUtil.getCertificate(encodeURIComponent(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);
-			}
-		}
-
+		urlString: string,
+		error: string
+	) => {
+		const url = new URL(urlString);
 		dialog.showErrorBox(
 			'Certificate error',
-			`The server presented an invalid certificate for ${origin}:
+			`The server presented an invalid certificate for ${url.origin}:
 
 ${error}`
 		);
@@ -278,32 +258,6 @@ ${error}`
 		app.quit();
 	});
 
-	// Code to show pdf in a new BrowserWindow (currently commented out due to bug-upstream)
-	// ipcMain.on('pdf-view', (event, url) => {
-	// 	// Paddings for pdfWindow so that it fits into the main browserWindow
-	// 	const paddingWidth = 55;
-	// 	const paddingHeight = 22;
-
-	// 	// Get the config of main browserWindow
-	// 	const mainWindowState = global.mainWindowState;
-
-	// 	// Window to view the pdf file
-	// 	const pdfWindow = new electron.BrowserWindow({
-	// 		x: mainWindowState.x + paddingWidth,
-	// 		y: mainWindowState.y + paddingHeight,
-	// 		width: mainWindowState.width - paddingWidth,
-	// 		height: mainWindowState.height - paddingHeight,
-	// 		webPreferences: {
-	// 			plugins: true,
-	// 			partition: 'persist:webviewsession'
-	// 		}
-	// 	});
-	// 	pdfWindow.loadURL(url);
-
-	// 	// We don't want to have the menu bar in pdf window
-	// 	pdfWindow.setMenu(null);
-	// });
-
 	// Reload full app not just webview, useful in debugging
 	ipcMain.on('reload-full-app', () => {
 		mainWindow.reload();
@@ -311,7 +265,7 @@ ${error}`
 	});
 
 	ipcMain.on('clear-app-settings', () => {
-		globalPatched.mainWindowState.unmanage();
+		mainWindowState.unmanage();
 		app.relaunch();
 		app.exit();
 	});
@@ -348,7 +302,7 @@ ${error}`
 		AppMenu.setMenu(props);
 		const activeTab = props.tabs[props.activeTabIndex];
 		if (activeTab) {
-			mainWindow.setTitle(`Zulip - ${activeTab.webview.props.name}`);
+			mainWindow.setTitle(`Zulip - ${activeTab.webviewName}`);
 		}
 	});
 
@@ -360,7 +314,7 @@ ${error}`
 		page.downloadURL(url);
 		page.session.once('will-download', async (_event: Event, item) => {
 			if (ConfigUtil.getConfigItem('promptDownload', false)) {
-				const showDialogOptions: object = {
+				const showDialogOptions: electron.SaveDialogOptions = {
 					defaultPath: path.join(downloadPath, item.getFilename())
 				};
 				item.setSaveDialogOptions(showDialogOptions);

app/main/linuxupdater.ts

@@ -1,52 +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, response: request.Response, body: string) => {
-		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 (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);
-				}
-			}
-		} 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: unknown) {
+		logger.error('Linux update error.');
+		logger.error(error);
+	}
 }

app/main/menu.ts

@@ -1,15 +1,17 @@
 import {app, shell, BrowserWindow, Menu} from 'electron';
-import {appUpdater} from './autoupdater';
 
 import AdmZip from 'adm-zip';
-import * as DNDUtil from '../renderer/js/utils/dnd-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';
-import type {ServerOrFunctionalTab} from '../renderer/js/main';
+
+import {appUpdater} from './autoupdater';
 
 export interface MenuProps {
-	tabs: ServerOrFunctionalTab[];
+	tabs: TabData[];
 	activeTabIndex?: number;
 	enableMenu?: boolean;
 }
@@ -41,8 +43,8 @@ function getHistorySubmenu(enableMenu: boolean): Electron.MenuItemConstructorOpt
 function getToolsSubmenu(): Electron.MenuItemConstructorOptions[] {
 	return [{
 		label: t.__('Check for Updates'),
-		click() {
-			checkForUpdate();
+		async click() {
+			await checkForUpdate();
 		}
 	},
 	{
@@ -213,7 +215,7 @@ function getHelpSubmenu(): Electron.MenuItemConstructorOptions[] {
 	];
 }
 
-function getWindowSubmenu(tabs: ServerOrFunctionalTab[], activeTabIndex: number): Electron.MenuItemConstructorOptions[] {
+function getWindowSubmenu(tabs: TabData[], activeTabIndex: number): Electron.MenuItemConstructorOptions[] {
 	const initialSubmenu: Electron.MenuItemConstructorOptions[] = [{
 		label: t.__('Minimize'),
 		role: 'minimize'
@@ -229,17 +231,17 @@ function getWindowSubmenu(tabs: ServerOrFunctionalTab[], activeTabIndex: number)
 		});
 		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,
+				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'
@@ -306,7 +308,7 @@ function getDarwinTpl(props: MenuProps): Electron.MenuItemConstructorOptions[] {
 			enabled: enableMenu,
 			click(_item, focusedWindow) {
 				if (focusedWindow) {
-					sendAction('shortcut');
+					sendAction('show-keyboard-shortcuts');
 				}
 			}
 		}, {
@@ -448,7 +450,7 @@ function getOtherTpl(props: MenuProps): Electron.MenuItemConstructorOptions[] {
 			enabled: enableMenu,
 			click(_item, focusedWindow) {
 				if (focusedWindow) {
-					sendAction('shortcut');
+					sendAction('show-keyboard-shortcuts');
 				}
 			}
 		}, {
@@ -541,24 +543,24 @@ function sendAction(action: string, ...parameters: unknown[]): void {
 	win.webContents.send(action, ...parameters);
 }
 
-function checkForUpdate(): void {
-	appUpdater(true);
+async function checkForUpdate(): Promise<void> {
+	await appUpdater(true);
 }
 
-function getNextServer(tabs: ServerOrFunctionalTab[], 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: ServerOrFunctionalTab[], 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;
 }

app/main/request.ts

@@ -0,0 +1,112 @@
+import {ClientRequest, IncomingMessage, app, net} from 'electron';
+import fs from 'fs';
+import path from 'path';
+import stream from 'stream';
+import util from 'util';
+
+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: 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: unknown) {
+		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: unknown) {
+		logger.log(error);
+		return false;
+	}
+};

app/main/startup.ts

@@ -2,6 +2,7 @@ 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 = async (AutoLaunchValue: boolean): Promise<void> => {
@@ -18,11 +19,7 @@ export const setAutoLaunch = async (AutoLaunchValue: boolean): Promise<void> =>
 			name: 'Zulip',
 			isHidden: false
 		});
-		if (autoLaunchOption) {
-			await ZulipAutoLauncher.enable();
-		} else {
-			await ZulipAutoLauncher.disable();
-		}
+		await (autoLaunchOption ? ZulipAutoLauncher.enable() : ZulipAutoLauncher.disable());
 	} else {
 		app.setLoginItemSettings({
 			openAtLogin: autoLaunchOption,

app/renderer/about.html

@@ -26,8 +26,7 @@
 
             const { app } = require('electron').remote;
             const version_tag = document.querySelector('#version');
-            version_tag.innerHTML = 'v' + app.getVersion();
+            version_tag.textContent = 'v' + app.getVersion();
         </script>
-        <script>require('./js/shared/preventdrag.js')</script>
     </body>
 </html>

app/renderer/css/preference.css

@@ -389,6 +389,10 @@ img.server-info-icon {
     margin: 6px;
 }
 
+#note {
+    font-size: 10px;
+}
+
 .code {
     font-family: Courier New, Courier, monospace;
 }
@@ -618,10 +622,6 @@ input.toggle-round:checked + label::after {
     max-width: 100%;
 }
 
-#add-certificate-button {
-    margin: 10px 10px 10px 37px;
-}
-
 .tip {
     background: none;
     padding: 0;

app/renderer/js/clipboard-decrypter.ts

@@ -1,5 +1,5 @@
-import {clipboard} from 'electron';
 import crypto from 'crypto';
+import {clipboard} from 'electron';
 
 // This helper is exposed via electron_bridge for use in the social
 // login flow.
@@ -59,7 +59,7 @@ export class ClipboardDecrypterImpl implements ClipboardDecrypter {
 					plaintext =
 						decipher.update(ciphertext, undefined, 'utf8') +
 						decipher.final('utf8');
-				} catch (_) {
+				} catch {
 					// If the parsing or decryption failed in any way,
 					// the correct token hasn’t been copied yet; try
 					// again next time.

app/renderer/js/components/base.ts

@@ -1,7 +1,7 @@
 export default class BaseComponent {
-	generateNodeFromTemplate(template: string): Element | null {
+	generateNodeFromHTML(html: string): Element | null {
 		const wrapper = document.createElement('div');
-		wrapper.innerHTML = template;
+		wrapper.innerHTML = html;
 		return wrapper.firstElementChild;
 	}
 }

app/renderer/js/components/context-menu.ts

@@ -1,10 +1,14 @@
 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 = Boolean(props.selectionText.length);
-	const isLink = Boolean(props.linkURL);
+	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,
@@ -21,7 +25,8 @@ export const contextMenu = (webContents: Electron.WebContents, event: Event, pro
 			webContents.session.addWordToSpellCheckerDictionary(props.misspelledWord);
 		}
 	}, {
-		type: 'separator'
+		type: 'separator',
+		visible: props.isEditable && isText && props.misspelledWord.length !== 0
 	}, {
 		label: `${t.__('Look Up')} "${props.selectionText}"`,
 		visible: process.platform === 'darwin' && isText,
@@ -29,7 +34,8 @@ export const contextMenu = (webContents: Electron.WebContents, event: Event, pro
 			webContents.showDefinitionForSelection();
 		}
 	}, {
-		type: 'separator'
+		type: 'separator',
+		visible: process.platform === 'darwin' && isText
 	}, {
 		label: t.__('Cut'),
 		visible: isText,
@@ -41,6 +47,7 @@ export const contextMenu = (webContents: Electron.WebContents, event: Event, pro
 	}, {
 		label: t.__('Copy'),
 		accelerator: 'CommandOrControl+C',
+		enabled: props.editFlags.canCopy,
 		click(_item) {
 			webContents.copy();
 		}
@@ -54,12 +61,12 @@ export const contextMenu = (webContents: Electron.WebContents, event: Event, pro
 	}, {
 		type: 'separator'
 	}, {
-		label: t.__('Copy Link'),
-		visible: isText && isLink,
+		label: isEmailAddress ? t.__('Copy Email Address') : t.__('Copy Link'),
+		visible: isLink,
 		click(_item) {
 			clipboard.write({
 				bookmark: props.linkText,
-				text: props.linkURL
+				text: isEmailAddress ? linkURL.pathname : props.linkURL
 			});
 		}
 	}, {
@@ -78,7 +85,8 @@ export const contextMenu = (webContents: Electron.WebContents, event: Event, pro
 			});
 		}
 	}, {
-		type: 'separator'
+		type: 'separator',
+		visible: isLink || props.mediaType === 'image'
 	}, {
 		label: t.__('Services'),
 		visible: process.platform === 'darwin',
@@ -96,7 +104,12 @@ export const contextMenu = (webContents: Electron.WebContents, event: Event, pro
 			});
 		}
 	}
+	// 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 menu = Menu.buildFromTemplate(menuTemplate);
+	const filteredMenuTemplate = menuTemplate.filter(menuItem => menuItem.visible ?? true);
+	const menu = Menu.buildFromTemplate(filteredMenuTemplate);
 	menu.popup();
 };

app/renderer/js/components/functional-tab.ts

@@ -1,3 +1,5 @@
+import {htmlEscape} from 'escape-goat';
+
 import Tab, {TabProps} from './tab';
 
 export default class FunctionalTab extends Tab {
@@ -8,19 +10,21 @@ export default class FunctionalTab extends Tab {
 		this.init();
 	}
 
-	template(): string {
-		return `<div class="tab functional-tab" data-tab-id="${this.props.tabIndex}">
-					<div class="server-tab-badge close-button">
-						<i class="material-icons">close</i>
-					</div>
-					<div class="server-tab">
-						<i class="material-icons">${this.props.materialIcon}</i>
-					</div>
-				</div>`;
+	templateHTML(): string {
+		return htmlEscape`
+			<div class="tab functional-tab" data-tab-id="${this.props.tabIndex}">
+				<div class="server-tab-badge close-button">
+					<i class="material-icons">close</i>
+				</div>
+				<div class="server-tab">
+					<i class="material-icons">${this.props.materialIcon}</i>
+				</div>
+			</div>
+		`;
 	}
 
 	init(): void {
-		this.$el = this.generateNodeFromTemplate(this.template());
+		this.$el = this.generateNodeFromHTML(this.templateHTML());
 		if (this.props.name !== 'Settings') {
 			this.props.$root.append(this.$el);
 			this.$closeButton = this.$el.querySelectorAll('.server-tab-badge')[0];

app/renderer/js/components/handle-external-link.ts

@@ -1,7 +1,8 @@
 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;

app/renderer/js/components/server-tab.ts

@@ -1,8 +1,11 @@
 import {ipcRenderer} from 'electron';
 
-import Tab, {TabProps} from './tab';
+import {htmlEscape} from 'escape-goat';
+
 import * as SystemUtil from '../utils/system-util';
 
+import Tab, {TabProps} from './tab';
+
 export default class ServerTab extends Tab {
 	$badge: Element;
 
@@ -11,19 +14,21 @@ export default class ServerTab extends Tab {
 		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>
-					<div class="server-tab-badge"></div>
-					<div class="server-tab">
-					<img class="server-icons" src='${this.props.icon}'/>
-					</div>
-					<div class="server-tab-shortcut">${this.generateShortcutText()}</div>
-				</div>`;
+	templateHTML(): string {
+		return htmlEscape`
+			<div class="tab" data-tab-id="${this.props.tabIndex}">
+				<div class="server-tooltip" style="display:none">${this.props.name}</div>
+				<div class="server-tab-badge"></div>
+				<div class="server-tab">
+					<img class="server-icons" src="${this.props.icon}"/>
+				</div>
+				<div class="server-tab-shortcut">${this.generateShortcutText()}</div>
+			</div>
+		`;
 	}
 
 	init(): void {
-		this.$el = this.generateNodeFromTemplate(this.template());
+		this.$el = this.generateNodeFromHTML(this.templateHTML());
 		this.props.$root.append(this.$el);
 		this.registerListeners();
 		this.$badge = this.$el.querySelectorAll('.server-tab-badge')[0];
@@ -32,7 +37,7 @@ export default class ServerTab extends Tab {
 	updateBadge(count: number): void {
 		if (count > 0) {
 			const formattedCount = count > 999 ? '1K+' : count.toString();
-			this.$badge.innerHTML = formattedCount;
+			this.$badge.textContent = formattedCount;
 			this.$badge.classList.add('active');
 		} else {
 			this.$badge.classList.remove('active');
@@ -49,11 +54,7 @@ export default class ServerTab extends Tab {
 
 		let shortcutText = '';
 
-		if (SystemUtil.getOS() === 'Mac') {
-			shortcutText = `⌘ ${shownIndex}`;
-		} else {
-			shortcutText = `Ctrl+${shownIndex}`;
-		}
+		shortcutText = SystemUtil.getOS() === 'Mac' ? `⌘ ${shownIndex}` : `Ctrl+${shownIndex}`;
 
 		// Array index == Shown index - 1
 		ipcRenderer.send('switch-server-tab', shownIndex - 1);

app/renderer/js/components/tab.ts

@@ -1,5 +1,5 @@
-import WebView from './webview';
 import BaseComponent from './base';
+import WebView from './webview';
 
 export interface TabProps {
 	role: string;

app/renderer/js/components/webview.ts

@@ -1,12 +1,15 @@
 import {ipcRenderer, remote} from 'electron';
-
-import path from 'path';
 import fs from 'fs';
+import path from 'path';
+
+import {htmlEscape} from 'escape-goat';
+
 import * as ConfigUtil from '../utils/config-util';
 import * as SystemUtil from '../utils/system-util';
+
 import BaseComponent from './base';
-import handleExternalLink from './handle-external-link';
 import {contextMenu} from './context-menu';
+import handleExternalLink from './handle-external-link';
 
 const {app, dialog} = remote;
 
@@ -49,25 +52,26 @@ export default class WebView extends BaseComponent {
 		this.$webviewsContainer = document.querySelector('#webviews-container').classList;
 	}
 
-	template(): string {
-		return `<webview
-					class="disabled"
-					data-tab-id="${this.props.tabIndex}"
-					src="${this.props.url}"
-					${this.props.nodeIntegration ? 'nodeIntegration' : ''}
-					${this.props.preload ? 'preload="js/preload.js"' : ''}
-					partition="persist:webviewsession"
-					name="${this.props.name}"
-					webpreferences="
-						${this.props.nodeIntegration ? '' : 'contextIsolation,'}
-						${ConfigUtil.getConfigItem('enableSpellchecker') ? 'spellcheck,' : ''}
-						javascript
-					">
-				</webview>`;
+	templateHTML(): string {
+		return htmlEscape`
+			<webview
+				class="disabled"
+				data-tab-id="${this.props.tabIndex}"
+				src="${this.props.url}"
+				` + (this.props.nodeIntegration ? 'nodeIntegration' : '') + htmlEscape`
+				` + (this.props.preload ? 'preload="js/preload.js"' : '') + htmlEscape`
+				partition="persist:webviewsession"
+				name="${this.props.name}"
+				webpreferences="
+					contextIsolation=${!this.props.nodeIntegration},
+					spellcheck=${Boolean(ConfigUtil.getConfigItem('enableSpellchecker'))}
+				">
+			</webview>
+		`;
 	}
 
 	init(): void {
-		this.$el = this.generateNodeFromTemplate(this.template()) as Electron.WebviewTag;
+		this.$el = this.generateNodeFromHTML(this.templateHTML()) as Electron.WebviewTag;
 		this.domReady = new Promise(resolve => {
 			this.$el.addEventListener('dom-ready', () => resolve(), true);
 		});
@@ -216,7 +220,7 @@ export default class WebView extends BaseComponent {
 
 	focus(): void {
 		// Focus Webview and it's contents when Window regain focus.
-		const webContents = this.$el.getWebContents();
+		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) {
@@ -261,8 +265,8 @@ export default class WebView extends BaseComponent {
 		ipcRenderer.sendTo(this.$el.getWebContentsId(), 'logout');
 	}
 
-	showShortcut(): void {
-		ipcRenderer.sendTo(this.$el.getWebContentsId(), 'shortcut');
+	showKeyboardShortcuts(): void {
+		ipcRenderer.sendTo(this.$el.getWebContentsId(), 'show-keyboard-shortcuts');
 	}
 
 	openDevTools(): void {

app/renderer/js/electron-bridge.ts

@@ -1,69 +1,61 @@
 import {ipcRenderer} from 'electron';
-
 import {EventEmitter} from 'events';
 
+import isDev from 'electron-is-dev';
+
 import {ClipboardDecrypterImpl} from './clipboard-decrypter';
 import {NotificationData, newNotification} from './notification';
 
 type ListenerType = ((...args: any[]) => void);
 
-class ElectronBridgeImpl extends EventEmitter implements ElectronBridge {
-	send_notification_reply_message_supported: boolean;
-	idle_on_system: boolean;
-	last_active_on_system: number;
+let notificationReplySupported = false;
+// Indicates if the user is idle or not
+let idle = false;
+// Indicates the time at which user was last active
+let lastActive = Date.now();
 
-	constructor() {
-		super();
-		this.send_notification_reply_message_supported = false;
-		// Indicates if the user is idle or not
-		this.idle_on_system = false;
+export const bridgeEvents = new EventEmitter();
 
-		// Indicates the time at which user was last active
-		this.last_active_on_system = Date.now();
-	}
+const electron_bridge: ElectronBridge = {
+	send_event: (eventName: string | symbol, ...args: unknown[]): boolean =>
+		bridgeEvents.emit(eventName, ...args),
 
-	send_event = (eventName: string | symbol, ...args: unknown[]): void => {
-		this.emit(eventName, ...args);
-	};
+	on_event: (eventName: string, listener: ListenerType): void => {
+		bridgeEvents.on(eventName, listener);
+	},
 
-	on_event = (eventName: string, listener: ListenerType): void => {
-		this.on(eventName, listener);
-	};
-
-	new_notification = (
+	new_notification: (
 		title: string,
 		options: NotificationOptions | undefined,
 		dispatch: (type: string, eventInit: EventInit) => boolean
 	): NotificationData =>
-		newNotification(title, options, dispatch);
+		newNotification(title, options, dispatch),
 
-	get_idle_on_system = (): boolean => this.idle_on_system;
+	get_idle_on_system: (): boolean => idle,
 
-	get_last_active_on_system = (): number => this.last_active_on_system;
+	get_last_active_on_system: (): number => lastActive,
 
-	get_send_notification_reply_message_supported = (): boolean =>
-		this.send_notification_reply_message_supported;
+	get_send_notification_reply_message_supported: (): boolean =>
+		notificationReplySupported,
 
-	set_send_notification_reply_message_supported = (value: boolean): void => {
-		this.send_notification_reply_message_supported = value;
-	};
+	set_send_notification_reply_message_supported: (value: boolean): void => {
+		notificationReplySupported = value;
+	},
 
-	decrypt_clipboard = (version: number): ClipboardDecrypterImpl =>
-		new ClipboardDecrypterImpl(version);
-}
+	decrypt_clipboard: (version: number): ClipboardDecrypterImpl =>
+		new ClipboardDecrypterImpl(version)
+};
 
-const electron_bridge = new ElectronBridgeImpl();
-
-electron_bridge.on('total_unread_count', (...args) => {
+bridgeEvents.on('total_unread_count', (...args) => {
 	ipcRenderer.send('unread-count', ...args);
 });
 
-electron_bridge.on('realm_name', realmName => {
+bridgeEvents.on('realm_name', realmName => {
 	const serverURL = location.origin;
 	ipcRenderer.send('realm-name-changed', serverURL, realmName);
 });
 
-electron_bridge.on('realm_icon_url', (iconURL: unknown) => {
+bridgeEvents.on('realm_icon_url', (iconURL: unknown) => {
 	if (typeof iconURL !== 'string') {
 		throw new TypeError('Expected string for iconURL');
 	}
@@ -73,6 +65,25 @@ electron_bridge.on('realm_icon_url', (iconURL: unknown) => {
 	ipcRenderer.send('realm-icon-changed', serverURL, iconURL);
 });
 
+// Set user as active and update the time of last activity
+ipcRenderer.on('set-active', () => {
+	if (isDev) {
+		console.log('active');
+	}
+
+	idle = false;
+	lastActive = Date.now();
+});
+
+// Set user as idle and time of last activity is left unchanged
+ipcRenderer.on('set-idle', () => {
+	if (isDev) {
+		console.log('idle');
+	}
+
+	idle = true;
+});
+
 // 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

app/renderer/js/feedback.ts

@@ -1,8 +1,8 @@
 import {remote} from 'electron';
-import SendFeedback from '@electron-elements/send-feedback';
-
-import path from 'path';
 import fs from 'fs';
+import path from 'path';
+
+import SendFeedback from '@electron-elements/send-feedback';
 
 const {app} = remote;
 

app/renderer/js/injected.ts

@@ -9,13 +9,7 @@ interface CompatElectronBridge extends ElectronBridge {
 (() => {
 	const zulipWindow = window as typeof window & {
 		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;
-		};
+		page_params?: unknown;
 		raw_electron_bridge: ElectronBridge;
 	};
 
@@ -41,27 +35,6 @@ interface CompatElectronBridge extends ElectronBridge {
 
 	zulipWindow.electron_bridge = electron_bridge;
 
-	(async () => {
-		if (document.readyState === 'loading') {
-			await new Promise(resolve => {
-				document.addEventListener('DOMContentLoaded', () => {
-					resolve();
-				});
-			});
-		}
-
-		const {page_params} = zulipWindow;
-		if (page_params) {
-			electron_bridge.send_event('zulip-loaded');
-		}
-	})();
-
-	electron_bridge.on_event('narrow-by-topic', (id: number) => {
-		const {narrow} = zulipWindow;
-		const narrowByTopic = narrow.by_topic || narrow.by_subject;
-		narrowByTopic(id, {trigger: 'notification'});
-	});
-
 	function attributeListener<T extends EventTarget>(type: string): PropertyDescriptor {
 		const symbol = Symbol('on' + type);
 

app/renderer/js/main.ts

@@ -1,27 +1,27 @@
 import {ipcRenderer, remote, clipboard} from 'electron';
-import {feedbackHolder} from './feedback';
-
 import path from 'path';
-import escape from 'escape-html';
+
 import isDev from 'electron-is-dev';
-const {session, app, Menu, dialog} = remote;
+
+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 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';
-import type {DNDSettings} from './utils/dnd-util';
+const {session, app, Menu, dialog} = remote;
 
 interface FunctionalTabProps {
 	name: string;
@@ -59,7 +59,14 @@ const logger = new Logger({
 });
 
 const rendererDirectory = path.resolve(__dirname, '..');
-export type ServerOrFunctionalTab = ServerTab | FunctionalTab;
+type ServerOrFunctionalTab = ServerTab | FunctionalTab;
+
+export interface TabData {
+	role: string;
+	name: string;
+	index: number;
+	webviewName: string;
+}
 
 class ServerManagerView {
 	$addServerButton: HTMLButtonElement;
@@ -116,7 +123,7 @@ class ServerManagerView {
 
 		this.$fullscreenPopup = document.querySelector('#fullscreen-popup');
 		this.$fullscreenEscapeKey = process.platform === 'darwin' ? '^⌘F' : 'F11';
-		this.$fullscreenPopup.innerHTML = `Press ${this.$fullscreenEscapeKey} to exit full screen`;
+		this.$fullscreenPopup.textContent = `Press ${this.$fullscreenEscapeKey} to exit full screen`;
 
 		this.loading = new Set();
 		this.activeTabIndex = -1;
@@ -154,19 +161,15 @@ class ServerManagerView {
 		}
 
 		const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
-		if (proxyEnabled) {
-			await session.fromPartition('persist:webviewsession').setProxy({
-				pacScript: ConfigUtil.getConfigItem('proxyPAC', ''),
-				proxyRules: ConfigUtil.getConfigItem('proxyRules', ''),
-				proxyBypassRules: ConfigUtil.getConfigItem('proxyBypass', '')
-			});
-		} else {
-			await session.fromPartition('persist:webviewsession').setProxy({
-				pacScript: '',
-				proxyRules: '',
-				proxyBypassRules: ''
-			});
-		}
+		await session.fromPartition('persist:webviewsession').setProxy(proxyEnabled ? {
+			pacScript: ConfigUtil.getConfigItem('proxyPAC', ''),
+			proxyRules: ConfigUtil.getConfigItem('proxyRules', ''),
+			proxyBypassRules: ConfigUtil.getConfigItem('proxyBypass', '')
+		} : {
+			pacScript: '',
+			proxyRules: '',
+			proxyBypassRules: ''
+		});
 	}
 
 	// Settings are initialized only when user clicks on General/Server/Network section settings
@@ -248,7 +251,7 @@ class ServerManagerView {
 			const serverConf = await DomainUtil.checkDomain(domain);
 			await DomainUtil.addDomain(serverConf);
 			return true;
-		} catch (error) {
+		} catch (error: unknown) {
 			logger.error(error);
 			logger.error(`Could not add ${domain}. Please contact your system administrator.`);
 			return false;
@@ -349,7 +352,7 @@ class ServerManagerView {
 		this.tabs.push(new ServerTab({
 			role: 'server',
 			icon: server.icon,
-			name: CommonUtil.decodeString(server.alias),
+			name: server.alias,
 			$root: this.$tabsContainer,
 			onClick: this.activateLastTab.bind(this, index),
 			index,
@@ -362,7 +365,7 @@ class ServerManagerView {
 				tabIndex,
 				url: server.url,
 				role: 'server',
-				name: CommonUtil.decodeString(server.alias),
+				name: server.alias,
 				hasPermission: (origin: string, permission: string) =>
 					origin === server.url && permission === 'notifications',
 				isActive: () => index === this.activeTabIndex,
@@ -454,7 +457,7 @@ class ServerManagerView {
 		const $parent = $img.parentElement;
 		const $container = $parent.parentElement;
 		const webviewId = $container.dataset.tabId;
-		const $webview = document.querySelector(`webview[data-tab-id="${webviewId}"]`);
+		const $webview = document.querySelector(`webview[data-tab-id="${CSS.escape(webviewId)}"]`);
 		const realmName = $webview.getAttribute('name');
 
 		if (realmName === null) {
@@ -490,7 +493,7 @@ class ServerManagerView {
 	}
 
 	onHover(index: number): void {
-		// `this.$serverIconTooltip[index].innerHTML` already has realm name, so we are just
+		// `this.$serverIconTooltip[index].textContent` 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
@@ -590,19 +593,13 @@ class ServerManagerView {
 	// 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 {
@@ -627,7 +624,7 @@ class ServerManagerView {
 
 		try {
 			this.tabs[index].webview.canGoBackButton();
-		} catch (_) {
+		} catch {
 		}
 
 		this.activeTabIndex = index;
@@ -681,8 +678,8 @@ class ServerManagerView {
 		this.functionalTabs.clear();
 
 		// Clear DOM elements
-		this.$tabsContainer.innerHTML = '';
-		this.$webviewsContainer.innerHTML = '';
+		this.$tabsContainer.textContent = '';
+		this.$webviewsContainer.textContent = '';
 	}
 
 	async reloadView(): Promise<void> {
@@ -717,7 +714,7 @@ class ServerManagerView {
 
 	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);
 		}
 	}
@@ -801,7 +798,7 @@ class ServerManagerView {
 			['zoomOut', webview => webview.zoomOut()],
 			['zoomActualSize', webview => webview.zoomActualSize()],
 			['log-out', webview => webview.logOut()],
-			['shortcut', webview => webview.showShortcut()],
+			['show-keyboard-shortcuts', webview => webview.showKeyboardShortcuts()],
 			['tab-devtools', webview => webview.openDevTools()]
 		];
 
@@ -893,7 +890,7 @@ class ServerManagerView {
 			webviews.forEach(webview => {
 				try {
 					webview.setAudioMuted(state);
-				} catch (_) {
+				} catch {
 					// Webview is not ready yet
 					webview.addEventListener('dom-ready', () => {
 						webview.setAudioMuted(state);
@@ -917,7 +914,7 @@ class ServerManagerView {
 		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);
 		});
 
@@ -926,11 +923,11 @@ class ServerManagerView {
 				if (domain.url.includes(serverURL)) {
 					const serverTooltipSelector = '.tab .server-tooltip';
 					const serverTooltips = document.querySelectorAll(serverTooltipSelector);
-					serverTooltips[index].innerHTML = escape(realmName);
-					this.tabs[index].props.name = escape(realmName);
+					serverTooltips[index].textContent = realmName;
+					this.tabs[index].props.name = realmName;
 					this.tabs[index].webview.props.name = realmName;
 
-					domain.alias = escape(realmName);
+					domain.alias = realmName;
 					DomainUtil.updateDomain(index, domain);
 					// Update the realm name also on the Window menu
 					ipcRenderer.send('update-menu', {
@@ -969,9 +966,9 @@ 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}"]`);
+				const concurrentTab: HTMLButtonElement = document.querySelector(`div[data-tab-id="${CSS.escape(tabId)}"]`);
 				if (currentId === webviewId) {
 					concurrentTab.click();
 				}
@@ -1046,7 +1043,8 @@ 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')) {
-		require('electron-connect').client.create();
+		// eslint-disable-next-line node/no-unsupported-features/es-syntax
+		(await import('electron-connect')).client.create();
 	}
 
 	const serverManagerView = new ServerManagerView();

app/renderer/js/notification/darwin-notifications.ts

@@ -1,111 +0,0 @@
-import {ipcRenderer} from 'electron';
-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;
-let clickHandler: ClickHandler;
-
-interface NotificationHandlerArgs {
-	response: string;
-}
-
-class DarwinNotification {
-	tag: number;
-
-	constructor(title: string, options: NotificationOptions) {
-		const silent: boolean = ConfigUtil.getConfigItem('silent') || false;
-		const {icon} = options;
-		const profilePic = new URL(icon, location.href).href;
-
-		this.tag = Number.parseInt(options.tag, 10);
-		const notification = new MacNotifier(title, Object.assign(options, {
-			bundleId: appId,
-			canReply: true,
-			silent,
-			icon: profilePic
-		}));
-
-		notification.addEventListener('click', () => {
-			// Focus to the server who sent the
-			// notification if not focused already
-			if (clickHandler) {
-				clickHandler();
-			}
-
-			focusCurrentServer();
-			ipcRenderer.send('focus-app');
-		});
-
-		notification.addEventListener('reply', this.notificationHandler);
-	}
-
-	static requestPermission(): void {
-		return; // eslint-disable-line no-useless-return
-	}
-
-	// Override default Notification permission
-	static get permission(): NotificationPermission {
-		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
-	}
-
-	get onreply(): ReplyHandler {
-		return replyHandler;
-	}
-
-	set onreply(handler: ReplyHandler) {
-		replyHandler = handler;
-	}
-
-	get onclick(): ClickHandler {
-		return clickHandler;
-	}
-
-	set onclick(handler: ClickHandler) {
-		clickHandler = handler;
-	}
-
-	// Not something that is common or
-	// used by zulip server but added to be
-	// future proff.
-	addEventListener(event: string, handler: ClickHandler | ReplyHandler): void {
-		if (event === 'click') {
-			clickHandler = handler as ClickHandler;
-		}
-
-		if (event === 'reply') {
-			replyHandler = handler as ReplyHandler;
-		}
-	}
-
-	async notificationHandler({response}: NotificationHandlerArgs): Promise<void> {
-		response = await parseReply(response);
-		focusCurrentServer();
-		if (electron_bridge.send_notification_reply_message_supported) {
-			electron_bridge.send_event('send_notification_reply_message', this.tag, response);
-			return;
-		}
-
-		electron_bridge.emit('narrow-by-topic', this.tag);
-		if (replyHandler) {
-			replyHandler(response);
-			return;
-		}
-
-		customReply(response);
-	}
-
-	// Method specific to notification api
-	// used by zulip
-	close(): void {
-		return; // eslint-disable-line no-useless-return
-	}
-}
-
-module.exports = DarwinNotification;

app/renderer/js/notification/default-notification.ts

@@ -1,8 +1,9 @@
 import {ipcRenderer} from 'electron';
-import {focusCurrentServer} from './helpers';
 
 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) {

app/renderer/js/notification/helpers.ts

@@ -1,69 +1,8 @@
 import {remote} from 'electron';
 
-import Logger from '../utils/logger-util';
-
-const logger = new Logger({
-	file: 'errors.log',
-	timestamp: true
-});
-
 // Do not change this
 export const appId = 'org.zulip.zulip-electron';
 
-export type BotListItem = [string, string];
-const botsList: BotListItem[] = [];
-let botsListLoaded = false;
-
-// 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(({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]);
-			}
-		});
-		botsListLoaded = true;
-	} else {
-		logger.log('Load bots request failed: ', await response.text());
-		logger.log('Load bots request status: ', response.status);
-	}
-}
-
-export function checkElements(...elements: unknown[]): boolean {
-	let status = true;
-	elements.forEach(element => {
-		if (element === null || element === undefined) {
-			status = false;
-		}
-	});
-	return status;
-}
-
-export function customReply(reply: string): void {
-	// 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
-	const elementsExists = checkElements(textarea, messagebox, sendButton);
-	if (!elementsExists) {
-		return;
-	}
-
-	textarea.value = reply;
-	messagebox.click();
-	sendButton.click();
-}
-
 const currentWindow = remote.getCurrentWindow();
 const webContents = remote.getCurrentWebContents();
 const webContentsId = webContents.id;
@@ -73,65 +12,3 @@ const webContentsId = webContents.id;
 export function focusCurrentServer(): void {
 	currentWindow.webContents.send('focus-webview-with-id', webContentsId);
 }
-
-// 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**
-// bot mentions are not yet supported
-export async function parseReply(reply: string): Promise<string> {
-	const usersDiv = document.querySelectorAll('#user_presences li');
-	const streamHolder = document.querySelectorAll('#stream_filters li');
-
-	type UsersItem = BotListItem;
-	type StreamsItem = BotListItem;
-	const users: UsersItem[] = [];
-	const streams: StreamsItem[] = [];
-
-	usersDiv.forEach(userRow => {
-		const anchor = userRow.querySelector('span a');
-		if (anchor !== null) {
-			const user = `@${anchor.textContent.trim()}`;
-			const mention = `@**${user.replace(/^@/, '')}**`;
-			users.push([user, mention]);
-		}
-	});
-
-	streamHolder.forEach(stream => {
-		const streamAnchor = stream.querySelector('div a');
-		if (streamAnchor !== null) {
-			const streamName = `#${streamAnchor.textContent.trim()}`;
-			const streamMention = `#**${streamName.replace(/^#/, '')}**`;
-			streams.push([streamName, streamMention]);
-		}
-	});
-
-	users.forEach(([user, mention]) => {
-		if (reply.includes(user)) {
-			const regex = new RegExp(user, 'g');
-			reply = reply.replace(regex, mention);
-		}
-	});
-
-	streams.forEach(([stream, streamMention]) => {
-		const regex = new RegExp(stream, 'g');
-		reply = reply.replace(regex, streamMention);
-	});
-
-	// If botsList isn't completely loaded yet, make a request for list
-	if (!botsListLoaded) {
-		await loadBots();
-	}
-
-	// Iterate for every bot name and replace in reply
-	// @botname with @**botname**
-	botsList.forEach(([bot, mention]) => {
-		if (reply.includes(bot)) {
-			const regex = new RegExp(bot, 'g');
-			reply = reply.replace(regex, mention);
-		}
-	});
-
-	reply = reply.replace(/\\n/, '\n');
-	return reply;
-}

app/renderer/js/notification/index.ts

@@ -1,20 +1,14 @@
 import {remote} from 'electron';
-import electron_bridge from '../electron-bridge';
-import {appId, loadBots} from './helpers';
 
 import DefaultNotification from './default-notification';
+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.
 app.setAppUserModelId(appId);
 
-let Notification = DefaultNotification;
-
-if (process.platform === 'darwin') {
-	Notification = require('./darwin-notifications');
-}
-
 export interface NotificationData {
 	close: () => void;
 	title: string;
@@ -39,7 +33,7 @@ export function newNotification(
 	options: NotificationOptions | undefined,
 	dispatch: (type: string, eventInit: EventInit) => boolean
 ): NotificationData {
-	const notification = new Notification(title, options);
+	const notification = new DefaultNotification(title, options);
 	for (const type of ['click', 'close', 'error', 'show']) {
 		notification.addEventListener(type, (ev: Event) => {
 			if (!dispatch(type, ev)) {
@@ -67,7 +61,3 @@ export function newNotification(
 		actions: notification.actions
 	};
 }
-
-electron_bridge.once('zulip-loaded', async () => {
-	await loadBots();
-});

app/renderer/js/pages/preference/add-certificate.ts

@@ -1,99 +0,0 @@
-'use-strict';
-
-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';
-import * as t from '../../utils/translation-util';
-
-interface AddCertificateProps {
-	$root: Element;
-}
-
-const {dialog} = remote;
-
-export default class AddCertificate extends BaseComponent {
-	props: AddCertificateProps;
-	_certFile: string;
-	$addCertificate: Element | null;
-	addCertificateButton: Element | null;
-	serverUrl: HTMLInputElement | null;
-	constructor(props: AddCertificateProps) {
-		super();
-		this.props = props;
-		this._certFile = '';
-	}
-
-	template(): string {
-		return `
-			<div class="settings-card certificates-card">
-				<div class="certificate-input">
-					<div>${t.__('Organization URL')}</div>
-					<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or zulip.your-organization.com"/>
-				</div>
-				<div class="certificate-input">
-					<div>${t.__('Certificate file')}</div>
-					<button class="green" id="add-certificate-button">${t.__('Upload')}</button>
-				</div>
-			</div>
-		`;
-	}
-
-	init(): void {
-		this.$addCertificate = this.generateNodeFromTemplate(this.template());
-		this.props.$root.append(this.$addCertificate);
-		this.addCertificateButton = this.$addCertificate.querySelector('#add-certificate-button');
-		this.serverUrl = this.$addCertificate.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
-		this.initListeners();
-	}
-
-	async validateAndAdd(): Promise<void> {
-		const certificate = this._certFile;
-		const serverUrl = this.serverUrl.value;
-		if (certificate !== '' && serverUrl !== '') {
-			const server = encodeURIComponent(DomainUtil.formatUrl(serverUrl));
-			const fileName = path.basename(certificate);
-			const copy = CertificateUtil.copyCertificate(server, certificate, fileName);
-			if (!copy) {
-				return;
-			}
-
-			CertificateUtil.setCertificate(server, fileName);
-			this.serverUrl.value = '';
-			await dialog.showMessageBox({
-				title: 'Success',
-				message: 'Certificate saved!'
-			});
-		} else {
-			dialog.showErrorBox('Error', `Please, ${serverUrl === '' ?
-				'Enter an Organization URL' : 'Choose certificate file'}`);
-		}
-	}
-
-	async addHandler(): Promise<void> {
-		const showDialogOptions: OpenDialogOptions = {
-			title: 'Select file',
-			properties: ['openFile'],
-			filters: [{name: 'crt, pem', extensions: ['crt', 'pem']}]
-		};
-		const {filePaths, canceled} = await dialog.showOpenDialog(showDialogOptions);
-		if (!canceled) {
-			this._certFile = filePaths[0] || '';
-			await this.validateAndAdd();
-		}
-	}
-
-	initListeners(): void {
-		this.addCertificateButton.addEventListener('click', async () => {
-			await this.addHandler();
-		});
-
-		this.serverUrl.addEventListener('keypress', async event => {
-			if (event.key === 'Enter') {
-				await this.addHandler();
-			}
-		});
-	}
-}

app/renderer/js/pages/preference/base-section.ts

@@ -1,5 +1,6 @@
 import {ipcRenderer} from 'electron';
-import escape from 'escape-html';
+
+import {htmlEscape} from 'escape-goat';
 
 import BaseComponent from '../../components/base';
 
@@ -14,9 +15,9 @@ export default class BaseSection extends BaseComponent {
 	generateSettingOption(props: BaseSectionProps): void {
 		const {$element, disabled, value, clickHandler} = props;
 
-		$element.innerHTML = '';
+		$element.textContent = '';
 
-		const $optionControl = this.generateNodeFromTemplate(this.generateOptionTemplate(value, disabled));
+		const $optionControl = this.generateNodeFromHTML(this.generateOptionHTML(value, disabled));
 		$element.append($optionControl);
 
 		if (!disabled) {
@@ -24,39 +25,39 @@ export default class BaseSection extends BaseComponent {
 		}
 	}
 
-	generateOptionTemplate(settingOption: boolean, disabled?: boolean): string {
-		const label = disabled ? '<label class="disallowed" title="Setting locked by system administrator."/>' : '<label/>';
+	generateOptionHTML(settingOption: boolean, disabled?: boolean): string {
+		const labelHTML = disabled ? '<label class="disallowed" title="Setting locked by system administrator."></label>' : '<label></label>';
 		if (settingOption) {
-			return `
+			return htmlEscape`
 				<div class="action">
 					<div class="switch">
-					  <input class="toggle toggle-round" type="checkbox" checked disabled>
-					  ${label}
+						<input class="toggle toggle-round" type="checkbox" checked disabled>
+						` + labelHTML + htmlEscape`
 					</div>
 				</div>
 			`;
 		}
 
-		return `
-				<div class="action">
-					<div class="switch">
-					  <input class="toggle toggle-round" type="checkbox">
-					  ${label}
-					</div>
+		return htmlEscape`
+			<div class="action">
+				<div class="switch">
+					<input class="toggle toggle-round" type="checkbox">
+					` + labelHTML + htmlEscape`
 				</div>
-			`;
+			</div>
+		`;
 	}
 
 	/* 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 {
-		let select = `<select class="${escape(className)}" id="${escape(idName)}">\n`;
+	generateSelectHTML(options: Record<string, string>, className?: string, idName?: string): string {
+		let html = htmlEscape`<select class="${className}" id="${idName}">\n`;
 		Object.keys(options).forEach(key => {
-			select += `<option name="${escape(key)}" value="${escape(key)}">${escape(options[key])}</option>\n`;
+			html += htmlEscape`<option name="${key}" value="${key}">${options[key]}</option>\n`;
 		});
-		select += '</select>';
-		return select;
+		html += '</select>';
+		return html;
 	}
 
 	reloadApp(): void {

app/renderer/js/pages/preference/connected-org-section.ts

@@ -1,12 +1,14 @@
 import {ipcRenderer} from 'electron';
 
-import BaseSection from './base-section';
+import {htmlEscape} from 'escape-goat';
+
 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 BaseSection from './base-section';
+import FindAccounts from './find-accounts';
+import ServerInfoForm from './server-info-form';
+
 interface ConnectedOrgSectionProps {
 	$root: Element;
 }
@@ -16,22 +18,19 @@ export default class ConnectedOrgSection extends BaseSection {
 	$serverInfoContainer: Element | null;
 	$existingServers: Element | null;
 	$newOrgButton: HTMLButtonElement | null;
-	$addCertificateContainer: Element | null;
 	$findAccountsContainer: Element | null;
 	constructor(props: ConnectedOrgSectionProps) {
 		super();
 		this.props = props;
 	}
 
-	template(): string {
-		return `
+	templateHTML(): string {
+		return htmlEscape`
 			<div class="settings-pane" id="server-settings-pane">
 				<div class="page-title">${t.__('Connected organizations')}</div>
 				<div class="title" id="existing-servers">${t.__('All the connected orgnizations will appear here.')}</div>
 				<div id="server-info-container"></div>
 				<div id="new-org-button"><button class="green sea w-250">${t.__('Connect to another organization')}</button></div>
-				<div class="page-title">${t.__('Add Custom Certificates')}</div>
-				<div id="add-certificate-container"></div>
 				<div class="page-title">${t.__('Find accounts by email')}</div>
 				<div id="find-accounts-container"></div>
 			</div>
@@ -43,20 +42,19 @@ export default class ConnectedOrgSection extends BaseSection {
 	}
 
 	initServers(): void {
-		this.props.$root.innerHTML = '';
+		this.props.$root.textContent = '';
 
 		const servers = DomainUtil.getDomains();
-		this.props.$root.innerHTML = this.template();
+		this.props.$root.innerHTML = this.templateHTML();
 
 		this.$serverInfoContainer = document.querySelector('#server-info-container');
 		this.$existingServers = document.querySelector('#existing-servers');
 		this.$newOrgButton = document.querySelector('#new-org-button');
-		this.$addCertificateContainer = document.querySelector('#add-certificate-container');
 		this.$findAccountsContainer = document.querySelector('#find-accounts-container');
 
 		const noServerText = t.__('All the connected orgnizations will appear here');
 		// Show noServerText if no servers are there otherwise hide it
-		this.$existingServers.innerHTML = servers.length === 0 ? noServerText : '';
+		this.$existingServers.textContent = servers.length === 0 ? noServerText : '';
 
 		for (const [i, server] of servers.entries()) {
 			new ServerInfoForm({
@@ -71,16 +69,9 @@ export default class ConnectedOrgSection extends BaseSection {
 			ipcRenderer.send('forward-message', 'open-org-tab');
 		});
 
-		this.initAddCertificate();
 		this.initFindAccounts();
 	}
 
-	initAddCertificate(): void {
-		new AddCertificate({
-			$root: this.$addCertificateContainer
-		}).init();
-	}
-
 	initFindAccounts(): void {
 		new FindAccounts({
 			$root: this.$findAccountsContainer

app/renderer/js/pages/preference/find-accounts.ts

@@ -1,4 +1,4 @@
-'use-strict';
+import {htmlEscape} from 'escape-goat';
 
 import BaseComponent from '../../components/base';
 import * as LinkUtil from '../../utils/link-util';
@@ -18,8 +18,8 @@ export default class FindAccounts extends BaseComponent {
 		this.props = props;
 	}
 
-	template(): string {
-		return `
+	templateHTML(): string {
+		return htmlEscape`
 			<div class="settings-card certificate-card">
 				<div class="certificate-input">
 					<div>${t.__('Organization URL')}</div>
@@ -33,7 +33,7 @@ export default class FindAccounts extends BaseComponent {
 	}
 
 	init(): void {
-		this.$findAccounts = this.generateNodeFromTemplate(this.template());
+		this.$findAccounts = this.generateNodeFromHTML(this.templateHTML());
 		this.props.$root.append(this.$findAccounts);
 		this.$findAccountsButton = this.$findAccounts.querySelector('#find-accounts-button');
 		this.$serverUrlField = this.$findAccounts.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;

app/renderer/js/pages/preference/general-section.ts

@@ -1,18 +1,20 @@
 import {ipcRenderer, remote, OpenDialogOptions} from 'electron';
-
 import path from 'path';
+
+import Tagify from '@yaireo/tagify';
+import {htmlEscape} from 'escape-goat';
 import fs from 'fs-extra';
+import ISO6391 from 'iso-639-1';
 
-const {app, dialog, session} = 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 Tagify from '@yaireo/tagify';
-import ISO6391 from 'iso-639-1';
+
+import BaseSection from './base-section';
+
+const {app, dialog, session} = remote;
+const currentBrowserWindow = remote.getCurrentWindow();
 
 interface GeneralSectionProps {
 	$root: Element;
@@ -25,8 +27,8 @@ export default class GeneralSection extends BaseSection {
 		this.props = props;
 	}
 
-	template(): string {
-		return `
+	templateHTML(): string {
+		return htmlEscape`
             <div class="settings-pane">
                 <div class="title">${t.__('Appearance')}</div>
                 <div id="appearance-option-settings" class="settings-card">
@@ -146,7 +148,7 @@ export default class GeneralSection extends BaseSection {
 				<div class="title">${t.__('Factory Reset Data')}</div>
                 <div class="settings-card">
 					<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 class="setting-description">${t.__('Reset the application, thus deleting all the connected organizations and accounts.')}
 						</div>
 						<button class="factory-reset-button red w-150">${t.__('Factory Reset')}</button>
 					</div>
@@ -156,7 +158,7 @@ export default class GeneralSection extends BaseSection {
 	}
 
 	init(): void {
-		this.props.$root.innerHTML = this.template();
+		this.props.$root.innerHTML = this.templateHTML();
 		this.updateTrayOption();
 		this.updateBadgeOption();
 		this.updateSilentOption();
@@ -398,8 +400,8 @@ export default class GeneralSection extends BaseSection {
 
 	setLocale(): void {
 		const langDiv: HTMLSelectElement = document.querySelector('.lang-div');
-		const langList = this.generateSelectTemplate(supportedLocales, 'lang-menu');
-		langDiv.innerHTML += langList;
+		const langListHTML = this.generateSelectHTML(supportedLocales, 'lang-menu');
+		langDiv.innerHTML += langListHTML;
 		// `langMenu` is the select-option dropdown menu formed after executing the previous command
 		const langMenu: HTMLSelectElement = document.querySelector('.lang-menu');
 
@@ -515,7 +517,7 @@ export default class GeneralSection extends BaseSection {
 			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 += `
+			spellDiv.innerHTML += htmlEscape`
 				<div class="setting-description">${t.__('Spellchecker Languages')}</div>
 				<input name='spellcheck' placeholder='Enter Languages'>`;
 
@@ -555,7 +557,7 @@ export default class GeneralSection extends BaseSection {
 				}
 			});
 
-			const configuredLanguages: string[] = ConfigUtil.getConfigItem('spellcheckerLanguages').map((code: string) => [...languagePairs].filter(pair => (pair[1] === code))[0][0]);
+			const configuredLanguages: string[] = ConfigUtil.getConfigItem('spellcheckerLanguages').map((code: string) => [...languagePairs].find(pair => (pair[1] === code))[0]);
 			tagify.addTags(configuredLanguages);
 
 			tagField.addEventListener('change', event => {

app/renderer/js/pages/preference/nav.ts

@@ -1,3 +1,5 @@
+import {htmlEscape} from 'escape-goat';
+
 import BaseComponent from '../../components/base';
 import * as t from '../../utils/translation-util';
 
@@ -17,29 +19,29 @@ export default class PreferenceNav extends BaseComponent {
 		this.init();
 	}
 
-	template(): string {
-		let navItemsTemplate = '';
+	templateHTML(): string {
+		let navItemsHTML = '';
 		for (const navItem of this.navItems) {
-			navItemsTemplate += `<div class="nav" id="nav-${navItem}">${t.__(navItem)}</div>`;
+			navItemsHTML += htmlEscape`<div class="nav" id="nav-${navItem}">${t.__(navItem)}</div>`;
 		}
 
-		return `
+		return htmlEscape`
 			<div>
 				<div id="settings-header">${t.__('Settings')}</div>
-				<div id="nav-container">${navItemsTemplate}</div>
+				<div id="nav-container">` + navItemsHTML + htmlEscape`</div>
 			</div>
 		`;
 	}
 
 	init(): void {
-		this.$el = this.generateNodeFromTemplate(this.template());
+		this.$el = this.generateNodeFromHTML(this.templateHTML());
 		this.props.$root.append(this.$el);
 		this.registerListeners();
 	}
 
 	registerListeners(): void {
 		for (const navItem of this.navItems) {
-			const $item = document.querySelector(`#nav-${navItem}`);
+			const $item = document.querySelector(`#nav-${CSS.escape(navItem)}`);
 			$item.addEventListener('click', () => {
 				this.props.onItemSelected(navItem);
 			});
@@ -57,12 +59,12 @@ export default class PreferenceNav extends BaseComponent {
 	}
 
 	activate(navItem: string): void {
-		const $item = document.querySelector(`#nav-${navItem}`);
+		const $item = document.querySelector(`#nav-${CSS.escape(navItem)}`);
 		$item.classList.add('active');
 	}
 
 	deactivate(navItem: string): void {
-		const $item = document.querySelector(`#nav-${navItem}`);
+		const $item = document.querySelector(`#nav-${CSS.escape(navItem)}`);
 		$item.classList.remove('active');
 	}
 }

app/renderer/js/pages/preference/network-section.ts

@@ -1,9 +1,12 @@
 import {ipcRenderer} from 'electron';
 
-import BaseSection from './base-section';
+import {htmlEscape} from 'escape-goat';
+
 import * as ConfigUtil from '../../utils/config-util';
 import * as t from '../../utils/translation-util';
 
+import BaseSection from './base-section';
+
 interface NetworkSectionProps {
 	$root: Element;
 }
@@ -20,8 +23,8 @@ export default class NetworkSection extends BaseSection {
 		this.props = props;
 	}
 
-	template(): string {
-		return `
+	templateHTML(): string {
+		return htmlEscape`
             <div class="settings-pane">
                 <div class="title">${t.__('Proxy')}</div>
                 <div id="appearance-option-settings" class="settings-card">
@@ -58,7 +61,7 @@ export default class NetworkSection extends BaseSection {
 	}
 
 	init(): void {
-		this.props.$root.innerHTML = this.template();
+		this.props.$root.innerHTML = this.templateHTML();
 		this.$proxyPAC = document.querySelector('#proxy-pac-option .setting-input-value');
 		this.$proxyRules = document.querySelector('#proxy-rules-option .setting-input-value');
 		this.$proxyBypass = document.querySelector('#proxy-bypass-option .setting-input-value');

app/renderer/js/pages/preference/new-server-form.ts

@@ -1,5 +1,7 @@
 import {ipcRenderer, remote} from 'electron';
 
+import {htmlEscape} from 'escape-goat';
+
 import BaseComponent from '../../components/base';
 import * as DomainUtil from '../../utils/domain-util';
 import * as LinkUtil from '../../utils/link-util';
@@ -22,8 +24,8 @@ export default class NewServerForm extends BaseComponent {
 		this.props = props;
 	}
 
-	template(): string {
-		return `
+	templateHTML(): string {
+		return htmlEscape`
 			<div class="server-input-container">
 				<div class="title">${t.__('Organization URL')}</div>
 				<div class="add-server-info-row">
@@ -56,23 +58,24 @@ export default class NewServerForm extends BaseComponent {
 	}
 
 	initForm(): void {
-		this.$newServerForm = this.generateNodeFromTemplate(this.template());
+		this.$newServerForm = this.generateNodeFromHTML(this.templateHTML());
 		this.$saveServerButton = this.$newServerForm.querySelector('#connect');
-		this.props.$root.innerHTML = '';
+		this.props.$root.textContent = '';
 		this.props.$root.append(this.$newServerForm);
 		this.$newServerUrl = this.$newServerForm.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
 	}
 
 	async submitFormHandler(): Promise<void> {
-		this.$saveServerButton.innerHTML = 'Connecting...';
+		this.$saveServerButton.textContent = 'Connecting...';
 		let serverConf;
 		try {
-			serverConf = await DomainUtil.checkDomain(this.$newServerUrl.value);
-		} catch (error) {
-			this.$saveServerButton.innerHTML = 'Connect';
+			serverConf = await DomainUtil.checkDomain(this.$newServerUrl.value.trim());
+		} catch (error: unknown) {
+			this.$saveServerButton.textContent = 'Connect';
 			await dialog.showMessageBox({
 				type: 'error',
-				message: error.toString(),
+				message: error instanceof Error ?
+					`${error.name}: ${error.message}` : 'Unknown error',
 				buttons: ['OK']
 			});
 			return;

app/renderer/js/pages/preference/preference.ts

@@ -1,14 +1,15 @@
 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 ConnectedOrgSection from './connected-org-section';
-import ShortcutsSection from './shortcuts-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;
 
 export default class PreferenceView extends BaseComponent {

app/renderer/js/pages/preference/server-info-form.ts

@@ -1,8 +1,10 @@
 import {remote, ipcRenderer} from 'electron';
 
+import {htmlEscape} from 'escape-goat';
+
+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;
@@ -26,8 +28,8 @@ export default class ServerInfoForm extends BaseComponent {
 		this.props = props;
 	}
 
-	template(): string {
-		return `
+	templateHTML(): string {
+		return htmlEscape`
 			<div class="settings-card">
 				<div class="server-info-left">
 					<img class="server-info-icon" src="${this.props.server.icon}"/>
@@ -56,7 +58,7 @@ export default class ServerInfoForm extends BaseComponent {
 	}
 
 	initForm(): void {
-		this.$serverInfoForm = this.generateNodeFromTemplate(this.template());
+		this.$serverInfoForm = this.generateNodeFromHTML(this.templateHTML());
 		this.$serverInfoAlias = this.$serverInfoForm.querySelectorAll('.server-info-alias')[0];
 		this.$serverIcon = this.$serverInfoForm.querySelectorAll('.server-info-icon')[0];
 		this.$deleteServerButton = this.$serverInfoForm.querySelectorAll('.server-delete-action')[0];

app/renderer/js/pages/preference/servers-section.ts

@@ -1,6 +1,9 @@
+import {htmlEscape} from 'escape-goat';
+
+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;
@@ -14,16 +17,16 @@ export default class ServersSection extends BaseSection {
 		this.props = props;
 	}
 
-	template(): string {
-		return `
-		<div class="add-server-modal">
-			<div class="modal-container">
-				<div class="settings-pane" id="server-settings-pane">
-					<div class="page-title">${t.__('Add a Zulip organization')}</div>
-					<div id="new-server-container"></div>
+	templateHTML(): string {
+		return htmlEscape`
+			<div class="add-server-modal">
+				<div class="modal-container">
+					<div class="settings-pane" id="server-settings-pane">
+						<div class="page-title">${t.__('Add a Zulip organization')}</div>
+						<div id="new-server-container"></div>
+					</div>
 				</div>
 			</div>
-		</div>
 		`;
 	}
 
@@ -32,9 +35,9 @@ export default class ServersSection extends BaseSection {
 	}
 
 	initServers(): void {
-		this.props.$root.innerHTML = '';
+		this.props.$root.textContent = '';
 
-		this.props.$root.innerHTML = this.template();
+		this.props.$root.innerHTML = this.templateHTML();
 		this.$newServerContainer = document.querySelector('#new-server-container');
 
 		this.initNewServerForm();

app/renderer/js/pages/preference/shortcuts-section.ts

@@ -1,7 +1,10 @@
-import BaseSection from './base-section';
+import {htmlEscape} from 'escape-goat';
+
 import * as LinkUtil from '../../utils/link-util';
 import * as t from '../../utils/translation-util';
 
+import BaseSection from './base-section';
+
 interface ShortcutsSectionProps {
 	$root: Element;
 }
@@ -13,14 +16,14 @@ export default class ShortcutsSection extends BaseSection {
 		this.props = props;
 	}
 
-	// TODO - Deduplicate templateMac and templateWinLin functions. In theory
+	// TODO - Deduplicate templateMacHTML and templateWinLinHTML functions. In theory
 	// they both should be the same the only thing different should be the userOSKey
 	// variable but there seems to be inconsistences between both function, one has more
 	// lines though one may just be using more new lines and other thing is the use of +.
-	templateMac(): string {
+	templateMacHTML(): string {
 		const userOSKey = '⌘';
 
-		return `
+		return htmlEscape`
 						<div class="settings-pane">
 						<div class="settings-card tip"><p><b><i class="material-icons md-14">settings</i>${t.__('Tip')}:  </b>${t.__('These desktop app shortcuts extend the Zulip webapp\'s')} <span id="open-hotkeys-link"> ${t.__('keyboard shortcuts')}</span>.</p></div>
 							<div class="title">${t.__('Application Shortcuts')}</div>
@@ -181,10 +184,10 @@ export default class ShortcutsSection extends BaseSection {
 		`;
 	}
 
-	templateWinLin(): string {
+	templateWinLinHTML(): string {
 		const userOSKey = 'Ctrl';
 
-		return `
+		return htmlEscape`
 						<div class="settings-pane">
 						<div class="settings-card tip"><p><b><i class="material-icons md-14">settings</i>${t.__('Tip')}:  </b>${t.__('These desktop app shortcuts extend the Zulip webapp\'s')} <span id="open-hotkeys-link"> ${t.__('keyboard shortcuts')}</span>.</p></div>
 							<div class="title">${t.__('Application Shortcuts')}</div>
@@ -339,7 +342,7 @@ export default class ShortcutsSection extends BaseSection {
 
 	init(): void {
 		this.props.$root.innerHTML = (process.platform === 'darwin') ?
-			this.templateMac() : this.templateWinLin();
+			this.templateMacHTML() : this.templateWinLinHTML();
 		this.openHotkeysExternalLink();
 	}
 }

app/renderer/js/preload.ts

@@ -1,21 +1,16 @@
 import {contextBridge, ipcRenderer, webFrame} from 'electron';
 import fs from 'fs';
 
-import isDev from 'electron-is-dev';
-
+import electron_bridge, {bridgeEvents} from './electron-bridge';
 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);
 
 ipcRenderer.on('logout', () => {
+	if (bridgeEvents.emit('logout')) {
+		return;
+	}
+
 	// Create the menu for the below
 	const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
 	dropdown.click();
@@ -24,7 +19,11 @@ ipcRenderer.on('logout', () => {
 	nodes[nodes.length - 1].click();
 });
 
-ipcRenderer.on('shortcut', () => {
+ipcRenderer.on('show-keyboard-shortcuts', () => {
+	if (bridgeEvents.emit('show-keyboard-shortcuts')) {
+		return;
+	}
+
 	// Create the menu for the below
 	const node: HTMLElement = document.querySelector('a[data-overlay-trigger=keyboard-shortcuts]');
 	// Additional check
@@ -38,6 +37,10 @@ ipcRenderer.on('shortcut', () => {
 });
 
 ipcRenderer.on('show-notification-settings', () => {
+	if (bridgeEvents.emit('show-notification-settings')) {
+		return;
+	}
+
 	// Create the menu for the below
 	const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
 	dropdown.click();
@@ -53,16 +56,6 @@ ipcRenderer.on('show-notification-settings', () => {
 	}, 100);
 });
 
-electron_bridge.once('zulip-loaded', () => {
-	// Redirect users to network troubleshooting page
-	const getRestartButton = document.querySelector('.restart_get_events_button');
-	if (getRestartButton) {
-		getRestartButton.addEventListener('click', () => {
-			ipcRenderer.send('forward-message', 'reload-viewer');
-		});
-	}
-});
-
 window.addEventListener('load', (event: any): void => {
 	if (!event.target.URL.includes('app/renderer/network.html')) {
 		return;
@@ -89,25 +82,6 @@ document.addEventListener('keydown', event => {
 	}
 });
 
-// Set user as active and update the time of last activity
-ipcRenderer.on('set-active', () => {
-	if (isDev) {
-		console.log('active');
-	}
-
-	electron_bridge.idle_on_system = false;
-	electron_bridge.last_active_on_system = Date.now();
-});
-
-// Set user as idle and time of last activity is left unchanged
-ipcRenderer.on('set-idle', () => {
-	if (isDev) {
-		console.log('idle');
-	}
-
-	electron_bridge.idle_on_system = true;
-});
-
 (async () => webFrame.executeJavaScript(
 	fs.readFileSync(require.resolve('./injected'), 'utf8')
 ))();

app/renderer/js/shared/preventdrag.ts

@@ -1,17 +0,0 @@
-// This is a security fix. Following function prevents drag and drop event in the app
-// so that attackers can't execute any remote code within the app
-// It doesn't affect the compose box so that users can still
-// use drag and drop event to share files etc
-
-const preventDragAndDrop = (): void => {
-	const preventEvents = ['dragover', 'drop'];
-	preventEvents.forEach(dragEvents => {
-		document.addEventListener(dragEvents, event => {
-			event.preventDefault();
-		});
-	});
-};
-
-preventDragAndDrop();
-
-export {};

app/renderer/js/tray.ts

@@ -1,6 +1,6 @@
 import {ipcRenderer, remote, WebviewTag, NativeImage} from 'electron';
-
 import path from 'path';
+
 import * as ConfigUtil from './utils/config-util';
 
 const {Tray, Menu, nativeImage, BrowserWindow} = remote;
@@ -21,6 +21,8 @@ const iconPath = (): string => {
 	return APP_ICON + (process.platform === 'win32' ? 'win.ico' : 'macOSTemplate.png');
 };
 
+const winUnreadTrayIconPath = (): string => APP_ICON + 'unread.ico';
+
 let unread = 0;
 
 const trayIconSize = (): number => {
@@ -97,6 +99,10 @@ const renderCanvas = function (arg: number): HTMLCanvasElement {
  * @return the native image
  */
 const renderNativeImage = function (arg: number): NativeImage {
+	if (process.platform === 'win32') {
+		return nativeImage.createFromPath(winUnreadTrayIconPath());
+	}
+
 	const canvas = renderCanvas(arg);
 	const pngData = nativeImage.createFromDataURL(canvas.toDataURL('image/png')).toPNG();
 	return nativeImage.createFromBuffer(pngData, {
@@ -207,7 +213,7 @@ function toggleTray(): void {
 
 	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);
 }
 

app/renderer/js/utils/certificate-util.ts

@@ -1,78 +0,0 @@
-import electron from 'electron';
-import {JsonDB} from 'node-json-db';
-import {initSetUp} from './default-util';
-
-import fs from 'fs';
-import path from 'path';
-import Logger from './logger-util';
-
-const {app, dialog} =
-	process.type === 'renderer' ? electron.remote : electron;
-
-initSetUp();
-
-const logger = new Logger({
-	file: 'certificate-util.log',
-	timestamp: true
-});
-
-const certificatesDir = `${app.getPath('userData')}/certificates`;
-
-let db: JsonDB;
-
-reloadDB();
-
-export function getCertificate(server: string): string | undefined {
-	reloadDB();
-	return db.getData('/')[server];
-}
-
-// Function to copy the certificate to userData folder
-export function copyCertificate(_server: string, location: string, fileName: string): boolean {
-	let copied = false;
-	const filePath = `${certificatesDir}/${fileName}`;
-	try {
-		fs.copyFileSync(location, filePath);
-		copied = true;
-	} 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(error);
-	}
-
-	return copied;
-}
-
-export function setCertificate(server: string, fileName: string): void {
-	const filePath = `${fileName}`;
-	db.push(`/${server}`, filePath, true);
-	reloadDB();
-}
-
-export function removeCertificate(server: string): void {
-	db.delete(`/${server}`);
-	reloadDB();
-}
-
-function reloadDB(): void {
-	const settingsJsonPath = path.join(app.getPath('userData'), '/config/certificates.json');
-	try {
-		const file = fs.readFileSync(settingsJsonPath, 'utf8');
-		JSON.parse(file);
-	} catch (error) {
-		if (fs.existsSync(settingsJsonPath)) {
-			fs.unlinkSync(settingsJsonPath);
-			dialog.showErrorBox(
-				'Error saving settings',
-				'We encountered error while saving the certificate.'
-			);
-			logger.error('Error while JSON parsing certificates.json: ');
-			logger.error(error);
-		}
-	}
-
-	db = new JsonDB(settingsJsonPath, true, true);
-}

app/renderer/js/utils/common-util.ts

@@ -1,8 +0,0 @@
-// Unescape already encoded/escaped strings
-export function decodeString(stringInput: string): string {
-	const parser = new DOMParser();
-	const dom = parser.parseFromString(
-		'<!doctype html><body>' + stringInput,
-		'text/html');
-	return dom.body.textContent;
-}

app/renderer/js/utils/config-util.ts

@@ -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',
@@ -31,7 +32,7 @@ reloadDB();
 export function getConfigItem(key: string, defaultValue: unknown = null): any {
 	try {
 		db.reload();
-	} catch (error) {
+	} catch (error: unknown) {
 		logger.error('Error while reloading settings.json: ');
 		logger.error(error);
 	}
@@ -59,7 +60,7 @@ export function getConfigString(key: string, defaultValue: string): string {
 export function isConfigItemExists(key: string): boolean {
 	try {
 		db.reload();
-	} catch (error) {
+	} catch (error: unknown) {
 		logger.error('Error while reloading settings.json: ');
 		logger.error(error);
 	}
@@ -88,7 +89,7 @@ function reloadDB(): void {
 	try {
 		const file = fs.readFileSync(settingsJsonPath, 'utf8');
 		JSON.parse(file);
-	} catch (error) {
+	} catch (error: unknown) {
 		if (fs.existsSync(settingsJsonPath)) {
 			fs.unlinkSync(settingsJsonPath);
 			dialog.showErrorBox(

app/renderer/js/utils/default-util.ts

@@ -1,17 +1,11 @@
 import electron from 'electron';
 import fs from 'fs';
 
-let app: Electron.App = null;
+const app = process.type === 'renderer' ? electron.remote.app : electron.app;
 let setupCompleted = false;
-if (process.type === 'renderer') {
-	app = electron.remote.app;
-} else {
-	app = electron.app;
-}
 
 const zulipDir = app.getPath('userData');
 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
@@ -26,16 +20,11 @@ export const initSetUp = (): void => {
 			fs.mkdirSync(logDir);
 		}
 
-		if (!fs.existsSync(certificatesDir)) {
-			fs.mkdirSync(certificatesDir);
-		}
-
 		// Migrate config files from app data folder to config folder inside app
 		// data folder. This will be done once when a user updates to the new version.
 		if (!fs.existsSync(configDir)) {
 			fs.mkdirSync(configDir);
 			const domainJson = `${zulipDir}/domain.json`;
-			const certificatesJson = `${zulipDir}/certificates.json`;
 			const settingsJson = `${zulipDir}/settings.json`;
 			const updatesJson = `${zulipDir}/updates.json`;
 			const windowStateJson = `${zulipDir}/window-state.json`;
@@ -44,10 +33,6 @@ export const initSetUp = (): void => {
 					path: domainJson,
 					fileName: 'domain.json'
 				},
-				{
-					path: certificatesJson,
-					fileName: 'certificates.json'
-				},
 				{
 					path: settingsJson,
 					fileName: 'settings.json'

app/renderer/js/utils/domain-util.ts

@@ -1,16 +1,14 @@
-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';
 
+import * as EnterpriseUtil from './enterprise-util';
+import Logger from './logger-util';
+
 const {app, dialog} = remote;
 
 export interface ServerConf {
@@ -93,27 +91,6 @@ export function duplicateDomain(domain: string): boolean {
 	return getDomains().some(server => server.url === domain);
 }
 
-async function checkCertError(domain: string, serverConf: ServerConf, error: any, silent: boolean): Promise<ServerConf> {
-	if (silent) {
-		// Since getting server settings has already failed
-		return serverConf;
-	}
-
-	// 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.');
-}
-
 export async function checkDomain(domain: string, silent = false): Promise<ServerConf> {
 	if (!silent && duplicateDomain(domain)) {
 		// Do not check duplicate in silent mode
@@ -122,98 +99,19 @@ export async function checkDomain(domain: string, silent = false): Promise<Serve
 
 	domain = formatUrl(domain);
 
-	const serverConf = {
-		icon: defaultIconUrl,
-		url: domain,
-		alias: domain
-	};
-
 	try {
 		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 = error_ || '';
-
-		const certsError = error.toString().includes('certificate');
-		if (certsError) {
-			const result = await checkCertError(domain, serverConf, error, silent);
-			return result;
-		}
-
+	} catch {
 		throw new Error(Messages.invalidZulipServerError(domain));
 	}
 }
 
 async function getServerSettings(domain: string): Promise<ServerConf> {
-	const serverSettingsOptions = {
-		url: domain + '/api/v1/server_settings',
-		...RequestUtil.requestOptions(domain)
-	};
-
-	return new Promise((resolve, reject) => {
-		request(serverSettingsOptions, (error: Error, response: request.Response) => {
-			if (!error && response.statusCode === 200) {
-				const {realm_name, realm_uri, realm_icon} = JSON.parse(response.body);
-				if (
-					typeof realm_name === 'string' &&
-					typeof realm_uri === 'string' &&
-					typeof realm_icon === 'string'
-				) {
-					resolve({
-						// 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)
-					});
-				} else {
-					reject(Messages.noOrgsError(domain));
-				}
-			} else {
-				reject(response);
-			}
-		});
-	});
+	return ipcRenderer.invoke('get-server-settings', domain);
 }
 
 export async function saveServerIcon(server: ServerConf): Promise<string> {
-	const url = server.icon;
-	const domain = server.url;
-
-	const serverIconOptions = {
-		url,
-		...RequestUtil.requestOptions(domain)
-	};
-
-	// 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: request.Response) => {
-				response.on('error', (err: Error) => {
-					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: Error) => {
-				logger.log('Could not get server icon.');
-				logger.log(err);
-				logger.reportSentry(err);
-				resolve(defaultIconUrl);
-			});
-		} catch (error) {
-			logger.log('Could not get server icon.');
-			logger.log(error);
-			logger.reportSentry(error);
-			resolve(defaultIconUrl);
-		}
-	});
+	return ipcRenderer.invoke('save-server-icon', server.icon);
 }
 
 export async function updateSavedServer(url: string, index: number): Promise<void> {
@@ -227,7 +125,7 @@ export async function updateSavedServer(url: string, index: number): Promise<voi
 			updateDomain(index, newServerConf);
 			reloadDB();
 		}
-	} catch (error) {
+	} catch (error: unknown) {
 		logger.log('Could not update server icon.');
 		logger.log(error);
 		logger.reportSentry(error);
@@ -239,7 +137,7 @@ function reloadDB(): void {
 	try {
 		const file = fs.readFileSync(domainJsonPath, 'utf8');
 		JSON.parse(file);
-	} catch (error) {
+	} catch (error: unknown) {
 		if (fs.existsSync(domainJsonPath)) {
 			fs.unlinkSync(domainJsonPath);
 			dialog.showErrorBox(
@@ -256,25 +154,6 @@ function reloadDB(): void {
 	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;

app/renderer/js/utils/enterprise-util.ts

@@ -9,7 +9,7 @@ const logger = new Logger({
 });
 
 // TODO: replace enterpriseSettings type with an interface once settings are final
-let enterpriseSettings: {[key: string]: unknown};
+let enterpriseSettings: Record<string, unknown>;
 let configFile: boolean;
 
 reloadDB();
@@ -26,7 +26,7 @@ function reloadDB(): void {
 		try {
 			const file = fs.readFileSync(enterpriseFile, 'utf8');
 			enterpriseSettings = JSON.parse(file);
-		} catch (error) {
+		} catch (error: unknown) {
 			logger.log('Error while JSON parsing global_config.json: ');
 			logger.log(error);
 		}

app/renderer/js/utils/link-util.ts

@@ -1,9 +1,10 @@
 import {shell} from 'electron';
-import escape from 'escape-html';
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
 
+import {htmlEscape} from 'escape-goat';
+
 export function isUploadsUrl(server: string, url: URL): boolean {
 	return url.origin === server && url.pathname.startsWith('/user_uploads/');
 }
@@ -18,12 +19,12 @@ export async function openBrowser(url: URL): Promise<void> {
 			path.join(os.tmpdir(), 'zulip-redirect-')
 		);
 		const file = path.join(dir, 'redirect.html');
-		fs.writeFileSync(file, `\
+		fs.writeFileSync(file, htmlEscape`\
 <!DOCTYPE html>
 <html>
     <head>
         <meta charset="UTF-8" />
-        <meta http-equiv="Refresh" content="0; url=${escape(url.href)}" />
+        <meta http-equiv="Refresh" content="0; url=${url.href}" />
         <title>Redirecting</title>
         <style>
             html {
@@ -32,11 +33,11 @@ export async function openBrowser(url: URL): Promise<void> {
         </style>
     </head>
     <body>
-        <p>Opening <a href="${escape(url.href)}">${escape(url.href)}</a>…</p>
+        <p>Opening <a href="${url.href}">${url.href}</a>…</p>
     </body>
 </html>
 `);
-		shell.openItem(file);
+		await shell.openPath(file);
 		setTimeout(() => {
 			fs.unlinkSync(file);
 			fs.rmdirSync(dir);

app/renderer/js/utils/linux-update-util.ts

@@ -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 =
@@ -46,7 +47,7 @@ function reloadDB(): void {
 	try {
 		const file = fs.readFileSync(linuxUpdateJsonPath, 'utf8');
 		JSON.parse(file);
-	} catch (error) {
+	} catch (error: unknown) {
 		if (fs.existsSync(linuxUpdateJsonPath)) {
 			fs.unlinkSync(linuxUpdateJsonPath);
 			dialog.showErrorBox(

app/renderer/js/utils/logger-util.ts

@@ -1,11 +1,12 @@
 import {Console} from 'console'; // eslint-disable-line node/prefer-global/console
-import {initSetUp} from './default-util';
-import {sentryInit, captureException} from './sentry-util';
-
+import electron from 'electron';
 import fs from 'fs';
 import os from 'os';
+
 import isDev from 'electron-is-dev';
-import electron from 'electron';
+
+import {initSetUp} from './default-util';
+import {sentryInit, captureException} from './sentry-util';
 
 interface LoggerOptions {
 	timestamp?: true | (() => string);
@@ -89,20 +90,21 @@ export default class Logger {
 			nodeConsole, timestamp, level, logInDevMode
 		} = this;
 
-		/* 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:
 				nodeConsole[type](...args);
+				break;
 
-			default: break;
+			default:
 		}
-		/* eslint-enable no-fallthrough */
 
 		console[type](...args);
 	}
@@ -131,7 +133,7 @@ export default class Logger {
 		}
 	}
 
-	trimLog(file: string): void{
+	trimLog(file: string): void {
 		fs.readFile(file, 'utf8', (err, data) => {
 			if (err) {
 				throw err;

app/renderer/js/utils/proxy-util.ts

@@ -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 (_) {
-		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;

app/renderer/js/utils/reconnect-util.ts

@@ -1,10 +1,11 @@
 import {ipcRenderer} from 'electron';
 
-import type WebView from '../components/webview';
 import backoff from 'backoff';
-import request from 'request';
+import {htmlEscape} from 'escape-goat';
+
+import type WebView from '../components/webview';
+
 import Logger from './logger-util';
-import * as RequestUtil from './request-util';
 
 const logger = new Logger({
 	file: 'domain-util.log',
@@ -32,23 +33,7 @@ export default class ReconnectUtil {
 	}
 
 	async isOnline(): Promise<boolean> {
-		return new Promise(resolve => {
-			try {
-				request(
-					{
-						url: `${this.url}/static/favicon.ico`,
-						...RequestUtil.requestOptions(this.url)
-					},
-					(error: Error, response: request.Response) => {
-						const isValidResponse =
-							!error && response.statusCode >= 200 && response.statusCode < 400;
-						resolve(isValidResponse);
-					}
-				);
-			} catch (error) {
-				logger.log(error);
-			}
-		});
+		return ipcRenderer.invoke('is-online', this.url);
 	}
 
 	pollInternetAndReload(): void {
@@ -76,7 +61,7 @@ export default class ReconnectUtil {
 		logger.log('There is no internet connection, try checking network cables, modem and router.');
 		const errorMessageHolder = document.querySelector('#description');
 		if (errorMessageHolder) {
-			errorMessageHolder.innerHTML = `
+			errorMessageHolder.innerHTML = htmlEscape`
 						<div>Your internet connection doesn't seem to work properly!</div>
 						<div>Verify that it works and then click try again.</div>`;
 		}

app/renderer/js/utils/request-util.ts

@@ -1,67 +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 };
-}
-
-export function requestOptions(domain: string): 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 (error) {
-			logger.warn('Error while trying to get certificate:', error);
-		}
-	}
-
-	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()}
-	};
-}
-
-function formatUrl(domain: string): string {
-	const hasPrefix = domain.startsWith('http', 0);
-	if (hasPrefix) {
-		return domain;
-	}
-
-	return domain.includes('localhost:') ? `http://${domain}` : `https://${domain}`;
-}

app/renderer/js/utils/sentry-util.ts

@@ -1,5 +1,4 @@
 import {init} from '@sentry/electron';
-
 import isDev from 'electron-is-dev';
 
 export const sentryInit = (): void => {

app/renderer/js/utils/system-util.ts

@@ -1,5 +1,4 @@
 import {ipcRenderer} from 'electron';
-
 import os from 'os';
 
 export const connectivityERR: string[] = [

app/renderer/js/utils/translation-util.ts

@@ -1,5 +1,7 @@
 import path from 'path';
+
 import i18n from 'i18n';
+
 import * as ConfigUtil from './config-util';
 
 i18n.configure({

app/renderer/main.html

@@ -61,5 +61,4 @@
         // it messes up require module path resolution
         require('./js/main');
     </script>
-    <script>require('./js/shared/preventdrag.js')</script>
 </html>

app/renderer/preference.html

@@ -16,6 +16,5 @@
     <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>
 </html>

app/resources/messages.ts

@@ -8,7 +8,7 @@ export function invalidZulipServerError(domain: string): string {
 		\n • You can connect to that URL in a web browser.\
 		\n • If you need a proxy to connect to the Internet, that you've configured your proxy in the Network settings.\
 		\n • It's a Zulip server. (The oldest supported version is 1.6).\
-		\n • The server has a valid certificate. (You can add custom certificates in Settings > Organizations). \
+		\n • The server has a valid certificate. \
 		\n • The SSL is correctly configured for the certificate. Check out the SSL troubleshooting guide -
 		\n https://zulip.readthedocs.io/en/stable/production/ssl-certificates.html`;
 }
@@ -18,15 +18,6 @@ export function noOrgsError(domain: string): string {
 	\nPlease contact your server administrator.`;
 }
 
-export function certErrorMessage(domain: string, error: string): string {
-	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.`;
-}
-
 export function enterpriseOrgError(length: number, domains: string[]): DialogBoxError {
 	let domainList = '';
 	for (const domain of domains) {

app/translations/ca.json

@@ -81,7 +81,7 @@
 	"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 sense llegir",
+	"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",

app/translations/da.json

@@ -20,57 +20,57 @@
 	"Change": "Skift",
 	"Check for Updates": "Tjek for opdateringer",
 	"Close": "Luk",
-	"Connect": "Forbind",
+	"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 location",
+	"Default download location": "Default download placering",
 	"Delete": "Slet",
-	"Desktop App Settings": "Desktop App Settings",
+	"Desktop App Settings": "Desktop app-indstillinger",
 	"Desktop Notifications": "Desktop-notifikationer",
 	"Desktop Settings": "Desktop-indstillinger",
 	"Disconnect": "Frakobl",
-	"Download App Logs": "Download App-logfiler",
+	"Download App Logs": "Download app-logfiler",
 	"Edit": "Redigér",
-	"Edit Shortcuts": "Edit Shortcuts",
+	"Edit Shortcuts": "Redigér genveje",
 	"Enable auto updates": "Aktivér auto-opdateringer",
-	"Enable error reporting (requires restart)": "Enable error reporting (requires restart)",
-	"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)",
-	"Factory Reset": "Factory Reset",
+	"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 accounts",
+	"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": "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",
+	"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": "NO",
-	"Network": "Network",
-	"OR": "OR",
-	"Organization URL": "Organization URL",
-	"Organizations": "Organizations",
-	"Paste": "Paste",
-	"Paste and Match Style": "Paste and Match Style",
+	"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 rules",
-	"Proxy rules": "Proxy rules",
-	"Quit": "Quit",
-	"Quit Zulip": "Quit Zulip",
+	"Proxy bypass rules": "Proxy bypass regler",
+	"Proxy rules": "Proxy regler",
+	"Quit": "Luk",
+	"Quit Zulip": "Luk Zulip",
 	"Redo": "Redo",
 	"Release Notes": "Release Notes",
 	"Reload": "Reload",

app/translations/de.json

@@ -9,11 +9,11 @@
 	"All the connected organizations will appear here": "Alle verbundenen Organisationen erscheinen hier",
 	"Always start minimized": "Immer minimiert öffnen",
 	"App Updates": "App Updates",
-	"Appearance": "Ansicht",
+	"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)",
+	"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": "Im Dock hüpfen, wenn neue private Nachrichten eingehen",
 	"Certificate file": "Zertifikatsdatei",
@@ -42,7 +42,7 @@
 	"Factory Reset": "Alle Einstellungen auf Standardwerte zurücksetzen",
 	"File": "Datei",
 	"Find accounts": "Accounts finden",
-	"Find accounts by email": "Accounts anhand E-Mail 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",
@@ -93,7 +93,7 @@
 	"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 Do Not Disturb": "Nicht-Stören-Modus umschalten",
 	"Toggle Full Screen": "Vollbildschirm umschalten",
 	"Toggle Sidebar": "Seitenleiste umschalten",
 	"Toggle Tray Icon": "Tray-Icon umschalten",

app/translations/en_GB.json

@@ -2,7 +2,7 @@
 	"About Zulip": "About Zulip",
 	"Actual Size": "Actual Size",
 	"Add Custom Certificates": "Add Custom Certificates",
-	"Add Organization": "Add Organization",
+	"Add Organization": "Add Organisation",
 	"Add a Zulip organization": "Add a Zulip organisation",
 	"Add custom CSS": "Add custom CSS",
 	"Advanced": "Advanced",

app/translations/fi.json

@@ -1,16 +1,16 @@
 {
 	"About Zulip": "Tietoa Zulipista",
-	"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",
+	"Actual Size": "Varsinainen koko",
+	"Add Custom Certificates": "Lisää omia sertifikaatteja",
+	"Add Organization": "Lisää organisaatio",
+	"Add a Zulip organization": "Lisää Zulip-organisaatio",
+	"Add custom CSS": "Lisää oma CSS",
+	"Advanced": "Edistynyt",
 	"All the connected organizations will appear here": "All the connected organizations will appear here",
-	"Always start minimized": "Always start minimized",
-	"App Updates": "App Updates",
-	"Appearance": "Appearance",
-	"Application Shortcuts": "Application Shortcuts",
+	"Always start minimized": "Aloita aina pienennettynä",
+	"App Updates": "Sovellspäivitykset",
+	"Appearance": "Ulkonäkö",
+	"Application Shortcuts": "Sovellusoikotiet",
 	"Are you sure you want to disconnect this organization?": "Are you sure you want to disconnect this organization?",
 	"Auto hide Menu bar": "Auto hide Menu bar",
 	"Auto hide menu bar (Press Alt key to display)": "Auto hide menu bar (Press Alt key to display)",
@@ -20,19 +20,19 @@
 	"Change": "Muuta",
 	"Check for Updates": "Check for Updates",
 	"Close": "Sulje",
-	"Connect": "Connect",
+	"Connect": "Yhdistä",
 	"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",
+	"Copy": "Kopioi",
+	"Copy Zulip URL": "Kopioi Zulip-URL",
+	"Create a new organization": "Luo uusi organisaatio",
+	"Cut": "Leikkaa",
 	"Default download location": "Default download location",
 	"Delete": "Poista",
 	"Desktop App Settings": "Desktop App Settings",
 	"Desktop Notifications": "Desktop Notifications",
 	"Desktop Settings": "Desktop Settings",
-	"Disconnect": "Disconnect",
+	"Disconnect": "Katkaise",
 	"Download App Logs": "Download App Logs",
 	"Edit": "Muokkaa",
 	"Edit Shortcuts": "Edit Shortcuts",
@@ -49,8 +49,8 @@
 	"General": "General",
 	"Get beta updates": "Get beta updates",
 	"Hard Reload": "Hard Reload",
-	"Help": "Help",
-	"Help Center": "Help Center",
+	"Help": "Ohje",
+	"Help Center": "Tukikeskus",
 	"History": "History",
 	"History Shortcuts": "History Shortcuts",
 	"Keyboard Shortcuts": "Keyboard Shortcuts",
@@ -59,26 +59,26 @@
 	"Manual proxy configuration": "Manual proxy configuration",
 	"Minimize": "Minimize",
 	"Mute all sounds from Zulip": "Mute all sounds from Zulip",
-	"NO": "NO",
+	"NO": "EI",
 	"Network": "Network",
 	"OR": "TAI",
 	"Organization URL": "Organisaation URL",
-	"Organizations": "Organizations",
+	"Organizations": "Organisaatiot",
 	"Paste": "Liitä",
-	"Paste and Match Style": "Paste and Match Style",
-	"Proxy": "Proxy",
+	"Paste and Match Style": "Liitä ja täsmää tyylit",
+	"Proxy": "Välipalvelin",
 	"Proxy bypass rules": "Proxy bypass rules",
 	"Proxy rules": "Proxy rules",
 	"Quit": "Lopeta",
-	"Quit Zulip": "Quit Zulip",
-	"Redo": "Redo",
+	"Quit Zulip": "Lopeta Zulip",
+	"Redo": "Toista",
 	"Release Notes": "Release Notes",
-	"Reload": "Reload",
+	"Reload": "Lataa uudelleen",
 	"Report an Issue": "Report an Issue",
-	"Save": "Talleta",
+	"Save": "Tallenna",
 	"Select All": "Valitse kaikki",
 	"Settings": "Asetukset",
-	"Shortcuts": "Shortcuts",
+	"Shortcuts": "Oikopolut",
 	"Show App Logs": "Show App Logs",
 	"Show app icon in system tray": "Show app icon in system tray",
 	"Show app unread badge": "Show app unread badge",
@@ -90,22 +90,22 @@
 	"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",
+	"Tip": "Vinkki",
 	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab",
 	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App",
 	"Toggle Do Not Disturb": "Toggle Do Not Disturb",
 	"Toggle Full Screen": "Toggle Full Screen",
 	"Toggle Sidebar": "Toggle Sidebar",
 	"Toggle Tray Icon": "Toggle Tray Icon",
-	"Tools": "Tools",
-	"Undo": "Undo",
+	"Tools": "Työkalut",
+	"Undo": "Peru",
 	"Upload": "Upload",
 	"Use system proxy settings (requires restart)": "Use system proxy settings (requires restart)",
-	"View": "View",
+	"View": "Näytä",
 	"View Shortcuts": "View Shortcuts",
-	"Window": "Window",
+	"Window": "Ikkuna",
 	"Window Shortcuts": "Window Shortcuts",
-	"YES": "YES",
+	"YES": "KYLLÄ",
 	"Zoom In": "Zoom In",
 	"Zoom Out": "Zoom Out",
 	"Zulip Help": "Zulip Help",

app/translations/hu.json

@@ -112,23 +112,23 @@
 	"keyboard shortcuts": "gyorsbillentyűk",
 	"script": "parancsfájl",
 	"Quit when the window is closed": "Kilépés az ablak bezárásakor",
-	"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"
+	"Ask where to save files before downloading": "Letöltés előtt kérdezze meg a mentés helyét",
+	"Services": "Szolgáltatások",
+	"Hide": "Elrejtés",
+	"Hide Others": "A többi elrejtése",
+	"Unhide": "Felfedés",
+	"AddServer": "Szerver hozzáadás",
+	"App language (requires restart)": "Alkalmazás nyelve (újraindítást igényel)",
+	"Factory Reset Data": "Gyári adatok visszaállítása",
+	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "Alkalmazásadatok törlése - törlődnek a csatlakoztatott szervezetek, fiókok és tanúsítványok is.",
+	"On macOS, the OS spellchecker is used.": "MacOS rendszereken az operációs rendszer helyesírásellenőrzőjét használjuk.",
+	"Change the language from System Preferences → Keyboard → Text → Spelling.": "A nyelv a Rendszerbeállítások → Billentyűzet → Szöveg → Helyesírás pontban változtatható meg.",
+	"Copy Link": "Hivatkozás másolása",
+	"Copy Image": "Kép másolása",
+	"Copy Image URL": "Kép címének másolása",
+	"No Suggestion Found": "Nem találtunk javaslatot",
+	"You can select a maximum of 3 languages for spellchecking.": "Maximum 3 nyelv választható ki helyesírásellenőrzéshez.",
+	"Spellchecker Languages": "Helyesírásellenőrzés nyelvei",
+	"Add to Dictionary": "Hozzáadás a szótárhoz",
+	"Look Up": "Keresés"
 }

app/translations/it.json

@@ -105,23 +105,23 @@
 	"View Shortcuts": "Visualizza Scorciatoie",
 	"Window": "Finestra",
 	"Window Shortcuts": "Scorciatoie Finestra",
-	"YES": "YES",
-	"Zoom In": "Zoom Più",
-	"Zoom Out": "Zoom Meno",
-	"Zulip Help": "Aiuto Zulip",
+	"YES": "SI",
+	"Zoom In": "Ingrandisci",
+	"Zoom Out": "Riduci",
+	"Zulip Help": "Guida di Zulip",
 	"keyboard shortcuts": "scorciatoie tastiera",
 	"script": "script",
 	"Quit when the window is closed": "Esci quando la finestra è chiusa",
 	"Ask where to save files before downloading": "Chiedi dove salvare i file prima di scaricarli",
 	"Services": "Servizi",
 	"Hide": "Nascondi",
-	"Hide Others": "Hide Others",
-	"Unhide": "Unhide",
+	"Hide Others": "Nascondi gli altri",
+	"Unhide": "Mostra",
 	"AddServer": "AddServer",
-	"App language (requires restart)": "App language (requires restart)",
+	"App language (requires restart)": "Lingua applicazione (richiede riavvio)",
 	"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.",
+	"On macOS, the OS spellchecker is used.": "Su macOS, è usato il correttore ortografico di sistema.",
 	"Change the language from System Preferences → Keyboard → Text → Spelling.": "Change the language from System Preferences → Keyboard → Text → Spelling.",
 	"Copy Link": "Copia link",
 	"Copy Image": "Copia immagine",

app/translations/ru.json

@@ -24,13 +24,13 @@
 	"Connect to another organization": "Подключиться к другой организации",
 	"Connected organizations": "Подключенные организации",
 	"Copy": "Копировать",
-	"Copy Zulip URL": "Скопировать URL Zulip",
+	"Copy Zulip URL": "Скопировать ссылку на сервер Zulip",
 	"Create a new organization": "Создать новую организацию",
 	"Cut": "Вырезать",
 	"Default download location": "Папка для загрузки",
 	"Delete": "Удалить",
 	"Desktop App Settings": "Настройки приложения",
-	"Desktop Notifications": "Всплывающие оповещения",
+	"Desktop Notifications": "Оповещения на рабочем столе",
 	"Desktop Settings": "Настройки рабочего стола",
 	"Disconnect": "Отключиться",
 	"Download App Logs": "Скачать логи приложения",
@@ -111,7 +111,7 @@
 	"Zulip Help": "Помощь по Zulip",
 	"keyboard shortcuts": "Горячие клавиши",
 	"script": "скрипт",
-	"Quit when the window is closed": "Выходить при закрытии окна",
+	"Quit when the window is closed": "Выйти, когда окно будет закрыто",
 	"Ask where to save files before downloading": "Спрашивать, где сохранять файлы перед скачиванием",
 	"Services": "Сервисы",
 	"Hide": "Скрыть",

app/translations/supported-locales.json

@@ -5,8 +5,8 @@
     "cs": "česky",
     "da": "Dansk",
     "de": "Deutsch",
+    "el_GR": "Greek (Greece)",
     "el": "Ελληνικά",
-    "el-GR": "Greek (Greece)",
     "en_GB": "English (UK)",
     "en": "English (US)",
     "es": "Español",
@@ -29,6 +29,7 @@
     "pt": "Português",
     "ro": "Română",
     "ru": "Русский",
+    "sk": "Slovak",
     "sr": "српски",
     "sv": "svenska",
     "ta": "தமிழ்",
@@ -37,6 +38,6 @@
     "uz": "O'zbek",
     "vi": "Tiếng Việt",
     "zh_TW": "中文 (傳統的)",
-    "zh-hans": "简体中文",
-    "zh-hant": "繁體中文"
+    "zh-Hans": "简体中文",
+    "zh-Hant": "繁體中文"
 }

app/translations/zh_TW.json

@@ -1,134 +1,134 @@
 {
-	"About Zulip": "About Zulip",
-	"Actual Size": "Actual Size",
-	"Add Custom Certificates": "Add Custom Certificates",
-	"Add Organization": "Add Organization",
-	"Add a Zulip organization": "Add a Zulip organization",
-	"Add custom CSS": "Add custom CSS",
-	"Advanced": "Advanced",
-	"All the connected organizations will appear here": "All the connected organizations will appear here",
-	"Always start minimized": "Always start minimized",
-	"App Updates": "App Updates",
-	"Appearance": "Appearance",
-	"Application Shortcuts": "Application Shortcuts",
-	"Are you sure you want to disconnect this organization?": "Are you sure you want to disconnect this organization?",
-	"Auto hide Menu bar": "Auto hide Menu bar",
-	"Auto hide menu bar (Press Alt key to display)": "Auto hide menu bar (Press Alt key to display)",
-	"Back": "Back",
-	"Bounce dock on new private message": "Bounce dock on new private message",
-	"Certificate file": "Certificate file",
-	"Change": "Change",
-	"Check for Updates": "Check for Updates",
-	"Close": "Close",
-	"Connect": "Connect",
-	"Connect to another organization": "Connect to another organization",
-	"Connected organizations": "Connected organizations",
-	"Copy": "Copy",
-	"Copy Zulip URL": "Copy Zulip URL",
-	"Create a new organization": "Create a new organization",
-	"Cut": "Cut",
-	"Default download location": "Default download location",
-	"Delete": "Delete",
-	"Desktop App Settings": "Desktop App Settings",
-	"Desktop Notifications": "Desktop Notifications",
-	"Desktop Settings": "Desktop Settings",
-	"Disconnect": "Disconnect",
-	"Download App Logs": "Download App Logs",
-	"Edit": "Edit",
-	"Edit Shortcuts": "Edit Shortcuts",
-	"Enable auto updates": "Enable auto updates",
-	"Enable error reporting (requires restart)": "Enable error reporting (requires restart)",
-	"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)",
-	"Factory Reset": "Factory Reset",
-	"File": "File",
-	"Find accounts": "Find accounts",
-	"Find accounts by email": "Find accounts by email",
-	"Flash taskbar on new message": "Flash taskbar on new message",
-	"Forward": "Forward",
-	"Functionality": "Functionality",
-	"General": "General",
-	"Get beta updates": "Get beta updates",
-	"Hard Reload": "Hard Reload",
-	"Help": "Help",
-	"Help Center": "Help Center",
-	"History": "History",
-	"History Shortcuts": "History Shortcuts",
-	"Keyboard Shortcuts": "Keyboard Shortcuts",
-	"Log Out": "Log Out",
-	"Log Out of Organization": "Log Out of Organization",
-	"Manual proxy configuration": "Manual proxy configuration",
-	"Minimize": "Minimize",
-	"Mute all sounds from Zulip": "Mute all sounds from Zulip",
-	"NO": "NO",
-	"Network": "Network",
+	"About Zulip": "關於 Zulip",
+	"Actual Size": "實際大小",
+	"Add Custom Certificates": "新增自定義證書",
+	"Add Organization": "新增組織",
+	"Add a Zulip organization": "新增 Zulip 組織",
+	"Add custom CSS": "新增自定義 CSS",
+	"Advanced": "\b\b進階",
+	"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 新的私人訊息",
+	"Certificate file": "證書檔案",
+	"Change": "修改",
+	"Check for Updates": "檢查更新",
+	"Close": "關閉",
+	"Connect": "連結",
+	"Connect to another organization": "連結至其他組織",
+	"Connected organizations": "已連結的組織",
+	"Copy": "複製",
+	"Copy Zulip URL": "複製 Zulip 網址",
+	"Create a new organization": "新增組織",
+	"Cut": "剪下",
+	"Default download location": "預設下載位置",
+	"Delete": "刪除",
+	"Desktop App Settings": "桌面版應用程式設定",
+	"Desktop Notifications": "桌面版通知",
+	"Desktop Settings": "桌面版設定",
+	"Disconnect": "斷開連結",
+	"Download App Logs": "下載應用程式紀錄",
+	"Edit": "編輯",
+	"Edit Shortcuts": "編輯快捷鍵",
+	"Enable auto updates": "啟用自動更新",
+	"Enable error reporting (requires restart)": "啟用錯誤回報（需要重新啟動）",
+	"Enable spellchecker (requires restart)": "啟用拼字檢查（需要重新啟動）",
+	"Factory Reset": "初始化",
+	"File": "檔案",
+	"Find accounts": "查詢帳號",
+	"Find accounts by email": "用 email 查詢帳號",
+	"Flash taskbar on new message": "有新訊息時閃爍任務欄",
+	"Forward": "轉發",
+	"Functionality": "功能性",
+	"General": "通用",
+	"Get beta updates": "取得 beta 更新",
+	"Hard Reload": "強制重新載入",
+	"Help": "幫助",
+	"Help Center": "幫助中心",
+	"History": "歷史",
+	"History Shortcuts": "歷史快捷鍵",
+	"Keyboard Shortcuts": "Keyboard 快捷鍵",
+	"Log Out": "登出",
+	"Log Out of Organization": "登出此組織",
+	"Manual proxy configuration": "proxy 設定",
+	"Minimize": "最小化",
+	"Mute all sounds from Zulip": "將所有 Zulip 音效靜音",
+	"NO": "否",
+	"Network": "網路",
 	"OR": "或",
-	"Organization URL": "Organization URL",
-	"Organizations": "Organizations",
-	"Paste": "Paste",
-	"Paste and Match Style": "Paste and Match Style",
+	"Organization URL": "組織網址",
+	"Organizations": "組織",
+	"Paste": "貼上",
+	"Paste and Match Style": "貼上並套用樣式",
 	"Proxy": "Proxy",
-	"Proxy bypass rules": "Proxy bypass rules",
-	"Proxy rules": "Proxy rules",
-	"Quit": "Quit",
-	"Quit Zulip": "Quit Zulip",
-	"Redo": "Redo",
-	"Release Notes": "Release Notes",
-	"Reload": "Reload",
-	"Report an Issue": "Report an Issue",
-	"Save": "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",
+	"Proxy bypass rules": "Proxy 白名單規則",
+	"Proxy rules": "Proxy 規則",
+	"Quit": "退出",
+	"Quit Zulip": "退出 Zulip",
+	"Redo": "重做",
+	"Release Notes": "發行公告",
+	"Reload": "重新載入",
+	"Report an Issue": "回報問題",
+	"Save": "儲存",
+	"Select All": "選擇全部",
+	"Settings": "設定",
+	"Shortcuts": "快捷鍵",
+	"Show App Logs": "顯示應用程式記錄",
+	"Show app icon in system tray": "顯示應用程式圖示在系統夾",
+	"Show app unread badge": "顯示應用程式未讀標記",
+	"Show desktop notifications": "顯示桌面版通知",
+	"Show downloaded files in file manager": "顯示下載檔案於檔案管理中",
+	"Show sidebar": "顯示側邊欄",
+	"Start app at login": "登入時開啟應用程式",
+	"Switch to Next Organization": "切換至後一個組織",
+	"Switch to Previous Organization": "切換至前一個組織",
+	"These desktop app shortcuts extend the Zulip webapp's": "這些桌面版快捷鍵是從 Zulip web 版應用程式擴展而來",
+	"This will delete all application data including all added accounts and preferences": "這樣將會刪除所有應用程式的資料，包含所有帳號跟其設定",
+	"Tip": "提示",
+	"Toggle DevTools for Active Tab": "切換 DevTools for Active Tab",
+	"Toggle DevTools for Zulip App": "切換 DevTools for Zulip App",
+	"Toggle Do Not Disturb": "切換勿擾模式",
+	"Toggle Full Screen": "切換全螢幕",
+	"Toggle Sidebar": "切換側邊欄",
+	"Toggle Tray Icon": "切換夾圖示",
+	"Tools": "工具",
+	"Undo": "復原",
+	"Upload": "上傳",
+	"Use system proxy settings (requires restart)": "使用系統 proxy 設定（需要重新啟動）",
+	"View": "檢視",
+	"View Shortcuts": "檢視快捷鍵",
+	"Window": "視窗",
+	"Window Shortcuts": "視窗快捷鍵",
+	"YES": "是",
+	"Zoom In": "放大",
+	"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"
+	"Quit when the window is closed": "當關閉視窗時退出",
+	"Ask where to save files before downloading": "下載前詢問檔案儲存位置",
+	"Services": "服務",
+	"Hide": "隱藏",
+	"Hide Others": "隱藏其他",
+	"Unhide": "取消隱藏",
+	"AddServer": "新增伺服器",
+	"App language (requires restart)": "應用程式語言（需要重新啟動）",
+	"Factory Reset Data": "設定初始化",
+	"Reset the application, thus deleting all the connected organizations, accounts, and certificates.": "重置應用程式，此操作將刪除：已連結的組織、帳號、跟證書",
+	"On macOS, the OS spellchecker is used.": "在 macOS 下使用作業系統的拼字檢查",
+	"Change the language from System Preferences → Keyboard → Text → Spelling.": "變更語言：System Preferences → Keyboard → Text → Spelling.",
+	"Copy Link": "複製網址",
+	"Copy Image": "複製圖",
+	"Copy Image URL": "複製圖網址",
+	"No Suggestion Found": "找不到建議事項",
+	"You can select a maximum of 3 languages for spellchecking.": "您最多可以選擇 3 個語言拼字檢查",
+	"Spellchecker Languages": "需要拼字檢查的語言",
+	"Add to Dictionary": "新增至資料夾",
+	"Look Up": "查詢"
 }

changelog.md

@@ -2,6 +2,81 @@
 
 All notable changes to the Zulip desktop app are documented in this file.
 
+### v5.5.0 --2020-12-01
+
+**Removed features**:
+* Removed legacy handling of custom certificates. Custom certificates can be configured in the same system certificate store that Chrome uses ([instructions](https://zulip.com/help/custom-certificates#desktop)).
+* Removed the unmaintained notification inline replies feature on macOS. We believe the `node-mac-notifier` library used by this feature had been responsible for the grey screen crash issue.
+
+**Fixes**:
+* Fixed a regression with the factory reset function.
+* Fixed the grey screen crash issue on macOS ([#1016](https://github.com/zulip/zulip-desktop/issues/1016)).
+* Whitespace is now stripped from the organization URL when adding a new organization.
+
+**Dependencies**:
+* Upgraded all dependencies, including Electron 11.0.3.
+
+### v5.4.3 --2020-09-10
+
+**Security fixes**:
+* CVE-2020-24582: Escape all strings interpolated into HTML to close cross-site scripting vulnerabilities that a malicious server could exploit.
+
+**Dependencies**:
+* Upgrade dependencies, including Electron 9.3.0.
+
+### v5.4.2 --2020-08-12
+
+**Dependencies**:
+* Upgrade all dependencies, including Electron 9.2.0.
+
+### v5.4.1-beta --2020-07-29
+
+**Fixes**:
+* Resized the large application icon on macOS dock to be coherent with other icons.
+
+**Dependencies**:
+* Upgrade all dependencies, including Electron 9.1.1.
+
+### v5.4.0 --2020-07-21
+
+**New features**:
+* Added support for certificates from system store.
+* Added support for Slovak as application language.
+
+**Fixes**:
+* Fix bug in *Copy Link* and add *Copy Email* option in context menu.
+* Enable *Copy* option in context menu only when copying is possible.
+* Remove leading and trailing separators in context menu on non-mac systems.
+* ignoreCerts: Accommodate WebSocket URLs in certificate-error handler.
+
+**Dependencies**:
+* Upgrade all dependencies, including Electron 8.4.0.
+
+**Deprecations**:
+* This release supports certificates from Zulip store as well as system store. Zulip certificate store will be deprecated in the next release.
+Users are hereby requested to move to system store. For more information, please see the [documentation](https://zulip.com/help/custom-certificates).
+
+### v5.3.0 --2020-06-24
+
+**Security fixes**:
+* Remove the insecure ignoreCerts option.
+
+**Fixes**:
+* Windows: Turn off start at login by default.
+* Fix zoom issues where some webviews would not get zoomed-out once zoomed-in.
+* Fix overflowing contents on 'Add Organization' view.
+
+**New features**:
+* Add a cancel button in the report-issue modal.
+* macOS: Use electron API to get dark tray icon instead of the green icon for the light theme.
+* Remove 'Reset App Data' option. Factory Reset option has been moved to Settings → General.
+* Support pkg installer on macOS.
+* Use electron 8 built-in spellchecker. Linux and Windows users can now choose upto three spellchecker languages from Settings → General. On macOS, default spellchecker is used.
+* Setup Transifex for better synchronization of translations. The application now supports 41 languages instead of 21.
+
+**Dependencies**:
+* Upgrade all dependencies, including Electron 8.3.3.
+
 ### v5.2.0 --2020-05-04
 
 **Security fixes**:

gulpfile.js

@@ -1,16 +1,16 @@
 'use strict';
-const gulp = require('gulp');
+const {execSync} = require('child_process');
+
 const electron = require('electron-connect').server.create({
 	verbose: true
 });
-const tape = require('gulp-tape');
-const tapColorize = require('tap-colorize');
-const ts = require('gulp-typescript');
-const tsProject = ts.createProject('tsconfig.json');
-
 const glob = require('glob');
-const {execSync} = require('child_process');
+const gulp = require('gulp');
+const tape = require('gulp-tape');
+const ts = require('gulp-typescript');
+const tapColorize = require('tap-colorize');
 
+const tsProject = ts.createProject('tsconfig.json');
 const baseFilePattern = 'app/+(main|renderer)/**/*';
 const globOptions = {cwd: __dirname};
 const jsFiles = glob.sync(baseFilePattern + '.js', globOptions);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "5.3.0",
+  "version": "5.5.0",
   "main": "./app/main",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
@@ -24,7 +24,7 @@
     "start": "tsc && electron .",
     "clean-ts-files": "git clean app/*.js -e node_modules -xf",
     "watch-ts": "tsc -w",
-    "reinstall": "node ./tools/reinstall-node-modules.js",
+    "reinstall": "rimraf node_modules && npm install",
     "postinstall": "electron-builder install-app-deps",
     "lint-css": "stylelint app/renderer/css/*.css",
     "lint-html": "./node_modules/.bin/htmlhint \"app/renderer/*.html\" ",
@@ -50,7 +50,7 @@
     "files": [
       "app/**/*"
     ],
-    "copyright": "©2019 Kandra Labs, Inc.",
+    "copyright": "©2020 Kandra Labs, Inc.",
     "mac": {
       "category": "public.app-category.productivity",
       "target": [
@@ -146,66 +146,67 @@
   ],
   "dependencies": {
     "@electron-elements/send-feedback": "^2.0.3",
-    "@sentry/electron": "^1.3.0",
-    "@yaireo/tagify": "^3.10.2",
-    "adm-zip": "^0.4.14",
+    "@sentry/electron": "^2.0.4",
+    "@yaireo/tagify": "^3.21.5",
+    "adm-zip": "^0.5.1",
     "auto-launch": "^5.0.5",
     "backoff": "^2.5.0",
     "electron-is-dev": "^1.2.0",
-    "electron-log": "^4.1.2",
-    "electron-updater": "^4.3.1",
+    "electron-log": "^4.3.0",
+    "electron-updater": "^4.3.5",
     "electron-window-state": "^5.0.3",
-    "escape-html": "^1.0.3",
-    "fs-extra": "^9.0.0",
-    "i18n": "^0.9.1",
-    "iso-639-1": "^2.1.3",
-    "nan": "^2.14.0",
+    "escape-goat": "^3.0.0",
+    "fs-extra": "^9.0.1",
+    "get-stream": "^6.0.0",
+    "i18n": "^0.13.2",
+    "iso-639-1": "^2.1.4",
     "node-json-db": "^1.1.0",
-    "request": "^2.88.2",
-    "semver": "^7.3.2"
-  },
-  "optionalDependencies": {
-    "node-mac-notifier": "^1.1.0"
+    "semver": "^7.3.4"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.4.33",
     "@types/auto-launch": "^5.0.1",
     "@types/backoff": "^2.5.1",
-    "@types/escape-html": "0.0.20",
-    "@types/fs-extra": "^8.1.0",
-    "@types/i18n": "^0.8.6",
-    "@types/node": "^13.13.4",
-    "@types/request": "^2.48.4",
+    "@types/fs-extra": "^9.0.4",
+    "@types/i18n": "^0.8.8",
+    "@types/node": "^14.14.10",
     "@types/requestidlecallback": "^0.3.1",
-    "@typescript-eslint/eslint-plugin": "^2.30.0",
-    "@typescript-eslint/parser": "^2.30.0",
-    "devtron": "^1.4.0",
     "dotenv": "^8.2.0",
-    "electron": "^8.3.3",
-    "electron-builder": "^22.6.0",
+    "electron": "^11.0.3",
+    "electron-builder": "^22.9.1",
     "electron-connect": "^0.6.3",
-    "electron-notarize": "^0.3.0",
-    "eslint-config-xo-typescript": "^0.28.0",
+    "electron-notarize": "^1.0.0",
     "glob": "^7.1.6",
     "gulp": "^4.0.2",
     "gulp-tape": "^1.0.0",
     "gulp-typescript": "^6.0.0-alpha.1",
-    "htmlhint": "^0.11.0",
-    "nodemon": "^2.0.3",
+    "htmlhint": "^0.14.2",
+    "nodemon": "^2.0.6",
     "pre-commit": "^1.2.2",
     "rimraf": "^3.0.2",
-    "spectron": "^10.0.1",
-    "stylelint": "^13.3.3",
+    "spectron": "^13.0.0",
+    "stylelint": "^13.8.0",
     "tap-colorize": "^1.2.0",
-    "tape": "^5.0.0",
-    "typescript": "^3.8.3",
-    "xo": "^0.30.0"
+    "tape": "^5.0.1",
+    "typescript": "^4.1.2",
+    "xo": "^0.35.0"
   },
   "xo": {
     "rules": {
       "@typescript-eslint/no-dynamic-delete": "off",
       "@typescript-eslint/prefer-readonly-parameter-types": "off",
       "arrow-body-style": "error",
+      "import/first": "error",
+      "import/newline-after-import": "error",
+      "import/order": [
+        "error",
+        {
+          "alphabetize": {
+            "order": "asc"
+          },
+          "newlines-between": "always"
+        }
+      ],
       "import/unambiguous": "error",
       "max-lines": [
         "warn",
@@ -228,8 +229,7 @@
           "app/renderer/js/injected.ts",
           "gulpfile.js",
           "scripts/notarize.js",
-          "tests/**/*.js",
-          "tools/reinstall-node-modules.js"
+          "tests/**/*.js"
         ],
         "parserOptions": {
           "sourceType": "script"

scripts/notarize.js

@@ -1,11 +1,11 @@
 'use strict';
 const path = require('path');
+
 const dotenv = require('dotenv');
+const {notarize} = require('electron-notarize');
 
 dotenv.config({path: path.join(__dirname, '/../.env')});
 
-const {notarize} = require('electron-notarize');
-
 exports.default = async function (context) {
 	const {electronPlatformName, appOutDir} = context;
 	if (electronPlatformName !== 'darwin') {