From 26f047fb42f8ccf40b2190da48f7ecc69dd82123 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Mon, 24 May 2021 11:07:02 +0200
Subject: [PATCH] fix: Click on room aliases

---
 lib/pages/search.dart            | 11 +++++++++--
 lib/pages/views/search_view.dart |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/pages/search.dart b/lib/pages/search.dart
index deb2ec875..171f509d2 100644
--- a/lib/pages/search.dart
+++ b/lib/pages/search.dart
@@ -131,11 +131,18 @@ class SearchController extends State<Search> {
     setState(() {});
   }
 
+  bool _init = false;
+
   @override
   Widget build(BuildContext context) {
-    alias = VRouter.of(context).queryParameters['query'];
-    if (alias != null) genericSearchTerm ??= alias;
+    if (!_init) {
+      _init = true;
+      controller.text = VRouter.of(context).queryParameters['query'] ?? '';
+      WidgetsBinding.instance
+          .addPostFrameCallback((_) => search(controller.text));
+    }
 
     return SearchView(this);
   }
 }
+// #fluffychat:matrix.org
\ No newline at end of file
diff --git a/lib/pages/views/search_view.dart b/lib/pages/views/search_view.dart
index c6defcffa..a0f9b5ad6 100644
--- a/lib/pages/views/search_view.dart
+++ b/lib/pages/views/search_view.dart
@@ -62,7 +62,8 @@ class SearchView extends StatelessWidget {
     );
     return DefaultTabController(
       length: 3,
-      initialIndex: 1,
+      initialIndex:
+          controller.controller.text?.startsWith('#') ?? false ? 0 : 1,
       child: Scaffold(
         appBar: AppBar(
           leading: BackButton(),