X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.kt;h=8aa488781dccbbce7e455cd2b80432a09db783a6;hb=7afd66a21244e757b6b49ba96bb3989bc55a2abf;hp=853fe26d136058c689175897fccdf412151377e1;hpb=fecc40a37c481ea7c8d0aa5d13331834d165de6a;p=Sone.git

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 853fe26..8aa4887 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
@@ -30,12 +30,12 @@ class GetStatusAjaxPage(webInterface: WebInterface, private val elementLoader: E
 	}
 
 	override fun createJsonObject(request: FreenetRequest) =
-			webInterface.getCurrentSoneWithoutCreatingSession(request.toadletContext).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(',').mapNotNull(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()
@@ -48,8 +48,8 @@ class GetStatusAjaxPage(webInterface: WebInterface, private val elementLoader: E
 
 	private fun String.asJson() = ObjectMapper().readTree(this).asIterable()
 
-	override fun needsFormPassword() = false
-	override fun requiresLogin() = false
+	override val needsFormPassword = false
+	override val requiresLogin = false
 
 	private fun SoneOptions.toJsonOptions() = jsonObject {
 		put("ShowNotification/NewSones", isShowNewSoneNotifications)
@@ -63,8 +63,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))