tomas.kracmar/ma1sd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Upgrade to V3 API' (#1) from ext/v3_update into master

Browse Source 
Reviewed-on: cqrenet/ma1sd#1
This commit is contained in:
Tomas Kracmar
2024-03-11 08:51:06 +00:00
parent 0f3c37bf6a 640fa8e9f1
commit c45f95ce3f
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/kamax/matrix/MatrixPath.java
View File

@@ -53,7 +53,7 @@ public class MatrixPath {
} }
public static MatrixPath clientR0() { public static MatrixPath clientR0() {
return client().add("r0"); return client().add("v3");
} }
private StringBuilder path = new StringBuilder(); private StringBuilder path = new StringBuilder();

4
src/main/java/io/kamax/matrix/client/AMatrixHttpClient.java
View File

@@ -375,13 +375,13 @@ public abstract class AMatrixHttpClient implements _MatrixClientRaw {
} }
protected HttpUrl.Builder getClientPathBuilder(String... segments) { protected HttpUrl.Builder getClientPathBuilder(String... segments) {
String[] base = { "client", "r0" }; String[] base = { "client", "v3" };
segments = ArrayUtils.addAll(base, segments); segments = ArrayUtils.addAll(base, segments);
return getPathBuilder(segments); return getPathBuilder(segments);
} }
protected HttpUrl.Builder getMediaPathBuilder(String... segments) { protected HttpUrl.Builder getMediaPathBuilder(String... segments) {
String[] base = { "media", "r0" }; String[] base = { "media", "v3" };
segments = ArrayUtils.addAll(base, segments); segments = ArrayUtils.addAll(base, segments);
return getPathBuilder(segments); return getPathBuilder(segments);
} }

2
src/main/java/io/kamax/mxisd/http/undertow/handler/auth/v1/LoginHandler.java
View File

@@ -24,6 +24,6 @@ import io.kamax.mxisd.http.undertow.handler.BasicHttpHandler;
public abstract class LoginHandler extends BasicHttpHandler { public abstract class LoginHandler extends BasicHttpHandler {
public static final String Path = "/_matrix/client/r0/login"; public static final String Path = "/_matrix/client/v3/login";
} }

2
src/main/java/io/kamax/mxisd/http/undertow/handler/directory/v1/UserDirectorySearchHandler.java
View File

@@ -31,7 +31,7 @@ import java.net.URI;
public class UserDirectorySearchHandler extends HomeserverProxyHandler { public class UserDirectorySearchHandler extends HomeserverProxyHandler {
public static final String Path = "/_matrix/client/r0/user_directory/search"; public static final String Path = "/_matrix/client/v3/user_directory/search";
private DirectoryManager mgr; private DirectoryManager mgr;

4
src/main/java/io/kamax/mxisd/http/undertow/handler/invite/v1/RoomInviteHandler.java
View File

@@ -44,7 +44,7 @@ import java.util.Optional;
public class RoomInviteHandler extends BasicHttpHandler { public class RoomInviteHandler extends BasicHttpHandler {
public static final String Path = "/_matrix/client/r0/rooms/{roomId}/invite"; public static final String Path = "/_matrix/client/v3/rooms/{roomId}/invite";
private static final Logger log = LoggerFactory.getLogger(RoomInviteHandler.class); private static final Logger log = LoggerFactory.getLogger(RoomInviteHandler.class);
@@ -62,7 +62,7 @@ public class RoomInviteHandler extends BasicHttpHandler {
public void handleRequest(HttpServerExchange exchange) { public void handleRequest(HttpServerExchange exchange) {
String accessToken = getAccessToken(exchange); String accessToken = getAccessToken(exchange);
String whoamiUri = dns.transform(URI.create(exchange.getRequestURL()).resolve(URI.create("/_matrix/client/r0/account/whoami"))).toString(); String whoamiUri = dns.transform(URI.create(exchange.getRequestURL()).resolve(URI.create("/_matrix/client/v3/account/whoami"))).toString();
log.info("Who Am I URL: {}", whoamiUri); log.info("Who Am I URL: {}", whoamiUri);
HttpGet whoAmIReq = new HttpGet(whoamiUri); HttpGet whoAmIReq = new HttpGet(whoamiUri);
whoAmIReq.addHeader("Authorization", "Bearer " + accessToken); whoAmIReq.addHeader("Authorization", "Bearer " + accessToken);

2
src/main/java/io/kamax/mxisd/http/undertow/handler/profile/v1/ProfileHandler.java
View File

@@ -34,7 +34,7 @@ import java.util.Optional;
public class ProfileHandler extends HomeserverProxyHandler { public class ProfileHandler extends HomeserverProxyHandler {
public static final String UserID = "userId"; public static final String UserID = "userId";
public static final String Path = "/_matrix/client/r0/profile/{" + UserID + "}"; public static final String Path = "/_matrix/client/v3/profile/{" + UserID + "}";
protected ProfileManager mgr; protected ProfileManager mgr;

2
src/main/java/io/kamax/mxisd/http/undertow/handler/register/v1/Register3pidRequestTokenHandler.java
View File

@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
public class Register3pidRequestTokenHandler extends BasicHttpHandler { public class Register3pidRequestTokenHandler extends BasicHttpHandler {
public static final String Key = "medium"; public static final String Key = "medium";
public static final String Path = "/_matrix/client/r0/register/{" + Key + "}/requestToken"; public static final String Path = "/_matrix/client/v3/register/{" + Key + "}/requestToken";
private static final Logger log = LoggerFactory.getLogger(Register3pidRequestTokenHandler.class); private static final Logger log = LoggerFactory.getLogger(Register3pidRequestTokenHandler.class);