GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-12-25 23:12:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'soru/fix-regressions' into 'main'

Browse Source 
fix: Emote settings and discovery fallback

See merge request famedly/fluffychat!366
This commit is contained in:
Krille Fear 2021-02-02 13:08:24 +00:00
commit e38879d37f
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

@ -161,8 +161,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/home_view_parts/discover.dart
View File

@ -110,7 +110,7 @@ class _DiscoverState extends State<Discover> {
}).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>{