separated spam and report filter options

app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt

@@ -61,7 +61,8 @@ private object PrefKeys {
     const val USE_PROXY = "use_proxy"
     const val PROXY_PORT = "proxy_port"
     const val SHOW_SENSITIVE_CONTENT = "show_sensitive_content"
-    const val OPT_OUT_FILTERS = "opt_out_filters"
+    const val WARN_ABOUT_REPORTS = "warn_about_reports"
+    const val FILTER_SPAM_FROM_STRANGERS = "filter_spam_from_strangers"
     val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
 }
 
@@ -218,7 +219,8 @@ object LocalPreferences {
             putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, account.hideBlockAlertDialog)
             putBoolean(PrefKeys.USE_PROXY, account.proxy != null)
             putInt(PrefKeys.PROXY_PORT, account.proxyPort)
-            putBoolean(PrefKeys.OPT_OUT_FILTERS, account.optOutFromFilters)
+            putBoolean(PrefKeys.WARN_ABOUT_REPORTS, account.warnAboutPostsWithReports)
+            putBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, account.filterSpamFromStrangers)
 
             if (account.showSensitiveContent == null) {
                 remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
@@ -308,7 +310,8 @@ object LocalPreferences {
             } else {
                 null
             }
-            val optOutFromFilters = getBoolean(PrefKeys.OPT_OUT_FILTERS, false)
+            val filterSpam = getBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, true)
+            val warnAboutReports = getBoolean(PrefKeys.WARN_ABOUT_REPORTS, true)
 
             val a = Account(
                 Persona(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray()),
@@ -331,7 +334,8 @@ object LocalPreferences {
                 proxy,
                 proxyPort,
                 showSensitiveContent,
-                optOutFromFilters
+                warnAboutReports,
+                filterSpam
             )
 
             return a

app/src/main/java/com/vitorpamplona/amethyst/OptOutFromFilters.kt

@@ -1,9 +1,11 @@
 package com.vitorpamplona.amethyst
 
 object OptOutFromFilters {
-    var optOutFromFilters: Boolean = false
+    var warnAboutPostsWithReports: Boolean = true
+    var filterSpamFromStrangers: Boolean = true
 
-    fun start(optOut: Boolean) {
+    fun start(warnAboutReports: Boolean, filterSpam: Boolean) {
-        optOutFromFilters = optOut
+        warnAboutPostsWithReports = warnAboutReports
+        filterSpamFromStrangers = filterSpam
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt

@@ -36,7 +36,7 @@ object ServiceManager {
 
         // Resets Proxy Use
         HttpClient.start(account)
-        OptOutFromFilters.start(account?.optOutFromFilters ?: false)
+        OptOutFromFilters.start(account?.warnAboutPostsWithReports ?: true, account?.filterSpamFromStrangers ?: true)
         Coil.setImageLoader {
             ImageLoader.Builder(context).components {
                 if (Build.VERSION.SDK_INT >= 28) {

app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -68,7 +68,8 @@ class Account(
     var proxy: Proxy?,
     var proxyPort: Int,
     var showSensitiveContent: Boolean? = null,
-    var optOutFromFilters: Boolean = false
+    var warnAboutPostsWithReports: Boolean = true,
+    var filterSpamFromStrangers: Boolean = true
 ) {
     var transientHiddenUsers: Set<String> = setOf()
 
@@ -79,9 +80,13 @@ class Account(
 
     var userProfileCache: User? = null
 
-    fun updateOptOutFromFilters(value: Boolean) {
+    fun updateOptOutOptions(warnReports: Boolean, filterSpam: Boolean) {
-        optOutFromFilters = value
+        warnAboutPostsWithReports = warnReports
-        OptOutFromFilters.start(optOutFromFilters)
+        filterSpamFromStrangers = filterSpam
+        OptOutFromFilters.start(warnAboutPostsWithReports, filterSpamFromStrangers)
+        if (!filterSpamFromStrangers) {
+            transientHiddenUsers = setOf()
+        }
         live.invalidateData()
         saveable.invalidateData()
     }
@@ -1066,7 +1071,7 @@ class Account(
     }
 
     fun isAcceptable(user: User): Boolean {
-        if (optOutFromFilters) {
+        if (!warnAboutPostsWithReports) {
             return !isHidden(user) && // if user hasn't hided this author
                 user.reportsBy(userProfile()).isEmpty() // if user has not reported this post
         }
@@ -1076,7 +1081,7 @@ class Account(
     }
 
     fun isAcceptableDirect(note: Note): Boolean {
-        if (optOutFromFilters) {
+        if (!warnAboutPostsWithReports) {
             return note.reportsBy(userProfile()).isEmpty()
         }
         return note.reportsBy(userProfile()).isEmpty() && // if user has not reported this post

app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt

@@ -21,7 +21,7 @@ class AntiSpamFilter {
     fun isSpam(event: Event, relay: Relay?): Boolean {
         checkNotInMainThread()
 
-        if (OptOutFromFilters.optOutFromFilters) return false
+        if (!OptOutFromFilters.filterSpamFromStrangers) return false
 
         val idHex = event.id
 

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HiddenUsersScreen.kt

@@ -74,19 +74,33 @@ fun HiddenUsersScreen(
         Column(modifier = Modifier.padding(start = 10.dp, end = 10.dp)) {
             val pagerState = rememberPagerState()
             val coroutineScope = rememberCoroutineScope()
-            var checked by remember { mutableStateOf(accountViewModel.account.optOutFromFilters) }
+            var warnAboutReports by remember { mutableStateOf(accountViewModel.account.warnAboutPostsWithReports) }
+            var filterSpam by remember { mutableStateOf(accountViewModel.account.filterSpamFromStrangers) }
 
             Row(verticalAlignment = Alignment.CenterVertically) {
                 Checkbox(
-                    checked = checked,
+                    checked = warnAboutReports,
                     onCheckedChange = {
-                        checked = it
+                        warnAboutReports = it
-                        accountViewModel.account.updateOptOutFromFilters(checked)
+                        accountViewModel.account.updateOptOutOptions(warnAboutReports, filterSpam)
                         LocalPreferences.saveToEncryptedStorage(accountViewModel.account)
                     }
                 )
 
-                Text(stringResource(R.string.opt_out_from_filters))
+                Text(stringResource(R.string.warn_when_posts_have_reports_from_your_follows))
+            }
+
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Checkbox(
+                    checked = filterSpam,
+                    onCheckedChange = {
+                        filterSpam = it
+                        accountViewModel.account.updateOptOutOptions(warnAboutReports, filterSpam)
+                        LocalPreferences.saveToEncryptedStorage(accountViewModel.account)
+                    }
+                )
+
+                Text(stringResource(R.string.filter_spam_from_strangers))
             }
 
             TabRow(

app/src/main/res/values/strings.xml

@@ -412,5 +412,6 @@
     <string name="content_warning_see_warnings">Always show content warnings</string>
 
     <string name="recommended_apps">Recommends: </string>
-    <string name="opt_out_from_filters">Opt-out from automatic filters</string>
+    <string name="filter_spam_from_strangers">Filter spam from strangers</string>
+    <string name="warn_when_posts_have_reports_from_your_follows">Warn when posts have reports from your follows</string>
 </resources>