fix: migrate remote parties away from roster name + add todo otherwise

prose-im · Nov 3, 2023 · 8b26d72 · 8b26d72
1 parent 739b131
commit 8b26d72
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/assemblies/inbox/InboxTopbar.vue b/src/assemblies/inbox/InboxTopbar.vue
@@ -300,6 +300,8 @@ export default {
           return {
             type: PopoverItemType.Button,
             icon: "clock",
+
+            // TODO: migrate to client-provided room name
             label: Store.$roster.getEntryName(new JID(historyRoomID)),
 
             click: () => {

diff --git a/src/components/base/BaseAvatar.vue b/src/components/base/BaseAvatar.vue
@@ -186,6 +186,8 @@ export default {
     },
 
     rosterName(): ReturnType<typeof Store.$roster.getEntryName> {
+      // TODO: migrate to client-provided name (do not source from roster \
+      //   anymore, might return jid-based nickname)
       return Store.$roster.getEntryName(this.jid);
     }
   },

diff --git a/src/components/inbox/InboxMessaging.vue b/src/components/inbox/InboxMessaging.vue
@@ -428,23 +428,29 @@ export default {
     identifyPartyLocal(runtime: MessagingRuntime): void {
       // Identify local party
       runtime.MessagingStore.identify(this.selfJID.toString(), {
+        // TODO: migrate to client-provided self name (do not source from \
+        //   roster anymore, returns jid-based nickname)
         name: Store.$roster.getEntryName(this.selfJID),
         avatar: Store.$avatar.getAvatarDataUrl(this.selfJID)
       });
     },
 
-    identifyPartyRemote(runtime: MessagingRuntime, jid: JID): void {
+    identifyPartyRemote(
+      runtime: MessagingRuntime,
+      jid: JID,
+      name: string
+    ): void {
       // Identify remote party
       runtime.MessagingStore.identify(jid.toString(), {
-        name: Store.$roster.getEntryName(jid),
+        name,
         avatar: Store.$avatar.getAvatarDataUrl(jid)
       });
     },
 
     identifyAllPartiesRemote(runtime: MessagingRuntime): void {
       // Identify remote all parties
       this.room?.members.forEach(member => {
-        this.identifyPartyRemote(runtime, member.jid);
+        this.identifyPartyRemote(runtime, member.jid, member.name);
       });
     },
 
@@ -981,7 +987,11 @@ export default {
         });
 
         if (remotePartyMember) {
-          this.identifyPartyRemote(frameRuntime, remotePartyMember.jid);
+          this.identifyPartyRemote(
+            frameRuntime,
+            remotePartyMember.jid,
+            remotePartyMember.name
+          );
         }
 
         // Re-identify local party?