From e399b9b65bf11d8370a1e4486667a8098c96aeca Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 19 May 2020 16:19:18 +1000 Subject: [PATCH] lint --- integration_test/message_sync_test.js | 88 +++++++++++++++++++++------ js/models/messages.js | 1 - libtextsecure/account_manager.js | 1 - libtextsecure/outgoing_message.js | 2 +- preload.js | 2 - 5 files changed, 70 insertions(+), 24 deletions(-) diff --git a/integration_test/message_sync_test.js b/integration_test/message_sync_test.js index 296f2674c..f83c9c14b 100644 --- a/integration_test/message_sync_test.js +++ b/integration_test/message_sync_test.js @@ -17,9 +17,7 @@ describe('Message Syncing', function() { await common.killallElectron(); await common.stopStubSnodeServer(); - - const alice2Props = { - }; + const alice2Props = {}; [Alice1, Bob1] = await common.startAppsAsFriends(); // Alice and Bob are friends @@ -54,8 +52,9 @@ describe('Message Syncing', function() { await common.timeout(12000); // validate primary pubkey of app2 is the same that in app1 - const alice2Pubkey = await Alice2.webContents - .executeJavaScript('window.textsecure.storage.user.getNumber()'); + const alice2Pubkey = await Alice2.webContents.executeJavaScript( + 'window.textsecure.storage.user.getNumber()' + ); alice2Pubkey.should.have.lengthOf(66); const alice1Logs = await Alice1.client.getRenderProcessLogs(); @@ -63,34 +62,85 @@ describe('Message Syncing', function() { const alice2Logs = await Alice2.client.getRenderProcessLogs(); // validate primary alice - await common.logsContains(alice1Logs, 'Sending closed-group-sync-send:outgoing message to OUR SECONDARY PUBKEY', 1); - await common.logsContains(alice1Logs, 'Sending open-group-sync-send:outgoing message to OUR SECONDARY PUBKEY', 1); - await common.logsContains(alice1Logs, 'Sending contact-sync-send:outgoing message to OUR SECONDARY PUBKEY', 1); - + await common.logsContains( + alice1Logs, + 'Sending closed-group-sync-send:outgoing message to OUR SECONDARY PUBKEY', + 1 + ); + await common.logsContains( + alice1Logs, + 'Sending open-group-sync-send:outgoing message to OUR SECONDARY PUBKEY', + 1 + ); + await common.logsContains( + alice1Logs, + 'Sending contact-sync-send:outgoing message to OUR SECONDARY PUBKEY', + 1 + ); // validate secondary alice // what is expected is // alice2 receives group sync, contact sync and open group sync // alice2 triggers session request with closed group members and autoFR with contact sync received // once autoFR is auto-accepted, alice2 trigger contact sync - await common.logsContains(alice2Logs, 'Got sync group message with group id', 1); - await common.logsContains(alice2Logs, 'Received GROUP_SYNC with open groups: [chat.getsession.org]', 1); - await common.logsContains(alice2Logs, `Sending auto-friend-request:onlineBroadcast message to ${common.TEST_PUBKEY2}`, 1); - await common.logsContains(alice2Logs, `Sending session-request:friend-request message to ${common.TEST_PUBKEY2}`, 1); - await common.logsContains(alice2Logs, `Sending contact-sync-send:outgoing message to OUR_PRIMARY_PUBKEY`, 1); + await common.logsContains( + alice2Logs, + 'Got sync group message with group id', + 1 + ); + await common.logsContains( + alice2Logs, + 'Received GROUP_SYNC with open groups: [chat.getsession.org]', + 1 + ); + await common.logsContains( + alice2Logs, + `Sending auto-friend-request:onlineBroadcast message to ${ + common.TEST_PUBKEY2 + }`, + 1 + ); + await common.logsContains( + alice2Logs, + `Sending session-request:friend-request message to ${ + common.TEST_PUBKEY2 + }`, + 1 + ); + await common.logsContains( + alice2Logs, + `Sending contact-sync-send:outgoing message to OUR_PRIMARY_PUBKEY`, + 1 + ); // validate primary bob // what is expected is // bob1 receives session request from alice2 // bob1 accept auto fr by sending a bg message // once autoFR is auto-accepted, alice2 trigger contact sync - await common.logsContains(bob1Logs, `Received SESSION_REQUEST from source: ${alice2Pubkey}`, 1); - await common.logsContains(bob1Logs, `Received AUTO_FRIEND_REQUEST from source: ${alice2Pubkey}`, 1); - await common.logsContains(bob1Logs, `Sending auto-friend-accept:onlineBroadcast message to ${alice2Pubkey}`, 1); + await common.logsContains( + bob1Logs, + `Received SESSION_REQUEST from source: ${alice2Pubkey}`, + 1 + ); + await common.logsContains( + bob1Logs, + `Received AUTO_FRIEND_REQUEST from source: ${alice2Pubkey}`, + 1 + ); + await common.logsContains( + bob1Logs, + `Sending auto-friend-accept:onlineBroadcast message to ${alice2Pubkey}`, + 1 + ); // be sure only one autoFR accept was sent (even if multi device, we need to reply to that specific device only) // FIXME happens 2 times await common.logsContains(bob1Logs, `Sending auto-friend-accept:onlineBroadcast message to`, 1); - await common.logsContains(bob1Logs, `Sending session-request-accepted:onlineBroadcast message to ${alice2Pubkey}`, 1); + await common.logsContains( + bob1Logs, + `Sending session-request-accepted:onlineBroadcast message to ${alice2Pubkey}`, + 1 + ); // be sure only one session request accept was sent (even if multi device, we need to reply to that specific device only) - // FIXME happens 2 times await common.logsContains(bob1Logs, `Sending session-request-accepted:onlineBroadcast message to`, 1); + // FIXME happens 2 times await common.logsContains(bob1Logs, `Sending session-request-accepted:onlineBroadcast message to`, 1); }); }); diff --git a/js/models/messages.js b/js/models/messages.js index b1095dca0..bb81814d0 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -1941,7 +1941,6 @@ const { primaryDevicePubKey } = authorisation; // ensure the primary device is a friend const c = window.ConversationController.get(primaryDevicePubKey); - if (!c || !await c.isFriendWithAnyDevice()) { return false; } diff --git a/libtextsecure/account_manager.js b/libtextsecure/account_manager.js index b3eea0c4f..e88c1581a 100644 --- a/libtextsecure/account_manager.js +++ b/libtextsecure/account_manager.js @@ -625,7 +625,6 @@ await textsecure.messaging.sendGroupSyncMessage(conversations); await textsecure.messaging.sendOpenGroupsSyncMessage(conversations); await textsecure.messaging.sendContactSyncMessage(conversations); - }, 5000); }, validatePubKeyHex(pubKey) { diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js index 7d4cb40c0..9e2aafcc4 100644 --- a/libtextsecure/outgoing_message.js +++ b/libtextsecure/outgoing_message.js @@ -741,7 +741,7 @@ OutgoingMessage.buildAutoFriendRequestMessage = function buildAutoFriendRequestM pubKey ) { const body = - '(If you see this message, you must be using an out-of-date client)'; + '(If you see this message, you must be using an out-of-date client)'; const dataMessage = new textsecure.protobuf.DataMessage({ body }); diff --git a/preload.js b/preload.js index f6367c8ab..9e39f1250 100644 --- a/preload.js +++ b/preload.js @@ -326,7 +326,6 @@ window.lokiSnodeAPI = new LokiSnodeAPI({ localUrl: config.localUrl, }); - if (process.env.USE_STUBBED_NETWORK) { const StubMessageAPI = require('./integration_test/stubs/stub_message_api'); window.LokiMessageAPI = StubMessageAPI; @@ -352,7 +351,6 @@ if (process.env.USE_STUBBED_NETWORK) { } window.LokiPublicChatAPI = require('./js/modules/loki_public_chat_api'); - window.LokiFileServerAPI = require('./js/modules/loki_file_server_api'); window.LokiRssAPI = require('./js/modules/loki_rss_api');