X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FOptionsPage.kt;h=412258de42295b4ddcded87ed51c9c3310a9e153;hp=dabe9f2ee1e93b4ca2c08bdef597a1e81f13fb69;hb=faf66247a34f64946990a985d2ea3003465969cb;hpb=cd72add62ab407336b471d4b7cda8e33dd2df5c6

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt
index dabe9f2..412258d 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt
@@ -1,22 +1,22 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.core.Preferences
-import net.pterodactylus.sone.data.SoneOptions.LoadExternalContent
-import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired
-import net.pterodactylus.sone.utils.emptyToNull
-import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.utils.parameters
-import net.pterodactylus.sone.web.WebInterface
+import net.pterodactylus.sone.data.SoneOptions.*
+import net.pterodactylus.sone.fcp.FcpInterface.*
+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.Template
-import net.pterodactylus.util.template.TemplateContext
-import javax.inject.Inject
+import net.pterodactylus.util.template.*
+import javax.inject.*
 
 /**
  * This page lets the user edit the options of the Sone plugin.
  */
-class OptionsPage @Inject constructor(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("options.html", webInterface, template, "Page.Options.Title") {
+@MenuName("Options")
+@TemplatePath("/templates/options.html")
+@ToadletPath("options.html")
+class OptionsPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+		SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.Options.Title") {
 
 	override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
 		if (soneRequest.isPOST) {
@@ -50,9 +50,6 @@ class OptionsPage @Inject constructor(template: Template, webInterface: WebInter
 			val imagesPerPage = soneRequest.parameters["images-per-page"]?.toIntOrNull()
 			val insertionDelay = soneRequest.parameters["insertion-delay"]?.toIntOrNull()
 			val fcpFullAccessRequired = soneRequest.parameters["fcp-full-access-required"]?.toIntOrNull()
-			val negativeTrust = soneRequest.parameters["negative-trust"]?.toIntOrNull()
-			val positiveTrust = soneRequest.parameters["positive-trust"]?.toIntOrNull()
-			val trustComment = soneRequest.parameters["trust-comment"]?.emptyToNull
 
 			if (cantSetOption { soneRequest.core.preferences.newPostsPerPage = postsPerPage }) fieldsWithErrors += "posts-per-page"
 			if (cantSetOption { soneRequest.core.preferences.newCharactersPerPost = charactersPerPost }) fieldsWithErrors += "characters-per-post"
@@ -60,13 +57,10 @@ class OptionsPage @Inject constructor(template: Template, webInterface: WebInter
 			if (cantSetOption { soneRequest.core.preferences.newImagesPerPage = imagesPerPage }) fieldsWithErrors += "images-per-page"
 			if (cantSetOption { soneRequest.core.preferences.newInsertionDelay = insertionDelay }) fieldsWithErrors += "insertion-delay"
 			fcpFullAccessRequired?.also { if (cantSetOption { soneRequest.core.preferences.newFcpFullAccessRequired = FullAccessRequired.values()[fcpFullAccessRequired] }) fieldsWithErrors += "fcp-full-access-required" }
-			if (cantSetOption { soneRequest.core.preferences.newNegativeTrust = negativeTrust }) fieldsWithErrors += "negative-trust"
-			if (cantSetOption { soneRequest.core.preferences.newPositiveTrust = positiveTrust }) fieldsWithErrors += "positive-trust"
-			if (cantSetOption { soneRequest.core.preferences.newTrustComment = trustComment }) fieldsWithErrors += "trust-comment"
 
 			if (fieldsWithErrors.isEmpty()) {
 				soneRequest.core.touchConfiguration()
-				throw RedirectException("options.html")
+				redirectTo("options.html")
 			}
 			templateContext["fieldErrors"] = fieldsWithErrors
 		}
@@ -86,11 +80,8 @@ class OptionsPage @Inject constructor(template: Template, webInterface: WebInter
 			templateContext["images-per-page"] = preferences.imagesPerPage
 			templateContext["fcp-interface-active"] = preferences.fcpInterfaceActive
 			templateContext["require-full-access"] = preferences.requireFullAccess
-			templateContext["negative-trust"] = preferences.negativeTrust
-			templateContext["positive-trust"] = preferences.positiveTrust
 			templateContext["post-cut-off-length"] = preferences.postCutOffLength
 			templateContext["posts-per-page"] = preferences.postsPerPage
-			templateContext["trust-comment"] = preferences.trustComment
 		}
 	}