🔥 Remove templates from FreenetTemplatePages

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / web / pages / FollowSonePage.kt

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 75ce7f8..3926851 100644 (file)
--- 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,30 @@
 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.util.template.Template
+import net.pterodactylus.sone.web.page.*
 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(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+               LoggedInPage("followSone.html", "Page.FollowSone.Title", webInterface, loaders, templateRenderer) {
 
-       override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-               if (request.isPOST) {
-                       request.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(request.currentSone, sone.first)
-                                               webInterface.core.markSoneKnown(sone.second)
+                                               soneRequest.core.followSone(currentSone, sone.first)
+                                               soneRequest.core.markSoneKnown(sone.second)
                                        }
-                       throw RedirectException(request.httpRequest.getPartAsStringFailsafe("returnPage", 256))
+                       throw RedirectException(soneRequest.httpRequest.getPartAsStringFailsafe("returnPage", 256))
                }
        }
 
-       private val FreenetRequest.currentSone get() = sessionProvider.getCurrentSone(toadletContext)
-
 }