Room server changes for room versions (#930)

Browse source

* Rearrange state package a bit, add some code to look up the right state resolution algorithm

* Remove shared

* Add GetRoomVersionForRoomNID

* Try to use room version to get correct state resolution algorithm

* Fix room joins over federation

* nolint resolveConflictsV2 because all attempts to break it up so far just result in it being awfully less obvious how it works

* Rename Prepare to NewStateResolution

* Update comments

* Re-add missing tests

...

This commit is contained in:

Neil Alexander 2020-03-19 18:33:04 +00:00 • committed by GitHub

parent 944d454cb0

commit f2030286de

No known key found for this signature in database

GPG key ID: 4AEE18F83AFDEB23

12 changed files with 1122 additions and 1025 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1102

roomserver/state/state.go

View file

File diff suppressed because it is too large Load diff