X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FEditAlbumPage.kt;h=4569e9a18157157c64ddabc907b417ac8316cec2;hp=ff8e728653cf122890e69270d7141f6e7edfc10d;hb=faf66247a34f64946990a985d2ea3003465969cb;hpb=7d023c8123bae2f0ba02b4ad8f43930e96ad30a6

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
index ff8e728..4569e9a 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
@@ -1,43 +1,44 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
-import net.pterodactylus.sone.data.Sone
-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.util.template.TemplateContext
-import javax.inject.Inject
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.data.Album.Modifier.*
+import net.pterodactylus.sone.main.*
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.web.*
+import net.pterodactylus.sone.web.page.*
+import net.pterodactylus.util.template.*
+import javax.inject.*
 
 /**
  * Page that lets the user edit the name and description of an album.
  */
-class EditAlbumPage @Inject constructor(template: Template, webInterface: WebInterface):
-		LoggedInPage("editAlbum.html", template, "Page.EditAlbum.Title", webInterface) {
+@ToadletPath("editAlbum.html")
+class EditAlbumPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+		LoggedInPage("Page.EditAlbum.Title", webInterface, loaders, templateRenderer) {
 
-	override fun handleRequest(freenetRequest: FreenetRequest, currentSone: Sone, templateContext: TemplateContext) {
-		if (freenetRequest.isPOST) {
-			val album = webInterface.core.getAlbum(freenetRequest.httpRequest.getPartAsStringFailsafe("album", 36)) ?: throw RedirectException("invalid.html")
-			album.takeUnless { it.sone.isLocal }?.run { throw RedirectException("noPermission.html") }
-			if (freenetRequest.httpRequest.getPartAsStringFailsafe("moveLeft", 4) == "true") {
+	override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
+		if (soneRequest.isPOST) {
+			val album = soneRequest.core.getAlbum(soneRequest.httpRequest.getPartAsStringFailsafe("album", 36)) ?: redirectTo("invalid.html")
+			album.takeUnless { it.sone.isLocal }?.run { redirectTo("noPermission.html") }
+			if (soneRequest.httpRequest.getPartAsStringFailsafe("moveLeft", 4) == "true") {
 				album.parent?.moveAlbumUp(album)
-				webInterface.core.touchConfiguration()
-				throw RedirectException("imageBrowser.html?album=${album.parent?.id}")
-			} else if (freenetRequest.httpRequest.getPartAsStringFailsafe("moveRight", 4) == "true") {
+				soneRequest.core.touchConfiguration()
+				redirectTo("imageBrowser.html?album=${album.parent?.id}")
+			} else if (soneRequest.httpRequest.getPartAsStringFailsafe("moveRight", 4) == "true") {
 				album.parent?.moveAlbumDown(album)
-				webInterface.core.touchConfiguration()
-				throw RedirectException("imageBrowser.html?album=${album.parent?.id}")
+				soneRequest.core.touchConfiguration()
+				redirectTo("imageBrowser.html?album=${album.parent?.id}")
 			} else {
 				try {
 					album.modify()
-							.setTitle(freenetRequest.httpRequest.getPartAsStringFailsafe("title", 100))
-							.setDescription(freenetRequest.httpRequest.getPartAsStringFailsafe("description", 1000))
+							.setTitle(soneRequest.httpRequest.getPartAsStringFailsafe("title", 100))
+							.setDescription(soneRequest.httpRequest.getPartAsStringFailsafe("description", 1000))
 							.update()
 				} catch (e: AlbumTitleMustNotBeEmpty) {
-					throw RedirectException("emptyAlbumTitle.html")
+					redirectTo("emptyAlbumTitle.html")
 				}
-				webInterface.core.touchConfiguration()
-				throw RedirectException("imageBrowser.html?album=${album.id}")
+				soneRequest.core.touchConfiguration()
+				redirectTo("imageBrowser.html?album=${album.id}")
 			}
 		}
 	}