chore: Follow up new chat: Add mxid if not found

krille-chan · Nov 21, 2023 · e4e399b · e4e399b
1 parent 83ce07c
commit e4e399b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/lib/pages/new_private_chat/new_private_chat.dart b/lib/pages/new_private_chat/new_private_chat.dart
@@ -27,7 +27,7 @@ class NewPrivateChatController extends State<NewPrivateChat> {
   final TextEditingController controller = TextEditingController();
   final FocusNode textFieldFocus = FocusNode();
 
-  Future<SearchUserDirectoryResponse>? searchResponse;
+  Future<List<Profile>>? searchResponse;
 
   Timer? _searchCoolDown;
 
@@ -46,12 +46,25 @@ class NewPrivateChatController extends State<NewPrivateChat> {
     _searchCoolDown?.cancel();
     _searchCoolDown = Timer(_coolDown, () {
       setState(() {
-        searchResponse =
-            Matrix.of(context).client.searchUserDirectory(searchTerm);
+        searchResponse = _searchUser(searchTerm);
       });
     });
   }
 
+  Future<List<Profile>> _searchUser(String searchTerm) async {
+    final result =
+        await Matrix.of(context).client.searchUserDirectory(searchTerm);
+    final profiles = result.results;
+
+    if (searchTerm.isValidMatrixId &&
+        searchTerm.sigil == '@' &&
+        !profiles.any((profile) => profile.userId == searchTerm)) {
+      profiles.add(Profile(userId: searchTerm));
+    }
+
+    return profiles;
+  }
+
   void inviteAction() => FluffyShare.shareInviteLink(context);
 
   void openScannerAction() async {

diff --git a/lib/pages/new_private_chat/new_private_chat_view.dart b/lib/pages/new_private_chat/new_private_chat_view.dart
@@ -205,7 +205,7 @@ class NewPrivateChatView extends StatelessWidget {
                         child: CircularProgressIndicator.adaptive(),
                       );
                     }
-                    if (result.results.isEmpty) {
+                    if (result.isEmpty) {
                       return Column(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
@@ -226,9 +226,9 @@ class NewPrivateChatView extends StatelessWidget {
                       );
                     }
                     return ListView.builder(
-                      itemCount: result.results.length,
+                      itemCount: result.length,
                       itemBuilder: (context, i) {
-                        final contact = result.results[i];
+                        final contact = result[i];
                         final displayname = contact.displayName ??
                             contact.userId.localpart ??
                             contact.userId;