add edits
This commit is contained in:
parent
9951898598
commit
6523420120
3 changed files with 47 additions and 15 deletions
|
|
@ -19,17 +19,28 @@ class RoomChatController extends AsyncNotifier<ChatController> {
|
|||
if (event.roomId != room.id) return;
|
||||
final message = await event.toMessage();
|
||||
if (message != null) {
|
||||
if (event.relationshipType == RelationshipTypes.edit) {
|
||||
final controller = await future;
|
||||
final oldMessage = controller.messages.firstWhereOrNull(
|
||||
(element) => element.id == event.relationshipEventId,
|
||||
);
|
||||
if (oldMessage == null) return;
|
||||
await updateMessage(oldMessage, message);
|
||||
} else {
|
||||
await insertMessage(message);
|
||||
}
|
||||
}
|
||||
}).cancel,
|
||||
);
|
||||
|
||||
return InMemoryChatController(
|
||||
messages: (await Future.wait(
|
||||
messages: {
|
||||
for (var msg in (await Future.wait(
|
||||
response.chunk.map(
|
||||
(event) => Event.fromMatrixEvent(event, room).toMessage(),
|
||||
),
|
||||
)).nonNulls.toList().reversed.toList(),
|
||||
)).nonNulls.toList().reversed.toList())
|
||||
msg.id: msg,
|
||||
}.values.toList(),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -40,13 +40,24 @@ extension ToMessage on Event {
|
|||
? relationshipEventId
|
||||
: null;
|
||||
final sender = (await fetchSenderUser()) ?? senderFromMemoryOrFallback;
|
||||
|
||||
final newContent = content["m.new_content"] as Map<String, Object?>?;
|
||||
final metadata = {
|
||||
"formatted": formattedText.isEmpty ? body : formattedText,
|
||||
"formatted":
|
||||
newContent?["formatted_body"] ??
|
||||
newContent?["body"] ??
|
||||
(formattedText.isEmpty ? this.body : formattedText),
|
||||
"eventType": type,
|
||||
"displayName": sender.displayName ?? sender.id,
|
||||
"txnId": transactionId,
|
||||
};
|
||||
|
||||
final editedAt = relationshipType == RelationshipTypes.edit
|
||||
? originServerTs
|
||||
: null;
|
||||
final body = newContent?["body"] as String? ?? this.body;
|
||||
final eventId = relationshipEventId ?? this.eventId;
|
||||
|
||||
if (redacted) return null;
|
||||
|
||||
final asText =
|
||||
|
|
@ -57,6 +68,7 @@ extension ToMessage on Event {
|
|||
text: body,
|
||||
replyToMessageId: replyId,
|
||||
deliveredAt: originServerTs,
|
||||
editedAt: editedAt,
|
||||
)
|
||||
as TextMessage;
|
||||
|
||||
|
|
|
|||
|
|
@ -142,7 +142,10 @@ class RoomChat extends HookConsumerWidget {
|
|||
),
|
||||
(m) =>
|
||||
"<a href=\"${m.group(0)!}\">${m.group(0)!}</a>",
|
||||
),
|
||||
) +
|
||||
((message.editedAt != null)
|
||||
? "<sub edited>(edited)</sub>"
|
||||
: ""),
|
||||
customWidgetBuilder: (element) {
|
||||
if (element.localName == "mx-reply") {
|
||||
return SizedBox.shrink();
|
||||
|
|
@ -193,11 +196,17 @@ class RoomChat extends HookConsumerWidget {
|
|||
"color",
|
||||
value,
|
||||
),
|
||||
|
||||
"data-mx-bg-color" =>
|
||||
MapEntry(
|
||||
"background-color",
|
||||
value,
|
||||
),
|
||||
|
||||
"edited" => MapEntry(
|
||||
"display",
|
||||
"block",
|
||||
),
|
||||
_ => null,
|
||||
},
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue