OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2067 from famedly/reza/delete-eidted-message 

Deleting last message is edited
This commit is contained in:
Reza 2025-04-10 12:24:43 +02:00 committed by GitHub
parent 0b4ee0e60e defe47a198
commit 0aa5527db0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/src/client.dart
View File

@ -2854,7 +2854,7 @@ class Client extends MatrixApi {
room.setState(user);
}
}
_updateRoomsByEventUpdate(room, event, type);
await _updateRoomsByEventUpdate(room, event, type);
if (store) {
await database?.storeEventUpdate(room.id, event, type, this);
}
@ -3020,11 +3020,11 @@ class Client extends MatrixApi {
return room;
}
void _updateRoomsByEventUpdate(
Future<void> _updateRoomsByEventUpdate(
Room room,
StrippedStateEvent eventUpdate,
EventUpdateType type,
) {
) async {
if (type == EventUpdateType.history) return;
switch (type) {
@ -3060,13 +3060,29 @@ class Client extends MatrixApi {
if (event.type == EventTypes.Redaction &&
({
room.lastEvent?.eventId,
room.lastEvent?.relationshipEventId,
}.contains(
event.redacts ?? event.content.tryGet<String>('redacts'),
))) {
room.lastEvent?.setRedactionEvent(event);
break;
}
// Is this event redacting the last event which is a edited event.
final relationshipEventId = room.lastEvent?.relationshipEventId;
if (relationshipEventId != null &&
relationshipEventId ==
(event.redacts ?? event.content.tryGet<String>('redacts')) &&
event.type == EventTypes.Redaction &&
room.lastEvent?.relationshipType == RelationshipTypes.edit) {
final originalEvent = await database?.getEventById(
relationshipEventId,
room,
) ??
room.lastEvent;
// Manually remove the data as it's already in cache until relogin.
originalEvent?.setRedactionEvent(event);
room.lastEvent = originalEvent;
break;
}
// Is this event an edit of the last event? Otherwise ignore it.
if (event.relationshipType == RelationshipTypes.edit) {

3
test/room_test.dart
View File

@ -509,7 +509,8 @@ void main() {
nextBatch: '',
),
);
expect(room.lastEvent?.eventId, 'testLastEventAfterEdit');
// We do not delete the last edited event. Manually set the last event to original redacted event.
expect(room.lastEvent?.eventId, 'testLastEventBeforeEdit');
expect(room.lastEvent?.body, 'Redacted');
});