X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.kt;h=696c65a3614cb4ff40342cc82d4c1740f360446e;hp=05a69d7b57b68e65e62014720deb5c3ab7b463af;hb=85b7420f3492af4e5591f62ad673309a76de7e04;hpb=a979c29be02a3b18e7c2104f3f7b780fea9c6f13

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
index 05a69d7..696c65a 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
@@ -12,27 +12,31 @@ import net.pterodactylus.sone.freenet.L10nFilter
 import net.pterodactylus.sone.template.SoneAccessor
 import net.pterodactylus.sone.text.TimeTextConverter
 import net.pterodactylus.sone.utils.jsonObject
+import net.pterodactylus.sone.utils.mapPresent
 import net.pterodactylus.sone.utils.toArray
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
 import java.text.SimpleDateFormat
+import java.util.TimeZone
 
 /**
  * The “get status” AJAX handler returns all information that is necessary to
  * update the web interface in real-time.
  */
-class GetStatusAjaxPage(webInterface: WebInterface, private val elementLoader: ElementLoader, private val timeTextConverter: TimeTextConverter, private val l10nFilter: L10nFilter):
+class GetStatusAjaxPage(webInterface: WebInterface, private val elementLoader: ElementLoader, private val timeTextConverter: TimeTextConverter, private val l10nFilter: L10nFilter, timeZone: TimeZone = TimeZone.getDefault()):
 		JsonPage("getStatus.ajax", webInterface) {
 
-	private val dateFormatter = SimpleDateFormat("MMM d, yyyy, HH:mm:ss")
+	private val dateFormatter = SimpleDateFormat("MMM d, yyyy, HH:mm:ss").apply {
+		this.timeZone = timeZone
+	}
 
 	override fun createJsonObject(request: FreenetRequest) =
-			(webInterface.getCurrentSoneWithoutCreatingSession(request.toadletContext) as Sone?).let { currentSone ->
+			getCurrentSone(request.toadletContext, false).let { currentSone ->
 				createSuccessJsonObject().apply {
 					this["loggedIn"] = currentSone != null
 					this["options"] = currentSone?.options?.toJsonOptions() ?: jsonObject {}
 					this["notificationHash"] = webInterface.getNotifications(currentSone).sortedBy { it.createdTime }.hashCode()
-					this["sones"] = request.httpRequest.getParam("soneIds").split(',').map { webInterface.core.getSone(it).orNull() }.plus(currentSone).filterNotNull().toJsonSones()
+					this["sones"] = request.httpRequest.getParam("soneIds").split(',').mapPresent(core::getSone).plus(currentSone).filterNotNull().toJsonSones()
 					this["newPosts"] = webInterface.getNewPosts(currentSone).toJsonPosts()
 					this["newReplies"] = webInterface.getNewReplies(currentSone).toJsonReplies()
 					this["linkedElements"] = request.httpRequest.getParam("elements", "[]").asJson().map(JsonNode::asText).map(elementLoader::loadElement).toJsonElements()
@@ -60,8 +64,8 @@ class GetStatusAjaxPage(webInterface: WebInterface, private val elementLoader: E
 			put("name", SoneAccessor.getNiceName(sone))
 			put("local", sone.isLocal)
 			put("status", sone.status.name)
-			put("modified", webInterface.core.isModifiedSone(sone))
-			put("locked", webInterface.core.isLocked(sone))
+			put("modified", core.isModifiedSone(sone))
+			put("locked", core.isLocked(sone))
 			put("lastUpdatedUnknown", sone.time == 0L)
 			synchronized(dateFormatter) {
 				put("lastUpdated", dateFormatter.format(sone.time))