X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.kt;h=8aa488781dccbbce7e455cd2b80432a09db783a6;hb=9fad99acd6c971d6046a117fb5b90e40872415e7;hp=e2642c97f6347759e86986f16fc6b84c4066f384;hpb=77ada453ff332d62adb0a7820e428f6a0030093f;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 e2642c9..8aa4887 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
@@ -12,7 +12,6 @@ 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
@@ -36,7 +35,7 @@ class GetStatusAjaxPage(webInterface: WebInterface, private val elementLoader: E
 					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(',').mapPresent(core::getSone).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()
@@ -49,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)
@@ -64,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))