♻️ Use SoneRequest instead of FreenetRequest

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

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
index 84634fc..d7714cd 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
@@ -5,7 +5,7 @@ import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.utils.paginate
 import net.pterodactylus.sone.utils.parameters
 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 java.net.URI
@@ -17,25 +17,25 @@ import javax.inject.Inject
 class ImageBrowserPage @Inject constructor(template: Template, webInterface: WebInterface):
                LoggedInPage("imageBrowser.html", template, "Page.ImageBrowser.Title", webInterface) {
 
-       override fun handleRequest(freenetRequest: FreenetRequest, currentSone: Sone, templateContext: TemplateContext) {
-               if ("album" in freenetRequest.parameters) {
+       override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
+               if ("album" in soneRequest.parameters) {
                        templateContext["albumRequested"] = true
-                       templateContext["album"] = webInterface.core.getAlbum(freenetRequest.parameters["album"]!!)
-                       templateContext["page"] = freenetRequest.parameters["page"]
-               } else if ("image" in freenetRequest.parameters) {
+                       templateContext["album"] = soneRequest.core.getAlbum(soneRequest.parameters["album"]!!)
+                       templateContext["page"] = soneRequest.parameters["page"]
+               } else if ("image" in soneRequest.parameters) {
                        templateContext["imageRequested"] = true
-                       templateContext["image"] = webInterface.core.getImage(freenetRequest.parameters["image"])
-               } else if (freenetRequest.parameters["mode"] == "gallery") {
+                       templateContext["image"] = soneRequest.core.getImage(soneRequest.parameters["image"])
+               } else if (soneRequest.parameters["mode"] == "gallery") {
                        templateContext["galleryRequested"] = true
-                       webInterface.core.sones
+                       soneRequest.core.sones
                                        .map(Sone::getRootAlbum)
                                        .flatMap(Album::getAlbums)
                                        .flatMap { Album.FLATTENER.apply(it)!! }
                                        .filterNot(Album::isEmpty)
                                        .sortedBy(Album::getTitle)
                                        .also { albums ->
-                                               albums.paginate(webInterface.core.preferences.imagesPerPage)
-                                                               .turnTo(freenetRequest.parameters["page"]?.toIntOrNull() ?: 0)
+                                               albums.paginate(soneRequest.core.preferences.imagesPerPage)
+                                                               .turnTo(soneRequest.parameters["page"]?.toIntOrNull() ?: 0)
                                                                .also { pagination ->
                                                        templateContext["albumPagination"] = pagination
                                                        templateContext["albums"] = pagination.items
@@ -43,7 +43,7 @@ class ImageBrowserPage @Inject constructor(template: Template, webInterface: Web
                                        }
                } else {
                        templateContext["soneRequested"] = true
-                       templateContext["sone"] = webInterface.core.getSone(freenetRequest.httpRequest.getParam("sone")) ?: currentSone
+                       templateContext["sone"] = soneRequest.core.getSone(soneRequest.httpRequest.getParam("sone")) ?: currentSone
                }
        }