X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FUploadImagePage.kt;h=8cacb6ac391110903ebcbae090280ce4a3296608;hb=1557106d0e373f7efc15faed65f69eb567613a45;hp=782c90df809f65bf0dc0703a3fdff68e939374f7;hpb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt
index 782c90d..8cacb6a 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt
@@ -1,6 +1,7 @@
 package net.pterodactylus.sone.web.pages
 
 import freenet.support.api.Bucket
+import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.text.TextFilter
 import net.pterodactylus.sone.utils.emptyToNull
 import net.pterodactylus.sone.utils.headers
@@ -15,17 +16,18 @@ import java.awt.image.BufferedImage
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import javax.imageio.ImageIO
+import javax.inject.Inject
 
 /**
  * Page implementation that lets the user upload an image.
  */
-class UploadImagePage(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("uploadImage.html", template, "Page.UploadImage.Title", webInterface, true) {
+class UploadImagePage @Inject constructor(template: Template, webInterface: WebInterface):
+		LoggedInPage("uploadImage.html", template, "Page.UploadImage.Title", webInterface) {
 
-	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+	override fun handleRequest(freenetRequest: FreenetRequest, currentSone: Sone, templateContext: TemplateContext) {
 		if (freenetRequest.isPOST) {
 			val parentAlbum = freenetRequest.parameters["parent"]!!.let(webInterface.core::getAlbum) ?: throw RedirectException("noPermission.html")
-			if (parentAlbum.sone != getCurrentSone(freenetRequest.toadletContext)) {
+			if (parentAlbum.sone != currentSone) {
 				throw RedirectException("noPermission.html")
 			}
 			val title = freenetRequest.parameters["title", 200].emptyToNull ?: throw RedirectException("emptyImageTitle.html")
@@ -39,7 +41,7 @@ class UploadImagePage(template: Template, webInterface: WebInterface):
 			}
 
 			val temporaryImage = webInterface.core.createTemporaryImage(bytes.mimeType, bytes)
-			webInterface.core.createImage(getCurrentSone(freenetRequest.toadletContext), parentAlbum, temporaryImage).modify().apply {
+			webInterface.core.createImage(currentSone, parentAlbum, temporaryImage).modify().apply {
 				setWidth(bufferedImage.width)
 				setHeight(bufferedImage.height)
 				setTitle(title)