ensure to propagate errors when bsyncOnlyMutes is on

bluesky-social · Jan 22, 2024 · b1db937 · b1db937
1 parent 7b600b6
commit b1db937
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 48 deletions.
diff --git a/packages/bsky/src/api/app/bsky/graph/muteActor.ts b/packages/bsky/src/api/app/bsky/graph/muteActor.ts
@@ -3,6 +3,7 @@ import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
 import { MuteOperation_Type } from '../../../../proto/bsync_pb'
+import { BsyncClient } from '../../../../bsync'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.graph.muteActor({
@@ -20,24 +21,32 @@ export default function (server: Server, ctx: AppContext) {
         throw new InvalidRequestError('Cannot mute oneself')
       }
 
-      if (!ctx.cfg.bsyncOnlyMutes) {
+      const muteActor = async () => {
         await ctx.services.graph(db).muteActor({
           subjectDid,
           mutedByDid: requester,
         })
-      } else {
-        assert(ctx.bsyncClient)
       }
 
-      if (ctx.bsyncClient) {
-        try {
-          await ctx.bsyncClient.addMuteOperation({
-            type: MuteOperation_Type.ADD,
-            actorDid: requester,
-            subject: subjectDid,
-          })
-        } catch (err) {
-          req.log.warn(err, 'failed to sync mute op to bsync')
+      const addBsyncMuteOp = async (bsyncClient: BsyncClient) => {
+        await bsyncClient.addMuteOperation({
+          type: MuteOperation_Type.ADD,
+          actorDid: requester,
+          subject: subjectDid,
+        })
+      }
+
+      if (ctx.cfg.bsyncOnlyMutes) {
+        assert(ctx.bsyncClient)
+        await addBsyncMuteOp(ctx.bsyncClient)
+      } else {
+        await muteActor()
+        if (ctx.bsyncClient) {
+          try {
+            await addBsyncMuteOp(ctx.bsyncClient)
+          } catch (err) {
+            req.log.warn(err, 'failed to sync mute op to bsync')
+          }
         }
       }
     },

diff --git a/packages/bsky/src/api/app/bsky/graph/muteActorList.ts b/packages/bsky/src/api/app/bsky/graph/muteActorList.ts
@@ -5,6 +5,7 @@ import * as lex from '../../../../lexicon/lexicons'
 import AppContext from '../../../../context'
 import { AtUri } from '@atproto/syntax'
 import { MuteOperation_Type } from '../../../../proto/bsync_pb'
+import { BsyncClient } from '../../../../bsync'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.graph.muteActorList({
@@ -21,24 +22,32 @@ export default function (server: Server, ctx: AppContext) {
         throw new InvalidRequestError(`Invalid collection: expected: ${collId}`)
       }
 
-      if (!ctx.cfg.bsyncOnlyMutes) {
+      const muteActorList = async () => {
         await ctx.services.graph(db).muteActorList({
           list,
           mutedByDid: requester,
         })
-      } else {
-        assert(ctx.bsyncClient)
       }
 
-      if (ctx.bsyncClient) {
-        try {
-          await ctx.bsyncClient.addMuteOperation({
-            type: MuteOperation_Type.ADD,
-            actorDid: requester,
-            subject: list,
-          })
-        } catch (err) {
-          req.log.warn(err, 'failed to sync mute op to bsync')
+      const addBsyncMuteOp = async (bsyncClient: BsyncClient) => {
+        await bsyncClient.addMuteOperation({
+          type: MuteOperation_Type.ADD,
+          actorDid: requester,
+          subject: list,
+        })
+      }
+
+      if (ctx.cfg.bsyncOnlyMutes) {
+        assert(ctx.bsyncClient)
+        await addBsyncMuteOp(ctx.bsyncClient)
+      } else {
+        await muteActorList()
+        if (ctx.bsyncClient) {
+          try {
+            await addBsyncMuteOp(ctx.bsyncClient)
+          } catch (err) {
+            req.log.warn(err, 'failed to sync mute op to bsync')
+          }
         }
       }
     },

diff --git a/packages/bsky/src/api/app/bsky/graph/unmuteActor.ts b/packages/bsky/src/api/app/bsky/graph/unmuteActor.ts
@@ -3,6 +3,7 @@ import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
 import { MuteOperation_Type } from '../../../../proto/bsync_pb'
+import { BsyncClient } from '../../../../bsync'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.graph.unmuteActor({
@@ -20,24 +21,32 @@ export default function (server: Server, ctx: AppContext) {
         throw new InvalidRequestError('Cannot mute oneself')
       }
 
-      if (!ctx.cfg.bsyncOnlyMutes) {
+      const unmuteActor = async () => {
         await ctx.services.graph(db).unmuteActor({
           subjectDid,
           mutedByDid: requester,
         })
-      } else {
-        assert(ctx.bsyncClient)
       }
 
-      if (ctx.bsyncClient) {
-        try {
-          await ctx.bsyncClient.addMuteOperation({
-            type: MuteOperation_Type.REMOVE,
-            actorDid: requester,
-            subject: subjectDid,
-          })
-        } catch (err) {
-          req.log.warn(err, 'failed to sync mute op to bsync')
+      const addBsyncMuteOp = async (bsyncClient: BsyncClient) => {
+        await bsyncClient.addMuteOperation({
+          type: MuteOperation_Type.REMOVE,
+          actorDid: requester,
+          subject: subjectDid,
+        })
+      }
+
+      if (ctx.cfg.bsyncOnlyMutes) {
+        assert(ctx.bsyncClient)
+        await addBsyncMuteOp(ctx.bsyncClient)
+      } else {
+        await unmuteActor()
+        if (ctx.bsyncClient) {
+          try {
+            await addBsyncMuteOp(ctx.bsyncClient)
+          } catch (err) {
+            req.log.warn(err, 'failed to sync mute op to bsync')
+          }
         }
       }
     },

diff --git a/packages/bsky/src/api/app/bsky/graph/unmuteActorList.ts b/packages/bsky/src/api/app/bsky/graph/unmuteActorList.ts
@@ -2,6 +2,7 @@ import assert from 'node:assert'
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
 import { MuteOperation_Type } from '../../../../proto/bsync_pb'
+import { BsyncClient } from '../../../../bsync'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.graph.unmuteActorList({
@@ -11,24 +12,32 @@ export default function (server: Server, ctx: AppContext) {
       const requester = auth.credentials.iss
       const db = ctx.db.getPrimary()
 
-      if (!ctx.cfg.bsyncOnlyMutes) {
+      const unmuteActorList = async () => {
         await ctx.services.graph(db).unmuteActorList({
           list,
           mutedByDid: requester,
         })
-      } else {
-        assert(ctx.bsyncClient)
       }
 
-      if (ctx.bsyncClient) {
-        try {
-          await ctx.bsyncClient.addMuteOperation({
-            type: MuteOperation_Type.REMOVE,
-            actorDid: requester,
-            subject: list,
-          })
-        } catch (err) {
-          req.log.warn(err, 'failed to sync mute op to bsync')
+      const addBsyncMuteOp = async (bsyncClient: BsyncClient) => {
+        await bsyncClient.addMuteOperation({
+          type: MuteOperation_Type.REMOVE,
+          actorDid: requester,
+          subject: list,
+        })
+      }
+
+      if (ctx.cfg.bsyncOnlyMutes) {
+        assert(ctx.bsyncClient)
+        await addBsyncMuteOp(ctx.bsyncClient)
+      } else {
+        await unmuteActorList()
+        if (ctx.bsyncClient) {
+          try {
+            await addBsyncMuteOp(ctx.bsyncClient)
+          } catch (err) {
+            req.log.warn(err, 'failed to sync mute op to bsync')
+          }
         }
       }
     },