X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FMarkAsKnownAjaxPage.kt;h=0451eaacff28cec5c973ed1c3d244fbb98b9f684;hb=9db5ef551b000dc6e9b6f6683a2cce3b8e2f5223;hp=beec718be70c4a14844d444799fe90203467e5ee;hpb=2ee758b50d597bfd1ec01db720e5b050027c80ea;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 beec718..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,7 +1,5 @@
 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
@@ -12,19 +10,19 @@ import net.pterodactylus.sone.web.page.FreenetRequest
  */
 class MarkAsKnownAjaxPage(webInterface: WebInterface) : JsonPage("markAsKnown.ajax", webInterface) {
 
-	override fun requiresLogin() = false
+	override val requiresLogin = false
 
 	override fun createJsonObject(request: FreenetRequest) = when (request.parameters["type"]) {
-		"sone" -> processIds(request, webInterface.core::getSone, webInterface.core::markSoneKnown)
-		"post" -> processIds(request, webInterface.core::getPost, webInterface.core::markPostKnown)
-		"reply" -> processIds(request, webInterface.core::getPostReply, webInterface.core::markReplyKnown)
+		"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() }