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=4ab6d187e154b69adcf91d126558f042a67ed0b9;hp=cca5cef59acf0dd3dcd0c3dae0c56195b7184d54;hb=ea7ad5e87074576d17b7df74365a726bd95d7665;hpb=8e313509a42a8c638fcac018dd73dd975bf9cb68

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 cca5cef..4ab6d18 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt
@@ -1,31 +1,30 @@
 package net.pterodactylus.sone.web.ajax
 
-import com.google.common.base.Optional
-import net.pterodactylus.sone.utils.asOptional
-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 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) {
+class MarkAsKnownAjaxPage @Inject constructor(webInterface: WebInterface) :
+		JsonPage("markAsKnown.ajax", webInterface) {
 
 	override val requiresLogin = false
 
 	override fun createJsonObject(request: FreenetRequest) = when (request.parameters["type"]) {
-		"sone" -> processIds(request, { core.getSone(it).asOptional() }, core::markSoneKnown)
+		"sone" -> processIds(request, core::getSone, core::markSoneKnown)
 		"post" -> processIds(request, core::getPost, core::markPostKnown)
 		"reply" -> processIds(request, core::getPostReply, core::markReplyKnown)
 		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() }