Fix error to display profile picture for DMs with more than 2 people

frontend/controller/actions/chatroom.js

@@ -248,9 +248,7 @@ export default (sbp('sbp/selectors/register', {
   ...encryptedAction('gi.actions/chatroom/rename', L('Failed to rename chat channel.')),
   ...encryptedAction('gi.actions/chatroom/changeDescription', L('Failed to change chat channel description.')),
   ...encryptedAction('gi.actions/chatroom/leave', L('Failed to leave chat channel.'), async (sendMessage, params, signingKeyId) => {
-    const rootGetters = sbp('state/vuex/getters')
-    const userID = rootGetters.ourContactProfiles[params.data.memberID]?.contractID
-
+    const userID = params.data.memberID
     const keyIds = userID && sbp('chelonia/contract/foreignKeysByContractID', params.contractID, userID)
 
     if (keyIds?.length) {

frontend/model/chatroom/vuexModule.js

@@ -63,7 +63,7 @@ const getters = {
             // prefix (@), etc.) to make it impossible (or at least obvious) to impersonate
             // users (e.g., 'user1' changing their display name to 'user2')
             title: partners.map(cID => getters.userDisplayNameFromID(cID)).join(', '),
-            picture: getters.ourContactProfiles[lastJoinedPartner]?.picture
+            picture: getters.ourContactProfilesById[lastJoinedPartner]?.picture
           }
         }
       }

frontend/model/contracts/chatroom.js

@@ -234,7 +234,7 @@ sbp('chelonia/defineContract', {
               console.error('Error while syncing other members\' contracts at chatroom join', e)
             })
           } else {
-            if (!rootGetters.ourContactProfiles[memberID]) {
+            if (!rootGetters.ourContactProfilesById[memberID]) {
               sbp('chelonia/contract/sync', memberID).catch((e) => {
                 console.error(`Error while syncing new memberID's contract ${memberID}`, e)
               })

frontend/model/contracts/shared/functions.js

@@ -143,7 +143,7 @@ export function makeMentionFromUsername (username: string, forceUsername: ?boole
   const rootGetters = sbp('state/vuex/getters')
   // Even if forceUsername is true, we want to look up the contract ID to ensure
   // that it exists, so that we know it'll later succeed.
-  const userID = rootGetters.ourContactProfiles[username]?.contractID
+  const userID = rootGetters.ourContactProfilesByUsername[username]?.contractID
   return makeMentionFromUserID(forceUsername && userID ? username : userID)
 }
 

frontend/model/state.js

@@ -461,7 +461,7 @@ const getters = {
       return getters.ourContactProfilesById[memberID]
     }
   },
-  ourContactProfiles (state, getters) {
+  ourContactProfilesByUsername (state, getters) {
     const profiles = {}
     Object.keys(state.contracts)
       .filter(contractID => state.contracts[contractID].type === 'gi.contracts/identity')
@@ -493,11 +493,11 @@ const getters = {
         return nameA.normalize().toUpperCase() > nameB.normalize().toUpperCase() ? 1 : -1
       })
   },
-  ourContacts (state, getters) {
-    return Object.keys(getters.ourContactProfiles)
+  ourContactsByUsername (state, getters) {
+    return Object.keys(getters.ourContactProfilesByUsername)
       .sort((usernameA, usernameB) => {
-        const nameA = getters.ourContactProfiles[usernameA].displayName || usernameA
-        const nameB = getters.ourContactProfiles[usernameB].displayName || usernameB
+        const nameA = getters.ourContactProfilesByUsername[usernameA].displayName || usernameA
+        const nameB = getters.ourContactProfilesByUsername[usernameB].displayName || usernameB
         return nameA.normalize().toUpperCase() > nameB.normalize().toUpperCase() ? 1 : -1
       })
   }

frontend/views/containers/chatroom/ChatMembers.vue

@@ -68,7 +68,6 @@ export default ({
   },
   computed: {
     ...mapGetters([
-      'ourContactProfiles',
       'groupShouldPropose',
       'ourGroupDirectMessages',
       'chatRoomUnreadMentions',

frontend/views/containers/chatroom/DMMixin.js

@@ -6,8 +6,6 @@ const DMMixin: Object = {
   computed: {
     ...mapGetters([
       'currentChatRoomId',
-      'ourContacts',
-      'ourContactProfiles',
       'isDirectMessage',
       'ourGroupDirectMessages',
       'ourIdentityContractId',

frontend/views/containers/chatroom/LeaveChannelModal.vue

@@ -38,8 +38,7 @@ export default ({
       'currentChatRoomId',
       'currentChatRoomState',
       'ourGroupDirectMessages',
-      'isDirectMessage',
-      'ourContactProfiles'
+      'isDirectMessage'
     ]),
     ...mapState(['loggedIn', 'currentGroupId']),
     channelName () {