lazy load memberships

README.md

@@ -15,113 +15,115 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
 
 ## Progress
 
-- [ ] New logo
+-   [ ] New logo
-- [ ] Make context menus appear as bottom sheets on mobile
+-   [ ] Make context menus appear as bottom sheets on mobile
-- [x] Move from the Dart SDK to the Gomuks SDK with Dart bindings: https://git.federated.nexus/Henry-Hiles/nexus/pulls/2
+-   [x] Move from the Dart SDK to the Gomuks SDK with Dart bindings: https://git.federated.nexus/Henry-Hiles/nexus/pulls/2
-    - [ ] Allow using remote gomuks over websocket
+    -   [ ] Allow using remote gomuks over websocket
-- [ ] Platform Support
+-   [ ] Platform Support
-    - [x] Linux
+    -   [x] Linux
-    - [x] Windows
+    -   [x] Windows
-    - [ ] MacOS
+    -   [ ] MacOS
-    - [ ] Android
+    -   [ ] Android
-    - [ ] iOS
+    -   [ ] iOS
-    - [ ] Web (may not be possible)
+    -   [ ] Web (may not be possible)
-- [x] Login
+-   [x] Login
-    - [x] Username / password auth
+    -   [x] Username / password auth
-    - [ ] OAuth / OIDC
+    -   [ ] OAuth / OIDC
-    - [x] Improve initial sync experience
+    -   [x] Improve initial sync experience
-- [x] Rooms / Spaces
+-   [x] Rooms / Spaces
-    - [x] Displaying and choosing
+    -   [x] Displaying and choosing
-    - [x] Reading, showing unread
+    -   [x] Reading, showing unread
-        - [x] Mark as read button on rooms and spaces
+        -   [x] Mark as read button on rooms and spaces
-    - [ ] Searching
+    -   [ ] Searching
-    - [ ] Creating (Rooms, Spaces, and DMs)
+    -   [ ] Creating (Rooms, Spaces, and DMs)
-    - [x] Joining
+    -   [x] Joining
-        - [ ] Parse vias
+        -   [ ] Parse vias
-        - [x] Using a text/uri/link
+        -   [x] Using a text/uri/link
-            - [x] Plain text
+            -   [x] Plain text
-            - [x] `matrix:` Uri
+            -   [x] `matrix:` Uri
-            - [x] Matrix.to link
+            -   [x] Matrix.to link
-        - [ ] From space
+        -   [ ] From space
-        - [ ] Exploring
+        -   [ ] Exploring
-    - [x] Leaving
+    -   [x] Leaving
-    - [x] Subspaces
+    -   [x] Subspaces
-- [x] Messages
+-   [x] Messages
-    - [x] Encryption
+    -   [x] Encryption
-        - [x] Restoring crypto identity from a recovery passphrase/key
+        -   [x] Restoring crypto identity from a recovery passphrase/key
-    - [x] Sending
+    -   [x] Sending
-        - [x] Plain text
+        -   [x] Plain text
-        - [x] HTML/Markdown
+        -   [x] HTML/Markdown
-        - [x] Replies
+        -   [x] Replies
-            - [x] Choose ping on/off
+            -   [x] Choose ping on/off
-        - [ ] Attachments
+        -   [ ] Per message profiles
-        - [ ] Commands with [MSC4391](https://github.com/matrix-org/matrix-spec-proposals/pull/4391)
+        -   [ ] Attachments
-        - [x] Mentions
+        -   [ ] Commands with [MSC4391](https://github.com/matrix-org/matrix-spec-proposals/pull/4391)
-            - [x] Users
+        -   [x] Mentions
-            - [x] Rooms
+            -   [x] Users
-            - [ ] Inline emoji picker (Putting this here since it'll be implemented the same way as mentions)
+            -   [x] Rooms
-        - [ ] Custom emojis/stickers
+            -   [ ] Inline emoji picker (Putting this here since it'll be implemented the same way as mentions)
-        - [ ] GIFs using Gomuks' GIF proxies
+        -   [ ] Custom emojis/stickers
-    - [x] Recieving
+        -   [ ] GIFs using Gomuks' GIF proxies
-        - [x] Plain text
+    -   [x] Recieving
-        - [x] HTML
+        -   [x] Plain text
-        - [x] Replies
+        -   [x] Per message profiles
-            - [x] Viewing
+        -   [x] HTML
-            - [ ] Jump to original message
+        -   [x] Replies
-                - [x] In loaded timeline
+            -   [x] Viewing
-                - [ ] Out of loaded timeline
+            -   [ ] Jump to original message
-        - [x] Edits
+                -   [x] In loaded timeline
-        - [x] Attachments
+                -   [ ] Out of loaded timeline
-            - [x] Unencrypted
+        -   [x] Edits
-            - [ ] Encrypted
+        -   [x] Attachments
-            - [x] Blurhashing
+            -   [x] Unencrypted
-            - [ ] Downloading attachments
+            -   [ ] Encrypted
-            - [x] Opening attachments in their own view
+            -   [x] Blurhashing
-        - [ ] Polls: Waiting on https://github.com/SwanFlutter/dynamic_polls/issues/1
+            -   [ ] Downloading attachments
-        - [x] Mentions
+            -   [x] Opening attachments in their own view
-            - [x] Users
+        -   [ ] Polls: Waiting on https://github.com/SwanFlutter/dynamic_polls/issues/1
-            - [x] Rooms
+        -   [x] Mentions
-                - [ ] Plain text (not sure if I want to add this or not, I probably won't unless there's interest)
+            -   [x] Users
-                - [x] Matrix URIs
+            -   [x] Rooms
-                - [x] Matrix.to links
+                -   [ ] Plain text (not sure if I want to add this or not, I probably won't unless there's interest)
-            - [ ] Do some fancy fetching to get nice names
+                -   [x] Matrix URIs
-            - [ ] Make clickable
+                -   [x] Matrix.to links
-        - [x] Custom emojis/stickers
+            -   [ ] Do some fancy fetching to get nice names
-        - [x] History loading
+            -   [ ] Make clickable
-            - [x] Backwards
+        -   [x] Custom emojis/stickers
-            - [ ] Forwards
+        -   [x] History loading
-    - [x] Editing
+            -   [x] Backwards
-    - [x] Deleting
+            -   [ ] Forwards
-- [ ] Reactions: Waiting on https://github.com/flyerhq/flutter_chat_ui/pull/838 or me doing a custom impl
+    -   [x] Editing
-- [ ] Pins
+    -   [x] Deleting
-    - [ ] Displaying
+-   [ ] Reactions: Waiting on https://github.com/flyerhq/flutter_chat_ui/pull/838 or me doing a custom impl
-    - [ ] Creating
+-   [ ] Pins
-- [ ] Threads
+    -   [ ] Displaying
-- [ ] Profile popouts
+    -   [ ] Creating
-- [ ] Copy link to [room, space]
+-   [ ] Threads
-- [ ] Reporting
+-   [ ] Profile popouts
-    - [x] Events
+-   [ ] Copy link to [room, space]
-    - [ ] Rooms
+-   [ ] Reporting
-- [ ] Notifications using UnifiedPush
+    -   [x] Events
-- [ ] Group calls using [MSC4195](https://github.com/matrix-org/matrix-spec-proposals/pull/4195)
+    -   [ ] Rooms
-- [ ] Invites
+-   [ ] Notifications using UnifiedPush
-- [ ] Settings
+-   [ ] Group calls using [MSC4195](https://github.com/matrix-org/matrix-spec-proposals/pull/4195)
-    - [ ] Light/Dark mode
+-   [ ] Invites
-    - [ ] SSD or CSD
+-   [ ] Settings
-    - [ ] Show media by default
+    -   [ ] Light/Dark mode
-    - [ ] Dynamic Theming
+    -   [ ] SSD or CSD
-    - [ ] Devices
+    -   [ ] Show media by default
-        - [ ] Viewing devices
+    -   [ ] Dynamic Theming
-        - [ ] Verifying devices
+    -   [ ] Devices
-    - [ ] URL preview: Server / Client / None
+        -   [ ] Viewing devices
-    - [ ] Account changes
+        -   [ ] Verifying devices
-        - [ ] Display name
+    -   [ ] URL preview: Server / Client / None
-        - [ ] Profile picture
+    -   [ ] Account changes
-        - [ ] Timezone
+        -   [ ] Display name
-        - [ ] Pronouns
+        -   [ ] Profile picture
-        - [ ] Password
+        -   [ ] Timezone
-    - [ ] About
+        -   [ ] Pronouns
-    - [x] Log Out
+        -   [ ] Password
+    -   [ ] About
+    -   [x] Log Out
 
 ## Build Instructions
 
@@ -136,8 +138,8 @@ cd nexus
 
 #### Linux
 
-- With Nix: Either use direnv, or `nix flake develop`
+-   With Nix: Either use direnv, or `nix flake develop`
-- Without Nix: Install Flutter, Go, Olm, Git, Clang, and GLibc.
+-   Without Nix: Install Flutter, Go, Olm, Git, Clang, and GLibc.
 
 #### Windows / MacOS
 

lib/controllers/author_controller.dart

@@ -0,0 +1,44 @@
+import "dart:async";
+import "package:collection/collection.dart";
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/members_controller.dart";
+import "package:nexus/models/configs/author_config.dart";
+import "package:nexus/models/membership.dart";
+
+class AuthorController extends AsyncNotifier<Membership> {
+  final AuthorConfig config;
+  AuthorController(this.config);
+
+  @override
+  Future<Membership> build() async {
+    var member = ref.watch(
+      MembersController.provider(config.room).select(
+        (value) => value.firstWhereOrNull(
+          (membership) => membership.userId == config.message.authorId,
+        ),
+      ),
+    );
+
+    final pmp = config.message.metadata?["pmp"] == null
+        ? null
+        : Membership.fromContent(
+            IMap(config.message.metadata?["pmp"]),
+            config.message.authorId,
+          );
+
+    return Membership(
+      avatarUrl: pmp?.avatarUrl ?? member?.avatarUrl,
+      displayName:
+          pmp?.displayName ??
+          member?.displayName ??
+          config.message.authorId.substring(1).split(":").first,
+      userId: config.message.authorId,
+    );
+  }
+
+  static final provider = AsyncNotifierProvider.family
+      .autoDispose<AuthorController, Membership, AuthorConfig>(
+        AuthorController.new,
+      );
+}

lib/controllers/member_controller.dart

@@ -1,42 +0,0 @@
-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,
-      );
-}

lib/controllers/members_controller.dart

@@ -1,7 +1,10 @@
 import "package:collection/collection.dart";
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/models/event.dart";
 import "package:nexus/models/membership.dart";
+import "package:nexus/models/requests/get_room_state_request.dart";
 import "package:nexus/models/room.dart";
 
 class MembersController extends Notifier<IList<Membership>> {
@@ -9,24 +12,42 @@ class MembersController extends Notifier<IList<Membership>> {
   MembersController(this.room);
 
   @override
-  IList<Membership> build() => (room.state["m.room.member"]?.values ?? [])
+  IList<Membership> build() {
-      .map(
+    IList<Membership> membersFromState(IList<Event> members) => members.nonNulls
-        (eventRowId) =>
+        .where((member) => member.content["membership"] == "join")
-            room.events.firstWhereOrNull((event) => event.rowId == eventRowId),
+        .map(
-      )
+          (membership) =>
-      .nonNulls
+              Membership.fromContent(membership.content, membership.stateKey!),
-      .where((member) => member.content["membership"] == "join")
+        )
-      .map(
+        .toIList();
-        (membership) => Membership(
-          avatarUrl: Uri.tryParse(membership.content["avatar_url"] ?? ""),
-          userId: membership.stateKey!,
-          displayName: membership.content["displayname"] ?? membership.stateKey,
-        ),
-      )
-      .toIList();
 
-  static final provider = NotifierProvider.family
+    if (room.metadata != null) {
-      .autoDispose<MembersController, IList<Membership>, Room>(
+      ref
+          .watch(ClientController.provider.notifier)
+          .getRoomState(
+            GetRoomStateRequest(
+              roomId: room.metadata!.id,
+              fetchMembers: room.metadata!.hasMemberList == false,
+              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(),
+    );
+  }
+
+  static final provider =
+      NotifierProvider.family<MembersController, IList<Membership>, Room>(
         MembersController.new,
       );
 }

lib/controllers/message_controller.dart

@@ -45,6 +45,7 @@ class MessageController extends AsyncNotifier<Message?> {
         "timelineId": event.timelineRowId,
         "big": event.localContent?.bigEmoji == true,
         "eventType": type,
+        "pmp": event.content["com.beeper.per_message_profile"],
         "editSource":
             event.localContent?.editSource ??
             newContent?["body"] ??

lib/controllers/rooms_controller.dart

@@ -36,6 +36,7 @@ class RoomsController extends Notifier<IMap<String, Room>> {
       return acc.add(
         roomId,
         existing?.copyWith(
+              hasMore: incoming.hasMore,
               metadata: incoming.metadata ?? existing.metadata,
               events: events!,
               state: incoming.state.entries.fold(

lib/models/configs/author_config.dart

@@ -0,0 +1,14 @@
+import "package:flutter_chat_core/flutter_chat_core.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/room.dart";
+part "author_config.freezed.dart";
+part "author_config.g.dart";
+
+@freezed
+abstract class AuthorConfig with _$AuthorConfig {
+  const factory AuthorConfig({required Message message, required Room room}) =
+      _AuthorConfig;
+
+  factory AuthorConfig.fromJson(Map<String, Object?> json) =>
+      _$AuthorConfigFromJson(json);
+}

lib/models/configs/member_config.dart

@@ -1,13 +0,0 @@
-import "package:freezed_annotation/freezed_annotation.dart";
-import "package:nexus/models/room.dart";
-part "member_config.freezed.dart";
-part "member_config.g.dart";
-
-@freezed
-abstract class MemberConfig with _$MemberConfig {
-  const factory MemberConfig({required Room room, required String userId}) =
-      _MemberConfig;
-
-  factory MemberConfig.fromJson(Map<String, Object?> json) =>
-      _$MemberConfigFromJson(json);
-}

lib/models/membership.dart

@@ -1,15 +1,22 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:freezed_annotation/freezed_annotation.dart";
 part "membership.freezed.dart";
-part "membership.g.dart";
 
 @freezed
 abstract class Membership with _$Membership {
+  const Membership._();
   const factory Membership({
     required Uri? avatarUrl,
     required String displayName,
     required String userId,
   }) = _Membership;
 
-  factory Membership.fromJson(Map<String, Object?> json) =>
+  factory Membership.fromContent(
-      _$MembershipFromJson(json);
+    IMap<String, dynamic> content,
+    String userId,
+  ) => Membership(
+    avatarUrl: Uri.tryParse(content["avatar_url"] ?? ""),
+    userId: userId,
+    displayName: content["displayname"] ?? userId.substring(1).split(":").first,
+  );
 }

lib/models/room.dart

@@ -18,7 +18,6 @@ abstract class Room with _$Room {
     @Default(IMap.empty()) IMap<String, IList<ReadReceipt>> receipts,
     @Default(false) bool dismissNotifications,
     @Default(true) bool hasMore,
-    @Default(false) bool hasFetchedMembers,
     // required IList<Notification> notifications,
   }) = _Room;
 

lib/widgets/chat_page/html/html.dart

@@ -22,6 +22,10 @@ class Html extends ConsumerWidget {
     html,
     textStyle: textStyle,
     customWidgetBuilder: (element) {
+      if (element.attributes.keys.contains("data-mx-profile-fallback")) {
+        return SizedBox.shrink();
+      }
+
       if (element.attributes.keys.contains("data-mx-spoiler")) {
         return InlineCustomWidget(child: SpoilerText(text: element.text));
       }

lib/widgets/chat_page/lazy_loading/message_avatar.dart

@@ -1,9 +1,9 @@
 import "package:flutter/widgets.dart";
 import "package:flutter_chat_core/flutter_chat_core.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/member_controller.dart";
+import "package:nexus/controllers/author_controller.dart";
 import "package:nexus/helpers/extensions/better_when.dart";
-import "package:nexus/models/configs/member_config.dart";
+import "package:nexus/models/configs/author_config.dart";
 import "package:nexus/models/room.dart";
 import "package:nexus/widgets/avatar_or_hash.dart";
 
@@ -16,9 +16,7 @@ class MessageAvatar extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) => ref
       .watch(
-        MemberController.provider(
+        AuthorController.provider(AuthorConfig(room: room, message: message)),
-          MemberConfig(room: room, userId: message.authorId),
-        ),
       )
       .betterWhen(
         data: (membership) => AvatarOrHash(

lib/widgets/chat_page/lazy_loading/message_displayname.dart

@@ -1,9 +1,9 @@
 import "package:flutter/widgets.dart";
 import "package:flutter_chat_core/flutter_chat_core.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/member_controller.dart";
+import "package:nexus/controllers/author_controller.dart";
 import "package:nexus/helpers/extensions/better_when.dart";
-import "package:nexus/models/configs/member_config.dart";
+import "package:nexus/models/configs/author_config.dart";
 import "package:nexus/models/room.dart";
 
 class MessageDisplayname extends ConsumerWidget {
@@ -15,13 +15,11 @@ class MessageDisplayname extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) => ref
       .watch(
-        MemberController.provider(
+        AuthorController.provider(AuthorConfig(room: room, message: message)),
-          MemberConfig(room: room, userId: message.authorId),
-        ),
       )
       .betterWhen(
         data: (membership) => Text(
-          membership.displayName,
+          "${membership.displayName} ${message.metadata?["pmp"] == null ? "" : "(via ${message.authorId})"}",
           style: style,
           overflow: TextOverflow.ellipsis,
         ),

lib/widgets/chat_page/reply_widget.dart

@@ -67,7 +67,7 @@ class ReplyWidget extends ConsumerWidget {
                                     mainAxisSize: MainAxisSize.min,
                                     spacing: 8,
                                     children: [
-                                      MessageAvatar(message, room),
+                                      MessageAvatar(replyMessage, room),
                                       Flexible(
                                         child: MessageDisplayname(
                                           replyMessage,