Fetch replies in toMessage not at runtime

lib/controllers/message_controller.dart

@@ -1,23 +0,0 @@
-import "package:flutter_chat_core/flutter_chat_core.dart";
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/selected_room_controller.dart";
-import "package:nexus/helpers/extensions/event_to_message.dart";
-
-class MessageController extends AsyncNotifier<TextMessage?> {
-  final String id;
-  MessageController(this.id);
-
-  @override
-  Future<TextMessage?> build() async {
-    final room = await ref.watch(SelectedRoomController.provider.future);
-    if (room == null) return null;
-
-    final event = await room.roomData.getEventById(id);
-    return (await event?.toMessage(mustBeText: true)) as TextMessage?;
-  }
-
-  static final provider = AsyncNotifierProvider.family
-      .autoDispose<MessageController, TextMessage?, String>(
-        MessageController.new,
-      );
-}

lib/helpers/extensions/event_to_message.dart

@@ -15,13 +15,18 @@ extension EventToMessage on Event {
     final newEvent = (unsigned?["m.relations"] as Map?)?["m.replace"];
     final event = newEvent == null ? this : Event.fromJson(newEvent, room);
 
+    final replyEvent = replyId == null
+        ? null
+        : await room.getEventById(replyId);
+
     final newContent = event.content["m.new_content"] as Map?;
     final metadata = {
       "formatted":
           newContent?["formatted_body"] ??
           newContent?["body"] ??
           event.content["formatted_body"] ??
-          event.content["body"],
+          event.body,
+      "reply": await replyEvent?.toMessage(mustBeText: true),
       "eventType": event.type,
       "displayName":
           event.senderFromMemoryOrFallback.displayName ??

lib/widgets/chat_page/top_widget.dart

@@ -3,8 +3,6 @@ import "package:flutter/material.dart";
 import "package:flutter_chat_core/flutter_chat_core.dart";
 import "package:flutter_chat_ui/flutter_chat_ui.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/message_controller.dart";
-import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/widgets/chat_page/quoted.dart";
 
 class TopWidget extends ConsumerWidget {
@@ -24,15 +22,11 @@ class TopWidget extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) => Column(
     crossAxisAlignment: CrossAxisAlignment.start,
     children: [
-      if (message.replyToMessageId != null) ...[
+      Builder(
-        ref
+        builder: (_) {
-            .watch(MessageController.provider(message.replyToMessageId!))
+          final replyMessage = message.metadata?["reply"] as TextMessage?;
-            .betterWhen(
-              loading: SizedBox.shrink,
-              data: (replyMessage) {
-                if (replyMessage == null) return SizedBox.shrink();
 
-                // Black magic to limit reply preview length
+          if (replyMessage == null) return SizedBox.shrink();
           final smallerText = message is TextMessage
               ? replyMessage.text.substring(
                   0,
@@ -54,7 +48,9 @@ class TopWidget extends ConsumerWidget {
               ? replyMessage.text
               : "$smallerText...";
 
-                return InkWell(
+          return Padding(
+            padding: EdgeInsets.only(bottom: 12),
+            child: InkWell(
               // TODO: Scroll to original message
               onTap: () => showAboutDialog(context: context),
               child: Quoted(
@@ -87,11 +83,10 @@ class TopWidget extends ConsumerWidget {
                   ],
                 ),
               ),
+            ),
           );
         },
       ),
-        SizedBox(height: 12),
-      ],
       if (alwaysShow || groupStatus?.isFirst != false)
         InkWell(
           onTap: () =>