@atproto/bsky 0.0.15 → 0.0.16

package/tests/views/threadgating.test.ts

@@ -29,6 +29,19 @@ describe('views with thread gating', () => {
     await network.close()
   })
 
+  // check that replyDisabled state is applied correctly in a simple method like getPosts
+  const checkReplyDisabled = async (
+    uri: string,
+    user: string,
+    blocked: boolean | undefined,
+  ) => {
+    const res = await agent.api.app.bsky.feed.getPosts(
+      { uris: [uri] },
+      { headers: await network.serviceHeaders(user) },
+    )
+    expect(res.data.posts[0].viewer?.replyDisabled).toBe(blocked)
+  }
+
   it('applies gate for empty rules.', async () => {
     const post = await sc.post(sc.dids.carol, 'empty rules')
     await pdsAgent.api.app.bsky.feed.threadgate.create(
@@ -46,8 +59,9 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(thread))
     expect(forSnapshot(thread.post.threadgate)).toMatchSnapshot()
-    expect(thread.viewer).toEqual({ canReply: false })
+    expect(thread.post.viewer).toEqual({ replyDisabled: true })
     expect(thread.replies?.length).toEqual(0)
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, true)
   })
 
   it('applies gate for mention rule.', async () => {
@@ -98,7 +112,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.alice) },
     )
     assert(isThreadViewPost(aliceThread))
-    expect(aliceThread.viewer).toEqual({ canReply: false })
+    expect(aliceThread.post.viewer).toEqual({ replyDisabled: true })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, true)
     const {
       data: { thread: danThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -107,7 +122,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(danThread))
     expect(forSnapshot(danThread.post.threadgate)).toMatchSnapshot()
-    expect(danThread.viewer).toEqual({ canReply: true })
+    expect(danThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, false)
     const [reply, ...otherReplies] = danThread.replies ?? []
     assert(isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
@@ -146,7 +162,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.dan) },
     )
     assert(isThreadViewPost(danThread))
-    expect(danThread.viewer).toEqual({ canReply: false })
+    expect(danThread.post.viewer).toEqual({ replyDisabled: true })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, true)
     const {
       data: { thread: aliceThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -155,7 +172,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(aliceThread))
     expect(forSnapshot(aliceThread.post.threadgate)).toMatchSnapshot()
-    expect(aliceThread.viewer).toEqual({ canReply: true })
+    expect(aliceThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
     const [reply, ...otherReplies] = aliceThread.replies ?? []
     assert(isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
@@ -235,7 +253,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.bob) },
     )
     assert(isThreadViewPost(bobThread))
-    expect(bobThread.viewer).toEqual({ canReply: false })
+    expect(bobThread.post.viewer).toEqual({ replyDisabled: true })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.bob, true)
     const {
       data: { thread: aliceThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -243,7 +262,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.alice) },
     )
     assert(isThreadViewPost(aliceThread))
-    expect(aliceThread.viewer).toEqual({ canReply: true })
+    expect(aliceThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
     const {
       data: { thread: danThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -252,7 +272,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(danThread))
     expect(forSnapshot(danThread.post.threadgate)).toMatchSnapshot()
-    expect(danThread.viewer).toEqual({ canReply: true })
+    expect(danThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, false)
     const [reply1, reply2, ...otherReplies] = aliceThread.replies ?? []
     assert(isThreadViewPost(reply1))
     assert(isThreadViewPost(reply2))
@@ -292,8 +313,9 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(thread))
     expect(forSnapshot(thread.post.threadgate)).toMatchSnapshot()
-    expect(thread.viewer).toEqual({ canReply: false })
+    expect(thread.post.viewer).toEqual({ replyDisabled: true })
     expect(thread.replies?.length).toEqual(0)
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, true)
   })
 
   it('applies gate for multiple rules.', async () => {
@@ -339,7 +361,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.bob) },
     )
     assert(isThreadViewPost(bobThread))
-    expect(bobThread.viewer).toEqual({ canReply: false })
+    expect(bobThread.post.viewer).toEqual({ replyDisabled: true })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.bob, true)
     const {
       data: { thread: aliceThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -347,7 +370,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.alice) },
     )
     assert(isThreadViewPost(aliceThread))
-    expect(aliceThread.viewer).toEqual({ canReply: true })
+    expect(aliceThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
     const {
       data: { thread: danThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -356,7 +380,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(danThread))
     expect(forSnapshot(danThread.post.threadgate)).toMatchSnapshot()
-    expect(danThread.viewer).toEqual({ canReply: true })
+    expect(danThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, false)
     const [reply1, reply2, ...otherReplies] = aliceThread.replies ?? []
     assert(isThreadViewPost(reply1))
     assert(isThreadViewPost(reply2))
@@ -387,7 +412,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(thread))
     expect(forSnapshot(thread.post.threadgate)).toMatchSnapshot()
-    expect(thread.viewer).toEqual({ canReply: true })
+    expect(thread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
     const [reply, ...otherReplies] = thread.replies ?? []
     assert(isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
@@ -438,7 +464,8 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.dan) },
     )
     assert(isThreadViewPost(danThread))
-    expect(danThread.viewer).toEqual({ canReply: false })
+    expect(danThread.post.viewer).toEqual({ replyDisabled: true })
+    await checkReplyDisabled(orphanedReply.ref.uriStr, sc.dids.dan, true)
     const {
       data: { thread: aliceThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -451,7 +478,8 @@ describe('views with thread gating', () => {
         aliceThread.parent.uri === post.ref.uriStr,
     )
     expect(aliceThread.post.threadgate).toMatchSnapshot()
-    expect(aliceThread.viewer).toEqual({ canReply: true })
+    expect(aliceThread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(orphanedReply.ref.uriStr, sc.dids.alice, false)
     const [reply, ...otherReplies] = aliceThread.replies ?? []
     assert(isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
@@ -480,7 +508,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(thread))
     expect(forSnapshot(thread.post.threadgate)).toMatchSnapshot()
-    expect(thread.viewer).toEqual({ canReply: true })
+    expect(thread.post.viewer).toEqual({ replyDisabled: false })
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.carol, false)
     const [reply, ...otherReplies] = thread.replies ?? []
     assert(isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
@@ -516,10 +545,11 @@ describe('views with thread gating', () => {
       { headers: await network.serviceHeaders(sc.dids.alice) },
     )
     assert(isThreadViewPost(thread))
-    expect(thread.viewer).toEqual({ canReply: false }) // nobody can reply to this, not even alice.
+    expect(thread.post.viewer).toEqual({ replyDisabled: true }) // nobody can reply to this, not even alice.
     expect(thread.replies).toBeUndefined()
     expect(thread.parent).toBeUndefined()
     expect(thread.post.threadgate).toBeUndefined()
+    await checkReplyDisabled(badReply.ref.uriStr, sc.dids.alice, true)
     // check feed view
     const {
       data: { feed },
@@ -552,8 +582,9 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(threadA))
     expect(threadA.post.threadgate).toBeUndefined()
-    expect(threadA.viewer).toEqual({ canReply: true })
+    expect(threadA.post.viewer).toEqual({})
     expect(threadA.replies?.length).toEqual(1)
+    await checkReplyDisabled(postA.ref.uriStr, sc.dids.alice, undefined)
     const {
       data: { thread: threadB },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -562,7 +593,8 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(threadB))
     expect(threadB.post.threadgate).toBeUndefined()
-    expect(threadB.viewer).toEqual({ canReply: true })
+    expect(threadB.post.viewer).toEqual({})
+    await checkReplyDisabled(postB.ref.uriStr, sc.dids.alice, undefined)
     expect(threadB.replies?.length).toEqual(1)
   })
 })

package/tests/views/timeline.test.ts

@@ -1,7 +1,6 @@
 import assert from 'assert'
 import AtpAgent from '@atproto/api'
 import { TestNetwork, SeedClient } from '@atproto/dev-env'
-import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import { forSnapshot, getOriginator, paginateAll } from '../_util'
 import basicSeed from '../seeds/basic'
 import { FeedAlgorithm } from '../../src/api/app/bsky/util/feed'
@@ -182,11 +181,11 @@ describe('timeline views', () => {
   })
 
   it('blocks posts, reposts, replies by actor takedown', async () => {
-    const actionResults = await Promise.all(
+    await Promise.all(
       [bob, carol].map((did) =>
-        agent.api.com.atproto.admin.takeModerationAction(
+        agent.api.com.atproto.admin.emitModerationEvent(
           {
-            action: TAKEDOWN,
+            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
             subject: {
               $type: 'com.atproto.admin.defs#repoRef',
               did,
@@ -211,10 +210,14 @@ describe('timeline views', () => {
 
     // Cleanup
     await Promise.all(
-      actionResults.map((result) =>
-        agent.api.com.atproto.admin.reverseModerationAction(
+      [bob, carol].map((did) =>
+        agent.api.com.atproto.admin.emitModerationEvent(
           {
-            id: result.data.id,
+            event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+            subject: {
+              $type: 'com.atproto.admin.defs#repoRef',
+              did,
+            },
             createdBy: 'did:example:admin',
             reason: 'Y',
           },
@@ -230,11 +233,11 @@ describe('timeline views', () => {
   it('blocks posts, reposts, replies by record takedown.', async () => {
     const postRef1 = sc.posts[dan][1].ref // Repost
     const postRef2 = sc.replies[bob][0].ref // Post and reply parent
-    const actionResults = await Promise.all(
+    await Promise.all(
       [postRef1, postRef2].map((postRef) =>
-        agent.api.com.atproto.admin.takeModerationAction(
+        agent.api.com.atproto.admin.emitModerationEvent(
           {
-            action: TAKEDOWN,
+            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
             subject: {
               $type: 'com.atproto.repo.strongRef',
               uri: postRef.uriStr,
@@ -260,10 +263,15 @@ describe('timeline views', () => {
 
     // Cleanup
     await Promise.all(
-      actionResults.map((result) =>
-        agent.api.com.atproto.admin.reverseModerationAction(
+      [postRef1, postRef2].map((postRef) =>
+        agent.api.com.atproto.admin.emitModerationEvent(
           {
-            id: result.data.id,
+            event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+            subject: {
+              $type: 'com.atproto.repo.strongRef',
+              uri: postRef.uriStr,
+              cid: postRef.cidStr,
+            },
             createdBy: 'did:example:admin',
             reason: 'Y',
           },

package/dist/api/com/atproto/admin/resolveModerationReports.d.ts

@@ -1,3 +0,0 @@
-import { Server } from '../../../../lexicon';
-import AppContext from '../../../../context';
-export default function (server: Server, ctx: AppContext): void;

package/dist/api/com/atproto/admin/reverseModerationAction.d.ts

@@ -1,3 +0,0 @@
-import { Server } from '../../../../lexicon';
-import AppContext from '../../../../context';
-export default function (server: Server, ctx: AppContext): void;

package/dist/api/com/atproto/admin/takeModerationAction.d.ts

@@ -1,3 +0,0 @@
-import { Server } from '../../../../lexicon';
-import AppContext from '../../../../context';
-export default function (server: Server, ctx: AppContext): void;

package/dist/lexicon/types/com/atproto/admin/getModerationReport.d.ts

@@ -1,29 +0,0 @@
-import express from 'express';
-import { HandlerAuth } from '@atproto/xrpc-server';
-import * as ComAtprotoAdminDefs from './defs';
-export interface QueryParams {
-    id: number;
-}
-export declare type InputSchema = undefined;
-export declare type OutputSchema = ComAtprotoAdminDefs.ReportViewDetail;
-export declare type HandlerInput = undefined;
-export interface HandlerSuccess {
-    encoding: 'application/json';
-    body: OutputSchema;
-    headers?: {
-        [key: string]: string;
-    };
-}
-export interface HandlerError {
-    status: number;
-    message?: string;
-}
-export declare type HandlerOutput = HandlerError | HandlerSuccess;
-export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
-    auth: HA;
-    params: QueryParams;
-    input: HandlerInput;
-    req: express.Request;
-    res: express.Response;
-};
-export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/dist/lexicon/types/com/atproto/admin/resolveModerationReports.d.ts

@@ -1,36 +0,0 @@
-import express from 'express';
-import { HandlerAuth } from '@atproto/xrpc-server';
-import * as ComAtprotoAdminDefs from './defs';
-export interface QueryParams {
-}
-export interface InputSchema {
-    actionId: number;
-    reportIds: number[];
-    createdBy: string;
-    [k: string]: unknown;
-}
-export declare type OutputSchema = ComAtprotoAdminDefs.ActionView;
-export interface HandlerInput {
-    encoding: 'application/json';
-    body: InputSchema;
-}
-export interface HandlerSuccess {
-    encoding: 'application/json';
-    body: OutputSchema;
-    headers?: {
-        [key: string]: string;
-    };
-}
-export interface HandlerError {
-    status: number;
-    message?: string;
-}
-export declare type HandlerOutput = HandlerError | HandlerSuccess;
-export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
-    auth: HA;
-    params: QueryParams;
-    input: HandlerInput;
-    req: express.Request;
-    res: express.Response;
-};
-export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/dist/lexicon/types/com/atproto/admin/reverseModerationAction.d.ts

@@ -1,36 +0,0 @@
-import express from 'express';
-import { HandlerAuth } from '@atproto/xrpc-server';
-import * as ComAtprotoAdminDefs from './defs';
-export interface QueryParams {
-}
-export interface InputSchema {
-    id: number;
-    reason: string;
-    createdBy: string;
-    [k: string]: unknown;
-}
-export declare type OutputSchema = ComAtprotoAdminDefs.ActionView;
-export interface HandlerInput {
-    encoding: 'application/json';
-    body: InputSchema;
-}
-export interface HandlerSuccess {
-    encoding: 'application/json';
-    body: OutputSchema;
-    headers?: {
-        [key: string]: string;
-    };
-}
-export interface HandlerError {
-    status: number;
-    message?: string;
-}
-export declare type HandlerOutput = HandlerError | HandlerSuccess;
-export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
-    auth: HA;
-    params: QueryParams;
-    input: HandlerInput;
-    req: express.Request;
-    res: express.Response;
-};
-export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/src/api/com/atproto/admin/getModerationAction.ts

@@ -1,44 +0,0 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { addAccountInfoToRepoView, getPdsAccountInfo } from './util'
-import {
-  isRecordView,
-  isRepoView,
-} from '../../../../lexicon/types/com/atproto/admin/defs'
-
-export default function (server: Server, ctx: AppContext) {
-  server.com.atproto.admin.getModerationAction({
-    auth: ctx.roleVerifier,
-    handler: async ({ params, auth }) => {
-      const { id } = params
-      const db = ctx.db.getPrimary()
-      const moderationService = ctx.services.moderation(db)
-      const result = await moderationService.getActionOrThrow(id)
-
-      const [action, accountInfo] = await Promise.all([
-        moderationService.views.actionDetail(result),
-        getPdsAccountInfo(ctx, result.subjectDid),
-      ])
-
-      // add in pds account info if available
-      if (isRepoView(action.subject)) {
-        action.subject = addAccountInfoToRepoView(
-          action.subject,
-          accountInfo,
-          auth.credentials.moderator,
-        )
-      } else if (isRecordView(action.subject)) {
-        action.subject.repo = addAccountInfoToRepoView(
-          action.subject.repo,
-          accountInfo,
-          auth.credentials.moderator,
-        )
-      }
-
-      return {
-        encoding: 'application/json',
-        body: action,
-      }
-    },
-  })
-}

package/src/api/com/atproto/admin/getModerationReport.ts

@@ -1,43 +0,0 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import {
-  isRecordView,
-  isRepoView,
-} from '../../../../lexicon/types/com/atproto/admin/defs'
-import { addAccountInfoToRepoView, getPdsAccountInfo } from './util'
-
-export default function (server: Server, ctx: AppContext) {
-  server.com.atproto.admin.getModerationReport({
-    auth: ctx.roleVerifier,
-    handler: async ({ params, auth }) => {
-      const { id } = params
-      const db = ctx.db.getPrimary()
-      const moderationService = ctx.services.moderation(db)
-      const result = await moderationService.getReportOrThrow(id)
-      const [report, accountInfo] = await Promise.all([
-        moderationService.views.reportDetail(result),
-        getPdsAccountInfo(ctx, result.subjectDid),
-      ])
-
-      // add in pds account info if available
-      if (isRepoView(report.subject)) {
-        report.subject = addAccountInfoToRepoView(
-          report.subject,
-          accountInfo,
-          auth.credentials.moderator,
-        )
-      } else if (isRecordView(report.subject)) {
-        report.subject.repo = addAccountInfoToRepoView(
-          report.subject.repo,
-          accountInfo,
-          auth.credentials.moderator,
-        )
-      }
-
-      return {
-        encoding: 'application/json',
-        body: report,
-      }
-    },
-  })
-}

package/src/api/com/atproto/admin/resolveModerationReports.ts

@@ -1,24 +0,0 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-
-export default function (server: Server, ctx: AppContext) {
-  server.com.atproto.admin.resolveModerationReports({
-    auth: ctx.roleVerifier,
-    handler: async ({ input }) => {
-      const db = ctx.db.getPrimary()
-      const moderationService = ctx.services.moderation(db)
-      const { actionId, reportIds, createdBy } = input.body
-
-      const moderationAction = await db.transaction(async (dbTxn) => {
-        const moderationTxn = ctx.services.moderation(dbTxn)
-        await moderationTxn.resolveReports({ reportIds, actionId, createdBy })
-        return await moderationTxn.getActionOrThrow(actionId)
-      })
-
-      return {
-        encoding: 'application/json',
-        body: await moderationService.views.action(moderationAction),
-      }
-    },
-  })
-}

package/src/api/com/atproto/admin/reverseModerationAction.ts

@@ -1,115 +0,0 @@
-import {
-  AuthRequiredError,
-  InvalidRequestError,
-  UpstreamFailureError,
-} from '@atproto/xrpc-server'
-import {
-  ACKNOWLEDGE,
-  ESCALATE,
-  TAKEDOWN,
-} from '../../../../lexicon/types/com/atproto/admin/defs'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { retryHttp } from '../../../../util/retry'
-
-export default function (server: Server, ctx: AppContext) {
-  server.com.atproto.admin.reverseModerationAction({
-    auth: ctx.roleVerifier,
-    handler: async ({ input, auth }) => {
-      const access = auth.credentials
-      const db = ctx.db.getPrimary()
-      const moderationService = ctx.services.moderation(db)
-      const { id, createdBy, reason } = input.body
-
-      const { result, restored } = await db.transaction(async (dbTxn) => {
-        const moderationTxn = ctx.services.moderation(dbTxn)
-        const labelTxn = ctx.services.label(dbTxn)
-        const now = new Date()
-
-        const existing = await moderationTxn.getAction(id)
-        if (!existing) {
-          throw new InvalidRequestError('Moderation action does not exist')
-        }
-        if (existing.reversedAt !== null) {
-          throw new InvalidRequestError(
-            'Moderation action has already been reversed',
-          )
-        }
-
-        // apply access rules
-
-        // if less than moderator access then can only reverse ack and escalation actions
-        if (
-          !access.moderator &&
-          ![ACKNOWLEDGE, ESCALATE].includes(existing.action)
-        ) {
-          throw new AuthRequiredError(
-            'Must be a full moderator to reverse this type of action',
-          )
-        }
-        // if less than moderator access then cannot reverse takedown on an account
-        if (
-          !access.moderator &&
-          existing.action === TAKEDOWN &&
-          existing.subjectType === 'com.atproto.admin.defs#repoRef'
-        ) {
-          throw new AuthRequiredError(
-            'Must be a full moderator to reverse an account takedown',
-          )
-        }
-
-        const { result, restored } = await moderationTxn.revertAction({
-          id,
-          createdAt: now,
-          createdBy,
-          reason,
-        })
-
-        // invert creates & negates
-        const { createLabelVals, negateLabelVals } = result
-        const negate =
-          createLabelVals && createLabelVals.length > 0
-            ? createLabelVals.split(' ')
-            : undefined
-        const create =
-          negateLabelVals && negateLabelVals.length > 0
-            ? negateLabelVals.split(' ')
-            : undefined
-        await labelTxn.formatAndCreate(
-          ctx.cfg.labelerDid,
-          result.subjectUri ?? result.subjectDid,
-          result.subjectCid,
-          { create, negate },
-        )
-
-        return { result, restored }
-      })
-
-      if (restored && ctx.moderationPushAgent) {
-        const agent = ctx.moderationPushAgent
-        const { subjects } = restored
-        const results = await Promise.allSettled(
-          subjects.map((subject) =>
-            retryHttp(() =>
-              agent.api.com.atproto.admin.updateSubjectStatus({
-                subject,
-                takedown: {
-                  applied: false,
-                },
-              }),
-            ),
-          ),
-        )
-        const hadFailure = results.some((r) => r.status === 'rejected')
-        if (hadFailure) {
-          throw new UpstreamFailureError('failed to revert action on PDS')
-        }
-      }
-
-      return {
-        encoding: 'application/json',
-        body: await moderationService.views.action(result),
-      }
-    },
-  })
-}