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=20219d747c379f1502b2fdfecb7b1017c7063628;hp=9e06c4aecfc08b4c395e883aab326e43f2c250f2;hb=HEAD;hpb=a76956e389fcfe6282ad4ca7156bbf76327bb0c0

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 9e06c4a..a0ca0d7 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
@@ -14,8 +14,9 @@ import javax.inject.*
  */
 @MenuName("ImageBrowser")
 @TemplatePath("/templates/imageBrowser.html")
-class ImageBrowserPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
-		LoggedInPage("imageBrowser.html", "Page.ImageBrowser.Title", webInterface, loaders, templateRenderer) {
+@ToadletPath("imageBrowser.html")
+class ImageBrowserPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+		LoggedInPage("Page.ImageBrowser.Title", webInterface, loaders, templateRenderer) {
 
 	override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
 		if ("album" in soneRequest.parameters) {
@@ -28,18 +29,16 @@ class ImageBrowserPage @Inject constructor(webInterface: WebInterface, loaders:
 		} else if (soneRequest.parameters["mode"] == "gallery") {
 			templateContext["galleryRequested"] = true
 			soneRequest.core.sones
-					.map(Sone::getRootAlbum)
-					.flatMap(Album::getAlbums)
-					.flatMap { Album.FLATTENER.apply(it)!! }
+					.flatMap(Sone::allAlbums)
 					.filterNot(Album::isEmpty)
 					.sortedBy(Album::getTitle)
 					.also { albums ->
 						albums.paginate(soneRequest.core.preferences.imagesPerPage)
 								.turnTo(soneRequest.parameters["page"]?.toIntOrNull() ?: 0)
 								.also { pagination ->
-							templateContext["albumPagination"] = pagination
-							templateContext["albums"] = pagination.items
-						}
+									templateContext["albumPagination"] = pagination
+									templateContext["albums"] = pagination.items
+								}
 					}
 		} else {
 			templateContext["soneRequested"] = true