add null check in room chat controller

lib/controllers/members_grouped_controller.dart

@@ -0,0 +1,64 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/members_by_status_controller.dart";
+import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/models/configs/members_by_status_config.dart";
+import "package:nexus/models/content/content.dart";
+import "package:nexus/models/content/create.dart";
+import "package:nexus/models/content/power_levels.dart";
+import "package:nexus/models/event.dart";
+
+class MembersGroupedController extends AsyncNotifier<IMap<int?, ISet<Event>>> {
+  final MembersByStatusConfig config;
+  MembersGroupedController(this.config);
+
+  @override
+  Future<IMap<int?, ISet<Event>>> build() async {
+    final room = ref.watch(
+      RoomsController.provider.select((value) => value[config.roomId]),
+    );
+
+    final createRowId = room?.state[EventType.create.type]?[""];
+    final createEvent = createRowId == null ? null : room?.events[createRowId];
+    final createEventContent = switch (createEvent?.content) {
+      CreateContent content => content,
+      _ => null,
+    };
+    final creators = createEventContent?.additionalCreatorIds.add(
+      createEvent!.sender,
+    );
+
+    final powerLevelsRowId = room?.state[EventType.powerLevels.type]?[""];
+    final powerLevelsEvent = powerLevelsRowId == null
+        ? null
+        : room?.events[powerLevelsRowId];
+
+    final content = switch (powerLevelsEvent?.content) {
+      PowerLevelsContent content => content,
+      _ => PowerLevelsContent(),
+    };
+
+    final members = await ref.watch(
+      MembersByStatusController.provider(config).future,
+    );
+
+    return members.fold<IMap<int?, ISet<Event>>>(.new(), (result, event) {
+      final groupKey = creators?.contains(event.stateKey!) == true
+          ? null
+          : content.users[event.stateKey!] ?? content.usersDefault;
+
+      return result.update(
+        groupKey,
+        (value) => value.add(event),
+        ifAbsent: () => .new({event}),
+      );
+    });
+  }
+
+  static final provider =
+      AsyncNotifierProvider.family<
+        MembersGroupedController,
+        IMap<int?, ISet<Event>>,
+        MembersByStatusConfig
+      >(MembersGroupedController.new);
+}

lib/controllers/room_chat_controller.dart

@@ -24,9 +24,8 @@ class RoomChatController extends AsyncNotifier<IList<Event>> {
     final room = ref.watch(
       RoomsController.provider.select((rooms) => rooms[roomId]),
     );
-    if (room == null) return .new();
 
-    if (!room.hasFetchedState) {
+    if (!room!.hasFetchedState) {
       final state = await client.getRoomState(.new(roomId: roomId));
 
       await ref.read(RoomsController.provider.notifier).addState(roomId, state);

lib/models/content/create.dart

@@ -8,8 +8,6 @@ part "create.g.dart";
 abstract class CreateContent extends Content with _$CreateContent {
   CreateContent._();
   factory CreateContent({
-    @JsonKey(name: "creator") String? creatorId,
-
     @JsonKey(name: "additional_creators")
     @Default(IList.empty())
     IList<String> additionalCreatorIds,

lib/widgets/member_list.dart

@@ -1,13 +1,16 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/members_by_status_controller.dart";
+import "package:m3e_buttons/m3e_buttons.dart";
+import "package:material_segmented_list/material_segmented_list.dart";
+import "package:nexus/controllers/members_grouped_controller.dart";
 import "package:nexus/helpers/extensions/get_localpart.dart";
-import "package:nexus/helpers/extensions/show_user_popover.dart";
 import "package:nexus/helpers/extensions/string_to_color.dart";
 import "package:nexus/models/content/membership.dart";
 import "package:nexus/models/membership_status.dart";
 import "package:nexus/widgets/avatar_or_hash.dart";
+import "package:nexus/widgets/divider_text.dart";
 import "package:nexus/widgets/error_dialog.dart";
 import "package:nexus/widgets/loading.dart";
 
@@ -18,12 +21,19 @@ class MemberList extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final status = useState(MembershipStatus.join);
-    final membersProvider = ref.watch(
+
-      MembersByStatusController.provider(
+    final membersData = ref.watch(
+      MembersGroupedController.provider(
         .new(roomId: roomId, status: status.value),
       ),
     );
 
+    final options = {
+      "Joined": MembershipStatus.join,
+      "Invited": MembershipStatus.invite,
+      "Banned": MembershipStatus.ban,
+    };
+
     return Drawer(
       shape: Border(),
       child: Column(
@@ -42,74 +52,107 @@ class MemberList extends HookConsumerWidget {
                 ),
             ],
           ),
-          Wrap(
+          M3EToggleButtonGroup(
-            alignment: .center,
+            type: M3EButtonGroupType.connected,
-            spacing: 8,
+            selectedIndex: options.values.toIList().indexOf(status.value),
-            runSpacing: 8,
+            onSelectedIndexChanged: (index) =>
-            children: [
+                status.value = options.values.elementAt(index ?? 0),
-              FilterChip(
+            // overflow: M3EButtonGroupOverflow.menu,
-                label: Text("Joined"),
+            actions: options
-                onSelected: (value) => status.value = .join,
+                .mapTo(
-                selected: status.value == .join,
+                  (name, value) => M3EToggleButtonGroupAction(
-              ),
+                    checkedLabel: Text(
-              FilterChip(
+                      "$name${switch (membersData) {
-                label: Text("Invited"),
+                        AsyncData(:final value) || AsyncLoading(:final value?) => " (${value.values.expand((element) => element).length})",
-                onSelected: (value) => status.value = .invite,
+                        _ => "",
-                selected: status.value == .invite,
+                      }}",
-              ),
+                    ),
-              FilterChip(
+                    label: Text(name),
-                label: Text("Banned"),
+                  ),
-                onSelected: (value) => status.value = .ban,
+                )
-                selected: status.value == .ban,
+                .toList(),
-              ),
-            ],
           ),
-          switch (membersProvider) {
+
+          switch (membersData) {
             AsyncError(:final error, :final stackTrace) => ErrorDialog(
               error,
               stackTrace,
             ),
-            AsyncData(:final value) || AsyncLoading(:final value?) => Expanded(
+            AsyncData(:final value) || AsyncLoading(:final value?) =>
-              child: ListView(
+              value.isEmpty
-                children: value
+                  ? Center(
-                    .map(
+                      child: Padding(
-                      (member) => switch (member.content) {
+                        padding: .symmetric(vertical: 18),
-                        MembershipContent(
+                        child: Text(
-                          :final avatarUrl,
+                          "No ${options.keys.toIList()[options.values.toIList().indexOf(status.value)]} Members",
-                          :final displayName,
+                          style: Theme.of(context).textTheme.headlineSmall,
-                        ) =>
+                        ),
-                          InkWell(
+                      ),
-                            onTapUp: (details) => context.showUserPopover(
-                              member.content as MembershipContent,
-                              member.stateKey!,
-                              roomId: roomId,
-                              globalPosition: details.globalPosition,
-                            ),
-                            child: ListTile(
-                              leading: AvatarOrHash(
-                                avatarUrl,
-                                displayName ?? member.sender.localpart,
-                              ),
-                              title: Text(
-                                displayName ?? member.stateKey!.localpart,
-                                overflow: .ellipsis,
-                                style: .new(
-                                  color: member.stateKey!.colorHash,
-                                  fontWeight: .bold,
-                                ),
-                              ),
-                              subtitle: Text(
-                                member.stateKey!,
-                                overflow: .ellipsis,
-                              ),
-                            ),
-                          ),
-                        _ => SizedBox.shrink(),
-                      },
                     )
-                    .toList(),
+                  : Expanded(
-              ),
+                      child: ListView(
-            ),
+                        padding: .all(12),
+                        children: [
+                          for (final MapEntry(key: powerLevel, value: members)
+                              in value.toEntryIList(
+                                compare: (a, b) => (b?.key ?? double.infinity)
+                                    .compareTo(a?.key ?? double.infinity),
+                              )) ...[
+                            Padding(
+                              padding: EdgeInsets.symmetric(horizontal: 4),
+                              child: DividerText(
+                                powerLevel == null
+                                    ? "Creators"
+                                    : "Power Level $powerLevel",
+                              ),
+                            ),
+                            SegmentedListSection(
+                              children: members
+                                  .map(
+                                    (member) => switch (member.content) {
+                                      MembershipContent(
+                                        :final avatarUrl,
+                                        :final displayName,
+                                      ) =>
+                                        SegmentedListTile(
+                                          onTap: () {},
+                                          //  context.showUserPopover(
+                                          //   member.content as MembershipContent,
+                                          //   member.stateKey!,
+                                          //   roomId: roomId,
+                                          //   globalPosition: details.globalPosition,
+                                          // ),
+                                          title: Text(
+                                            displayName ??
+                                                member.stateKey!.localpart,
+                                            overflow: .ellipsis,
+                                            style: .new(
+                                              color: member.stateKey!.colorHash,
+                                              fontWeight: .bold,
+                                            ),
+                                          ),
+                                          subtitle: Text(
+                                            member.stateKey!,
+                                            overflow: .ellipsis,
+                                          ),
+                                          leading: AvatarOrHash(
+                                            avatarUrl,
+                                            displayName ??
+                                                member.sender.localpart,
+                                          ),
+                                        ),
+                                      _ => throw Exception(
+                                        "Member content was not MembershipContent",
+                                      ),
+                                    },
+                                  )
+                                  .toList(),
+                            ),
+                            SizedBox(height: 4),
+                          ],
+                        ],
+                      ),
+                    ),
             AsyncLoading _ => Loading(),
           },
         ],

pubspec.lock

@@ -299,6 +299,14 @@ packages:
       url: "https://github.com/Henry-Hiles/emoji_text_field"
     source: git
     version: "1.0.0"
+  equatable:
+    dependency: transitive
+    description:
+      name: equatable
+      sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.8"
   fake_async:
     dependency: transitive
     description:
@@ -744,6 +752,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
+  m3e_buttons:
+    dependency: "direct main"
+    description:
+      name: m3e_buttons
+      sha256: "50cdf9ba30fb3ab529afafb0e837484549f8599f1f109ac07da50951febaace1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.3"
   matcher:
     dependency: transitive
     description:
@@ -760,6 +776,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.13.0"
+  material_segmented_list:
+    dependency: "direct main"
+    description:
+      name: material_segmented_list
+      sha256: "384bfd41a78e745397ceff1dd39700961e6a5419ad911d1797bcc13ea3824241"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
   measure_size:
     dependency: "direct main"
     description:
@@ -848,6 +872,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
+  motor:
+    dependency: transitive
+    description:
+      name: motor
+      sha256: cbd49f21b00e568c2b1a55f134ed803614a107782f4fea7769693bca32940c58
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   native_toolchain_c:
     dependency: transitive
     description:

pubspec.yaml

@@ -64,6 +64,8 @@ dependencies:
   media_kit_video: 2.0.1
   media_kit_libs_video: 1.0.7
   measure_size: ^5.0.2
+  material_segmented_list: ^1.0.5
+  m3e_buttons: ^0.0.3
   
 dev_dependencies:
   build_runner: 2.15.0