mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-07 17:28:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed many url issues

Browse Source
This commit is contained in:
Rsl1122 2017-09-26 20:13:16 +03:00
parent 7dcbac3fa7
commit 3c5868170f
9 changed files with 16 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/src/main/java/com/djrapitops/plan/api/API.java
View File

@ -81,7 +81,7 @@ public class API {
* @return ./player/PlayerName
*/
public String getPlayerInspectPageLink(String name) {
return plugin.getInfoManager().getLinkTo("/player/" + name).relative().toString();
return "../player/" + name;
}
/**

2
Plan/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java
View File

@ -55,7 +55,7 @@ public class AnalyzeCommand extends SubCommand {
Optional<String> serverName = plugin.getDB().getServerTable().getServerName(serverUUID);
if (serverName.isPresent()) {
String target = "/server/" + serverName.get();
String url = plugin.getInfoManager().getLinkTo(target).toString();
String url = plugin.getInfoManager().getLinkTo(target);
String message = Locale.get(Msg.CMD_INFO_LINK).toString();
for (ISender sender : senders) {

4
Plan/src/main/java/com/djrapitops/plan/command/commands/ListCommand.java
View File

@ -5,9 +5,9 @@ import com.djrapitops.plugin.command.CommandUtils;
import com.djrapitops.plugin.command.ISender;
import com.djrapitops.plugin.command.SubCommand;
import main.java.com.djrapitops.plan.Permissions;
import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.locale.Locale;
import main.java.com.djrapitops.plan.locale.Msg;
import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
/**
* Command used to display link to the player list webpage.
@ -43,7 +43,7 @@ public class ListCommand extends SubCommand {
sender.sendMessage(Locale.get(Msg.CMD_CONSTANT_FOOTER).parse());
// Link
String url = HtmlUtils.getServerAnalysisUrlWithProtocol().replace("server", "players");
String url = Plan.getInstance().getInfoManager().getLinkTo("/players");
String message = Locale.get(Msg.CMD_INFO_LINK).toString();
boolean console = !CommandUtils.isPlayer(sender);
if (console) {

9
Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java
View File

@ -7,7 +7,6 @@ package main.java.com.djrapitops.plan.systems.info;
import com.djrapitops.plugin.command.ISender;
import main.java.com.djrapitops.plan.systems.cache.DataCache;
import main.java.com.djrapitops.plan.systems.cache.SessionCache;
import main.java.com.djrapitops.plan.systems.info.parsing.UrlParser;
import main.java.com.djrapitops.plan.systems.webserver.PageCache;
import java.util.*;
@ -32,12 +31,8 @@ public abstract class InformationManager {
public abstract void cachePlayer(UUID uuid);
public UrlParser getLinkTo(String target) {
if (webServerAddress != null) {
return new UrlParser(webServerAddress).target(target);
} else {
return new UrlParser("");
}
public String getLinkTo(String target) {
return getWebServerAddress() + target;
}
public abstract void refreshAnalysis(UUID serverUUID);

4
Plan/src/main/java/com/djrapitops/plan/systems/processing/info/InspectCacheRequestProcessor.java
View File

@ -6,13 +6,13 @@ package main.java.com.djrapitops.plan.systems.processing.info;
import com.djrapitops.plugin.command.CommandUtils;
import com.djrapitops.plugin.command.ISender;
import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.api.IPlan;
import main.java.com.djrapitops.plan.locale.Locale;
import main.java.com.djrapitops.plan.locale.Msg;
import main.java.com.djrapitops.plan.systems.cache.DataCache;
import main.java.com.djrapitops.plan.systems.processing.player.PlayerProcessor;
import main.java.com.djrapitops.plan.utilities.MiscUtils;
import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
import java.util.UUID;
@ -46,7 +46,7 @@ public class InspectCacheRequestProcessor extends PlayerProcessor {
private void sendInspectMsg(ISender sender, String playerName) {
sender.sendMessage(Locale.get(Msg.CMD_HEADER_INSPECT) + " " + playerName);
// Link
String url = HtmlUtils.getInspectUrlWithProtocol(playerName);
String url = Plan.getInstance().getInfoManager().getLinkTo("/player/" + playerName);
String message = Locale.get(Msg.CMD_INFO_LINK).toString();
boolean console = !CommandUtils.isPlayer(sender);
if (console) {

11
Plan/src/main/java/com/djrapitops/plan/systems/webserver/ResponseHandler.java
View File

@ -11,7 +11,6 @@ import main.java.com.djrapitops.plan.database.tables.SecurityTable;
import main.java.com.djrapitops.plan.systems.webserver.response.*;
import main.java.com.djrapitops.plan.utilities.MiscUtils;
import main.java.com.djrapitops.plan.utilities.PassEncryptUtil;
import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
import main.java.com.djrapitops.plan.utilities.uuid.UUIDUtility;
import java.sql.SQLException;
@ -217,10 +216,12 @@ public class ResponseHandler extends APIResponseHandler {
private Response notFoundResponse() {
String error = "404 Not Found";
return PageCache.loadPage("notFound: " + error, () ->
new NotFoundResponse("Make sure you're accessing a link given by a command, Examples:</p>"
+ "<p>" + webServer.getProtocol() + ":" + HtmlUtils.getInspectUrl("<player>") + " or<br>"
+ webServer.getProtocol() + ":" + HtmlUtils.getServerAnalysisUrl())
return PageCache.loadPage("notFound: " + error, () -> {
String url = plugin.getInfoManager().getWebServerAddress();
return new NotFoundResponse("Make sure you're accessing a link given by a command, Examples:</p>"
+ "<p>" + url + "/player/Playername<br>" +
url + "/server</p>");
}
);
}

3
Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
View File

@ -21,7 +21,6 @@ import main.java.com.djrapitops.plan.utilities.Benchmark;
import main.java.com.djrapitops.plan.utilities.MiscUtils;
import main.java.com.djrapitops.plan.utilities.comparators.UserInfoLastPlayedComparator;
import main.java.com.djrapitops.plan.utilities.html.HtmlStructure;
import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
import main.java.com.djrapitops.plan.utilities.html.tables.PlayersTableCreator;
import org.apache.commons.lang3.StringUtils;
@ -122,7 +121,7 @@ public class Analysis {
Log.logDebug("Analysis", time);
Log.info(Locale.get(Msg.ANALYSIS_FINISHED).parse(String.valueOf(time), HtmlUtils.getServerAnalysisUrlWithProtocol()));
Log.info(Locale.get(Msg.ANALYSIS_FINISHED).parse(String.valueOf(time), ""));
// TODO Export
// ExportUtility.export(analysisData, rawData);

2
Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlStructure.java
View File

@ -408,7 +408,7 @@ public class HtmlStructure {
boolean analysisIsAvailable = analysisRefreshDate.isPresent();
String serverName = plugin.getServerInfoManager().getServerName();
String address = plugin.getInfoManager().getLinkTo("/server/" + serverName).relative().toString();
String address = "../server/" + serverName;
StringBuilder b = new StringBuilder("<div class=\"column\">");

34
Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlUtils.java
View File

@ -34,21 +34,6 @@ public class HtmlUtils {
return sub.replace(html);
}
/**
* @return
*/
public static String getServerAnalysisUrlWithProtocol() {
return getProtocol() + ":" + getServerAnalysisUrl();
}
/**
* @return
*/
public static String getServerAnalysisUrl() {
String ip = getIP();
return "//" + ip + "/server";
}
/**
* Used to get the WebServer's IP with Port.
*
@ -70,25 +55,6 @@ public class HtmlUtils {
return uiServer.isEnabled() ? uiServer.getProtocol() : Settings.EXTERNAL_WEBSERVER_LINK_PROTOCOL.toString();
}
/**
* @param playerName
* @return
*/
public static String getInspectUrlWithProtocol(String playerName) {
return getProtocol() + ":" + getInspectUrl(playerName);
}
/**
* @param playerName
* @return
* @deprecated Use getRelativeInspectUrl instead.
*/
@Deprecated
public static String getInspectUrl(String playerName) {
String ip = getIP();
return "//" + ip + "/player/" + playerName.replace(" ", "%20").replace(".", "%2E");
}
public static String getRelativeInspectUrl(String playerName) {
return "../player/" + playerName.replace(" ", "%20").replace(".", "%2E");
}