♻️ 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 2f165fc..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
@@ -2,46 +2,51 @@ package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Album
 import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.utils.Pagination
+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
+import javax.inject.Inject
 
 /**
  * The image browser page is the entry page for the image management.
  */
-class ImageBrowserPage(template: Template, webInterface: WebInterface):
-               SoneTemplatePage("imageBrowser.html", template, "Page.ImageBrowser.Title", webInterface, true) {
+class ImageBrowserPage @Inject constructor(template: Template, webInterface: WebInterface):
+               LoggedInPage("imageBrowser.html", template, "Page.ImageBrowser.Title", webInterface) {
 
-       override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-               if ("album" in request.parameters) {
+       override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
+               if ("album" in soneRequest.parameters) {
                        templateContext["albumRequested"] = true
-                       templateContext["album"] = webInterface.core.getAlbum(request.parameters["album"]!!)
-                       templateContext["page"] = request.parameters["page"]
-               } else if ("image" in request.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(request.parameters["image"])
-               } else if (request.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 ->
-                                               templateContext["albums"] = albums
-                                               templateContext["albumPagination"] = Pagination(albums, 12).apply { page = request.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
+                                               }
                                        }
                } else {
                        templateContext["soneRequested"] = true
-                       templateContext["sone"] = webInterface.core.getSone(request.httpRequest.getParam("sone")).orNull() ?: getCurrentSone(request.toadletContext)
+                       templateContext["sone"] = soneRequest.core.getSone(soneRequest.httpRequest.getParam("sone")) ?: currentSone
                }
        }
 
-       override fun isLinkExcepted(link: URI?) = true
+       override fun isLinkExcepted(link: URI) = true
 
 }