X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FFollowSonePage.kt;h=f4aa2e00cc2f0106e5ed280793ef53e8b5c0028f;hp=781e07fa6346a6d47592190ddaa0754a810b7c5d;hb=6a3f1fede0cda5cd6ed56204aa1dd37a19813cb9;hpb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt
index 781e07f..f4aa2e0 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt
@@ -1,31 +1,31 @@
 package net.pterodactylus.sone.web.pages
 
+import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.main.*
 import net.pterodactylus.sone.utils.isPOST
 import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
+import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
+import javax.inject.Inject
 
 /**
  * This page lets the user follow another Sone.
  */
-class FollowSonePage(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("followSone.html", template, "Page.FollowSone.Title", webInterface, true) {
+class FollowSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
+		LoggedInPage("followSone.html", template, "Page.FollowSone.Title", webInterface, loaders) {
 
-	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
-		if (freenetRequest.isPOST) {
-			freenetRequest.httpRequest.getPartAsStringFailsafe("sone", 1200).split(Regex("[ ,]+"))
-					.map { it to webInterface.core.getSone(it) }
-					.filter { it.second.isPresent }
-					.map { it.first to it.second.get() }
+	override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
+		if (soneRequest.isPOST) {
+			soneRequest.httpRequest.getPartAsStringFailsafe("sone", 1200).split(Regex("[ ,]+"))
+					.map { it to soneRequest.core.getSone(it) }
+					.filterNot { it.second == null }
 					.forEach { sone ->
-						webInterface.core.followSone(freenetRequest.currentSone, sone.first)
-						webInterface.core.markSoneKnown(sone.second)
+						soneRequest.core.followSone(currentSone, sone.first)
+						soneRequest.core.markSoneKnown(sone.second)
 					}
-			throw RedirectException(freenetRequest.httpRequest.getPartAsStringFailsafe("returnPage", 256))
+			throw RedirectException(soneRequest.httpRequest.getPartAsStringFailsafe("returnPage", 256))
 		}
 	}
 
-	private val FreenetRequest.currentSone get() = sessionProvider.getCurrentSone(toadletContext)
-
 }