call /join/{roomIdOrAlias} instead of /rooms/{roomId}/join

The former endpoint doesn't work for joining over federation, the
server_name parameter is ignored.

Fixes #697

Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
This commit is contained in:
Marcus Hoffmann 2020-01-06 00:51:41 +01:00
parent 455448806d
commit ce73007157
2 changed files with 5 additions and 3 deletions

View File

@ -16,6 +16,7 @@ Bugfix 🐛:
- Fix crash when opening room creation screen from the room filtering screen
- Fix avatar image disappearing (#777)
- Fix read marker banner when permalink
- Fix joining upgraded rooms (#697)
Translations 🗣:
-

View File

@ -212,11 +212,12 @@ internal interface RoomAPI {
/**
* Join the given room.
*
* @param roomId the room id
* @param roomIdOrAlias the room id or alias
* @param server_name the servers to attempt to join the room through
* @param params the request body
*/
@POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/join")
fun join(@Path("roomId") roomId: String,
@POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "join/{roomIdOrAlias}")
fun join(@Path("roomIdOrAlias") roomIdOrAlias: String,
@Query("server_name") viaServers: List<String>,
@Body params: Map<String, String?>): Call<Unit>