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

Merge branch 'krille/fix-edits-status' into 'main' 

fix: Change eventstatus of edits in prevEvent

Closes #244

See merge request famedly/company/frontend/famedlysdk!891
This commit is contained in:
Krille Fear 2021-11-12 14:00:13 +00:00
parent 5f448020af f052957c0a
commit 77d7249699
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/src/room.dart
View File

@ -187,7 +187,8 @@ class Room {
state.relationshipEventId != null &&
state.relationshipType == RelationshipTypes.edit &&
lastEvent != null &&
!lastEvent.matchesEventOrTransactionId(state.relationshipEventId)) {
!state.matchesEventOrTransactionId(lastEvent.eventId) &&
lastEvent.eventId != state.relationshipEventId) {
return;
}

26
test/room_test.dart
View File

@ -234,9 +234,35 @@ void main() {
'm.relates_to': {'rel_type': 'm.replace', 'event_id': '2'},
},
stateKey: '',
status: EventStatus.sending,
),
);
expect(room.lastEvent?.body, 'edited cdc');
expect(room.lastEvent?.status, EventStatus.sending);
expect(room.lastEvent?.eventId, '4');
// Status update on edits working?
room.setState(
Event(
senderId: '@test:example.com',
type: 'm.room.encrypted',
room: room,
eventId: '5',
unsigned: {'transaction_id': '4'},
originServerTs: DateTime.now(),
content: {
'msgtype': 'm.text',
'body': 'edited cdc',
'm.new_content': {'msgtype': 'm.text', 'body': 'edited cdc'},
'm.relates_to': {'rel_type': 'm.replace', 'event_id': '2'},
},
stateKey: '',
status: EventStatus.sent,
),
);
expect(room.lastEvent?.eventId, '5');
expect(room.lastEvent?.body, 'edited cdc');
expect(room.lastEvent?.status, EventStatus.sent);
});
test('lastEvent when reply parent edited', () async {
room.setState(