Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-01 21:11:23 +01:00
Code Issues Projects Releases Wiki Activity

Fixed /server/Server <bungee id> not redirecting to /network

Browse Source
This commit is contained in:
Risto Lahtela 2020-03-28 12:00:44 +02:00
parent 081f378135
commit 24fc3f665f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/ServerPageResolver.java
View File

@ -68,7 +68,7 @@ public class ServerPageResolver implements Resolver {
@Override
public Optional<Response> resolve(Request request) {
return getServerUUID(request.getPath())
.map(this::getServerPage)
.map(serverUUID -> getServerPage(serverUUID, request))
.orElseGet(this::redirectToCurrentServer);
}
@ -79,9 +79,16 @@ public class ServerPageResolver implements Resolver {
return Optional.of(responseFactory.redirectResponse(directTo));
}
private Optional<Response> getServerPage(UUID serverUUID) {
private Optional<Response> getServerPage(UUID serverUUID, Request request) {
boolean toNetworkPage = serverInfo.getServer().isProxy() && serverInfo.getServerUUID().equals(serverUUID);
if (toNetworkPage) return Optional.of(responseFactory.networkPageResponse());
if (toNetworkPage) {
if (request.getPath().getPart(0).map("network"::equals).orElse(false)) {
return Optional.of(responseFactory.networkPageResponse());
} else {
// Accessing /server/Server <Bungee ID> which should be redirected to /network
return redirectToCurrentServer();
}
}
return Optional.of(responseFactory.serverPageResponse(serverUUID));
}