make members controller an asyncnotifier

makes loading smoother and more responsive
This commit is contained in:
Henry Hiles 2026-03-22 16:46:48 -04:00
commit 237886971c
No known key found for this signature in database
4 changed files with 92 additions and 81 deletions

View file

@ -12,8 +12,8 @@ class AuthorController extends AsyncNotifier<Membership> {
@override @override
Future<Membership> build() async { Future<Membership> build() async {
var member = ref.watch( var member = await ref.watch(
MembersController.provider(config.room).select( MembersController.provider(config.room).selectAsync(
(value) => value.firstWhereOrNull( (value) => value.firstWhereOrNull(
(membership) => membership.userId == config.message.authorId, (membership) => membership.userId == config.message.authorId,
), ),

View file

@ -7,22 +7,15 @@ import "package:nexus/models/membership.dart";
import "package:nexus/models/requests/get_room_state_request.dart"; import "package:nexus/models/requests/get_room_state_request.dart";
import "package:nexus/models/room.dart"; import "package:nexus/models/room.dart";
class MembersController extends Notifier<IList<Membership>> { class MembersController extends AsyncNotifier<IList<Membership>> {
final Room room; final Room room;
MembersController(this.room); MembersController(this.room);
@override @override
IList<Membership> build() { Future<IList<Membership>> build() async {
IList<Membership> membersFromState(IList<Event> members) => members.nonNulls if (room.metadata == null) return const IList.empty();
.where((member) => member.content["membership"] == "join")
.map(
(membership) =>
Membership.fromContent(membership.content, membership.stateKey!),
)
.toIList();
if (room.metadata != null) { final state = await ref
ref
.watch(ClientController.provider.notifier) .watch(ClientController.provider.notifier)
.getRoomState( .getRoomState(
GetRoomStateRequest( GetRoomStateRequest(
@ -30,24 +23,19 @@ class MembersController extends Notifier<IList<Membership>> {
fetchMembers: room.metadata!.hasMemberList == false, fetchMembers: room.metadata!.hasMemberList == false,
includeMembers: true, includeMembers: true,
), ),
)
.then((value) => state = membersFromState(value));
}
return membersFromState(
(room.state["m.room.members"]?.values ?? [])
.map(
(eventRowId) => room.events.firstWhereOrNull(
(event) => event.rowId == eventRowId,
),
)
.nonNulls
.toIList(),
); );
return state.nonNulls
.where((member) => member.content["membership"] == "join")
.map(
(membership) =>
Membership.fromContent(membership.content, membership.stateKey!),
)
.toIList();
} }
static final provider = static final provider =
NotifierProvider.family<MembersController, IList<Membership>, Room>( AsyncNotifierProvider.family<MembersController, IList<Membership>, Room>(
MembersController.new, MembersController.new,
); );
} }

View file

@ -2,6 +2,7 @@ import "package:flutter/material.dart";
import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:nexus/controllers/members_controller.dart"; import "package:nexus/controllers/members_controller.dart";
import "package:nexus/controllers/rooms_controller.dart"; import "package:nexus/controllers/rooms_controller.dart";
import "package:nexus/helpers/extensions/better_when.dart";
import "package:nexus/models/room.dart"; import "package:nexus/models/room.dart";
import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/widgets/avatar_or_hash.dart";
import "package:nexus/widgets/loading.dart"; import "package:nexus/widgets/loading.dart";
@ -31,10 +32,11 @@ class MentionOverlay extends ConsumerWidget {
color: Theme.of(context).colorScheme.surfaceContainerHigh, color: Theme.of(context).colorScheme.surfaceContainerHigh,
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
child: switch (triggerCharacter) { child: switch (triggerCharacter) {
"@" => Consumer( "@" =>
builder: (_, ref, _) { ref
final members = ref.watch(MembersController.provider(room)); .watch(MembersController.provider(room))
return ListView( .betterWhen(
data: (members) => ListView(
children: children:
(query.isEmpty (query.isEmpty
? members ? members
@ -44,7 +46,9 @@ class MentionOverlay extends ConsumerWidget {
query.toLowerCase(), query.toLowerCase(),
) == ) ==
true || true ||
member.displayName.toLowerCase().contains( member.displayName
.toLowerCase()
.contains(
query.toLowerCase(), query.toLowerCase(),
) == ) ==
true, true,
@ -67,8 +71,7 @@ class MentionOverlay extends ConsumerWidget {
), ),
) )
.toList(), .toList(),
); ),
},
), ),
"#" => ListView( "#" => ListView(
children: children:

View file

@ -1,6 +1,7 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:nexus/controllers/members_controller.dart"; import "package:nexus/controllers/members_controller.dart";
import "package:nexus/helpers/extensions/better_when.dart";
import "package:nexus/models/room.dart"; import "package:nexus/models/room.dart";
import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/widgets/avatar_or_hash.dart";
@ -10,15 +11,17 @@ class MemberList extends ConsumerWidget {
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final members = ref.watch(MembersController.provider(room)); final membersProvider = ref.watch(MembersController.provider(room));
return Drawer( return Drawer(
shape: Border(), shape: Border(),
child: ListView( child: Column(
children: [ children: [
AppBar( AppBar(
scrolledUnderElevation: 0, scrolledUnderElevation: 0,
leading: Icon(Icons.people), leading: Icon(Icons.people),
title: Text("Members (${members.length})"), title: Text(
"Members ${membersProvider.when(data: (members) => "${members.length}", error: (_, _) => "", loading: () => "")}",
),
actionsPadding: EdgeInsets.only(right: 4), actionsPadding: EdgeInsets.only(right: 4),
actions: [ actions: [
if (Scaffold.of(context).hasEndDrawer) if (Scaffold.of(context).hasEndDrawer)
@ -29,16 +32,33 @@ class MemberList extends ConsumerWidget {
), ),
], ],
), ),
...members.map( membersProvider.betterWhen(
data: (members) => Expanded(
child: ListView(
children: members
.map(
(member) => ListTile( (member) => ListTile(
onTap: () => showDialog( onTap: () => showDialog(
context: context, context: context,
builder: (context) => builder: (context) =>
Dialog(child: Text("TODO: Open member popover")), Dialog(child: Text("TODO: Open member popover")),
), ),
leading: AvatarOrHash(member.avatarUrl, member.displayName), leading: AvatarOrHash(
title: Text(member.displayName, overflow: TextOverflow.ellipsis), member.avatarUrl,
subtitle: Text(member.userId, overflow: TextOverflow.ellipsis), member.displayName,
),
title: Text(
member.displayName,
overflow: TextOverflow.ellipsis,
),
subtitle: Text(
member.userId,
overflow: TextOverflow.ellipsis,
),
),
)
.toList(),
),
), ),
), ),
], ],