Fix edge-case where we could delete own messages

Author: christianbundy

lib/main-window.js

@@ -83,35 +83,37 @@ module.exports = function (config) {
 
       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`)
-            }
-          })
-        )
-      })
+          )
+        })
     })
   })