From dbadbc59e29ef5a94faae01e0c71db0e69fd52d8 Mon Sep 17 00:00:00 2001
From: Sorunome <mail@sorunome.de>
Date: Sun, 15 Aug 2021 09:14:23 +0200
Subject: [PATCH] fix: Joining room aliases not published into the room
 directory

---
 lib/pages/search.dart            |  1 -
 lib/pages/views/search_view.dart | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/pages/search.dart b/lib/pages/search.dart
index 88ddb6e6..3d8a0acb 100644
--- a/lib/pages/search.dart
+++ b/lib/pages/search.dart
@@ -23,7 +23,6 @@ class SearchController extends State<Search> {
   String lastServer;
   Timer _coolDown;
   String genericSearchTerm;
-  String alias;
 
   void search(String query) async {
     setState(() => null);
diff --git a/lib/pages/views/search_view.dart b/lib/pages/views/search_view.dart
index 5e600107..696c7410 100644
--- a/lib/pages/views/search_view.dart
+++ b/lib/pages/views/search_view.dart
@@ -32,21 +32,21 @@ class SearchView extends StatelessWidget {
           genericSearchTerm: controller.genericSearchTerm,
         )
         .catchError((error) {
-      if (controller.alias == null) {
+      if (!(controller.genericSearchTerm?.isValidMatrixId ?? false)) {
         throw error;
       }
       return PublicRoomsResponse.fromJson({
         'chunk': [],
       });
     }).then((PublicRoomsResponse res) {
-      if (controller.alias != null &&
+      if (controller.genericSearchTerm != null &&
           !res.chunk.any((room) =>
-              (room.aliases?.contains(controller.alias) ?? false) ||
-              room.canonicalAlias == controller.alias)) {
+              (room.aliases?.contains(controller.genericSearchTerm) ?? false) ||
+              room.canonicalAlias == controller.genericSearchTerm)) {
         // we have to tack on the original alias
         res.chunk.add(PublicRoom.fromJson(<String, dynamic>{
-          'aliases': [controller.alias],
-          'name': controller.alias,
+          'aliases': [controller.genericSearchTerm],
+          'name': controller.genericSearchTerm,
         }));
       }
       return res;