Simplify moderation fanout to configured url (bluesky-social#1804)

* simplify moderation fanout to configured url * fix bsky mod fanout tests
OtherwiseJunk · Nov 5, 2023 · bebc4ba · bebc4ba
1 parent a3d81dd
commit bebc4ba
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 30 deletions.
diff --git a/packages/bsky/src/api/com/atproto/admin/reverseModerationAction.ts b/packages/bsky/src/api/com/atproto/admin/reverseModerationAction.ts
@@ -85,9 +85,9 @@ export default function (server: Server, ctx: AppContext) {
         return { result, restored }
       })
 
-      if (restored) {
-        const { did, subjects } = restored
-        const agent = await ctx.pdsAdminAgent(did)
+      if (restored && ctx.moderationPushAgent) {
+        const agent = ctx.moderationPushAgent
+        const { subjects } = restored
         const results = await Promise.allSettled(
           subjects.map((subject) =>
             retryHttp(() =>

diff --git a/packages/bsky/src/api/com/atproto/admin/takeModerationAction.ts b/packages/bsky/src/api/com/atproto/admin/takeModerationAction.ts
@@ -111,10 +111,10 @@ export default function (server: Server, ctx: AppContext) {
         return { result, takenDown }
       })
 
-      if (takenDown) {
+      if (takenDown && ctx.moderationPushAgent) {
+        const agent = ctx.moderationPushAgent
         const { did, subjects } = takenDown
         if (did && subjects.length > 0) {
-          const agent = await ctx.pdsAdminAgent(did)
           const results = await Promise.allSettled(
             subjects.map((subject) =>
               retryHttp(() =>

diff --git a/packages/bsky/src/api/com/atproto/admin/util.ts b/packages/bsky/src/api/com/atproto/admin/util.ts
@@ -9,8 +9,9 @@ export const getPdsAccountInfo = async (
   ctx: AppContext,
   did: string,
 ): Promise<AccountView | null> => {
+  const agent = ctx.moderationPushAgent
+  if (!agent) return null
   try {
-    const agent = await ctx.pdsAdminAgent(did)
     const res = await agent.api.com.atproto.admin.getAccountInfo({ did })
     return res.data
   } catch (err) {

diff --git a/packages/bsky/src/config.ts b/packages/bsky/src/config.ts
@@ -23,7 +23,7 @@ export interface ServerConfigValues {
   adminPassword: string
   moderatorPassword?: string
   triagePassword?: string
-  moderationActionReverseUrl?: string
+  moderationPushUrl?: string
 }
 
 export class ServerConfig {
@@ -78,8 +78,8 @@ export class ServerConfig {
     const moderatorPassword = process.env.MODERATOR_PASSWORD || undefined
     const triagePassword = process.env.TRIAGE_PASSWORD || undefined
     const labelerDid = process.env.LABELER_DID || 'did:example:labeler'
-    const moderationActionReverseUrl =
-      overrides?.moderationActionReverseUrl ||
+    const moderationPushUrl =
+      overrides?.moderationPushUrl ||
       process.env.MODERATION_PUSH_URL ||
       undefined
     return new ServerConfig({
@@ -104,7 +104,7 @@ export class ServerConfig {
       adminPassword,
       moderatorPassword,
       triagePassword,
-      moderationActionReverseUrl,
+      moderationPushUrl,
       ...stripUndefineds(overrides ?? {}),
     })
   }
@@ -206,8 +206,8 @@ export class ServerConfig {
     return this.cfg.triagePassword
   }
 
-  get moderationActionReverseUrl() {
-    return this.cfg.moderationActionReverseUrl
+  get moderationPushUrl() {
+    return this.cfg.moderationPushUrl
   }
 }
 

diff --git a/packages/bsky/src/context.ts b/packages/bsky/src/context.ts
@@ -15,6 +15,7 @@ import { LabelCache } from './label-cache'
 import { NotificationServer } from './notifications'
 
 export class AppContext {
+  public moderationPushAgent: AtpAgent | undefined
   constructor(
     private opts: {
       db: DatabaseCoordinator
@@ -30,7 +31,16 @@ export class AppContext {
       algos: MountedAlgos
       notifServer: NotificationServer
     },
-  ) {}
+  ) {
+    if (opts.cfg.moderationPushUrl) {
+      const url = new URL(opts.cfg.moderationPushUrl)
+      this.moderationPushAgent = new AtpAgent({ service: url.origin })
+      this.moderationPushAgent.api.setHeader(
+        'authorization',
+        auth.buildBasicAuth(url.username, url.password),
+      )
+    }
+  }
 
   get db(): DatabaseCoordinator {
     return this.opts.db
@@ -107,14 +117,6 @@ export class AppContext {
     })
   }
 
-  async pdsAdminAgent(did: string): Promise<AtpAgent> {
-    const data = await this.idResolver.did.resolveAtprotoData(did)
-    const agent = new AtpAgent({ service: data.pds })
-    const jwt = await this.serviceAuthJwt(did)
-    agent.api.setHeader('authorization', `Bearer ${jwt}`)
-    return agent
-  }
-
   get backgroundQueue(): BackgroundQueue {
     return this.opts.backgroundQueue
   }

diff --git a/packages/bsky/src/db/periodic-moderation-action-reversal.ts b/packages/bsky/src/db/periodic-moderation-action-reversal.ts
@@ -3,7 +3,6 @@ import { Leader } from './leader'
 import { dbLogger } from '../logger'
 import AppContext from '../context'
 import AtpAgent from '@atproto/api'
-import { buildBasicAuth } from '../auth'
 import { LabelService } from '../services/label'
 import { ModerationActionRow } from '../services/moderation'
 
@@ -18,14 +17,7 @@ export class PeriodicModerationActionReversal {
   pushAgent?: AtpAgent
 
   constructor(private appContext: AppContext) {
-    if (appContext.cfg.moderationActionReverseUrl) {
-      const url = new URL(appContext.cfg.moderationActionReverseUrl)
-      this.pushAgent = new AtpAgent({ service: url.origin })
-      this.pushAgent.api.setHeader(
-        'authorization',
-        buildBasicAuth(url.username, url.password),
-      )
-    }
+    this.pushAgent = appContext.moderationPushAgent
   }
 
   // invert label creation & negations

diff --git a/packages/dev-env/src/network.ts b/packages/dev-env/src/network.ts
@@ -40,6 +40,7 @@ export class TestNetwork extends TestNetworkNoAppView {
       dbPostgresSchema: `appview_${dbPostgresSchema}`,
       dbPrimaryPostgresUrl: dbPostgresUrl,
       redisHost,
+      moderationPushUrl: `http://admin:${ADMIN_PASSWORD}@localhost:${pdsPort}`,
       ...params.bsky,
     })
     const pds = await TestPds.create({