Invites are collapsed incorrectly (#6300)

* Invites are collapsed incorrectly - use invitee avatar instead of the target avatar for collapsed membership cell
2026-04-19 16:13:42 +02:00 · 2022-06-15 20:11:03 +02:00
parent 2891ec98b8
commit 0015993b8e
3 changed files with 51 additions and 10 deletions
@@ -55,7 +55,22 @@
            [bubbleComponents addObject:firstComponent];
            
            senderId = event.sender;
-            targetId = [event.type isEqualToString:kMXEventTypeStringRoomMember] ? event.stateKey : nil;
+            if ([event.type isEqualToString:kMXEventTypeStringRoomMember])
+            {
+                MXRoomMemberEventContent *content = [MXRoomMemberEventContent modelFromJSON:event.content];
+                if (![content.membership isEqualToString:kMXMembershipStringJoin])
+                {
+                    targetId = event.stateKey;
+                }
+                else
+                {
+                    targetId = event.sender;
+                }
+            }
+            else
+            {
+                targetId = nil;
+            }
            roomId = roomDataSource.roomId;

            // If `roomScreenUseOnlyLatestUserAvatarAndName`is enabled, the avatar and name are