X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetNotificationsAjaxPage.kt;h=c60fe567bf8c7bd68a1f3f270b3cf5c27511868c;hp=f3b370d78a9f5efd7c14a23ce81f795f5c40115c;hb=HEAD;hpb=8a0e0ee93d2f49762d87c4897a3a4de7273b3046

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt
index f3b370d..c60fe56 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt
@@ -3,10 +3,9 @@ package net.pterodactylus.sone.web.ajax
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.data.SoneOptions
 import net.pterodactylus.sone.main.SonePlugin
-import net.pterodactylus.sone.utils.jsonArray
-import net.pterodactylus.sone.utils.jsonObject
+import net.pterodactylus.sone.utils.*
 import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
+import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.notify.Notification
 import net.pterodactylus.util.notify.TemplateNotification
 import java.io.StringWriter
@@ -15,14 +14,14 @@ import javax.inject.Inject
 /**
  * AJAX handler to return all current notifications.
  */
-class GetNotificationsAjaxPage @Inject constructor(webInterface: WebInterface) :
-		JsonPage("getNotifications.ajax", webInterface) {
+@ToadletPath("getNotifications.ajax")
+class GetNotificationsAjaxPage @Inject constructor(webInterface: WebInterface) : JsonPage(webInterface) {
 
 	override val needsFormPassword = false
 	override val requiresLogin = false
 
 	override fun createJsonObject(request: FreenetRequest) =
-			getCurrentSone(request.toadletContext, false).let { currentSone ->
+			getCurrentSone(request.toadletContext).let { currentSone ->
 				webInterface.getNotifications(currentSone)
 						.sortedBy(Notification::getCreatedTime)
 						.let { notifications ->
@@ -74,5 +73,3 @@ private val SoneOptions?.asJsonObject
 				"ShowNotification/NewReplies" to options.isShowNewReplyNotifications
 		)
 	} ?: jsonObject {}
-
-private fun Notification.render() = StringWriter().use { it.also { render(it) } }.toString()