GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-30 16:29:30 +01:00
Code Issues Projects Releases Wiki Activity

fix: Emote settings and discovery fallback

Browse Source
This commit is contained in:
Sorunome 2021-02-02 11:24:37 +01:00
parent b079e2bcf5
commit 8f8b8d8bf7
No known key found for this signature in database
GPG Key ID: B19471D07FC9BE9C
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config/routes.dart
View File

@ -162,8 +162,8 @@ class FluffyRoutes {
return ViewData( return ViewData(
leftView: (_) => Settings(), leftView: (_) => Settings(),
mainView: (_) => EmotesSettings( mainView: (_) => EmotesSettings(
room: (settings.arguments as Map)['room'], room: ((settings.arguments ?? {}) as Map)['room'],
stateKey: (settings.arguments as Map)['stateKey'], stateKey: ((settings.arguments ?? {}) as Map)['stateKey'],
), ),
); );
case 'ignore': case 'ignore':

2
lib/views/discover_view.dart
View File

@ -132,7 +132,7 @@ class _DiscoverPageState extends State<DiscoverPage> {
}).then((PublicRoomsResponse res) { }).then((PublicRoomsResponse res) {
if (widget.alias != null && if (widget.alias != null &&
!res.chunk.any((room) => !res.chunk.any((room) =>
room.aliases.contains(widget.alias) || (room.aliases?.contains(widget.alias) ?? false) ||
room.canonicalAlias == widget.alias)) { room.canonicalAlias == widget.alias)) {
// we have to tack on the original alias // we have to tack on the original alias
res.chunk.add(PublicRoom.fromJson(<String, dynamic>{ res.chunk.add(PublicRoom.fromJson(<String, dynamic>{