From b539d26b696ab85f061d9fbd777d1aa253e6caf5 Mon Sep 17 00:00:00 2001
From: Sorunome <mail@sorunome.de>
Date: Tue, 2 Feb 2021 11:24:37 +0100
Subject: [PATCH] fix: Emote settings and discovery fallback

---
 lib/config/routes.dart       | 4 ++--
 lib/views/discover_view.dart | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/config/routes.dart b/lib/config/routes.dart
index 338ded0a0..d765d9c6c 100644
--- a/lib/config/routes.dart
+++ b/lib/config/routes.dart
@@ -162,8 +162,8 @@ class FluffyRoutes {
                 return ViewData(
                   leftView: (_) => Settings(),
                   mainView: (_) => EmotesSettings(
-                    room: (settings.arguments as Map)['room'],
-                    stateKey: (settings.arguments as Map)['stateKey'],
+                    room: ((settings.arguments ?? {}) as Map)['room'],
+                    stateKey: ((settings.arguments ?? {}) as Map)['stateKey'],
                   ),
                 );
               case 'ignore':
diff --git a/lib/views/discover_view.dart b/lib/views/discover_view.dart
index b0b30dcb6..fb0882066 100644
--- a/lib/views/discover_view.dart
+++ b/lib/views/discover_view.dart
@@ -132,7 +132,7 @@ class _DiscoverPageState extends State<DiscoverPage> {
     }).then((PublicRoomsResponse res) {
       if (widget.alias != null &&
           !res.chunk.any((room) =>
-              room.aliases.contains(widget.alias) ||
+              (room.aliases?.contains(widget.alias) ?? false) ||
               room.canonicalAlias == widget.alias)) {
         // we have to tack on the original alias
         res.chunk.add(PublicRoom.fromJson(<String, dynamic>{