From ab48472aec0b023f8184af75631543ad9745b224 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Fri, 13 Feb 2026 17:02:38 -0500
Subject: [PATCH] use stateKey for memberships

---
 lib/widgets/chat_page/member_list.dart     |  2 +-
 lib/widgets/chat_page/mention_overlay.dart | 27 ++++++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/lib/widgets/chat_page/member_list.dart b/lib/widgets/chat_page/member_list.dart
index 5e1f3bf..93b5a65 100644
--- a/lib/widgets/chat_page/member_list.dart
+++ b/lib/widgets/chat_page/member_list.dart
@@ -46,7 +46,7 @@ class MemberList extends ConsumerWidget {
                     overflow: TextOverflow.ellipsis,
                   ),
                   subtitle: Text(
-                    member.authorId,
+                    member.stateKey ?? "Unknown User",
                     overflow: TextOverflow.ellipsis,
                   ),
                 ),
diff --git a/lib/widgets/chat_page/mention_overlay.dart b/lib/widgets/chat_page/mention_overlay.dart
index b2f2d9d..7151615 100644
--- a/lib/widgets/chat_page/mention_overlay.dart
+++ b/lib/widgets/chat_page/mention_overlay.dart
@@ -42,9 +42,12 @@ class MentionOverlay extends ConsumerWidget {
                                   ? members
                                   : members.where(
                                       (member) =>
-                                          member.authorId
-                                              .toLowerCase()
-                                              .contains(query.toLowerCase()) ||
+                                          member.stateKey
+                                                  ?.toLowerCase()
+                                                  .contains(
+                                                    query.toLowerCase(),
+                                                  ) ==
+                                              true ||
                                           (member.content["displayname"]
                                                       as String?)
                                                   ?.toLowerCase()
@@ -63,14 +66,20 @@ class MentionOverlay extends ConsumerWidget {
                                   ),
                                   title: Text(
                                     member.content["displayname"] as String? ??
-                                        member.authorId,
+                                        member.stateKey ??
+                                        "Unknown User",
                                   ),
+                                  subtitle: member.stateKey != null
+                                      ? Text(member.stateKey!)
+                                      : null,
                                   onTap: () => addTag(
-                                    id: "[@${member.content["displayname"]}](https://matrix.to/#/${member.authorId})",
-                                    name: member.authorId
-                                        .substring(1)
-                                        .split(":")
-                                        .first,
+                                    id: "[@${member.content["displayname"]}](https://matrix.to/#/${member.stateKey})",
+                                    name:
+                                        member.stateKey
+                                            ?.substring(1)
+                                            .split(":")
+                                            .first ??
+                                        "Unknown User",
                                   ),
                                 ),
                               )