paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-04 05:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

xo: Enable @typescript-eslint/restrict-template-expressions.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2020-04-25 16:53:33 -07:00
committed by Anders Kaseorg
parent fc6ff83485
commit 849df4adaf
6 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/renderer/js/electron-bridge.ts
View File

@@ -59,7 +59,11 @@ electron_bridge.on('realm_name', realmName => {
ipcRenderer.send('realm-name-changed', serverURL, realmName); ipcRenderer.send('realm-name-changed', serverURL, realmName);
}); });
electron_bridge.on('realm_icon_url', iconURL => { electron_bridge.on('realm_icon_url', (iconURL: unknown) => {
if (typeof iconURL !== 'string') {
throw new TypeError('Expected string for iconURL');
}
const serverURL = location.origin; const serverURL = location.origin;
iconURL = iconURL.includes('http') ? iconURL : `${serverURL}${iconURL}`; iconURL = iconURL.includes('http') ? iconURL : `${serverURL}${iconURL}`;
ipcRenderer.send('realm-icon-changed', serverURL, iconURL); ipcRenderer.send('realm-icon-changed', serverURL, iconURL);

6
app/renderer/js/notification/helpers.ts
View File

@@ -21,9 +21,9 @@ export async function loadBots(): Promise<void> {
const response = await fetch('/json/users'); const response = await fetch('/json/users');
if (response.ok) { if (response.ok) {
const { members } = await response.json(); const { members } = await response.json();
members.forEach((membersRow: any) => { members.forEach(({ is_bot, full_name }: any) => {
if (membersRow.is_bot) { if (is_bot && typeof full_name === 'string') {
const bot = `@${membersRow.full_name}`; const bot = `@${full_name}`;
const mention = `@**${bot.replace(/^@/, '')}**`; const mention = `@**${bot.replace(/^@/, '')}**`;
botsList.push([bot, mention]); botsList.push([bot, mention]);
} }

6
app/renderer/js/pages/preference/general-section.ts
View File

@@ -101,7 +101,7 @@ export default class GeneralSection extends BaseSection {
<div class="setting-description">${t.__('Enable error reporting (requires restart)')}</div> <div class="setting-description">${t.__('Enable error reporting (requires restart)')}</div>
<div class="setting-control"></div> <div class="setting-control"></div>
</div> </div>
<div class="setting-row" id="app-language"> <div class="setting-row" id="app-language">
<div class="setting-description">${t.__('App language (requires restart)')}</div> <div class="setting-description">${t.__('App language (requires restart)')}</div>
<div id="lang-div" class="lang-div"></div> <div id="lang-div" class="lang-div"></div>
@@ -115,7 +115,7 @@ export default class GeneralSection extends BaseSection {
</div> </div>
<div class="setting-row" id="remove-custom-css"> <div class="setting-row" id="remove-custom-css">
<div class="setting-description"> <div class="setting-description">
<div class="selected-css-path" id="custom-css-path">${ConfigUtil.getConfigItem('customCSS')}</div> <div class="selected-css-path" id="custom-css-path">${ConfigUtil.getConfigString('customCSS', '')}</div>
</div> </div>
<div class="action red" id="css-delete-action"> <div class="action red" id="css-delete-action">
<i class="material-icons">indeterminate_check_box</i> <i class="material-icons">indeterminate_check_box</i>
@@ -130,7 +130,7 @@ export default class GeneralSection extends BaseSection {
</div> </div>
<div class="setting-row"> <div class="setting-row">
<div class="setting-description"> <div class="setting-description">
<div class="download-folder-path">${ConfigUtil.getConfigItem('downloadsPath', `${app.getPath('downloads')}`)}</div> <div class="download-folder-path">${ConfigUtil.getConfigString('downloadsPath', app.getPath('downloads'))}</div>
</div> </div>
</div> </div>
<div class="setting-row" id="prompt-download"> <div class="setting-row" id="prompt-download">

10
app/renderer/js/utils/config-util.ts
View File

@@ -45,6 +45,16 @@ export function getConfigItem(key: string, defaultValue: any = null): any {
} }
} }
export function getConfigString(key: string, defaultValue: string): string {
const value = getConfigItem(key, defaultValue);
if (typeof value === 'string') {
return value;
} else {
setConfigItem(key, defaultValue);
return defaultValue;
}
}
// This function returns whether a key exists in the configuration file (settings.json) // This function returns whether a key exists in the configuration file (settings.json)
export function isConfigItemExists(key: string): boolean { export function isConfigItemExists(key: string): boolean {
try { try {

2
app/renderer/js/utils/request-util.ts
View File

@@ -45,7 +45,7 @@ export function requestOptions(domain: string, ignoreCerts: boolean): RequestUti
try { try {
certificateLocation = fs.readFileSync(certificateFile, 'utf8'); certificateLocation = fs.readFileSync(certificateFile, 'utf8');
} catch (error) { } catch (error) {
logger.warn(`Error while trying to get certificate: ${error}`); logger.warn('Error while trying to get certificate:', error);
} }
} }

1
package.json
View File

@@ -207,7 +207,6 @@
"@typescript-eslint/no-unused-vars": "off", "@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/prefer-readonly-parameter-types": "off", "@typescript-eslint/prefer-readonly-parameter-types": "off",
"@typescript-eslint/restrict-plus-operands": "off", "@typescript-eslint/restrict-plus-operands": "off",
"@typescript-eslint/restrict-template-expressions": "off",
"capitalized-comments": "off", "capitalized-comments": "off",
"import/no-mutable-exports": "off", "import/no-mutable-exports": "off",
"import/unambiguous": "error", "import/unambiguous": "error",