forked from Henry-Hiles/nexus
dont fetch members on load
This commit is contained in:
parent
edbc647a06
commit
8b056d8ed1
21 changed files with 206 additions and 137 deletions
42
lib/controllers/member_controller.dart
Normal file
42
lib/controllers/member_controller.dart
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
import "dart:async";
|
||||
import "package:collection/collection.dart";
|
||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||
import "package:nexus/controllers/members_controller.dart";
|
||||
import "package:nexus/models/configs/member_config.dart";
|
||||
import "package:nexus/models/membership.dart";
|
||||
|
||||
class MemberController extends AsyncNotifier<Membership> {
|
||||
final MemberConfig config;
|
||||
MemberController(this.config);
|
||||
|
||||
@override
|
||||
FutureOr<Membership> build() {
|
||||
final member = ref.watch(
|
||||
MembersController.provider(config.room).select(
|
||||
(value) => value.firstWhereOrNull(
|
||||
(membership) => membership.userId == config.userId,
|
||||
),
|
||||
),
|
||||
);
|
||||
if (config.room.hasFetchedMembers || member != null) {
|
||||
return member ??
|
||||
Membership(
|
||||
avatarUrl: null,
|
||||
displayName: config.userId,
|
||||
userId: config.userId,
|
||||
);
|
||||
}
|
||||
return Membership(
|
||||
avatarUrl: null,
|
||||
displayName: config.userId,
|
||||
userId: config.userId,
|
||||
);
|
||||
|
||||
throw UnimplementedError();
|
||||
}
|
||||
|
||||
static final provider = AsyncNotifierProvider.family
|
||||
.autoDispose<MemberController, Membership, MemberConfig>(
|
||||
MemberController.new,
|
||||
);
|
||||
}
|
||||
|
|
@ -1,25 +1,32 @@
|
|||
import "package:collection/collection.dart";
|
||||
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||
import "package:nexus/models/event.dart";
|
||||
import "package:nexus/models/membership.dart";
|
||||
import "package:nexus/models/room.dart";
|
||||
|
||||
class MembersController extends Notifier<IList<Event>> {
|
||||
class MembersController extends Notifier<IList<Membership>> {
|
||||
final Room room;
|
||||
MembersController(this.room);
|
||||
|
||||
@override
|
||||
IList<Event> build() => (room.state["m.room.member"]?.values ?? [])
|
||||
IList<Membership> build() => (room.state["m.room.member"]?.values ?? [])
|
||||
.map(
|
||||
(eventRowId) =>
|
||||
room.events.firstWhereOrNull((event) => event.rowId == eventRowId),
|
||||
)
|
||||
.nonNulls
|
||||
.where((member) => member.content["membership"] == "join")
|
||||
.map(
|
||||
(membership) => Membership(
|
||||
avatarUrl: Uri.tryParse(membership.content["avatar_url"] ?? ""),
|
||||
userId: membership.stateKey!,
|
||||
displayName: membership.content["displayname"] ?? membership.stateKey,
|
||||
),
|
||||
)
|
||||
.toIList();
|
||||
|
||||
static final provider = NotifierProvider.family
|
||||
.autoDispose<MembersController, IList<Event>, Room>(
|
||||
.autoDispose<MembersController, IList<Membership>, Room>(
|
||||
MembersController.new,
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@ import "package:collection/collection.dart";
|
|||
import "package:flutter_chat_core/flutter_chat_core.dart";
|
||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||
import "package:nexus/controllers/client_state_controller.dart";
|
||||
import "package:nexus/controllers/members_controller.dart";
|
||||
import "package:nexus/helpers/extensions/mxc_to_https.dart";
|
||||
import "package:nexus/models/message_config.dart";
|
||||
import "package:nexus/models/configs/message_config.dart";
|
||||
|
||||
class MessageController extends AsyncNotifier<Message?> {
|
||||
final MessageConfig config;
|
||||
|
|
@ -27,12 +26,6 @@ class MessageController extends AsyncNotifier<Message?> {
|
|||
|
||||
if (!ref.mounted) return null;
|
||||
|
||||
final members = ref.read(MembersController.provider(config.room));
|
||||
final author = members.firstWhereOrNull(
|
||||
(member) => member.stateKey == event.authorId,
|
||||
);
|
||||
if (!ref.mounted) return null;
|
||||
|
||||
final content = (event.decrypted ?? event.content);
|
||||
final type = (config.event.decryptedType ?? config.event.type);
|
||||
final newContent = content["m.new_content"] as Map?;
|
||||
|
|
@ -52,14 +45,10 @@ class MessageController extends AsyncNotifier<Message?> {
|
|||
"timelineId": event.timelineRowId,
|
||||
"big": event.localContent?.bigEmoji == true,
|
||||
"eventType": type,
|
||||
"avatarUrl": author?.content["avatar_url"],
|
||||
"editSource":
|
||||
event.localContent?.editSource ??
|
||||
newContent?["body"] ??
|
||||
content["body"],
|
||||
"displayName": author?.content["displayname"]?.isNotEmpty == true
|
||||
? author?.content["displayname"]
|
||||
: event.authorId.substring(1).split(":")[0],
|
||||
"txnId": config.event.transactionId,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
|||
import "package:flutter_chat_core/flutter_chat_core.dart";
|
||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||
import "package:nexus/controllers/message_controller.dart";
|
||||
import "package:nexus/models/message_config.dart";
|
||||
import "package:nexus/models/messages_config.dart";
|
||||
import "package:nexus/models/configs/message_config.dart";
|
||||
import "package:nexus/models/configs/messages_config.dart";
|
||||
|
||||
class MessagesController extends AsyncNotifier<IList<Message>> {
|
||||
final MessagesConfig config;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import "dart:async";
|
||||
|
||||
import "package:collection/collection.dart";
|
||||
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
||||
import "package:flutter_chat_core/flutter_chat_core.dart";
|
||||
|
|
@ -11,8 +10,8 @@ import "package:nexus/controllers/message_controller.dart";
|
|||
import "package:nexus/controllers/messages_controller.dart";
|
||||
import "package:nexus/controllers/new_events_controller.dart";
|
||||
import "package:nexus/controllers/rooms_controller.dart";
|
||||
import "package:nexus/models/message_config.dart";
|
||||
import "package:nexus/models/messages_config.dart";
|
||||
import "package:nexus/models/configs/messages_config.dart";
|
||||
import "package:nexus/models/configs/message_config.dart";
|
||||
import "package:nexus/models/requests/get_room_state_request.dart";
|
||||
import "package:nexus/models/requests/paginate_request.dart";
|
||||
import "package:nexus/models/requests/redact_event_request.dart";
|
||||
|
|
@ -31,11 +30,7 @@ class RoomChatController extends AsyncNotifier<InMemoryChatController> {
|
|||
if (room == null) return InMemoryChatController();
|
||||
|
||||
final state = await client.getRoomState(
|
||||
GetRoomStateRequest(
|
||||
roomId: roomId,
|
||||
fetchMembers: room.metadata?.hasMemberList == false,
|
||||
includeMembers: true,
|
||||
),
|
||||
GetRoomStateRequest(roomId: roomId),
|
||||
);
|
||||
|
||||
ref
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue