Merge pull request #1152 from ssbc/opt-in-auto-delete

Make feed deletion an opt-in setting

Author: christianbundy

lib/depject/page/html/render/settings.js

@@ -35,6 +35,7 @@ exports.create = function (api) {
     const fontSize = api.settings.obs.get('patchwork.fontSize', '')
     const fontFamily = api.settings.obs.get('patchwork.fontFamily', '')
     const includeParticipating = api.settings.obs.get('patchwork.includeParticipating', false)
+    const autoDeleteBlocked = api.settings.obs.get('patchwork.autoDeleteBlocked', false)
 
     // const filterFollowing = api.settings.obs.get('filters.following')
     // const filterSubscriptions = api.settings.obs.get('filters.subscriptions')
@@ -108,6 +109,14 @@ exports.create = function (api) {
             checkbox(includeParticipating, {
               label: i18n('Include "Participating" tab in navigation bar')
             })
+          ]),
+
+          h('h2', i18n('Blocking')),
+
+          h('div', [
+            checkbox(autoDeleteBlocked, {
+              label: i18n('Automatically delete messages from blocked authors. This is irreversible and will cause problems with clients that share the database but do not support deleted messages. Enable at your own risk!')
+            })
           ])
         ]),
 

lib/main-window.js

@@ -60,6 +60,7 @@ module.exports = function (config) {
   var latestUpdate = LatestUpdate()
   var subscribedChannels = api.channel.obs.subscribed(id)
   var includeParticipating = api.settings.obs.get('patchwork.includeParticipating', false)
+  var autoDeleteBlocked = api.settings.obs.get('patchwork.autoDeleteBlocked', false)
 
   // prompt to setup profile on first use
   onceTrue(api.sbot.obs.connection, (ssb) => {
@@ -77,39 +78,42 @@ module.exports = function (config) {
     const currentlyDeleting = {}
 
     watch(api.contact.obs.blocking(id), (blocking) => {
+      if (autoDeleteBlocked() !== true) return
       if (blocking.length === 0) return
 
       if (ssb.del == null) return
 
-      blocking.forEach(feed => {
-        pull(
-          ssb.createUserStream({ id: feed }),
-          pull.asyncMap((msg, cb) => {
-            const key = msg.key
-            if (currentlyDeleting[key] === true) {
-              return cb(null, null) // already deleting
-            }
+      blocking
+        .filter(feedId => feedId !== ssb.id)
+        .forEach(feed => {
+          pull(
+            ssb.createUserStream({ id: feed }),
+            pull.asyncMap((msg, cb) => {
+              const key = msg.key
+              if (currentlyDeleting[key] === true) {
+                return cb(null, null) // already deleting
+              }
 
-            currentlyDeleting[key] = true
+              currentlyDeleting[key] = true
+
+              ssb.del(key, (err) => {
+                currentlyDeleting[key] = false
+                cb(err, key)
+              })
+            }),
+            pull.filter(),
+            pull.collect((err, keys) => {
+              if (err) {
+                console.error(keys)
+                throw err
+              }
 
-            ssb.del(key, (err) => {
-              currentlyDeleting[key] = false
-              cb(err, key)
+              if (keys.length > 0) {
+                console.log(`deleted ${keys.length} messages from blocked authors`)
+              }
             })
-          }),
-          pull.filter(),
-          pull.collect((err, keys) => {
-            if (err) {
-              console.error(keys)
-              throw err
-            }
-
-            if (keys.length > 0) {
-              console.log(`deleted ${keys.length} messages from blocked authors`)
-            }
-          })
-        )
-      })
+          )
+        })
     })
   })
 

locales/en.json

@@ -308,5 +308,8 @@
 	" replied but is blocked by ": " replied but is blocked by ",
 	"Content of a blocked user": "Content of a blocked user",
 	"el": "el",
-	"eo": "eo"
-}
+	"eo": "eo",
+	"zh-TW": "zh-TW",
+	"Blocking": "Blocking",
+	"Automatically delete messages from blocked authors. This is irreversible and will cause problems with clients that share the database but do not support deleted messages. Enable at your own risk!": "Automatically delete messages from blocked authors. This is irreversible and will cause problems with clients that share the database but do not support deleted messages. Enable at your own risk!"
+}