Auto-fix lint errors

This commit is contained in:
J. Ryan Stinnett 2021-05-27 14:39:26 +01:00
parent 3efed87d38
commit 1455687384
10 changed files with 22 additions and 25 deletions

View File

@ -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 PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/";
const ASAR_PATH = 'webapp.asar'; const ASAR_PATH = 'webapp.asar';
const {setPackageVersion} = require('./set-version.js'); const { setPackageVersion } = require('./set-version.js');
async function getLatestDevelopUrl(bkToken) { async function getLatestDevelopUrl(bkToken) {
const buildsResult = await needle('get', const buildsResult = await needle('get',

View File

@ -37,7 +37,7 @@ async function fetch(hakEnv, moduleInfo) {
if (haveModuleBuildDir) return; if (haveModuleBuildDir) return;
await new Promise((resolve) => { await new Promise((resolve) => {
npm.load({'loglevel': 'silent'}, resolve); npm.load({ 'loglevel': 'silent' }, resolve);
}); });
console.log("Fetching " + moduleInfo.name + " at version " + moduleInfo.version); console.log("Fetching " + moduleInfo.name + " at version " + moduleInfo.version);

View File

@ -52,4 +52,4 @@ if (require.main === module) {
main(process.argv.slice(2)).then((ret) => process.exit(ret)); main(process.argv.slice(2)).then((ret) => process.exit(ret));
} }
module.exports = {versionFromAsar, setPackageVersion}; module.exports = { versionFromAsar, setPackageVersion };

View File

@ -24,7 +24,7 @@ const checkSquirrelHooks = require('./squirrelhooks');
if (checkSquirrelHooks()) return; if (checkSquirrelHooks()) return;
const argv = require('minimist')(process.argv, { const argv = require('minimist')(process.argv, {
alias: {help: "h"}, alias: { help: "h" },
}); });
const { const {
@ -37,7 +37,7 @@ const tray = require('./tray');
const buildMenuTemplate = require('./vectormenu'); const buildMenuTemplate = require('./vectormenu');
const webContentsHandler = require('./webcontents-handler'); const webContentsHandler = require('./webcontents-handler');
const updater = require('./updater'); const updater = require('./updater');
const {getProfileFromDeeplink, protocolInit, recordSSOSession} = require('./protocol'); const { getProfileFromDeeplink, protocolInit, recordSSOSession } = require('./protocol');
const windowStateKeeper = require('electron-window-state'); const windowStateKeeper = require('electron-window-state');
const Store = require('electron-store'); const Store = require('electron-store');
@ -499,7 +499,6 @@ ipcMain.on('ipcCall', async function(ev, payload) {
}); });
}); });
const seshatDefaultPassphrase = "DEFAULT_PASSPHRASE"; const seshatDefaultPassphrase = "DEFAULT_PASSPHRASE";
async function getOrCreatePassphrase(key) { async function getOrCreatePassphrase(key) {
if (keytar) { if (keytar) {
@ -551,8 +550,8 @@ ipcMain.on('seshat', async function(ev, payload) {
const passphrase = await getOrCreatePassphrase(passphraseKey); const passphrase = await getOrCreatePassphrase(passphraseKey);
try { try {
await afs.mkdir(eventStorePath, {recursive: true}); await afs.mkdir(eventStorePath, { recursive: true });
eventIndex = new Seshat(eventStorePath, {passphrase}); eventIndex = new Seshat(eventStorePath, { passphrase });
} catch (e) { } catch (e) {
if (e instanceof ReindexError) { if (e instanceof ReindexError) {
// If this is a reindex error, the index schema // If this is a reindex error, the index schema
@ -578,7 +577,7 @@ ipcMain.on('seshat', async function(ev, payload) {
await recoveryIndex.reindex(); await recoveryIndex.reindex();
} }
eventIndex = new Seshat(eventStorePath, {passphrase}); eventIndex = new Seshat(eventStorePath, { passphrase });
} else { } else {
sendError(payload.id, e); sendError(payload.id, e);
return; return;
@ -836,17 +835,17 @@ app.on('ready', async () => {
protocol.registerFileProtocol('vector', (request, callback) => { protocol.registerFileProtocol('vector', (request, callback) => {
if (request.method !== 'GET') { 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; return null;
} }
const parsedUrl = new URL(request.url); const parsedUrl = new URL(request.url);
if (parsedUrl.protocol !== 'vector:') { if (parsedUrl.protocol !== 'vector:') {
callback({error: -302}); // UNKNOWN_URL_SCHEME callback({ error: -302 }); // UNKNOWN_URL_SCHEME
return; return;
} }
if (parsedUrl.host !== 'vector') { if (parsedUrl.host !== 'vector') {
callback({error: -105}); // NAME_NOT_RESOLVED callback({ error: -105 }); // NAME_NOT_RESOLVED
return; return;
} }
@ -854,7 +853,7 @@ app.on('ready', async () => {
// path starts with a '/' // path starts with a '/'
if (target[0] !== '') { if (target[0] !== '') {
callback({error: -6}); // FILE_NOT_FOUND callback({ error: -6 }); // FILE_NOT_FOUND
return; return;
} }
@ -866,7 +865,7 @@ app.on('ready', async () => {
if (target[1] === 'webapp') { if (target[1] === 'webapp') {
baseDir = asarPath; baseDir = asarPath;
} else { } else {
callback({error: -6}); // FILE_NOT_FOUND callback({ error: -6 }); // FILE_NOT_FOUND
return; return;
} }
@ -876,7 +875,7 @@ app.on('ready', async () => {
const relTarget = path.normalize(path.join(...target.slice(2))); const relTarget = path.normalize(path.join(...target.slice(2)));
if (relTarget.startsWith('..')) { if (relTarget.startsWith('..')) {
callback({error: -6}); // FILE_NOT_FOUND callback({ error: -6 }); // FILE_NOT_FOUND
return; return;
} }
const absTarget = path.join(baseDir, relTarget); const absTarget = path.join(baseDir, relTarget);

View File

@ -48,7 +48,7 @@ function _t(text, variables = {}) {
if (translated === undefined && count !== undefined) { if (translated === undefined && count !== undefined) {
// counterpart does not do fallback if no pluralisation exists // counterpart does not do fallback if no pluralisation exists
// in the preferred language, so do it here // 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) // 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 = { module.exports = {
AppLocalization, AppLocalization,
_t, _t,

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
const {app} = require("electron"); const { app } = require("electron");
const path = require("path"); const path = require("path");
const fs = require("fs"); const fs = require("fs");

View File

@ -16,7 +16,7 @@ limitations under the License.
const path = require('path'); const path = require('path');
const spawn = require('child_process').spawn; const spawn = require('child_process').spawn;
const {app} = require('electron'); const { app } = require('electron');
const fsProm = require('fs').promises; const fsProm = require('fs').promises;
function runUpdateExe(args) { function runUpdateExe(args) {

View File

@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License. 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 pngToIco = require('png-to-ico');
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs');

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
const {app, shell, Menu} = require('electron'); const { app, shell, Menu } = require('electron');
const { _t } = require('./language-helper'); const { _t } = require('./language-helper');
function buildMenuTemplate() { function buildMenuTemplate() {

View File

@ -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 url = require('url');
const fs = require('fs'); const fs = require('fs');
const request = require('request'); const request = require('request');
@ -50,7 +50,6 @@ function writeNativeImage(filePath, img) {
} }
} }
function onLinkContextMenu(ev, params) { function onLinkContextMenu(ev, params) {
let url = params.linkURL || params.srcURL; let url = params.linkURL || params.srcURL;
@ -112,7 +111,7 @@ function onLinkContextMenu(ev, params) {
accelerator: 'a', accelerator: 'a',
async click() { async click() {
const targetFileName = params.titleText || "image.png"; const targetFileName = params.titleText || "image.png";
const {filePath} = await dialog.showSaveDialog({ const { filePath } = await dialog.showSaveDialog({
defaultPath: targetFileName, defaultPath: targetFileName,
}); });
@ -215,7 +214,7 @@ function onEditableContextMenu(ev, params) {
ev.preventDefault(); ev.preventDefault();
} }
ipcMain.on('userDownloadOpen', function(ev, {path}) { ipcMain.on('userDownloadOpen', function(ev, { path }) {
shell.openPath(path); shell.openPath(path);
}); });