Merge pull request #29 from zamaudio/join-room

Join by alias or id; the one remaining commit to use the /join/ api looks like it works
matrix-org · Feb 21, 2018 · bad6aa4 · bad6aa4
2 parents 5f72d4f + c843db3
commit bad6aa4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/matrix-api.c b/matrix-api.c
@@ -774,9 +774,9 @@ MatrixApiRequestData *matrix_api_join_room(MatrixConnectionData *conn,
     MatrixApiRequestData *fetch_data;
 
     url = g_string_new(conn->homeserver);
-    g_string_append(url, "_matrix/client/r0/rooms/");
+    g_string_append(url, "_matrix/client/r0/join/");
     g_string_append(url, purple_url_encode(room));
-    g_string_append(url, "/join?access_token=");
+    g_string_append(url, "?access_token=");
     g_string_append(url, purple_url_encode(conn->access_token));
 
     purple_debug_info("matrixprpl", "joining %s\n", room);