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

Added networkName to player.html for #337

Browse Source
This commit is contained in:
Rsl1122 2017-10-08 11:53:47 +03:00
parent 56fa9dbeac
commit f8f0603951
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ public enum Settings {
// //
// Bungee // Bungee
BUNGEE_IP("Server.IP"), BUNGEE_IP("Server.IP"),
BUNGEE_NETWROK_NAME("Network.Name"); BUNGEE_NETWORK_NAME("Network.Name");
private static final ServerSpecificSettings serverSpecificSettings = new ServerSpecificSettings(); private static final ServerSpecificSettings serverSpecificSettings = new ServerSpecificSettings();

4
Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java
View File

@ -186,6 +186,10 @@ public class InspectPageParser extends PageParser {
addValue("playerClassification", active); addValue("playerClassification", active);
} }
if (!plugin.getInfoManager().isUsingAnotherWebServer()) {
addValue("networkName", Settings.SERVER_NAME.toString());
}
return HtmlUtils.replacePlaceholders(FileUtil.getStringFromResource("player.html"), placeHolders); return HtmlUtils.replacePlaceholders(FileUtil.getStringFromResource("player.html"), placeHolders);
} catch (Exception e) { } catch (Exception e) {
Log.toLog(this.getClass().getName(), e); Log.toLog(this.getClass().getName(), e);

2
Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/NetworkPageParser.java
View File

@ -43,7 +43,7 @@ public class NetworkPageParser extends PageParser {
Database db = plugin.getDB(); Database db = plugin.getDB();
List<TPS> networkOnlineData = db.getTpsTable().getNetworkOnlineData(); List<TPS> networkOnlineData = db.getTpsTable().getNetworkOnlineData();
addValue("networkName", Settings.BUNGEE_NETWROK_NAME.toString()); addValue("networkName", Settings.BUNGEE_NETWORK_NAME.toString());
addValue("version", plugin.getVersion()); addValue("version", plugin.getVersion());
addValue("playersOnlineSeries", PlayerActivityGraphCreator.buildSeriesDataString(networkOnlineData)); addValue("playersOnlineSeries", PlayerActivityGraphCreator.buildSeriesDataString(networkOnlineData));
addValue("playersGraphColor", Colors.PLAYERS_ONLINE.getColor()); addValue("playersGraphColor", Colors.PLAYERS_ONLINE.getColor());

9
Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostHtmlWebAPI.java
View File

@ -4,6 +4,7 @@
*/ */
package main.java.com.djrapitops.plan.systems.webserver.webapi.bungee; package main.java.com.djrapitops.plan.systems.webserver.webapi.bungee;
import main.java.com.djrapitops.plan.Settings;
import main.java.com.djrapitops.plan.api.IPlan; import main.java.com.djrapitops.plan.api.IPlan;
import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; import main.java.com.djrapitops.plan.api.exceptions.WebAPIException;
import main.java.com.djrapitops.plan.systems.info.InformationManager; import main.java.com.djrapitops.plan.systems.info.InformationManager;
@ -12,7 +13,9 @@ import main.java.com.djrapitops.plan.systems.webserver.response.AnalysisPageResp
import main.java.com.djrapitops.plan.systems.webserver.response.InspectPageResponse; import main.java.com.djrapitops.plan.systems.webserver.response.InspectPageResponse;
import main.java.com.djrapitops.plan.systems.webserver.response.Response; import main.java.com.djrapitops.plan.systems.webserver.response.Response;
import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI;
import org.apache.commons.lang3.text.StrSubstitutor;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -32,7 +35,11 @@ public class PostHtmlWebAPI extends WebAPI {
switch (target) { switch (target) {
case "inspectPage": case "inspectPage":
String uuid = variables.get("uuid"); String uuid = variables.get("uuid");
PageCache.cachePage("inspectPage:" + uuid, () -> new InspectPageResponse(infoManager, UUID.fromString(uuid), html));
Map<String, String> map = new HashMap<>();
map.put("networkName", Settings.BUNGEE_NETWORK_NAME.toString());
PageCache.cachePage("inspectPage:" + uuid, () -> new InspectPageResponse(infoManager, UUID.fromString(uuid), StrSubstitutor.replace(html, map)));
break; break;
case "analysisPage": case "analysisPage":
PageCache.cachePage("analysisPage:" + variables.get("sender"), () -> new AnalysisPageResponse(html)); PageCache.cachePage("analysisPage:" + variables.get("sender"), () -> new AnalysisPageResponse(html));

2
Plan/src/main/resources/html/player.html
View File

@ -29,7 +29,7 @@
</div> </div>
</div> </div>
<p class="right">Player Analytics v.${version}</p> <p class="right">Player Analytics v.${version}</p>
<h1>Player | ${playerName}</h1> <h1>${networkName} | ${playerName}</h1>
</div> </div>
</header> </header>
<div class="content-server"> <div class="content-server">