From f5bdcca569cc5af1d920fd12d6806284caf07203 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 27 May 2020 15:27:04 +1000 Subject: [PATCH] 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(