X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FMarkAsKnownAjaxPage.kt;h=808d2fafd0b87728c8dc9b80c299d2a3bb2420b6;hp=9e4e4a3803ab864d4bcc0042dd9470073b26df91;hb=ca45de0dcbd2e361ab630bbee1d47ff6cf34d97c;hpb=5ebcf8e99818206776539ab6610461dc4386a304

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt
index 9e4e4a3..808d2fa 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt
@@ -1,16 +1,16 @@
 package net.pterodactylus.sone.web.ajax
 
-import com.google.common.base.Optional
-import net.pterodactylus.sone.utils.mapPresent
 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 javax.inject.Inject
 
 /**
  * AJAX page that lets the user mark a number of [net.pterodactylus.sone.data.Sone]s,
  * [net.pterodactylus.sone.data.Post]s, or [net.pterodactylus.sone.data.Reply]s as known.
  */
-class MarkAsKnownAjaxPage(webInterface: WebInterface) : JsonPage("markAsKnown.ajax", webInterface) {
+@ToadletPath("markAsKnown.ajax")
+class MarkAsKnownAjaxPage @Inject constructor(webInterface: WebInterface) : JsonPage(webInterface) {
 
 	override val requiresLogin = false
 
@@ -21,10 +21,10 @@ class MarkAsKnownAjaxPage(webInterface: WebInterface) : JsonPage("markAsKnown.aj
 		else -> createErrorJsonObject("invalid-type")
 	}
 
-	private fun <T> processIds(request: FreenetRequest, getter: (String) -> Optional<T>, marker: (T) -> Unit) =
+	private fun <T : Any> processIds(request: FreenetRequest, getter: (String) -> T?, marker: (T) -> Unit) =
 			request.parameters["id"]
 					?.split(Regex(" +"))
-					?.mapPresent(getter)
+					?.mapNotNull(getter)
 					?.onEach(marker)
 					.let { createSuccessJsonObject() }