Replace Sone provider interface with Kotlin version

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / web / ajax / GetStatusAjaxPage.kt

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 696c65a..7646704 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
@@ -36,7 +36,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 +49,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)