From 14556873841e4abb056efaae3f6f069e01402d51 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 27 May 2021 14:39:26 +0100 Subject: [PATCH] Auto-fix lint errors --- scripts/fetch-package.js | 2 +- scripts/hak/fetch.js | 2 +- scripts/set-version.js | 2 +- src/electron-main.js | 23 +++++++++++------------ src/language-helper.js | 3 +-- src/protocol.js | 2 +- src/squirrelhooks.js | 2 +- src/tray.js | 2 +- src/vectormenu.js | 2 +- src/webcontents-handler.js | 7 +++---- 10 files changed, 22 insertions(+), 25 deletions(-) diff --git a/scripts/fetch-package.js b/scripts/fetch-package.js index 5bd73cc..61d97aa 100755 --- a/scripts/fetch-package.js +++ b/scripts/fetch-package.js @@ -15,7 +15,7 @@ const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc"; const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/"; const ASAR_PATH = 'webapp.asar'; -const {setPackageVersion} = require('./set-version.js'); +const { setPackageVersion } = require('./set-version.js'); async function getLatestDevelopUrl(bkToken) { const buildsResult = await needle('get', diff --git a/scripts/hak/fetch.js b/scripts/hak/fetch.js index 27727cc..3dbda14 100644 --- a/scripts/hak/fetch.js +++ b/scripts/hak/fetch.js @@ -37,7 +37,7 @@ async function fetch(hakEnv, moduleInfo) { if (haveModuleBuildDir) return; await new Promise((resolve) => { - npm.load({'loglevel': 'silent'}, resolve); + npm.load({ 'loglevel': 'silent' }, resolve); }); console.log("Fetching " + moduleInfo.name + " at version " + moduleInfo.version); diff --git a/scripts/set-version.js b/scripts/set-version.js index 169556f..d5d5cc1 100755 --- a/scripts/set-version.js +++ b/scripts/set-version.js @@ -52,4 +52,4 @@ if (require.main === module) { main(process.argv.slice(2)).then((ret) => process.exit(ret)); } -module.exports = {versionFromAsar, setPackageVersion}; +module.exports = { versionFromAsar, setPackageVersion }; diff --git a/src/electron-main.js b/src/electron-main.js index 28c0d4e..3966834 100644 --- a/src/electron-main.js +++ b/src/electron-main.js @@ -24,7 +24,7 @@ const checkSquirrelHooks = require('./squirrelhooks'); if (checkSquirrelHooks()) return; const argv = require('minimist')(process.argv, { - alias: {help: "h"}, + alias: { help: "h" }, }); const { @@ -37,7 +37,7 @@ const tray = require('./tray'); const buildMenuTemplate = require('./vectormenu'); const webContentsHandler = require('./webcontents-handler'); const updater = require('./updater'); -const {getProfileFromDeeplink, protocolInit, recordSSOSession} = require('./protocol'); +const { getProfileFromDeeplink, protocolInit, recordSSOSession } = require('./protocol'); const windowStateKeeper = require('electron-window-state'); const Store = require('electron-store'); @@ -499,7 +499,6 @@ ipcMain.on('ipcCall', async function(ev, payload) { }); }); - const seshatDefaultPassphrase = "DEFAULT_PASSPHRASE"; async function getOrCreatePassphrase(key) { if (keytar) { @@ -551,8 +550,8 @@ ipcMain.on('seshat', async function(ev, payload) { const passphrase = await getOrCreatePassphrase(passphraseKey); try { - await afs.mkdir(eventStorePath, {recursive: true}); - eventIndex = new Seshat(eventStorePath, {passphrase}); + await afs.mkdir(eventStorePath, { recursive: true }); + eventIndex = new Seshat(eventStorePath, { passphrase }); } catch (e) { if (e instanceof ReindexError) { // If this is a reindex error, the index schema @@ -578,7 +577,7 @@ ipcMain.on('seshat', async function(ev, payload) { await recoveryIndex.reindex(); } - eventIndex = new Seshat(eventStorePath, {passphrase}); + eventIndex = new Seshat(eventStorePath, { passphrase }); } else { sendError(payload.id, e); return; @@ -836,17 +835,17 @@ app.on('ready', async () => { protocol.registerFileProtocol('vector', (request, callback) => { if (request.method !== 'GET') { - callback({error: -322}); // METHOD_NOT_SUPPORTED from chromium/src/net/base/net_error_list.h + callback({ error: -322 }); // METHOD_NOT_SUPPORTED from chromium/src/net/base/net_error_list.h return null; } const parsedUrl = new URL(request.url); if (parsedUrl.protocol !== 'vector:') { - callback({error: -302}); // UNKNOWN_URL_SCHEME + callback({ error: -302 }); // UNKNOWN_URL_SCHEME return; } if (parsedUrl.host !== 'vector') { - callback({error: -105}); // NAME_NOT_RESOLVED + callback({ error: -105 }); // NAME_NOT_RESOLVED return; } @@ -854,7 +853,7 @@ app.on('ready', async () => { // path starts with a '/' if (target[0] !== '') { - callback({error: -6}); // FILE_NOT_FOUND + callback({ error: -6 }); // FILE_NOT_FOUND return; } @@ -866,7 +865,7 @@ app.on('ready', async () => { if (target[1] === 'webapp') { baseDir = asarPath; } else { - callback({error: -6}); // FILE_NOT_FOUND + callback({ error: -6 }); // FILE_NOT_FOUND return; } @@ -876,7 +875,7 @@ app.on('ready', async () => { const relTarget = path.normalize(path.join(...target.slice(2))); if (relTarget.startsWith('..')) { - callback({error: -6}); // FILE_NOT_FOUND + callback({ error: -6 }); // FILE_NOT_FOUND return; } const absTarget = path.join(baseDir, relTarget); diff --git a/src/language-helper.js b/src/language-helper.js index baf6c46..e3a8231 100644 --- a/src/language-helper.js +++ b/src/language-helper.js @@ -48,7 +48,7 @@ function _t(text, variables = {}) { if (translated === undefined && count !== undefined) { // counterpart does not do fallback if no pluralisation exists // in the preferred language, so do it here - translated = counterpart.translate(text, Object.assign({}, args, {locale: DEFAULT_LOCALE})); + translated = counterpart.translate(text, Object.assign({}, args, { locale: DEFAULT_LOCALE })); } // The translation returns text so there's no XSS vector here (no unsafe HTML, no code execution) @@ -121,7 +121,6 @@ class AppLocalization { } } - module.exports = { AppLocalization, _t, diff --git a/src/protocol.js b/src/protocol.js index 3b2cd20..69f3df5 100644 --- a/src/protocol.js +++ b/src/protocol.js @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -const {app} = require("electron"); +const { app } = require("electron"); const path = require("path"); const fs = require("fs"); diff --git a/src/squirrelhooks.js b/src/squirrelhooks.js index 317a974..4eeb1c8 100644 --- a/src/squirrelhooks.js +++ b/src/squirrelhooks.js @@ -16,7 +16,7 @@ limitations under the License. const path = require('path'); const spawn = require('child_process').spawn; -const {app} = require('electron'); +const { app } = require('electron'); const fsProm = require('fs').promises; function runUpdateExe(args) { diff --git a/src/tray.js b/src/tray.js index 7e43025..34ae072 100644 --- a/src/tray.js +++ b/src/tray.js @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -const {app, Tray, Menu, nativeImage} = require('electron'); +const { app, Tray, Menu, nativeImage } = require('electron'); const pngToIco = require('png-to-ico'); const path = require('path'); const fs = require('fs'); diff --git a/src/vectormenu.js b/src/vectormenu.js index 8f1fb63..a14aab0 100644 --- a/src/vectormenu.js +++ b/src/vectormenu.js @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -const {app, shell, Menu} = require('electron'); +const { app, shell, Menu } = require('electron'); const { _t } = require('./language-helper'); function buildMenuTemplate() { diff --git a/src/webcontents-handler.js b/src/webcontents-handler.js index 24523e7..1f63cf8 100644 --- a/src/webcontents-handler.js +++ b/src/webcontents-handler.js @@ -1,4 +1,4 @@ -const {clipboard, nativeImage, Menu, MenuItem, shell, dialog, ipcMain} = require('electron'); +const { clipboard, nativeImage, Menu, MenuItem, shell, dialog, ipcMain } = require('electron'); const url = require('url'); const fs = require('fs'); const request = require('request'); @@ -50,7 +50,6 @@ function writeNativeImage(filePath, img) { } } - function onLinkContextMenu(ev, params) { let url = params.linkURL || params.srcURL; @@ -112,7 +111,7 @@ function onLinkContextMenu(ev, params) { accelerator: 'a', async click() { const targetFileName = params.titleText || "image.png"; - const {filePath} = await dialog.showSaveDialog({ + const { filePath } = await dialog.showSaveDialog({ defaultPath: targetFileName, }); @@ -215,7 +214,7 @@ function onEditableContextMenu(ev, params) { ev.preventDefault(); } -ipcMain.on('userDownloadOpen', function(ev, {path}) { +ipcMain.on('userDownloadOpen', function(ev, { path }) { shell.openPath(path); });