From 1cd716d0532451eea5251266a3cf5cc97a1da521 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 27 May 2020 10:20:44 +1000 Subject: [PATCH] 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,