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=75f3c3c7a7b19f3a8b7e28f3379bac6bf88f0810;hp=696c65a3614cb4ff40342cc82d4c1740f360446e;hb=ca45de0dcbd2e361ab630bbee1d47ff6cf34d97c;hpb=85b7420f3492af4e5591f62ad673309a76de7e04

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..75f3c3c 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
@@ -12,19 +12,23 @@ 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 net.pterodactylus.sone.web.page.*
 import java.text.SimpleDateFormat
 import java.util.TimeZone
+import javax.inject.Inject
 
 /**
  * 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, timeZone: TimeZone = TimeZone.getDefault()):
-		JsonPage("getStatus.ajax", webInterface) {
+@ToadletPath("getStatus.ajax")
+class GetStatusAjaxPage(webInterface: WebInterface, private val elementLoader: ElementLoader, private val timeTextConverter: TimeTextConverter, private val l10nFilter: L10nFilter, timeZone: TimeZone):
+		JsonPage(webInterface) {
+
+	@Inject constructor(webInterface: WebInterface, elementLoader: ElementLoader, timeTextConverter: TimeTextConverter, l10nFilter: L10nFilter):
+			this(webInterface, elementLoader, timeTextConverter, l10nFilter, TimeZone.getDefault())
 
 	private val dateFormatter = SimpleDateFormat("MMM d, yyyy, HH:mm:ss").apply {
 		this.timeZone = timeZone
@@ -36,7 +40,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 +53,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)