diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-05-04 13:53:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 13:53:47 +0100 |
| commit | 5c894efd0ee67bf911b9c3b5428a61ddc58819de (patch) | |
| tree | 3b576827ad15d26eaa09423492231c00893dec54 /clientapi/jsonerror/jsonerror.go | |
| parent | 36bbb255614d289a3417194d4d2ac129e339f531 (diff) | |
Roomserver perform join (#1001)
* Add PerformJoin template
* Try roomserver perform join
* Send correct server name to FS API
* Pass through content, try to handle multiple server names
* Fix local server checks
* Don't refer to non-existent error
* Add directory lookups of aliases
* Remove unneeded parameters
* Don't repeat join events into the roomserver
* Unmarshal the content, that would help
* Check if the user is already in the room in the fedeationapi too
* Return incompatible room version error
* Use Membership, don't try more servers than needed
* Review comments, make FS API take list of servernames, dedupe them, break out of loop properly on success
* Tweaks
Diffstat (limited to 'clientapi/jsonerror/jsonerror.go')
| -rw-r--r-- | clientapi/jsonerror/jsonerror.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/clientapi/jsonerror/jsonerror.go b/clientapi/jsonerror/jsonerror.go index 735de5be..85e887ae 100644 --- a/clientapi/jsonerror/jsonerror.go +++ b/clientapi/jsonerror/jsonerror.go @@ -18,6 +18,7 @@ import ( "fmt" "net/http" + "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" ) @@ -124,6 +125,12 @@ func GuestAccessForbidden(msg string) *MatrixError { return &MatrixError{"M_GUEST_ACCESS_FORBIDDEN", msg} } +// IncompatibleRoomVersion is an error which is returned when the client +// requests a room with a version that is unsupported. +func IncompatibleRoomVersion(roomVersion gomatrixserverlib.RoomVersion) *MatrixError { + return &MatrixError{"M_INCOMPATIBLE_ROOM_VERSION", string(roomVersion)} +} + // UnsupportedRoomVersion is an error which is returned when the client // requests a room with a version that is unsupported. func UnsupportedRoomVersion(msg string) *MatrixError { |