Merge branch 'nico/fix-emote-rooms-without-default' into 'main'

fix: type error in emote pack list in rooms with only non-default packs

Closes #1138

See merge request famedly/fluffychat!1098
This commit is contained in:
Krille 2023-03-11 16:54:38 +00:00
commit 0a6a0d6807

View file

@ -24,8 +24,11 @@ class MultipleEmotesSettingsView extends StatelessWidget {
body: StreamBuilder(
stream: room.onUpdate.stream,
builder: (context, snapshot) {
final Map<String, Event?> packs =
room.states['im.ponies.room_emotes'] ?? <String, Event>{};
final packStateEvents = room.states['im.ponies.room_emotes'];
// we need to manually convert the map using Map.of, otherwise assigning null will throw a type error.
final Map<String, Event?> packs = packStateEvents != null
? Map<String, Event?>.of(packStateEvents)
: <String, Event?>{};
if (!packs.containsKey('')) {
packs[''] = null;
}