diff --git a/js/models/conversations.js b/js/models/conversations.js index 3a84663dd..10bc72834 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,8 @@ this.messageCollection.forEach(m => m.trigger('change')); }, async acceptFriendRequest() { + // Friend request message conmfirmations (Accept / Decline) are always + // sent to the primary device conversation const messages = await window.Signal.Data.getMessagesByConversation( this.id, { @@ -253,6 +256,7 @@ type: 'friend-request', } ); + const lastMessageModel = messages.at(0); if (lastMessageModel) { lastMessageModel.acceptFriendRequest(); @@ -549,6 +553,7 @@ MessageCollection: Whisper.MessageCollection, } ); + if (typeof status === 'string') { // eslint-disable-next-line no-param-reassign status = [status]; @@ -584,7 +589,6 @@ const result = { id: this.id, - isArchived: this.get('isArchived'), activeAt: this.get('active_at'), avatarPath: this.getAvatarPath(), @@ -976,19 +980,42 @@ if (!response) { return; } - const primaryConversation = ConversationController.get( + + // Accept FRs from all the user's devices + const allDevices = await libloki.storage.getAllDevicePubKeysForPrimaryPubKey( this.getPrimaryDevicePubKey() ); - // Should never happen - if (!primaryConversation) { + + if (!allDevices.length) { return; } - const pending = await primaryConversation.getFriendRequests( - direction, - status + + const allConversationsWithUser = allDevices.map(d => + ConversationController.get(d) ); + + // Search through each conversation (device) for friend request messages + const pendingRequestPromises = allConversationsWithUser.map( + async conversation => { + const request = (await conversation.getFriendRequests( + direction, + status + ))[0]; + return { conversation, request }; + } + ); + + let pendingRequests = await Promise.all(pendingRequestPromises); + + // Filter out all undefined requests + pendingRequests = pendingRequests.filter(p => Boolean(p.request)); + + // We set all friend request messages from all devices + // from a user here to accepted where possible await Promise.all( - pending.map(async request => { + pendingRequests.map(async friendRequest => { + const { conversation, request } = friendRequest; + if (request.hasErrors()) { return; } @@ -997,7 +1024,7 @@ await window.Signal.Data.saveMessage(request.attributes, { Message: Whisper.Message, }); - primaryConversation.trigger('updateMessage', request); + conversation.trigger('updateMessage', request); }) ); }, @@ -1658,6 +1685,7 @@ const model = this.addSingleMessage(attributes); const message = MessageController.register(model.id, model); + await window.Signal.Data.saveMessage(message.attributes, { forceSave: true, Message: Whisper.Message, @@ -2439,7 +2467,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 7a56660f6..91e381252 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -415,24 +415,57 @@ }, async acceptFriendRequest() { + const primaryDevicePubKey = this.attributes.conversationId; + if (this.get('friendStatus') !== 'pending') { return; } - const conversation = 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; + + const allDevices = await libloki.storage.getAllDevicePubKeysForPrimaryPubKey( + primaryDevicePubKey + ); + + // Set profile name to primary conversation + 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 + // 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; + } + + 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); } - this.set({ friendStatus: 'accepted' }); + await window.Signal.Data.saveMessage(this.attributes, { Message: Whisper.Message, }); - conversation.onAcceptFriendRequest(); + + 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') { @@ -2220,6 +2253,7 @@ let attributes = { ...conversation.attributes, }; + if (dataMessage.group) { let groupUpdate = null; attributes = { @@ -2509,6 +2543,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; @@ -2534,7 +2569,6 @@ } } - // We need to map the original message source to the primary device if (source !== ourNumber) { message.set({ source: primarySource }); } diff --git a/ts/components/session/LeftPaneMessageSection.tsx b/ts/components/session/LeftPaneMessageSection.tsx index e29b942b1..36601aa75 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.isSecondary && !conversation.isPendingFriendRequest + !conversation.isPendingFriendRequest && !conversation.isSecondary ); } 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; }; diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 4cc66343d..56f242c7b 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -129,7 +129,15 @@ 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,22 +168,23 @@ 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( - c => !secondariesToRemove.find(s => s === c.id) - ); + const filteredGroup = [ + ...new Set(group.filter(c => !secondariesToRemove.find(s => s === c.id))), + ]; return filteredGroup as T; };