🚧 Add processing of strict-filtering option

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / web / pages / OptionsPage.kt

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 2c454e8..9465a6a 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt
@@ -40,9 +40,11 @@ class OptionsPage @Inject constructor(webInterface: WebInterface, loaders: Loade
                        }
                        val fullAccessRequired = "require-full-access" in soneRequest.parameters
                        val fcpInterfaceActive = "fcp-interface-active" in soneRequest.parameters
+                       val strictFiltering = "strict-filtering" in soneRequest.parameters
 
                        soneRequest.core.preferences.newRequireFullAccess = fullAccessRequired
                        soneRequest.core.preferences.newFcpInterfaceActive = fcpInterfaceActive
+                       soneRequest.core.preferences.newStrictFiltering = strictFiltering
 
                        val postsPerPage = soneRequest.parameters["posts-per-page"]?.toIntOrNull()
                        val charactersPerPost = soneRequest.parameters["characters-per-post"]?.toIntOrNull()
@@ -50,9 +52,6 @@ class OptionsPage @Inject constructor(webInterface: WebInterface, loaders: Loade
                        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,9 +59,6 @@ class OptionsPage @Inject constructor(webInterface: WebInterface, loaders: Loade
                        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()
@@ -86,11 +82,9 @@ class OptionsPage @Inject constructor(webInterface: WebInterface, loaders: Loade
                        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
+                       templateContext["strict-filtering"] = preferences.strictFiltering
                }
        }