X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.kt;h=19cd7f984a3e9209e0a0982cb3630f3a64aba86f;hb=4965986ea98879fbe0a2ca9bcf8dbeeeaebaa9ef;hp=9872d1e79e1d855b69fc4dd346d786dae74b51a8;hpb=40998dc856efb0df91f669c6dff1b829d573a54a;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 9872d1e..19cd7f9 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
@@ -13,31 +13,39 @@ import net.pterodactylus.sone.template.SoneAccessor
 import net.pterodactylus.sone.text.TimeTextConverter
 import net.pterodactylus.sone.utils.jsonObject
 import net.pterodactylus.sone.utils.toArray
+import net.pterodactylus.sone.web.NewElements
 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 newElements: NewElements, private val timeTextConverter: TimeTextConverter, private val l10nFilter: L10nFilter, timeZone: TimeZone):
+		JsonPage(webInterface) {
 
-	private val dateFormatter = SimpleDateFormat("MMM d, yyyy, HH:mm:ss").apply {
-		this.timeZone = timeZone
+	@Inject constructor(webInterface: WebInterface, elementLoader: ElementLoader, newElements: NewElements, timeTextConverter: TimeTextConverter, l10nFilter: L10nFilter):
+			this(webInterface, elementLoader, newElements, timeTextConverter, l10nFilter, TimeZone.getDefault())
+
+	private val dateFormatter by lazy {
+		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).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["newPosts"] = webInterface.getNewPosts(currentSone).toJsonPosts()
-					this["newReplies"] = webInterface.getNewReplies(currentSone).toJsonReplies()
+					this["sones"] = request.httpRequest.getParam("soneIds").split(',').mapNotNull(core::getSone).plus(currentSone).filterNotNull().toJsonSones()
+					this["newPosts"] = newElements.newPosts.toJsonPosts()
+					this["newReplies"] = newElements.newReplies.toJsonReplies()
 					this["linkedElements"] = request.httpRequest.getParam("elements", "[]").asJson().map(JsonNode::asText).map(elementLoader::loadElement).toJsonElements()
 				}
 			}
@@ -48,8 +56,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 +71,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))