Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-10 13:49:17 +01:00
Code Issues Projects Releases Wiki Activity

Made player kills table load again

Browse Source
This commit is contained in:
Risto Lahtela 2021-02-11 12:49:20 +02:00
parent 6715244b2c
commit 794c995012
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/PlayerKillsJSONResolver.java
View File

@ -17,12 +17,14 @@
package com.djrapitops.plan.delivery.webserver.resolver.json;
import com.djrapitops.plan.delivery.rendering.json.JSONFactory;
import com.djrapitops.plan.delivery.web.resolver.MimeType;
import com.djrapitops.plan.delivery.web.resolver.Resolver;
import com.djrapitops.plan.delivery.web.resolver.Response;
import com.djrapitops.plan.delivery.web.resolver.request.Request;
import com.djrapitops.plan.delivery.web.resolver.request.WebUser;
import com.djrapitops.plan.delivery.webserver.cache.AsyncJSONResolverService;
import com.djrapitops.plan.delivery.webserver.cache.DataID;
import com.djrapitops.plan.delivery.webserver.cache.JSONCache;
import com.djrapitops.plan.delivery.webserver.cache.JSONStorage;
import com.djrapitops.plan.identification.Identifiers;
import javax.inject.Inject;
@ -40,14 +42,17 @@ import java.util.UUID;
public class PlayerKillsJSONResolver implements Resolver {
private final Identifiers identifiers;
private final AsyncJSONResolverService jsonResolverService;
private final JSONFactory jsonFactory;
@Inject
public PlayerKillsJSONResolver(
Identifiers identifiers,
AsyncJSONResolverService jsonResolverService,
JSONFactory jsonFactory
) {
this.identifiers = identifiers;
this.jsonResolverService = jsonResolverService;
this.jsonFactory = jsonFactory;
}
@ -63,6 +68,13 @@ public class PlayerKillsJSONResolver implements Resolver {
private Response getResponse(Request request) {
UUID serverUUID = identifiers.getServerUUID(request);
return JSONCache.getOrCache(DataID.KILLS, serverUUID, () -> Collections.singletonMap("player_kills", jsonFactory.serverPlayerKillsAsJSONMap(serverUUID)));
long timestamp = Identifiers.getTimestamp(request);
JSONStorage.StoredJSON storedJSON = jsonResolverService.resolve(timestamp, DataID.KILLS, serverUUID,
theUUID -> Collections.singletonMap("player_kills", jsonFactory.serverPlayerKillsAsJSONMap(theUUID))
);
return Response.builder()
.setMimeType(MimeType.JSON)
.setJSONContent(storedJSON.json)
.build();
}
}

5
Plan/common/src/main/resources/assets/plan/web/server.html
View File

@ -714,8 +714,7 @@
Recent Kills</h6>
</div>
<div class="scrollbar">
<table class="table" id="playerKillTable">
</table>
<table class="table" id="playerKillTable"></table>
</div>
</div>
</div>
@ -1392,7 +1391,7 @@
$('.player-table').text("Failed to load Players table data: " + error);
}
});
jsonRequest("../v1/kills?server=${serverUUID}", loadPlayerKills);
refreshingJsonRequest("../v1/kills?server=${serverUUID}", loadPlayerKills, 'pvp-pve');
refreshingJsonRequest("../v1/pingTable?server=${serverUUID}", loadPingTable, 'geolocations');
$('.player-plugin-table').DataTable({