Merge branch 'main' into android

README.md

@@ -54,6 +54,7 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
         -   [x] HTML/Markdown
         -   [x] Replies
             -   [x] Choose ping on/off
+        -   [ ] Per message profiles
         -   [ ] Attachments
         -   [ ] Commands with [MSC4391](https://github.com/matrix-org/matrix-spec-proposals/pull/4391)
         -   [x] Mentions
@@ -64,6 +65,7 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
         -   [ ] GIFs using Gomuks' GIF proxies
     -   [x] Recieving
         -   [x] Plain text
+        -   [x] Per message profiles
         -   [x] HTML
         -   [x] Replies
             -   [x] Viewing

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 = await ref.watch(
+      MembersController.provider(config.room).selectAsync(
+        (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/members_controller.dart

@@ -1,25 +1,39 @@
-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/controllers/client_controller.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<Event>> {
+class MembersController extends AsyncNotifier<IList<Membership>> {
   final Room room;
   MembersController(this.room);
 
   @override
-  IList<Event> build() => (room.state["m.room.member"]?.values ?? [])
+  Future<IList<Membership>> build() async {
-      .map(
+    if (room.metadata == null) return const IList.empty();
-        (eventRowId) =>
-            room.events.firstWhereOrNull((event) => event.rowId == eventRowId),
-      )
-      .nonNulls
-      .where((member) => member.content["membership"] == "join")
-      .toIList();
 
-  static final provider = NotifierProvider.family
+    final state = await ref
-      .autoDispose<MembersController, IList<Event>, Room>(
+        .watch(ClientController.provider.notifier)
+        .getRoomState(
+          GetRoomStateRequest(
+            roomId: room.metadata!.id,
+            fetchMembers: room.metadata!.hasMemberList == false,
+            includeMembers: true,
+          ),
+        );
+
+    return state.nonNulls
+        .where((member) => member.content["membership"] == "join")
+        .map(
+          (membership) =>
+              Membership.fromContent(membership.content, membership.stateKey!),
+        )
+        .toIList();
+  }
+
+  static final provider =
+      AsyncNotifierProvider.family<MembersController, IList<Membership>, Room>(
         MembersController.new,
       );
 }

lib/controllers/message_controller.dart

@@ -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,11 @@ class MessageController extends AsyncNotifier<Message?> {
         "timelineId": event.timelineRowId,
         "big": event.localContent?.bigEmoji == true,
         "eventType": type,
-        "avatarUrl": author?.content["avatar_url"],
+        "pmp": event.content["com.beeper.per_message_profile"],
         "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,
       };
 

lib/controllers/messages_controller.dart

@@ -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/configs/message_config.dart";
-import "package:nexus/models/messages_config.dart";
+import "package:nexus/models/configs/messages_config.dart";
 
 class MessagesController extends AsyncNotifier<IList<Message>> {
   final MessagesConfig config;

lib/controllers/room_chat_controller.dart

@@ -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/configs/messages_config.dart";
-import "package:nexus/models/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(
+      GetRoomStateRequest(roomId: roomId),
-        roomId: roomId,
-        fetchMembers: room.metadata?.hasMemberList == false,
-        includeMembers: true,
-      ),
     );
 
     ref

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/message_config.dart

@@ -0,0 +1,28 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/event.dart";
+import "package:nexus/models/room.dart";
+part "message_config.freezed.dart";
+part "message_config.g.dart";
+
+@freezed
+abstract class MessageConfig with _$MessageConfig {
+  const MessageConfig._();
+  const factory MessageConfig({
+    @Default(false) bool alwaysReturn,
+    @Default(false) bool includeEdits,
+    required Room room,
+    required Event event,
+  }) = _MessageConfig;
+
+  @override
+  bool operator ==(Object other) =>
+      other.runtimeType == runtimeType &&
+      other is MessageConfig &&
+      other.event.eventId == event.eventId;
+
+  @override
+  int get hashCode => Object.hash(runtimeType, event.eventId);
+
+  factory MessageConfig.fromJson(Map<String, Object?> json) =>
+      _$MessageConfigFromJson(json);
+}

lib/models/configs/messages_config.dart

@@ -0,0 +1,17 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/event.dart";
+import "package:nexus/models/room.dart";
+part "messages_config.freezed.dart";
+part "messages_config.g.dart";
+
+@freezed
+abstract class MessagesConfig with _$MessagesConfig {
+  const factory MessagesConfig({
+    required Room room,
+    required IList<Event> events,
+  }) = _MessagesConfig;
+
+  factory MessagesConfig.fromJson(Map<String, Object?> json) =>
+      _$MessagesConfigFromJson(json);
+}

lib/models/membership.dart

@@ -0,0 +1,22 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+part "membership.freezed.dart";
+
+@freezed
+abstract class Membership with _$Membership {
+  const Membership._();
+  const factory Membership({
+    required Uri? avatarUrl,
+    required String displayName,
+    required String userId,
+  }) = _Membership;
+
+  factory Membership.fromContent(
+    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/requests/get_room_state_request.dart

@@ -6,7 +6,7 @@ part "get_room_state_request.g.dart";
 abstract class GetRoomStateRequest with _$GetRoomStateRequest {
   const factory GetRoomStateRequest({
     required String roomId,
-    required bool fetchMembers,
+    @Default(false) bool fetchMembers,
     @Default(false) bool includeMembers,
   }) = _GetRoomStateRequest;
 

lib/widgets/chat_page/composer/chat_box.dart

@@ -0,0 +1,179 @@
+import "dart:io";
+import "package:flutter/material.dart";
+import "package:flutter/services.dart";
+import "package:flutter_chat_core/flutter_chat_core.dart";
+import "package:flutter_hooks/flutter_hooks.dart";
+import "package:fluttertagger/fluttertagger.dart";
+import "package:hooks_riverpod/hooks_riverpod.dart";
+import "package:nexus/controllers/room_chat_controller.dart";
+import "package:nexus/models/relation_type.dart";
+import "package:nexus/models/room.dart";
+import "package:nexus/widgets/chat_page/composer/mention_overlay.dart";
+import "package:nexus/widgets/chat_page/composer/relation_preview.dart";
+
+class ChatBox extends HookConsumerWidget {
+  final Message? relatedMessage;
+  final RelationType relationType;
+  final VoidCallback onDismiss;
+  final Room room;
+  const ChatBox({
+    required this.relatedMessage,
+    required this.relationType,
+    required this.onDismiss,
+    required this.room,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = Theme.of(context);
+    final controller = useRef(FlutterTaggerController());
+    final triggerCharacter = useState("");
+    final shouldMention = useState(true);
+    final query = useState("");
+
+    if (relationType == RelationType.edit &&
+        relatedMessage is TextMessage &&
+        controller.value.text.isEmpty) {
+      controller.value.text = relatedMessage?.metadata?["editSource"] ?? "";
+    }
+
+    void send() {
+      if (controller.value.text.trim().isEmpty || room.metadata == null) return;
+      ref
+          .watch(RoomChatController.provider(room.metadata!.id).notifier)
+          .send(
+            controller.value.formattedText,
+            shouldMention: shouldMention.value,
+            relation: relatedMessage,
+            relationType: relationType,
+            tags: controller.value.tags,
+          );
+      onDismiss();
+      controller.value.text = "";
+    }
+
+    final node = useFocusNode(
+      onKeyEvent: (_, event) {
+        if (event is KeyDownEvent && !Platform.isAndroid && !Platform.isIOS) {
+          if (event.logicalKey == LogicalKeyboardKey.enter &&
+              !HardwareKeyboard.instance.isShiftPressed) {
+            send();
+            return KeyEventResult.handled;
+          } else if (event.logicalKey == LogicalKeyboardKey.escape) {
+            onDismiss();
+            return KeyEventResult.handled;
+          }
+        }
+
+        return KeyEventResult.ignored;
+      },
+    )..requestFocus();
+
+    final style = TextStyle(
+      color: theme.colorScheme.primary,
+      fontWeight: FontWeight.bold,
+    );
+
+    return Positioned(
+      bottom: 0,
+      left: 0,
+      right: 0,
+      child: Padding(
+        padding: EdgeInsetsGeometry.all(12),
+        child: ClipRRect(
+          borderRadius: BorderRadius.all(Radius.circular(12)),
+          child: Column(
+            children: [
+              RelationPreview(
+                relatedMessage,
+                room: room,
+                shouldMention: shouldMention.value,
+                toggleShouldMention: () =>
+                    shouldMention.value = !shouldMention.value,
+                relationType: relationType,
+                onDismiss: onDismiss,
+              ),
+              Container(
+                color: theme.colorScheme.surfaceContainerHighest,
+                padding: EdgeInsets.symmetric(horizontal: 8),
+                child: Row(
+                  spacing: 8,
+                  children: [
+                    PopupMenuButton(
+                      tooltip: "Add media",
+                      itemBuilder: (context) => [
+                        PopupMenuItem(
+                          child: ListTile(
+                            title: Text("Camera"),
+                            leading: Icon(Icons.add_a_photo),
+                          ),
+                        ),
+                        PopupMenuItem(
+                          child: ListTile(
+                            title: Text("Gallery"),
+                            leading: Icon(Icons.add_photo_alternate),
+                          ),
+                        ),
+                        PopupMenuItem(
+                          child: ListTile(
+                            title: Text("Files"),
+                            leading: Icon(Icons.attachment),
+                          ),
+                        ),
+                      ],
+                      icon: Icon(Icons.add),
+                      // enabled: room.canSendDefaultMessages, TODO: Permissions check
+                    ),
+                    Expanded(
+                      child: FlutterTagger(
+                        triggerStrategy: TriggerStrategy.eager,
+                        overlay: MentionOverlay(
+                          room,
+                          query: query.value,
+                          triggerCharacter: triggerCharacter.value,
+                          addTag: ({required id, required name}) {
+                            controller.value.addTag(id: id, name: name);
+                            node.requestFocus();
+                          },
+                        ),
+                        controller: controller.value,
+                        onSearch: (newQuery, newTriggerCharacter) {
+                          triggerCharacter.value = newTriggerCharacter;
+                          query.value = newQuery;
+                        },
+                        triggerCharacterAndStyles: {"@": style, "#": style},
+                        builder: (context, key) => TextFormField(
+                          // enabled: room.canSendDefaultMessages,
+                          maxLines: 12,
+                          minLines: 1,
+                          decoration: InputDecoration(
+                            hintText:
+                                true // TODO: room.canSendDefaultMessages
+                                ? "Your message here..."
+                                : "You don't have permission to send messages in this room...",
+                            border: InputBorder.none,
+                          ),
+                          controller: controller.value,
+                          key: key,
+                          autofocus: true,
+                          focusNode: node,
+                        ),
+                      ),
+                    ),
+                    IconButton(
+                      onPressed: send,
+                      // onPressed: room.canSendDefaultMessages ? send : null,
+                      icon: Icon(Icons.send),
+                      tooltip: "Send message",
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/widgets/chat_page/composer/mention_overlay.dart

@@ -0,0 +1,117 @@
+import "package:flutter/material.dart";
+import "package:hooks_riverpod/hooks_riverpod.dart";
+import "package:nexus/controllers/members_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/widgets/avatar_or_hash.dart";
+import "package:nexus/widgets/loading.dart";
+
+class MentionOverlay extends ConsumerWidget {
+  final String? triggerCharacter;
+  final String query;
+  final Room room;
+  final void Function({required String id, required String name}) addTag;
+  const MentionOverlay(
+    this.room, {
+    required this.query,
+    required this.addTag,
+    required this.triggerCharacter,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final rooms = ref.watch(RoomsController.provider);
+
+    return Padding(
+      padding: EdgeInsets.all(8),
+      child: ClipRRect(
+        borderRadius: BorderRadius.all(Radius.circular(12)),
+        child: Container(
+          color: Theme.of(context).colorScheme.surfaceContainerHigh,
+          padding: EdgeInsets.all(8),
+          child: switch (triggerCharacter) {
+            "@" =>
+              ref
+                  .watch(MembersController.provider(room))
+                  .betterWhen(
+                    data: (members) => ListView(
+                      children:
+                          (query.isEmpty
+                                  ? members
+                                  : members.where(
+                                      (member) =>
+                                          member.userId.toLowerCase().contains(
+                                                query.toLowerCase(),
+                                              ) ==
+                                              true ||
+                                          member.displayName
+                                                  .toLowerCase()
+                                                  .contains(
+                                                    query.toLowerCase(),
+                                                  ) ==
+                                              true,
+                                    ))
+                              .map(
+                                (member) => ListTile(
+                                  leading: AvatarOrHash(
+                                    member.avatarUrl,
+                                    member.displayName,
+                                  ),
+                                  title: Text(member.displayName),
+                                  subtitle: Text(member.userId),
+                                  onTap: () => addTag(
+                                    id: "[@${member.displayName}](https://matrix.to/#/${member.userId})",
+                                    name: member.userId
+                                        .substring(1)
+                                        .split(":")
+                                        .first,
+                                  ),
+                                ),
+                              )
+                              .toList(),
+                    ),
+                  ),
+            "#" => ListView(
+              children:
+                  (query.isEmpty
+                          ? rooms.values
+                          : rooms.values.where(
+                              (room) => (room.metadata?.name ?? "Unnamed Room")
+                                  .toLowerCase()
+                                  .contains(query.toLowerCase()),
+                            ))
+                      .map(
+                        (room) => ListTile(
+                          leading: AvatarOrHash(
+                            room.metadata?.avatar,
+                            room.metadata?.name ?? "Unnamed Room",
+                            fallback: Icon(Icons.numbers),
+                          ),
+                          title: Text(room.metadata?.name ?? "Unnamed Room"),
+                          subtitle: room.metadata?.topic == null
+                              ? null
+                              : Text(room.metadata!.topic!, maxLines: 1),
+                          onTap: () => addTag(
+                            id: "[#${room.metadata?.name ?? "Unnamed Room"}](https://matrix.to/#/${room.metadata?.id})",
+                            name:
+                                (room.metadata?.canonicalAlias ??
+                                        room.metadata?.id)
+                                    ?.substring(1)
+                                    .split(":")
+                                    .first ??
+                                "",
+                          ),
+                        ),
+                      )
+                      .toList(),
+            ),
+
+            _ => Loading(),
+          },
+        ),
+      ),
+    );
+  }
+}

lib/widgets/chat_page/composer/relation_preview.dart

@@ -0,0 +1,84 @@
+import "package:flutter/material.dart";
+import "package:flutter_chat_core/flutter_chat_core.dart";
+import "package:hooks_riverpod/hooks_riverpod.dart";
+import "package:nexus/models/relation_type.dart";
+import "package:nexus/models/room.dart";
+import "package:nexus/widgets/chat_page/lazy_loading/message_avatar.dart";
+import "package:nexus/widgets/chat_page/lazy_loading/message_displayname.dart";
+
+class RelationPreview extends ConsumerWidget {
+  final Message? relatedMessage;
+  final RelationType relationType;
+  final VoidCallback onDismiss;
+  final bool shouldMention;
+  final VoidCallback toggleShouldMention;
+  final Room room;
+
+  const RelationPreview(
+    this.relatedMessage, {
+    required this.room,
+    required this.relationType,
+    required this.onDismiss,
+    required this.shouldMention,
+    required this.toggleShouldMention,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    if (relatedMessage == null) return SizedBox.shrink();
+    final theme = Theme.of(context);
+
+    return Container(
+      color: theme.colorScheme.surfaceContainerHigh,
+      padding: EdgeInsets.symmetric(horizontal: 8),
+      child: Row(
+        spacing: 8,
+        children: [
+          SizedBox(width: 4),
+          if (relationType == RelationType.edit)
+            Text(
+              "Editing message:",
+              style: TextStyle(fontWeight: FontWeight.bold),
+            ),
+          MessageAvatar(relatedMessage!, room),
+          MessageDisplayname(
+            relatedMessage!,
+            room,
+            style: theme.textTheme.labelMedium?.copyWith(
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          Expanded(
+            child: Text(
+              relatedMessage?.metadata?["body"] ??
+                  relatedMessage?.metadata?["eventType"],
+              overflow: TextOverflow.ellipsis,
+              style: theme.textTheme.labelMedium,
+              maxLines: 1,
+            ),
+          ),
+
+          if (relationType == RelationType.reply)
+            TextButton(
+              onPressed: toggleShouldMention,
+              child: Text(
+                shouldMention ? "@On" : "@Off",
+                style: TextStyle(
+                  fontWeight: FontWeight.w900,
+                  color: shouldMention ? null : Theme.of(context).disabledColor,
+                ),
+              ),
+            ),
+          IconButton(
+            tooltip:
+                "Cancel ${relationType == RelationType.edit ? "edit" : "reply"}",
+            onPressed: onDismiss,
+            icon: Icon(Icons.close),
+            iconSize: 20,
+          ),
+        ],
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,30 @@
+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/author_controller.dart";
+import "package:nexus/helpers/extensions/better_when.dart";
+import "package:nexus/models/configs/author_config.dart";
+import "package:nexus/models/room.dart";
+import "package:nexus/widgets/avatar_or_hash.dart";
+
+class MessageAvatar extends ConsumerWidget {
+  final Message message;
+  final Room room;
+  final double height;
+  const MessageAvatar(this.message, this.room, {this.height = 16, super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) => ref
+      .watch(
+        AuthorController.provider(AuthorConfig(room: room, message: message)),
+      )
+      .betterWhen(
+        data: (membership) => AvatarOrHash(
+          membership.avatarUrl,
+          membership.displayName,
+          height: height,
+        ),
+        loading: () =>
+            AvatarOrHash(null, message.authorId.substring(1), height: height),
+      );
+}

lib/widgets/chat_page/lazy_loading/message_displayname.dart

@@ -0,0 +1,28 @@
+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/author_controller.dart";
+import "package:nexus/helpers/extensions/better_when.dart";
+import "package:nexus/models/configs/author_config.dart";
+import "package:nexus/models/room.dart";
+
+class MessageDisplayname extends ConsumerWidget {
+  final Message message;
+  final Room room;
+  final TextStyle? style;
+  const MessageDisplayname(this.message, this.room, {this.style, super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) => ref
+      .watch(
+        AuthorController.provider(AuthorConfig(room: room, message: message)),
+      )
+      .betterWhen(
+        data: (membership) => Text(
+          "${membership.displayName} ${message.metadata?["pmp"] == null ? "" : "(via ${message.authorId})"}",
+          style: style,
+          overflow: TextOverflow.ellipsis,
+        ),
+        loading: () => Text(""),
+      );
+}