X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FMarkAsKnownAjaxPage.kt;h=0451eaacff28cec5c973ed1c3d244fbb98b9f684;hb=7afd66a21244e757b6b49ba96bb3989bc55a2abf;hp=cca5cef59acf0dd3dcd0c3dae0c56195b7184d54;hpb=8e313509a42a8c638fcac018dd73dd975bf9cb68;p=Sone.git

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..0451eaa 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt
@@ -1,8 +1,5 @@
 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
@@ -16,16 +13,16 @@ class MarkAsKnownAjaxPage(webInterface: WebInterface) : JsonPage("markAsKnown.aj
 	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() }