From 3ea0689d2f513bd3386b8eb6af96bda679f9333a Mon Sep 17 00:00:00 2001 From: Mikunj Date: Fri, 5 Jun 2020 13:07:11 +1000 Subject: [PATCH] Linting --- _locales/en/messages.json | 3 +- integration_test/add_friends_test.js | 12 ++---- integration_test/link_device_test.js | 4 +- integration_test/message_sync_test.js | 8 +--- js/models/conversations.js | 7 ++-- js/modules/loki_app_dot_net_api.js | 16 ++------ js/modules/loki_rpc.js | 4 +- js/modules/loki_snode_api.js | 12 ++---- libtextsecure/outgoing_message.js | 3 +- preload.js | 4 +- .../session/SessionClosableOverlay.tsx | 41 +++++++++---------- 11 files changed, 41 insertions(+), 73 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 47278c477..84442031f 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2229,8 +2229,7 @@ }, "invalidHexId": { "message": "Invalid Session ID or LNS Name", - "description": - "Error string shown when user types an invalid pubkey hex string" + "description": "Error string shown when user types an invalid pubkey hex string" }, "invalidLnsFormat": { "message": "Invalid LNS Name", diff --git a/integration_test/add_friends_test.js b/integration_test/add_friends_test.js index cd3f4566e..034064bb5 100644 --- a/integration_test/add_friends_test.js +++ b/integration_test/add_friends_test.js @@ -124,21 +124,15 @@ describe('Add friends', function() { ); await common.logsContains( bobLogs, - `Received a NORMAL_FRIEND_REQUEST from source: ${ - common.TEST_PUBKEY1 - }, primarySource: ${common.TEST_PUBKEY1},` + `Received a NORMAL_FRIEND_REQUEST from source: ${common.TEST_PUBKEY1}, primarySource: ${common.TEST_PUBKEY1},` ); await common.logsContains( bobLogs, - `Sending incoming-friend-request-accept:onlineBroadcast message to ${ - common.TEST_PUBKEY1 - }` + `Sending incoming-friend-request-accept:onlineBroadcast message to ${common.TEST_PUBKEY1}` ); await common.logsContains( aliceLogs, - `Sending outgoing-friend-request-accepted:onlineBroadcast message to ${ - common.TEST_PUBKEY2 - }` + `Sending outgoing-friend-request-accepted:onlineBroadcast message to ${common.TEST_PUBKEY2}` ); }); }); diff --git a/integration_test/link_device_test.js b/integration_test/link_device_test.js index 2c7ac9505..6ccbd14f1 100644 --- a/integration_test/link_device_test.js +++ b/integration_test/link_device_test.js @@ -52,9 +52,7 @@ describe('Link Device', function() { // pairing request message sent from secondary to primary pubkey await common.logsContains( secondaryRenderLogs, - `Sending pairing-request:pairing-request message to ${ - common.TEST_PUBKEY1 - }` + `Sending pairing-request:pairing-request message to ${common.TEST_PUBKEY1}` ); const primaryRenderLogs = await app.client.getRenderProcessLogs(); diff --git a/integration_test/message_sync_test.js b/integration_test/message_sync_test.js index 46e0f275a..4f40a89d3 100644 --- a/integration_test/message_sync_test.js +++ b/integration_test/message_sync_test.js @@ -98,16 +98,12 @@ describe('Message Syncing', function() { ); await common.logsContains( alice2Logs, - `Sending auto-friend-request:friend-request message to ${ - common.TEST_PUBKEY2 - }`, + `Sending auto-friend-request:friend-request message to ${common.TEST_PUBKEY2}`, 1 ); await common.logsContains( alice2Logs, - `Sending session-request:friend-request message to ${ - common.TEST_PUBKEY2 - }`, + `Sending session-request:friend-request message to ${common.TEST_PUBKEY2}`, 1 ); await common.logsContains( diff --git a/js/models/conversations.js b/js/models/conversations.js index 4ec89bbc2..3419e15b3 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -1005,10 +1005,9 @@ // Search through each conversation (device) for friend request messages const pendingRequestPromises = allConversationsWithUser.map( async conversation => { - const request = (await conversation.getFriendRequests( - direction, - status - ))[0]; + const request = ( + await conversation.getFriendRequests(direction, status) + )[0]; return { conversation, request }; } ); diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index 79bf92331..ef693a024 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -97,16 +97,12 @@ const sendViaOnion = async (srvPubKey, url, fetchOptions, options = {}) => { pathNodes = await lokiSnodeAPI.getOnionPath(); } catch (e) { log.error( - `loki_app_dot_net:::sendViaOnion #${ - options.requestNumber - } - getOnionPath Error ${e.code} ${e.message}` + `loki_app_dot_net:::sendViaOnion #${options.requestNumber} - getOnionPath Error ${e.code} ${e.message}` ); } if (!pathNodes || !pathNodes.length) { log.warn( - `loki_app_dot_net:::sendViaOnion #${ - options.requestNumber - } - failing, no path available` + `loki_app_dot_net:::sendViaOnion #${options.requestNumber} - failing, no path available` ); // should we retry? return {}; @@ -135,9 +131,7 @@ const sendViaOnion = async (srvPubKey, url, fetchOptions, options = {}) => { // handle error/retries if (!result.status) { log.error( - `loki_app_dot_net:::sendViaOnion #${options.requestNumber} - Retry #${ - options.retry - } Couldnt handle onion request, retrying`, + `loki_app_dot_net:::sendViaOnion #${options.requestNumber} - Retry #${options.retry} Couldnt handle onion request, retrying`, payloadObj ); return sendViaOnion(srvPubKey, url, fetchOptions, { @@ -155,9 +149,7 @@ const sendViaOnion = async (srvPubKey, url, fetchOptions, options = {}) => { body = JSON.parse(result.body); } catch (e) { log.error( - `loki_app_dot_net:::sendViaOnion #${ - options.requestNumber - } - Cant decode JSON body`, + `loki_app_dot_net:::sendViaOnion #${options.requestNumber} - Cant decode JSON body`, result.body ); } diff --git a/js/modules/loki_rpc.js b/js/modules/loki_rpc.js index 589c91a33..faf59adcd 100644 --- a/js/modules/loki_rpc.js +++ b/js/modules/loki_rpc.js @@ -284,9 +284,7 @@ const processOnionResponse = async ( if (response.status !== 200) { log.warn( - `(${reqIdx}) [path] lokiRpc::processOnionResponse - fetch unhandled error code: ${ - response.status - }` + `(${reqIdx}) [path] lokiRpc::processOnionResponse - fetch unhandled error code: ${response.status}` ); return false; } diff --git a/js/modules/loki_snode_api.js b/js/modules/loki_snode_api.js index d1d32b503..e015fc923 100644 --- a/js/modules/loki_snode_api.js +++ b/js/modules/loki_snode_api.js @@ -115,9 +115,7 @@ async function tryGetSnodeListFromLokidSeednode( } if (snodes.length) { log.info( - `loki_snodes:::tryGetSnodeListFromLokidSeednode - got ${ - snodes.length - } service nodes from seed` + `loki_snodes:::tryGetSnodeListFromLokidSeednode - got ${snodes.length} service nodes from seed` ); } return snodes; @@ -277,18 +275,14 @@ class LokiSnodeAPI { if (shuffled.length < DESIRED_GUARD_COUNT) { log.error( - `Could not select guard nodes: node pool is not big enough, pool size ${ - shuffled.length - }, need ${DESIRED_GUARD_COUNT}, attempting to refresh randomPool` + `Could not select guard nodes: node pool is not big enough, pool size ${shuffled.length}, need ${DESIRED_GUARD_COUNT}, attempting to refresh randomPool` ); await this.refreshRandomPool(); nodePool = await this.getRandomSnodePool(); shuffled = _.shuffle(nodePool); if (shuffled.length < DESIRED_GUARD_COUNT) { log.error( - `Could not select guard nodes: node pool is not big enough, pool size ${ - shuffled.length - }, need ${DESIRED_GUARD_COUNT}, failing...` + `Could not select guard nodes: node pool is not big enough, pool size ${shuffled.length}, need ${DESIRED_GUARD_COUNT}, failing...` ); return []; } diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js index 04659a76f..750ee6e4b 100644 --- a/libtextsecure/outgoing_message.js +++ b/libtextsecure/outgoing_message.js @@ -167,8 +167,7 @@ function OutgoingMessage( publicSendData, debugMessageType, autoSession, - } = - options || {}; + } = options || {}; this.numberInfo = numberInfo; this.isPublic = isPublic; this.isMediumGroup = !!isMediumGroup; diff --git a/preload.js b/preload.js index 3f3dfc376..4622d12b7 100644 --- a/preload.js +++ b/preload.js @@ -73,7 +73,7 @@ window.isBeforeVersion = (toCheck, baseVersion) => { }; // eslint-disable-next-line func-names -window.CONSTANTS = new function() { +window.CONSTANTS = new (function() { this.MAX_LOGIN_TRIES = 3; this.MAX_PASSWORD_LENGTH = 64; this.MAX_USERNAME_LENGTH = 20; @@ -96,7 +96,7 @@ window.CONSTANTS = new function() { // https://loki.network/2020/03/25/loki-name-system-the-facts/ this.LNS_REGEX = `^[a-zA-Z0-9_]([a-zA-Z0-9_-]{0,${this.LNS_MAX_LENGTH - 2}}[a-zA-Z0-9_]){0,1}$`; -}(); +})(); window.versionInfo = { environment: window.getEnvironment(), diff --git a/ts/components/session/SessionClosableOverlay.tsx b/ts/components/session/SessionClosableOverlay.tsx index e4e804a8b..8c26927d7 100644 --- a/ts/components/session/SessionClosableOverlay.tsx +++ b/ts/components/session/SessionClosableOverlay.tsx @@ -249,27 +249,26 @@ export class SessionClosableOverlay extends React.Component { /> )} - {isClosedGroupView && - window.lokiFeatureFlags.enableSenderKeys && ( -
- { - const value = this.state.senderKeys; - this.setState({ senderKeys: !value }); - }} - /> - - - {window.i18n('useSenderKeys')} - -
- )} + {isClosedGroupView && window.lokiFeatureFlags.enableSenderKeys && ( +
+ { + const value = this.state.senderKeys; + this.setState({ senderKeys: !value }); + }} + /> + + + {window.i18n('useSenderKeys')} + +
+ )}