X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetSoneStatusPage.java;h=ff8e1815d13212bed0878c72c4caf8eb2cac6957;hb=378e6fafef1f68f197a944713b926e03a0c06cb9;hp=3b619ccc3550ae83000be8ed1878bc000ceadd5b;hpb=896463c592837b09794fa9368accf105c0bb05be;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetSoneStatusPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetSoneStatusPage.java index 3b619cc..ff8e181 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetSoneStatusPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetSoneStatusPage.java @@ -20,14 +20,16 @@ package net.pterodactylus.sone.web.ajax; import java.text.SimpleDateFormat; import java.util.Date; +import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.core.Core.SoneStatus; import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.template.SoneAccessor; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.util.json.JsonObject; /** * AJAX page that reeturns the status of a sone, as a) a {@link SoneStatus} name - * and b) a “modified” boolean (as per {@link Sone#getModificationCounter()}). + * and b) a “modified” boolean (as per {@link Core#isModifiedSone(Sone)}). * * @author David ‘Bombe’ Roden */ @@ -53,9 +55,9 @@ public class GetSoneStatusPage extends JsonPage { @Override protected JsonObject createJsonObject(Request request) { String soneId = request.getHttpRequest().getParam("sone"); - Sone sone = webInterface.core().getSone(soneId); - SoneStatus soneStatus = webInterface.core().getSoneStatus(sone); - return new JsonObject().put("status", soneStatus.name()).put("modified", sone.getModificationCounter() > 0).put("lastUpdated", new SimpleDateFormat("MMM d, yyyy, HH:mm:ss").format(new Date(sone.getTime()))).put("age", (System.currentTimeMillis() - sone.getTime()) / 1000); + Sone sone = webInterface.getCore().getSone(soneId); + SoneStatus soneStatus = webInterface.getCore().getSoneStatus(sone); + return new JsonObject().put("status", soneStatus.name()).put("name", SoneAccessor.getNiceName(sone)).put("modified", webInterface.getCore().isModifiedSone(sone)).put("lastUpdated", new SimpleDateFormat("MMM d, yyyy, HH:mm:ss").format(new Date(sone.getTime()))).put("age", (System.currentTimeMillis() - sone.getTime()) / 1000); } /**