aboutsummaryrefslogtreecommitdiff
path: root/roomserver/state
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-03-30 09:51:45 +0100
committerNeil Alexander <neilalexander@users.noreply.github.com>2020-03-30 09:51:45 +0100
commit664f31ec988180341f007b4479ea83a19e68d8e7 (patch)
tree73e93b1d9730943b5732d15e1b062446c56c608a /roomserver/state
parent05e1ae8745725245ee3b85a588000b0d26bae96c (diff)
Ensure state res results are unique
Diffstat (limited to 'roomserver/state')
-rw-r--r--roomserver/state/state.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/roomserver/state/state.go b/roomserver/state/state.go
index b8e3e18a..94873dbe 100644
--- a/roomserver/state/state.go
+++ b/roomserver/state/state.go
@@ -672,7 +672,7 @@ func (v StateResolution) calculateStateAfterManyEvents(
return
}
algorithm = "full_state_with_conflicts"
- state = resolved
+ state = resolved[:util.SortAndUnique(stateEntrySorter(resolved))]
} else {
algorithm = "full_state_no_conflicts"
// 6) There weren't any conflicts