magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: delta calculation

Browse source
This commit is contained in:
Timo Kösters 2021-08-14 19:07:50 +02:00
parent 3cf0145bc5
commit 38effda799
No known key found for this signature in database
GPG key ID: 356E705610F626D5
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/database/rooms.rs
View file

@ -510,10 +510,19 @@ impl Rooms {
for removed in statediffremoved {
if !parent_new.remove(&removed) {
// It was not added in the parent and we removed it
parent_removed.insert(removed);
}
// Else it was added in the parent and we removed it again. We can forget this change
}
for new in statediffnew {
if !parent_removed.remove(&new) {
// It was not touched in the parent and we added it
parent_new.insert(new);
}
// Else it was removed in the parent and we added it again. We can forget this change
}
parent_new.extend(statediffnew);
self.save_state_from_diff(
shortstatehash,
@ -557,11 +566,20 @@ impl Rooms {
for removed in statediffremoved {
if !parent_new.remove(&removed) {
// It was not added in the parent and we removed it
parent_removed.insert(removed);
}
// Else it was added in the parent and we removed it again. We can forget this change
}
for new in statediffnew {
if !parent_removed.remove(&new) {
// It was not touched in the parent and we added it
parent_new.insert(new);
}
// Else it was removed in the parent and we added it again. We can forget this change
}
parent_new.extend(statediffnew);
self.save_state_from_diff(
shortstatehash,
parent_new,