sticks/nexus
1
0
Fork 0
forked from Henry-Hiles/nexus
Code Pull requests Activity

Fetch replies in toMessage not at runtime

Browse source
This commit is contained in:
Henry Hiles 2025-12-23 18:46:31 -05:00
commit 7ce4d3c9fb
No known key found for this signature in database
3 changed files with 67 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/controllers/message_controller.dart
View file

@ -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,
);
}

7
lib/helpers/extensions/event_to_message.dart
View file

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

127
lib/widgets/chat_page/top_widget.dart
View file

@ -3,8 +3,6 @@ import "package:flutter/material.dart";
import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:flutter_chat_core/flutter_chat_core.dart";
import "package:flutter_chat_ui/flutter_chat_ui.dart"; import "package:flutter_chat_ui/flutter_chat_ui.dart";
import "package:flutter_riverpod/flutter_riverpod.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"; import "package:nexus/widgets/chat_page/quoted.dart";
class TopWidget extends ConsumerWidget { class TopWidget extends ConsumerWidget {
@ -24,74 +22,71 @@ class TopWidget extends ConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) => Column( Widget build(BuildContext context, WidgetRef ref) => Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ 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 final smallerText = message is TextMessage
? replyMessage.text.substring( ? replyMessage.text.substring(
0, 0,
min( min(
max( max(
max( max(
(message as TextMessage).text.length - 20, (message as TextMessage).text.length - 20,
message.metadata?["displayName"].length, message.metadata?["displayName"].length,
), ),
5, 5,
),
replyMessage.text.length,
),
)
: null;
final replyText =
(smallerText == null ||
smallerText.length == replyMessage.text.length)
? replyMessage.text
: "$smallerText...";
return InkWell(
// TODO: Scroll to original message
onTap: () => showAboutDialog(context: context),
child: Quoted(
Row(
mainAxisSize: MainAxisSize.min,
spacing: 8,
children: [
Avatar(
userId: replyMessage.authorId,
headers: headers,
size: 16,
),
Flexible(
child: Text(
replyMessage.metadata?["displayName"] ??
replyMessage.authorId,
style: Theme.of(context).textTheme.labelMedium
?.copyWith(fontWeight: FontWeight.bold),
overflow: TextOverflow.ellipsis,
),
),
Flexible(
child: Text(
replyText,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.labelMedium,
maxLines: 1,
),
),
],
), ),
replyMessage.text.length,
), ),
); )
}, : null;
final replyText =
(smallerText == null ||
smallerText.length == replyMessage.text.length)
? replyMessage.text
: "$smallerText...";
return Padding(
padding: EdgeInsets.only(bottom: 12),
child: InkWell(
// TODO: Scroll to original message
onTap: () => showAboutDialog(context: context),
child: Quoted(
Row(
mainAxisSize: MainAxisSize.min,
spacing: 8,
children: [
Avatar(
userId: replyMessage.authorId,
headers: headers,
size: 16,
),
Flexible(
child: Text(
replyMessage.metadata?["displayName"] ??
replyMessage.authorId,
style: Theme.of(context).textTheme.labelMedium
?.copyWith(fontWeight: FontWeight.bold),
overflow: TextOverflow.ellipsis,
),
),
Flexible(
child: Text(
replyText,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.labelMedium,
maxLines: 1,
),
),
],
),
),
), ),
SizedBox(height: 12), );
], },
),
if (alwaysShow || groupStatus?.isFirst != false) if (alwaysShow || groupStatus?.isFirst != false)
InkWell( InkWell(
onTap: () => onTap: () =>