From 60ddaa14bef0473668ac34881884a47ee08383f1 Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 19 May 2020 11:12:05 +1000 Subject: [PATCH 01/13] Prevent multiple FR conversations --- js/conversation_controller.js | 9 +++++++++ js/models/conversations.js | 9 ++++++++- js/models/messages.js | 19 ++++++++++++++++++- package.json | 2 +- .../session/LeftPaneContactSection.tsx | 2 ++ .../session/LeftPaneMessageSection.tsx | 2 +- ts/state/ducks/conversations.ts | 1 + 7 files changed, 40 insertions(+), 4 deletions(-) diff --git a/js/conversation_controller.js b/js/conversation_controller.js index 171703716..ea93a3437 100644 --- a/js/conversation_controller.js +++ b/js/conversation_controller.js @@ -87,6 +87,9 @@ ); } + console.log('[vince] Creating conversation with id:', id); + + if (!this._initialFetchComplete) { throw new Error( 'ConversationController.get() needs complete initial fetch' @@ -194,6 +197,12 @@ conversations.remove(conversation); }, getOrCreateAndWait(id, type) { + const ourNumber = textsecure.storage.user.getNumber(); + + if (id !== ourNumber) { + console.log('[vince][core] getOrCreateAndWaiting.. with source:', id); + } + return this._initialPromise.then(() => { const conversation = this.getOrCreate(id, type); diff --git a/js/models/conversations.js b/js/models/conversations.js index 3a84663dd..6be3aef1b 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -584,7 +584,6 @@ const result = { id: this.id, - isArchived: this.get('isArchived'), activeAt: this.get('active_at'), avatarPath: this.getAvatarPath(), @@ -1620,6 +1619,8 @@ FriendRequestStatusEnum.pendingSend ); + + // Always share our profileKey in the friend request // This will get added automatically after the FR // is accepted, via the profileSharing flag @@ -1637,6 +1638,9 @@ direction: 'outgoing', friendStatus: 'pending', }); + + console.log(`[vince][core] Sending FR message from conversations.js`, messageWithSchema); + } if (this.isPrivate()) { @@ -1658,6 +1662,9 @@ const model = this.addSingleMessage(attributes); const message = MessageController.register(model.id, model); + + console.log('[vince][core] Sending message:', message); + await window.Signal.Data.saveMessage(message.attributes, { forceSave: true, Message: Whisper.Message, diff --git a/js/models/messages.js b/js/models/messages.js index bb81814d0..516d8f1f8 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -429,6 +429,10 @@ return; } this.set({ friendStatus: 'accepted' }); + + console.log('[vince][core] this.attributes:', this.attributes); + console.log('[vince][core] This is the conversation youre accepting!! :', conversation); + await window.Signal.Data.saveMessage(this.attributes, { Message: Whisper.Message, }); @@ -2219,6 +2223,7 @@ let attributes = { ...conversation.attributes, }; + if (dataMessage.group) { let groupUpdate = null; attributes = { @@ -2508,6 +2513,7 @@ - We are friends with the user, and that user just sent us a friend request. */ + const isFriend = sendingDeviceConversation.isFriend(); const hasSentFriendRequest = sendingDeviceConversation.hasSentFriendRequest(); autoAccept = isFriend || hasSentFriendRequest; @@ -2515,6 +2521,12 @@ if (autoAccept) { message.set({ friendStatus: 'accepted' }); } + + + console.log('[vince][core] source:', source); + console.log('[vince][core] ourNumber:', ourNumber); + console.log('[vince][core] Friend request in messaages.js:2391', message); + libloki.api.debug.logNormalFriendRequest( `Received a NORMAL_FRIEND_REQUEST from source: ${source}, primarySource: ${primarySource}, isAlreadyFriend: ${isFriend}, didWeAlreadySentFR: ${hasSentFriendRequest}` @@ -2534,8 +2546,13 @@ } // We need to map the original message source to the primary device + // only map to primary device if this is NOT a friend request. + // Otherwise you can enter a stalemate. + const conditionalSource = message.get('type') === 'friend-request' + ? source + : primarySource; if (source !== ourNumber) { - message.set({ source: primarySource }); + message.set({ source: conditionalSource }); } const id = await window.Signal.Data.saveMessage(message.attributes, { diff --git a/package.json b/package.json index 4603dedd2..a75ced0ce 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "start-multi2": "cross-env NODE_APP_INSTANCE=2 electron .", "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod electron .", "start-prod-multi": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod1 electron .", - "start-prod-multi-2": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod2 electron .", + "start-prod-multi1": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod2 electron .", "start-swarm-test": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=1 electron .", "start-swarm-test-2": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=2 electron .", "start-swarm-test-3": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=3 electron .", diff --git a/ts/components/session/LeftPaneContactSection.tsx b/ts/components/session/LeftPaneContactSection.tsx index 75f5423f1..54dba48e6 100644 --- a/ts/components/session/LeftPaneContactSection.tsx +++ b/ts/components/session/LeftPaneContactSection.tsx @@ -123,6 +123,8 @@ export class LeftPaneContactSection extends React.Component { const item = receivedFriendsRequest[index]; const onClick = this.props.openConversationInternal; + console.log('[vince] renderRowFriendRequest: receivedFriendsRequest:', receivedFriendsRequest); + return ( { if (conversationList !== undefined) { conversationList = conversationList.filter( conversation => - !conversation.isSecondary && !conversation.isPendingFriendRequest + !conversation.isPendingFriendRequest ); } diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 219c66377..2305cae6d 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -55,6 +55,7 @@ export type ConversationType = { isFriend?: boolean; isSecondary?: boolean; primaryDevice: string; + isPendingFriendRequest?: boolean; hasReceivedFriendRequest?: boolean; hasSentFriendRequest?: boolean; }; From 5db97950761d134464dcbb531a41b06dfb591530 Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 19 May 2020 17:19:09 +1000 Subject: [PATCH 02/13] Accepting FRs to all devices --- js/models/conversations.js | 103 ++++++++++++++++++++++++++++++------- js/models/messages.js | 21 ++++++-- 2 files changed, 101 insertions(+), 23 deletions(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index 6be3aef1b..b18c15b95 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -4,6 +4,7 @@ log, i18n, Backbone, + libloki, ConversationController, MessageController, storage, @@ -245,6 +246,12 @@ this.messageCollection.forEach(m => m.trigger('change')); }, async acceptFriendRequest() { + + console.log(`[vince][fr] accepting friend request from conversations.js`); + console.log('[vince][fr] this.id:', this.id); + console.log(`[vince][fr] primary pubkey`, this.getPrimaryDevicePubKey()); + + // Friend request messages are always send to primary device conversation const messages = await window.Signal.Data.getMessagesByConversation( this.id, { @@ -253,6 +260,24 @@ type: 'friend-request', } ); + + const priamryMessages = await window.Signal.Data.getMessagesByConversation( + this.getPrimaryDevicePubKey(), + { + limit: 1, + MessageCollection: Whisper.MessageCollection, + type: 'friend-request', + } + ); + + + + console.log(`[vince][fr] messages: `, messages); + console.log(`[vince][fr] Primary messages: `, priamryMessages); + + + + // LAST MODEL IS POINTING TO THE PRIMARY DEVICE'S LASTMODEL. NOT SECONDARY FOR A2 --> B const lastMessageModel = messages.at(0); if (lastMessageModel) { lastMessageModel.acceptFriendRequest(); @@ -970,35 +995,75 @@ }); }, async respondToAllFriendRequests(options) { + + console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); + console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); + console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); + console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); + console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); + console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); + console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); + console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); + const { response, status, direction = null } = options; // Ignore if no response supplied if (!response) { return; } - const primaryConversation = ConversationController.get( + + // const primaryConversation = ConversationController.get( + // this.getPrimaryDevicePubKey() + // ); + + // // Should never happen + // if (!primaryConversation) { + // return; + // } + // const pending = await primaryConversation.getFriendRequests( + // direction, + // status + // ); + // await Promise.all( + // pending.map(async request => { + // if (request.hasErrors()) { + // return; + // } + + // request.set({ friendStatus: response }); + // await window.Signal.Data.saveMessage(request.attributes, { + // Message: Whisper.Message, + // }); + // primaryConversation.trigger('updateMessage', request); + // }) + // ); + + // Accept FRs from all the user's devices + const allDevices = await libloki.storage.getAllDevicePubKeysForPrimaryPubKey( this.getPrimaryDevicePubKey() ); - // Should never happen - if (!primaryConversation) { + + const allConversationsWithUser = allDevices.map(d => ConversationController.get(d)); + + + console.log(`[vince][fr] allDevices: `, allDevices); + console.log('[vince][fr] allConversationsWithUser:', allConversationsWithUser); + + + + + if (!allDevices.length) { return; } - const pending = await primaryConversation.getFriendRequests( - direction, - status - ); - await Promise.all( - pending.map(async request => { - if (request.hasErrors()) { - return; - } - request.set({ friendStatus: response }); - await window.Signal.Data.saveMessage(request.attributes, { - Message: Whisper.Message, - }); - primaryConversation.trigger('updateMessage', request); - }) - ); + const pendingRequests = allConversationsWithUser.map(async c => { + await c.getFriendRequests(direction, status); + }); + + console.log(`[vince][fr] Pending requests: `, pendingRequests); + + + + }, async respondToAllPendingFriendRequests(options) { return this.respondToAllFriendRequests({ diff --git a/js/models/messages.js b/js/models/messages.js index 516d8f1f8..6d44e2b22 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -415,10 +415,18 @@ }, async acceptFriendRequest() { + // THIS FUNCTION RUNS WHEN "ACCEPT" BUTTON IN CHAT IS CLICKED + if (this.get('friendStatus') !== 'pending') { return; } + const conversation = await this.getSourceDeviceConversation(); + + console.log('[vince][fr] conversation:', conversation); + console.log('[vince][fr] sourceDeviceConversation():', await this.getSourceDeviceConversation()); + + // If we somehow received an old friend request (e.g. after having restored // from seed, we won't be able to accept it, we should initiate our own // friend request to reset the session: @@ -2548,11 +2556,16 @@ // We need to map the original message source to the primary device // only map to primary device if this is NOT a friend request. // Otherwise you can enter a stalemate. - const conditionalSource = message.get('type') === 'friend-request' - ? source - : primarySource; + + // const conditionalSource = message.get('type') === 'friend-request' + // ? source + // : primarySource; + // if (source !== ourNumber) { + // message.set({ source: conditionalSource }); + // } + if (source !== ourNumber) { - message.set({ source: conditionalSource }); + message.set({ primarySource }); } const id = await window.Signal.Data.saveMessage(message.attributes, { From e8e7b2121e52c316248ba0ee42bfc379860b6ec2 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 20 May 2020 15:20:05 +1000 Subject: [PATCH 03/13] Message FR accept fiddling --- js/conversation_controller.js | 1 + js/models/conversations.js | 84 +++++++++++++++-------------------- js/models/messages.js | 4 +- 3 files changed, 40 insertions(+), 49 deletions(-) diff --git a/js/conversation_controller.js b/js/conversation_controller.js index ea93a3437..9f51f9157 100644 --- a/js/conversation_controller.js +++ b/js/conversation_controller.js @@ -87,6 +87,7 @@ ); } + console.log('[vince] Creating conversation with id:', id); diff --git a/js/models/conversations.js b/js/models/conversations.js index b18c15b95..eb05a9b5e 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -574,6 +574,9 @@ MessageCollection: Whisper.MessageCollection, } ); + + console.log('[vince][fr] messages:', messages); + if (typeof status === 'string') { // eslint-disable-next-line no-param-reassign status = [status]; @@ -581,6 +584,12 @@ // Get the pending friend requests that match the direction // If no direction is supplied then return all pending friend requests return messages.models.filter(m => { + console.log('[vince][fr] status:', status); + console.log('[vince][fr] m.get(`friendStatus`):', m.get('friendStatus')); + console.log('[vince][fr] m:', m); + + console.log('[vince][fr] status.includes(m.get(`friendStatus`):', status.includes(m.get('friendStatus'))); + if (!status.includes(m.get('friendStatus'))) { return false; } @@ -996,74 +1005,53 @@ }, async respondToAllFriendRequests(options) { - console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); - console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); - console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); - console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); - console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); - console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); - console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); - console.log(`[vince][fr] respondToAllFriendRequests: IM BIENG CALLLLEDED`); - const { response, status, direction = null } = options; // Ignore if no response supplied if (!response) { return; } - // const primaryConversation = ConversationController.get( - // this.getPrimaryDevicePubKey() - // ); - - // // Should never happen - // if (!primaryConversation) { - // return; - // } - // const pending = await primaryConversation.getFriendRequests( - // direction, - // status - // ); - // await Promise.all( - // pending.map(async request => { - // if (request.hasErrors()) { - // return; - // } - - // request.set({ friendStatus: response }); - // await window.Signal.Data.saveMessage(request.attributes, { - // Message: Whisper.Message, - // }); - // primaryConversation.trigger('updateMessage', request); - // }) - // ); - // Accept FRs from all the user's devices const allDevices = await libloki.storage.getAllDevicePubKeysForPrimaryPubKey( this.getPrimaryDevicePubKey() ); + if (!allDevices.length) { + return; + } + + console.log('[vince] allDevices:', allDevices); const allConversationsWithUser = allDevices.map(d => ConversationController.get(d)); - - console.log(`[vince][fr] allDevices: `, allDevices); console.log('[vince][fr] allConversationsWithUser:', allConversationsWithUser); - + console.log('[vince][fr] direction:', direction); + console.log(`[vince][fr] Status: `, status); + + const pendingRequests = await Promise.all(allConversationsWithUser.reduce(async (requests, conversation) => { + const request = (await conversation.getFriendRequests(direction, status))[0]; + return request ? requests.concat({ conversation, request }) : requests; + }, [])); + console.log('[vince][fr] pendingRequests:', pendingRequests); + await Promise.all( + pendingRequests.map(async friendRequest => { + const { conversation, request } = friendRequest; - if (!allDevices.length) { - return; - } + console.log('[vince][fr] friendRequest:', friendRequest); - const pendingRequests = allConversationsWithUser.map(async c => { - await c.getFriendRequests(direction, status); - }); - - console.log(`[vince][fr] Pending requests: `, pendingRequests); + if (request.hasErrors()) { + return; + } + request.set({ friendStatus: response }); + await window.Signal.Data.saveMessage(request.attributes, { + Message: Whisper.Message, + }); + conversation.trigger('updateMessage', request); + }) + ); - - }, async respondToAllPendingFriendRequests(options) { return this.respondToAllFriendRequests({ diff --git a/js/models/messages.js b/js/models/messages.js index 6d44e2b22..991eef62f 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -436,7 +436,9 @@ }); return; } - this.set({ friendStatus: 'accepted' }); + + // TESTING turning this off + // this.set({ friendStatus: 'accepted' }); console.log('[vince][core] this.attributes:', this.attributes); console.log('[vince][core] This is the conversation youre accepting!! :', conversation); From 8f08c2aabf411c9c52e8093fa2bc5a0117abe029 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 20 May 2020 15:46:29 +1000 Subject: [PATCH 04/13] Accept FRs from all Devices --- js/models/conversations.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index eb05a9b5e..de6a47567 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -1027,10 +1027,12 @@ console.log('[vince][fr] direction:', direction); console.log(`[vince][fr] Status: `, status); - const pendingRequests = await Promise.all(allConversationsWithUser.reduce(async (requests, conversation) => { + const pendingRequests = await allConversationsWithUser.reduce(async (requestsP, conversation) => { + const requests = await requestsP; const request = (await conversation.getFriendRequests(direction, status))[0]; + return request ? requests.concat({ conversation, request }) : requests; - }, [])); + }, []); console.log('[vince][fr] pendingRequests:', pendingRequests); From 9c7f5b2c09bd44fd524174a90ba947f13a44926f Mon Sep 17 00:00:00 2001 From: Vincent Date: Thu, 21 May 2020 10:36:51 +1000 Subject: [PATCH 05/13] Accepting FR from each conv --- js/conversation_controller.js | 1 - js/models/conversations.js | 11 --------- js/models/messages.js | 42 ++++++++++++++++------------------- 3 files changed, 19 insertions(+), 35 deletions(-) diff --git a/js/conversation_controller.js b/js/conversation_controller.js index 9f51f9157..ea93a3437 100644 --- a/js/conversation_controller.js +++ b/js/conversation_controller.js @@ -87,7 +87,6 @@ ); } - console.log('[vince] Creating conversation with id:', id); diff --git a/js/models/conversations.js b/js/models/conversations.js index de6a47567..362f1f051 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -1004,7 +1004,6 @@ }); }, async respondToAllFriendRequests(options) { - const { response, status, direction = null } = options; // Ignore if no response supplied if (!response) { @@ -1020,13 +1019,8 @@ return; } - console.log('[vince] allDevices:', allDevices); const allConversationsWithUser = allDevices.map(d => ConversationController.get(d)); - console.log('[vince][fr] allConversationsWithUser:', allConversationsWithUser); - console.log('[vince][fr] direction:', direction); - console.log(`[vince][fr] Status: `, status); - const pendingRequests = await allConversationsWithUser.reduce(async (requestsP, conversation) => { const requests = await requestsP; const request = (await conversation.getFriendRequests(direction, status))[0]; @@ -1034,14 +1028,10 @@ return request ? requests.concat({ conversation, request }) : requests; }, []); - console.log('[vince][fr] pendingRequests:', pendingRequests); - await Promise.all( pendingRequests.map(async friendRequest => { const { conversation, request } = friendRequest; - console.log('[vince][fr] friendRequest:', friendRequest); - if (request.hasErrors()) { return; } @@ -1053,7 +1043,6 @@ conversation.trigger('updateMessage', request); }) ); - }, async respondToAllPendingFriendRequests(options) { return this.respondToAllFriendRequests({ diff --git a/js/models/messages.js b/js/models/messages.js index 991eef62f..bf7a36a54 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -415,38 +415,34 @@ }, async acceptFriendRequest() { - // THIS FUNCTION RUNS WHEN "ACCEPT" BUTTON IN CHAT IS CLICKED - if (this.get('friendStatus') !== 'pending') { return; } - const conversation = await this.getSourceDeviceConversation(); - - console.log('[vince][fr] conversation:', conversation); - console.log('[vince][fr] sourceDeviceConversation():', await this.getSourceDeviceConversation()); - - - // If we somehow received an old friend request (e.g. after having restored - // from seed, we won't be able to accept it, we should initiate our own - // friend request to reset the session: - if (conversation.get('sessionRestoreSeen')) { - conversation.sendMessage('', null, null, null, null, { - sessionRestoration: true, - }); - return; - } - - // TESTING turning this off - // this.set({ friendStatus: 'accepted' }); + const allDevices = await libloki.storage.getAllDevicePubKeysForPrimaryPubKey( + this.attributes.conversationId + ); - console.log('[vince][core] this.attributes:', this.attributes); - console.log('[vince][core] This is the conversation youre accepting!! :', conversation); + const allConversationsWithUser = allDevices.map(d => ConversationController.get(d)); + allConversationsWithUser.forEach(conversation => { + // If we somehow received an old friend request (e.g. after having restored + // from seed, we won't be able to accept it, we should initiate our own + // friend request to reset the session: + if (conversation.get('sessionRestoreSeen')) { + conversation.sendMessage('', null, null, null, null, { + sessionRestoration: true, + }); + return; + } + conversation.onAcceptFriendRequest(); + }); + await window.Signal.Data.saveMessage(this.attributes, { Message: Whisper.Message, }); - conversation.onAcceptFriendRequest(); + + this.set({ friendStatus: 'accepted' }); }, async declineFriendRequest() { if (this.get('friendStatus') !== 'pending') { From 19cf4fa54bfdcfcc84cc97272221bcdeeff9c068 Mon Sep 17 00:00:00 2001 From: Vincent Date: Thu, 21 May 2020 12:18:11 +1000 Subject: [PATCH 06/13] Set profile name --- js/conversation_controller.js | 9 --------- js/models/conversations.js | 30 +---------------------------- js/models/messages.js | 13 ++++++++++++- ts/state/selectors/conversations.ts | 13 +++++++++++++ 4 files changed, 26 insertions(+), 39 deletions(-) diff --git a/js/conversation_controller.js b/js/conversation_controller.js index ea93a3437..171703716 100644 --- a/js/conversation_controller.js +++ b/js/conversation_controller.js @@ -87,9 +87,6 @@ ); } - console.log('[vince] Creating conversation with id:', id); - - if (!this._initialFetchComplete) { throw new Error( 'ConversationController.get() needs complete initial fetch' @@ -197,12 +194,6 @@ conversations.remove(conversation); }, getOrCreateAndWait(id, type) { - const ourNumber = textsecure.storage.user.getNumber(); - - if (id !== ourNumber) { - console.log('[vince][core] getOrCreateAndWaiting.. with source:', id); - } - return this._initialPromise.then(() => { const conversation = this.getOrCreate(id, type); diff --git a/js/models/conversations.js b/js/models/conversations.js index 362f1f051..c9e51c27d 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -246,11 +246,6 @@ this.messageCollection.forEach(m => m.trigger('change')); }, async acceptFriendRequest() { - - console.log(`[vince][fr] accepting friend request from conversations.js`); - console.log('[vince][fr] this.id:', this.id); - console.log(`[vince][fr] primary pubkey`, this.getPrimaryDevicePubKey()); - // Friend request messages are always send to primary device conversation const messages = await window.Signal.Data.getMessagesByConversation( this.id, @@ -260,24 +255,7 @@ type: 'friend-request', } ); - - const priamryMessages = await window.Signal.Data.getMessagesByConversation( - this.getPrimaryDevicePubKey(), - { - limit: 1, - MessageCollection: Whisper.MessageCollection, - type: 'friend-request', - } - ); - - - console.log(`[vince][fr] messages: `, messages); - console.log(`[vince][fr] Primary messages: `, priamryMessages); - - - - // LAST MODEL IS POINTING TO THE PRIMARY DEVICE'S LASTMODEL. NOT SECONDARY FOR A2 --> B const lastMessageModel = messages.at(0); if (lastMessageModel) { lastMessageModel.acceptFriendRequest(); @@ -1014,7 +992,7 @@ const allDevices = await libloki.storage.getAllDevicePubKeysForPrimaryPubKey( this.getPrimaryDevicePubKey() ); - + if (!allDevices.length) { return; } @@ -1663,8 +1641,6 @@ FriendRequestStatusEnum.pendingSend ); - - // Always share our profileKey in the friend request // This will get added automatically after the FR // is accepted, via the profileSharing flag @@ -1682,9 +1658,6 @@ direction: 'outgoing', friendStatus: 'pending', }); - - console.log(`[vince][core] Sending FR message from conversations.js`, messageWithSchema); - } if (this.isPrivate()) { @@ -2490,7 +2463,6 @@ }, // LOKI PROFILES - async setNickname(nickname) { const trimmed = nickname && nickname.trim(); if (this.get('nickname') === trimmed) { diff --git a/js/models/messages.js b/js/models/messages.js index bf7a36a54..520001515 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -415,14 +415,17 @@ }, async acceptFriendRequest() { + const primaryDevicePubKey = this.attributes.conversationId; + if (this.get('friendStatus') !== 'pending') { return; } const allDevices = await libloki.storage.getAllDevicePubKeysForPrimaryPubKey( - this.attributes.conversationId + primaryDevicePubKey ); + let profileName; const allConversationsWithUser = allDevices.map(d => ConversationController.get(d)); allConversationsWithUser.forEach(conversation => { // If we somehow received an old friend request (e.g. after having restored @@ -435,8 +438,16 @@ return; } + profileName = conversation.getProfileName() || profileName; conversation.onAcceptFriendRequest(); }); + + // If you don't have a profile name for this device, and profileName is set, + // add profileName to conversation. + const primaryConversation = allConversationsWithUser.find(c => c.id === primaryDevicePubKey) + if (!primaryConversation.getProfileName() && profileName) { + await primaryConversation.setNickname(profileName); + } await window.Signal.Data.saveMessage(this.attributes, { Message: Whisper.Message, diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 4cc66343d..3ed5638b4 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -180,6 +180,8 @@ export const _getLeftPaneLists = ( return filteredGroup as T; }; + + const friends: Array = filterToPrimary(allFriends); const receivedFriendsRequest: Array< ConversationListItemPropsType @@ -188,6 +190,17 @@ export const _getLeftPaneLists = ( ConversationListItemPropsType > = filterToPrimary(allSentFriendsRequest); + + console.log('[vince][friends] allReceivedFriendsRequest:', allReceivedFriendsRequest); + console.log('[vince][friends] receivedFriendsRequest:', receivedFriendsRequest); + console.log('[vince][friends] allSentFriendsRequest:', allSentFriendsRequest); + console.log('[vince][friends] sentFriendsRequest:', sentFriendsRequest); + console.log('[vince][friends] allFriends:', allFriends); + console.log('[vince][friends] friends:', friends); + + + + return { conversations, archivedConversations, From 34ecc5a75148dff7fb2517828a8c1f7b3ffeeb30 Mon Sep 17 00:00:00 2001 From: Vincent Date: Thu, 21 May 2020 13:55:28 +1000 Subject: [PATCH 07/13] Finalisation; working FRs from secondary; --- libtextsecure/message_receiver.js | 39 +++++++++++++++++++ .../session/LeftPaneMessageSection.tsx | 2 +- ts/state/selectors/conversations.ts | 17 ++++---- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js index de913df47..ef34a500d 100644 --- a/libtextsecure/message_receiver.js +++ b/libtextsecure/message_receiver.js @@ -1045,6 +1045,45 @@ MessageReceiver.prototype.extend({ return this.handlePairingRequest(envelope, pairingAuthorisation); }, + async handleSecondaryDeviceFriendRequest(pubKey, deviceMapping) { + if (!deviceMapping) { + return false; + } + // Only handle secondary pubkeys + if (deviceMapping.isPrimary === '1' || !deviceMapping.authorisations) { + return false; + } + const { authorisations } = deviceMapping; + // Secondary devices should only have 1 authorisation from a primary device + if (authorisations.length !== 1) { + return false; + } + const authorisation = authorisations[0]; + if (!authorisation) { + return false; + } + if (!authorisation.grantSignature) { + return false; + } + const isValid = await libloki.crypto.validateAuthorisation(authorisation); + if (!isValid) { + return false; + } + const correctSender = pubKey === authorisation.secondaryDevicePubKey; + if (!correctSender) { + return false; + } + const { primaryDevicePubKey } = authorisation; + // ensure the primary device is a friend + const c = window.ConversationController.get(primaryDevicePubKey); + if (!c || await !c.isFriendWithAnyDevice()) { + return false; + } + await libloki.storage.savePairingAuthorisation(authorisation); + + return true; + }, + async updateProfile(conversation, profile, profileKey) { // Retain old values unless changed: const newProfile = conversation.get('profile') || {}; diff --git a/ts/components/session/LeftPaneMessageSection.tsx b/ts/components/session/LeftPaneMessageSection.tsx index 11f683ef9..14ac3a709 100644 --- a/ts/components/session/LeftPaneMessageSection.tsx +++ b/ts/components/session/LeftPaneMessageSection.tsx @@ -97,7 +97,7 @@ export class LeftPaneMessageSection extends React.Component { if (conversationList !== undefined) { conversationList = conversationList.filter( conversation => - !conversation.isPendingFriendRequest + !conversation.isPendingFriendRequest && !conversation.isSecondary ); } diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 3ed5638b4..1f3b5174d 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -129,7 +129,11 @@ export const _getLeftPaneLists = ( } if (conversation.hasReceivedFriendRequest) { - allReceivedFriendsRequest.push(conversation); + // Friend requests should always appear as coming from primary + const primaryConversation = conversations.find(c => c.id === conversation.primaryDevice) || conversation; + primaryConversation.hasReceivedFriendRequest = conversation.hasReceivedFriendRequest; + primaryConversation.isPendingFriendRequest = conversation.isPendingFriendRequest; + allReceivedFriendsRequest.push(primaryConversation); } else if ( unreadCount < 9 && conversation.isFriend && @@ -160,28 +164,28 @@ export const _getLeftPaneLists = ( group: Array ): T => { const secondariesToRemove: Array = []; + group.forEach(device => { if (!device.isSecondary) { return; } const devicePrimary = group.find(c => c.id === device.primaryDevice); + // Remove secondary where primary already exists in group if (group.some(c => c === devicePrimary)) { secondariesToRemove.push(device.id); } + }); - // tslint:disable-next-line: no-unnecessary-local-variable - const filteredGroup = group.filter( + const filteredGroup = [...new Set(group.filter( c => !secondariesToRemove.find(s => s === c.id) - ); + ))]; return filteredGroup as T; }; - - const friends: Array = filterToPrimary(allFriends); const receivedFriendsRequest: Array< ConversationListItemPropsType @@ -200,7 +204,6 @@ export const _getLeftPaneLists = ( - return { conversations, archivedConversations, From 1cd716d0532451eea5251266a3cf5cc97a1da521 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 27 May 2020 10:20:44 +1000 Subject: [PATCH 08/13] Removed comments --- js/models/conversations.js | 36 +++++++++---------- js/models/messages.js | 31 +++++----------- libtextsecure/message_receiver.js | 2 +- .../session/LeftPaneContactSection.tsx | 2 -- .../session/LeftPaneMessageSection.tsx | 2 +- ts/state/selectors/conversations.ts | 27 ++++++-------- 6 files changed, 39 insertions(+), 61 deletions(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index c9e51c27d..08e9058e2 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -255,7 +255,7 @@ type: 'friend-request', } ); - + const lastMessageModel = messages.at(0); if (lastMessageModel) { lastMessageModel.acceptFriendRequest(); @@ -553,8 +553,6 @@ } ); - console.log('[vince][fr] messages:', messages); - if (typeof status === 'string') { // eslint-disable-next-line no-param-reassign status = [status]; @@ -562,12 +560,6 @@ // Get the pending friend requests that match the direction // If no direction is supplied then return all pending friend requests return messages.models.filter(m => { - console.log('[vince][fr] status:', status); - console.log('[vince][fr] m.get(`friendStatus`):', m.get('friendStatus')); - console.log('[vince][fr] m:', m); - - console.log('[vince][fr] status.includes(m.get(`friendStatus`):', status.includes(m.get('friendStatus'))); - if (!status.includes(m.get('friendStatus'))) { return false; } @@ -997,14 +989,24 @@ return; } - const allConversationsWithUser = allDevices.map(d => ConversationController.get(d)); - - const pendingRequests = await allConversationsWithUser.reduce(async (requestsP, conversation) => { - const requests = await requestsP; - const request = (await conversation.getFriendRequests(direction, status))[0]; + const allConversationsWithUser = allDevices.map(d => + ConversationController.get(d) + ); - return request ? requests.concat({ conversation, request }) : requests; - }, []); + const pendingRequests = await allConversationsWithUser.reduce( + async (requestsP, conversation) => { + const requests = await requestsP; + const request = (await conversation.getFriendRequests( + direction, + status + ))[0]; + + return request + ? requests.concat({ conversation, request }) + : requests; + }, + [] + ); await Promise.all( pendingRequests.map(async friendRequest => { @@ -1680,8 +1682,6 @@ const model = this.addSingleMessage(attributes); const message = MessageController.register(model.id, model); - console.log('[vince][core] Sending message:', message); - await window.Signal.Data.saveMessage(message.attributes, { forceSave: true, Message: Whisper.Message, diff --git a/js/models/messages.js b/js/models/messages.js index 520001515..c78537161 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -420,13 +420,15 @@ if (this.get('friendStatus') !== 'pending') { return; } - + const allDevices = await libloki.storage.getAllDevicePubKeysForPrimaryPubKey( primaryDevicePubKey ); let profileName; - const allConversationsWithUser = allDevices.map(d => ConversationController.get(d)); + const allConversationsWithUser = allDevices.map(d => + ConversationController.get(d) + ); allConversationsWithUser.forEach(conversation => { // If we somehow received an old friend request (e.g. after having restored // from seed, we won't be able to accept it, we should initiate our own @@ -438,17 +440,19 @@ return; } - profileName = conversation.getProfileName() || profileName; + profileName = conversation.getProfileName() || profileName; conversation.onAcceptFriendRequest(); }); // If you don't have a profile name for this device, and profileName is set, // add profileName to conversation. - const primaryConversation = allConversationsWithUser.find(c => c.id === primaryDevicePubKey) + const primaryConversation = allConversationsWithUser.find( + c => c.id === primaryDevicePubKey + ); if (!primaryConversation.getProfileName() && profileName) { await primaryConversation.setNickname(profileName); } - + await window.Signal.Data.saveMessage(this.attributes, { Message: Whisper.Message, }); @@ -2538,12 +2542,6 @@ if (autoAccept) { message.set({ friendStatus: 'accepted' }); } - - - console.log('[vince][core] source:', source); - console.log('[vince][core] ourNumber:', ourNumber); - console.log('[vince][core] Friend request in messaages.js:2391', message); - libloki.api.debug.logNormalFriendRequest( `Received a NORMAL_FRIEND_REQUEST from source: ${source}, primarySource: ${primarySource}, isAlreadyFriend: ${isFriend}, didWeAlreadySentFR: ${hasSentFriendRequest}` @@ -2562,17 +2560,6 @@ } } - // We need to map the original message source to the primary device - // only map to primary device if this is NOT a friend request. - // Otherwise you can enter a stalemate. - - // const conditionalSource = message.get('type') === 'friend-request' - // ? source - // : primarySource; - // if (source !== ourNumber) { - // message.set({ source: conditionalSource }); - // } - if (source !== ourNumber) { message.set({ primarySource }); } diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js index ef34a500d..8f62cf34a 100644 --- a/libtextsecure/message_receiver.js +++ b/libtextsecure/message_receiver.js @@ -1076,7 +1076,7 @@ MessageReceiver.prototype.extend({ const { primaryDevicePubKey } = authorisation; // ensure the primary device is a friend const c = window.ConversationController.get(primaryDevicePubKey); - if (!c || await !c.isFriendWithAnyDevice()) { + if (!c || (await !c.isFriendWithAnyDevice())) { return false; } await libloki.storage.savePairingAuthorisation(authorisation); diff --git a/ts/components/session/LeftPaneContactSection.tsx b/ts/components/session/LeftPaneContactSection.tsx index 54dba48e6..75f5423f1 100644 --- a/ts/components/session/LeftPaneContactSection.tsx +++ b/ts/components/session/LeftPaneContactSection.tsx @@ -123,8 +123,6 @@ export class LeftPaneContactSection extends React.Component { const item = receivedFriendsRequest[index]; const onClick = this.props.openConversationInternal; - console.log('[vince] renderRowFriendRequest: receivedFriendsRequest:', receivedFriendsRequest); - return ( { if (conversationList !== undefined) { conversationList = conversationList.filter( conversation => - !conversation.isPendingFriendRequest && !conversation.isSecondary + !conversation.isPendingFriendRequest && !conversation.isSecondary ); } diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 1f3b5174d..56f242c7b 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -130,9 +130,13 @@ export const _getLeftPaneLists = ( if (conversation.hasReceivedFriendRequest) { // Friend requests should always appear as coming from primary - const primaryConversation = conversations.find(c => c.id === conversation.primaryDevice) || conversation; - primaryConversation.hasReceivedFriendRequest = conversation.hasReceivedFriendRequest; - primaryConversation.isPendingFriendRequest = conversation.isPendingFriendRequest; + const primaryConversation = + conversations.find(c => c.id === conversation.primaryDevice) || + conversation; + primaryConversation.hasReceivedFriendRequest = + conversation.hasReceivedFriendRequest; + primaryConversation.isPendingFriendRequest = + conversation.isPendingFriendRequest; allReceivedFriendsRequest.push(primaryConversation); } else if ( unreadCount < 9 && @@ -176,12 +180,11 @@ export const _getLeftPaneLists = ( if (group.some(c => c === devicePrimary)) { secondariesToRemove.push(device.id); } - }); - const filteredGroup = [...new Set(group.filter( - c => !secondariesToRemove.find(s => s === c.id) - ))]; + const filteredGroup = [ + ...new Set(group.filter(c => !secondariesToRemove.find(s => s === c.id))), + ]; return filteredGroup as T; }; @@ -194,16 +197,6 @@ export const _getLeftPaneLists = ( ConversationListItemPropsType > = filterToPrimary(allSentFriendsRequest); - - console.log('[vince][friends] allReceivedFriendsRequest:', allReceivedFriendsRequest); - console.log('[vince][friends] receivedFriendsRequest:', receivedFriendsRequest); - console.log('[vince][friends] allSentFriendsRequest:', allSentFriendsRequest); - console.log('[vince][friends] sentFriendsRequest:', sentFriendsRequest); - console.log('[vince][friends] allFriends:', allFriends); - console.log('[vince][friends] friends:', friends); - - - return { conversations, archivedConversations, From 1f9b3ce5ea5a50ec6d352be8afeb5e8b745ea396 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 27 May 2020 10:25:24 +1000 Subject: [PATCH 09/13] Updated comments --- js/models/conversations.js | 3 ++- js/models/messages.js | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index 08e9058e2..11a209730 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -246,7 +246,8 @@ this.messageCollection.forEach(m => m.trigger('change')); }, async acceptFriendRequest() { - // Friend request messages are always send to primary device conversation + // Friend request message conmfirmations (Accept / Decline) are always + // sent to the primary device conversation const messages = await window.Signal.Data.getMessagesByConversation( this.id, { diff --git a/js/models/messages.js b/js/models/messages.js index c78537161..4fe21e55a 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -2561,7 +2561,7 @@ } if (source !== ourNumber) { - message.set({ primarySource }); + message.set({ source: primarySource }); } const id = await window.Signal.Data.saveMessage(message.attributes, { diff --git a/package.json b/package.json index a75ced0ce..4603dedd2 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "start-multi2": "cross-env NODE_APP_INSTANCE=2 electron .", "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod electron .", "start-prod-multi": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod1 electron .", - "start-prod-multi1": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod2 electron .", + "start-prod-multi-2": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod2 electron .", "start-swarm-test": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=1 electron .", "start-swarm-test-2": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=2 electron .", "start-swarm-test-3": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=3 electron .", From 1b345bce4287e06cbe63b59a5adbf75f6557e039 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 27 May 2020 14:24:31 +1000 Subject: [PATCH 10/13] Simplification --- js/models/conversations.js | 22 +++++++---------- js/models/messages.js | 8 +++++++ libtextsecure/message_receiver.js | 39 ------------------------------- 3 files changed, 16 insertions(+), 53 deletions(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index 11a209730..515f0d9d4 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -994,21 +994,15 @@ ConversationController.get(d) ); - const pendingRequests = await allConversationsWithUser.reduce( - async (requestsP, conversation) => { - const requests = await requestsP; - const request = (await conversation.getFriendRequests( - direction, - status - ))[0]; - - return request - ? requests.concat({ conversation, request }) - : requests; - }, - [] - ); + const pendingRequestPromises = allConversationsWithUser.map(c => + c.getFriendRequests(direction, status) + )[0]; + + let pendingRequests = await Promise.all(pendingRequestPromises); + pendingRequests = pendingRequests.filter(p => Boolean(p.length)); + // We set all friend request messages from all devices + // from a user here to accepted where possible await Promise.all( pendingRequests.map(async friendRequest => { const { conversation, request } = friendRequest; diff --git a/js/models/messages.js b/js/models/messages.js index 4fe21e55a..7a6dfb207 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -425,6 +425,7 @@ primaryDevicePubKey ); + // Set profile name to primary conversation let profileName; const allConversationsWithUser = allDevices.map(d => ConversationController.get(d) @@ -458,6 +459,13 @@ }); this.set({ friendStatus: 'accepted' }); + + // Update redux store + window.Signal.Data.updateConversation( + primaryConversation.id, + primaryConversation.attributes, + { Conversation: Whisper.Conversation } + ); }, async declineFriendRequest() { if (this.get('friendStatus') !== 'pending') { diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js index 8f62cf34a..de913df47 100644 --- a/libtextsecure/message_receiver.js +++ b/libtextsecure/message_receiver.js @@ -1045,45 +1045,6 @@ MessageReceiver.prototype.extend({ return this.handlePairingRequest(envelope, pairingAuthorisation); }, - async handleSecondaryDeviceFriendRequest(pubKey, deviceMapping) { - if (!deviceMapping) { - return false; - } - // Only handle secondary pubkeys - if (deviceMapping.isPrimary === '1' || !deviceMapping.authorisations) { - return false; - } - const { authorisations } = deviceMapping; - // Secondary devices should only have 1 authorisation from a primary device - if (authorisations.length !== 1) { - return false; - } - const authorisation = authorisations[0]; - if (!authorisation) { - return false; - } - if (!authorisation.grantSignature) { - return false; - } - const isValid = await libloki.crypto.validateAuthorisation(authorisation); - if (!isValid) { - return false; - } - const correctSender = pubKey === authorisation.secondaryDevicePubKey; - if (!correctSender) { - return false; - } - const { primaryDevicePubKey } = authorisation; - // ensure the primary device is a friend - const c = window.ConversationController.get(primaryDevicePubKey); - if (!c || (await !c.isFriendWithAnyDevice())) { - return false; - } - await libloki.storage.savePairingAuthorisation(authorisation); - - return true; - }, - async updateProfile(conversation, profile, profileKey) { // Retain old values unless changed: const newProfile = conversation.get('profile') || {}; From 307fdd1bd6546bfbc76019fe2c8709b92b72d147 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 27 May 2020 14:48:01 +1000 Subject: [PATCH 11/13] Finalisation --- js/models/conversations.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/models/conversations.js b/js/models/conversations.js index 515f0d9d4..f9b1dfbd9 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -994,6 +994,7 @@ ConversationController.get(d) ); + // Search through each conversation (device) for friend request messages const pendingRequestPromises = allConversationsWithUser.map(c => c.getFriendRequests(direction, status) )[0]; From 2378574519a5234be4f52aa70f0500ea41b2906d Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 27 May 2020 15:09:05 +1000 Subject: [PATCH 12/13] Testing --- js/models/conversations.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index f9b1dfbd9..625b77ebd 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -994,14 +994,23 @@ ConversationController.get(d) ); + console.log('[vince] allConversationsWithUser:', allConversationsWithUser); + // Search through each conversation (device) for friend request messages - const pendingRequestPromises = allConversationsWithUser.map(c => - c.getFriendRequests(direction, status) - )[0]; + const pendingRequestPromises = allConversationsWithUser.map(async c => + (await c.getFriendRequests(direction, status))[0] + ); + + console.log('[vince] pendingRequestPromises:', pendingRequestPromises); let pendingRequests = await Promise.all(pendingRequestPromises); - pendingRequests = pendingRequests.filter(p => Boolean(p.length)); + console.log('[vince] pendingRequests:', pendingRequests); + + pendingRequests = pendingRequests.filter(p => Boolean(p)); + + console.log('[vince] pendingRequests:', pendingRequests); + // We set all friend request messages from all devices // from a user here to accepted where possible await Promise.all( From f5bdcca569cc5af1d920fd12d6806284caf07203 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 27 May 2020 15:27:04 +1000 Subject: [PATCH 13/13] pending request filters --- js/models/conversations.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index 625b77ebd..10bc72834 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -994,23 +994,22 @@ ConversationController.get(d) ); - console.log('[vince] allConversationsWithUser:', allConversationsWithUser); - // Search through each conversation (device) for friend request messages - const pendingRequestPromises = allConversationsWithUser.map(async c => - (await c.getFriendRequests(direction, status))[0] + const pendingRequestPromises = allConversationsWithUser.map( + async conversation => { + const request = (await conversation.getFriendRequests( + direction, + status + ))[0]; + return { conversation, request }; + } ); - console.log('[vince] pendingRequestPromises:', pendingRequestPromises); - let pendingRequests = await Promise.all(pendingRequestPromises); - console.log('[vince] pendingRequests:', pendingRequests); - - pendingRequests = pendingRequests.filter(p => Boolean(p)); + // Filter out all undefined requests + pendingRequests = pendingRequests.filter(p => Boolean(p.request)); - console.log('[vince] pendingRequests:', pendingRequests); - // We set all friend request messages from all devices // from a user here to accepted where possible await Promise.all(