X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetTimesAjaxPage.kt;h=ef4a0db52b7b843d9d4450a2e775ea0994229b9a;hp=9310786e51f402cdbb05fcb27eb2f6fccc515f7c;hb=ca45de0dcbd2e361ab630bbee1d47ff6cf34d97c;hpb=4af98a3470ba214fb452b0f0d908b707811fa496

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt
index 9310786..ef4a0db 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt
@@ -3,32 +3,33 @@ package net.pterodactylus.sone.web.ajax
 import net.pterodactylus.sone.freenet.L10nFilter
 import net.pterodactylus.sone.text.TimeTextConverter
 import net.pterodactylus.sone.utils.jsonObject
-import net.pterodactylus.sone.utils.let
 import net.pterodactylus.sone.utils.parameters
 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
 
 /**
  * Ajax page that returns a formatted, relative timestamp for replies or posts.
  */
-class GetTimesAjaxPage(webInterface: WebInterface,
+@ToadletPath("getTimes.ajax")
+class GetTimesAjaxPage @Inject constructor(webInterface: WebInterface,
 		private val timeTextConverter: TimeTextConverter,
 		private val l10nFilter: L10nFilter,
-		timeZone: TimeZone) : JsonPage("getTimes.ajax", webInterface) {
+		timeZone: TimeZone) : JsonPage(webInterface) {
 
 	private val dateTimeFormatter = SimpleDateFormat("MMM d, yyyy, HH:mm:ss").apply {
 		this.timeZone = timeZone
 	}
 
-	override fun needsFormPassword() = false
-	override fun requiresLogin() = false
+	override val needsFormPassword = false
+	override val requiresLogin = false
 
 	override fun createJsonObject(request: FreenetRequest) =
 			createSuccessJsonObject().apply {
-				put("postTimes", request.parameters["posts"]!!.idsToJson { webInterface.core.getPost(it)?.let { it.id to it.time } })
-				put("replyTimes", request.parameters["replies"]!!.idsToJson { webInterface.core.getPostReply(it)?.let { it.id to it.time } })
+				put("postTimes", request.parameters["posts"]!!.idsToJson { core.getPost(it)?.let { it.id to it.time } })
+				put("replyTimes", request.parameters["replies"]!!.idsToJson { core.getPostReply(it)?.let { it.id to it.time } })
 			}
 
 	private fun String.idsToJson(transform: (String) -> Pair<String, Long>?) =
@@ -43,7 +44,7 @@ class GetTimesAjaxPage(webInterface: WebInterface,
 					"tooltip" to synchronized(dateTimeFormatter) {
 						dateTimeFormatter.format(time)
 					})
-		}.forEach { this@jsonObject.put(it.first, it.second) }
+		}.forEach { this@jsonObject.set(it.first, it.second) }
 	}
 
 }