@atproto/bsky 0.0.15 → 0.0.16

package/tests/views/follows.test.ts

@@ -2,7 +2,6 @@ import AtpAgent from '@atproto/api'
 import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { forSnapshot, paginateAll, stripViewer } from '../_util'
 import followsSeed from '../seeds/follows'
-import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 
 describe('pds follow views', () => {
   let agent: AtpAgent
@@ -121,22 +120,21 @@ describe('pds follow views', () => {
   })
 
   it('blocks followers by actor takedown', async () => {
-    const { data: modAction } =
-      await agent.api.com.atproto.admin.takeModerationAction(
-        {
-          action: TAKEDOWN,
-          subject: {
-            $type: 'com.atproto.admin.defs#repoRef',
-            did: sc.dids.dan,
-          },
-          createdBy: 'did:example:admin',
-          reason: 'Y',
-        },
-        {
-          encoding: 'application/json',
-          headers: network.pds.adminAuthHeaders(),
+    await agent.api.com.atproto.admin.emitModerationEvent(
+      {
+        event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: sc.dids.dan,
         },
-      )
+        createdBy: 'did:example:admin',
+        reason: 'Y',
+      },
+      {
+        encoding: 'application/json',
+        headers: network.pds.adminAuthHeaders(),
+      },
+    )
 
     const aliceFollowers = await agent.api.app.bsky.graph.getFollowers(
       { actor: sc.dids.alice },
@@ -147,9 +145,13 @@ describe('pds follow views', () => {
       sc.dids.dan,
     )
 
-    await agent.api.com.atproto.admin.reverseModerationAction(
+    await agent.api.com.atproto.admin.emitModerationEvent(
       {
-        id: modAction.id,
+        event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: sc.dids.dan,
+        },
         createdBy: 'did:example:admin',
         reason: 'Y',
       },
@@ -250,22 +252,21 @@ describe('pds follow views', () => {
   })
 
   it('blocks follows by actor takedown', async () => {
-    const { data: modAction } =
-      await agent.api.com.atproto.admin.takeModerationAction(
-        {
-          action: TAKEDOWN,
-          subject: {
-            $type: 'com.atproto.admin.defs#repoRef',
-            did: sc.dids.dan,
-          },
-          createdBy: 'did:example:admin',
-          reason: 'Y',
-        },
-        {
-          encoding: 'application/json',
-          headers: network.pds.adminAuthHeaders(),
+    await agent.api.com.atproto.admin.emitModerationEvent(
+      {
+        event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: sc.dids.dan,
         },
-      )
+        createdBy: 'did:example:admin',
+        reason: 'Y',
+      },
+      {
+        encoding: 'application/json',
+        headers: network.pds.adminAuthHeaders(),
+      },
+    )
 
     const aliceFollows = await agent.api.app.bsky.graph.getFollows(
       { actor: sc.dids.alice },
@@ -276,9 +277,13 @@ describe('pds follow views', () => {
       sc.dids.dan,
     )
 
-    await agent.api.com.atproto.admin.reverseModerationAction(
+    await agent.api.com.atproto.admin.emitModerationEvent(
       {
-        id: modAction.id,
+        event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: sc.dids.dan,
+        },
         createdBy: 'did:example:admin',
         reason: 'Y',
       },

package/tests/views/list-feed.test.ts

@@ -2,7 +2,6 @@ import AtpAgent from '@atproto/api'
 import { TestNetwork, SeedClient, RecordRef } from '@atproto/dev-env'
 import { forSnapshot, paginateAll, stripViewerFromPost } from '../_util'
 import basicSeed from '../seeds/basic'
-import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 
 describe('list feed views', () => {
   let network: TestNetwork
@@ -113,9 +112,9 @@ describe('list feed views', () => {
   })
 
   it('blocks posts by actor takedown', async () => {
-    const actionRes = await agent.api.com.atproto.admin.takeModerationAction(
+    await agent.api.com.atproto.admin.emitModerationEvent(
       {
-        action: TAKEDOWN,
+        event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
         subject: {
           $type: 'com.atproto.admin.defs#repoRef',
           did: bob,
@@ -136,9 +135,13 @@ describe('list feed views', () => {
     expect(hasBob).toBe(false)
 
     // Cleanup
-    await agent.api.com.atproto.admin.reverseModerationAction(
+    await agent.api.com.atproto.admin.emitModerationEvent(
       {
-        id: actionRes.data.id,
+        event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: bob,
+        },
         createdBy: 'did:example:admin',
         reason: 'Y',
       },
@@ -151,9 +154,9 @@ describe('list feed views', () => {
 
   it('blocks posts by record takedown.', async () => {
     const postRef = sc.replies[bob][0].ref // Post and reply parent
-    const actionRes = await agent.api.com.atproto.admin.takeModerationAction(
+    await agent.api.com.atproto.admin.emitModerationEvent(
       {
-        action: TAKEDOWN,
+        event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
         subject: {
           $type: 'com.atproto.repo.strongRef',
           uri: postRef.uriStr,
@@ -177,9 +180,14 @@ describe('list feed views', () => {
     expect(hasPost).toBe(false)
 
     // Cleanup
-    await agent.api.com.atproto.admin.reverseModerationAction(
+    await agent.api.com.atproto.admin.emitModerationEvent(
       {
-        id: actionRes.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/tests/views/notifications.test.ts

@@ -1,6 +1,5 @@
 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, paginateAll } from '../_util'
 import basicSeed from '../seeds/basic'
 import { Notification } from '../../src/lexicon/types/app/bsky/notification/listNotifications'
@@ -61,7 +60,7 @@ describe('notification views', () => {
       { headers: await network.serviceHeaders(sc.dids.bob) },
     )
 
-    expect(notifCountBob.data.count).toBe(4)
+    expect(notifCountBob.data.count).toBeGreaterThanOrEqual(3)
   })
 
   it('generates notifications for all reply ancestors', async () => {
@@ -89,7 +88,7 @@ describe('notification views', () => {
       { headers: await network.serviceHeaders(sc.dids.bob) },
     )
 
-    expect(notifCountBob.data.count).toBe(5)
+    expect(notifCountBob.data.count).toBeGreaterThanOrEqual(4)
   })
 
   it('does not give notifs for a deleted subject', async () => {
@@ -233,11 +232,11 @@ describe('notification views', () => {
   it('fetches notifications omitting mentions and replies for taken-down posts', async () => {
     const postRef1 = sc.replies[sc.dids.carol][0].ref // Reply
     const postRef2 = sc.posts[sc.dids.dan][1].ref // Mention
-    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,
@@ -270,10 +269,15 @@ describe('notification 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/tests/views/profile.test.ts

@@ -1,7 +1,6 @@
 import fs from 'fs/promises'
 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, stripViewer } from '../_util'
 import { ids } from '../../src/lexicon/lexicons'
 import basicSeed from '../seeds/basic'
@@ -186,22 +185,21 @@ describe('pds profile views', () => {
   })
 
   it('blocked by actor takedown', async () => {
-    const { data: action } =
-      await agent.api.com.atproto.admin.takeModerationAction(
-        {
-          action: TAKEDOWN,
-          subject: {
-            $type: 'com.atproto.admin.defs#repoRef',
-            did: alice,
-          },
-          createdBy: 'did:example:admin',
-          reason: 'Y',
-        },
-        {
-          encoding: 'application/json',
-          headers: network.pds.adminAuthHeaders(),
+    await agent.api.com.atproto.admin.emitModerationEvent(
+      {
+        event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: alice,
         },
-      )
+        createdBy: 'did:example:admin',
+        reason: 'Y',
+      },
+      {
+        encoding: 'application/json',
+        headers: network.pds.adminAuthHeaders(),
+      },
+    )
     const promise = agent.api.app.bsky.actor.getProfile(
       { actor: alice },
       { headers: await network.serviceHeaders(bob) },
@@ -210,9 +208,13 @@ describe('pds profile views', () => {
     await expect(promise).rejects.toThrow('Account has been taken down')
 
     // Cleanup
-    await agent.api.com.atproto.admin.reverseModerationAction(
+    await agent.api.com.atproto.admin.emitModerationEvent(
       {
-        id: action.id,
+        event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: alice,
+        },
         createdBy: 'did:example:admin',
         reason: 'Y',
       },

package/tests/views/thread.test.ts

@@ -1,6 +1,5 @@
 import AtpAgent, { AppBskyFeedGetPostThread } from '@atproto/api'
 import { TestNetwork, SeedClient } from '@atproto/dev-env'
-import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import { forSnapshot, stripViewerFromThread } from '../_util'
 import basicSeed from '../seeds/basic'
 import assert from 'assert'
@@ -167,9 +166,9 @@ describe('pds thread views', () => {
   describe('takedown', () => {
     it('blocks post by actor', async () => {
       const { data: modAction } =
-        await agent.api.com.atproto.admin.takeModerationAction(
+        await agent.api.com.atproto.admin.emitModerationEvent(
           {
-            action: TAKEDOWN,
+            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
             subject: {
               $type: 'com.atproto.admin.defs#repoRef',
               did: alice,
@@ -194,9 +193,13 @@ describe('pds thread views', () => {
       )
 
       // Cleanup
-      await agent.api.com.atproto.admin.reverseModerationAction(
+      await agent.api.com.atproto.admin.emitModerationEvent(
         {
-          id: modAction.id,
+          event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: alice,
+          },
           createdBy: 'did:example:admin',
           reason: 'Y',
         },
@@ -209,9 +212,9 @@ describe('pds thread views', () => {
 
     it('blocks replies by actor', async () => {
       const { data: modAction } =
-        await agent.api.com.atproto.admin.takeModerationAction(
+        await agent.api.com.atproto.admin.emitModerationEvent(
           {
-            action: TAKEDOWN,
+            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
             subject: {
               $type: 'com.atproto.admin.defs#repoRef',
               did: carol,
@@ -234,9 +237,13 @@ describe('pds thread views', () => {
       expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
 
       // Cleanup
-      await agent.api.com.atproto.admin.reverseModerationAction(
+      await agent.api.com.atproto.admin.emitModerationEvent(
         {
-          id: modAction.id,
+          event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: carol,
+          },
           createdBy: 'did:example:admin',
           reason: 'Y',
         },
@@ -249,9 +256,9 @@ describe('pds thread views', () => {
 
     it('blocks ancestors by actor', async () => {
       const { data: modAction } =
-        await agent.api.com.atproto.admin.takeModerationAction(
+        await agent.api.com.atproto.admin.emitModerationEvent(
           {
-            action: TAKEDOWN,
+            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
             subject: {
               $type: 'com.atproto.admin.defs#repoRef',
               did: bob,
@@ -274,9 +281,13 @@ describe('pds thread views', () => {
       expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
 
       // Cleanup
-      await agent.api.com.atproto.admin.reverseModerationAction(
+      await agent.api.com.atproto.admin.emitModerationEvent(
         {
-          id: modAction.id,
+          event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: bob,
+          },
           createdBy: 'did:example:admin',
           reason: 'Y',
         },
@@ -290,9 +301,9 @@ describe('pds thread views', () => {
     it('blocks post by record', async () => {
       const postRef = sc.posts[alice][1].ref
       const { data: modAction } =
-        await agent.api.com.atproto.admin.takeModerationAction(
+        await agent.api.com.atproto.admin.emitModerationEvent(
           {
-            action: TAKEDOWN,
+            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
             subject: {
               $type: 'com.atproto.repo.strongRef',
               uri: postRef.uriStr,
@@ -317,9 +328,14 @@ describe('pds thread views', () => {
       )
 
       // Cleanup
-      await agent.api.com.atproto.admin.reverseModerationAction(
+      await agent.api.com.atproto.admin.emitModerationEvent(
         {
-          id: modAction.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',
         },
@@ -339,9 +355,9 @@ describe('pds thread views', () => {
       const parent = threadPreTakedown.data.thread.parent?.['post']
 
       const { data: modAction } =
-        await agent.api.com.atproto.admin.takeModerationAction(
+        await agent.api.com.atproto.admin.emitModerationEvent(
           {
-            action: TAKEDOWN,
+            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
             subject: {
               $type: 'com.atproto.repo.strongRef',
               uri: parent.uri,
@@ -365,9 +381,14 @@ describe('pds thread views', () => {
       expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
 
       // Cleanup
-      await agent.api.com.atproto.admin.reverseModerationAction(
+      await agent.api.com.atproto.admin.emitModerationEvent(
         {
-          id: modAction.id,
+          event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+          subject: {
+            $type: 'com.atproto.repo.strongRef',
+            uri: parent.uri,
+            cid: parent.cid,
+          },
           createdBy: 'did:example:admin',
           reason: 'Y',
         },
@@ -388,9 +409,9 @@ describe('pds thread views', () => {
 
       const actionResults = await Promise.all(
         [post1, post2].map((post) =>
-          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: post.uri,
@@ -417,10 +438,17 @@ describe('pds thread views', () => {
 
       // Cleanup
       await Promise.all(
-        actionResults.map((result) =>
-          agent.api.com.atproto.admin.reverseModerationAction(
+        [post1, post2].map((post) =>
+          agent.api.com.atproto.admin.emitModerationEvent(
             {
-              id: result.data.id,
+              event: {
+                $type: 'com.atproto.admin.defs#modEventReverseTakedown',
+              },
+              subject: {
+                $type: 'com.atproto.repo.strongRef',
+                uri: post.uri,
+                cid: post.cid,
+              },
               createdBy: 'did:example:admin',
               reason: 'Y',
             },