X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FImageBrowserPage.kt;h=d7714cd79ca64a3d85974f2da90a718a5a5d5205;hp=e9911e6ab58a95c50ab8a08667e8050fe10a1c59;hb=cd72add62ab407336b471d4b7cda8e33dd2df5c6;hpb=74cbe983cd38da24847e6247ac595cb70d8e115b

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 e9911e6..d7714cd 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
@@ -2,48 +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):
+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 ->
-						Pagination(albums, webInterface.core.preferences.imagesPerPage).apply { page = freenetRequest.parameters["page"]?.toIntOrNull() ?: 0 }.also { pagination ->
+						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(freenetRequest.httpRequest.getParam("sone")) ?: currentSone
+			templateContext["sone"] = soneRequest.core.getSone(soneRequest.httpRequest.getParam("sone")) ?: currentSone
 		}
 	}
 
-	override fun isLinkExcepted(link: URI?) = true
+	override fun isLinkExcepted(link: URI) = true
 
 }