@atproto/bsky 0.0.15 → 0.0.16

package/tests/admin/repo-search.test.ts

@@ -1,6 +1,5 @@
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import AtpAgent from '@atproto/api'
-import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import { paginateAll } from '../_util'
 import usersBulkSeed from '../seeds/users-bulk'
 
@@ -25,8 +24,8 @@ describe('admin repo search view', () => {
   })
 
   beforeAll(async () => {
-    await sc.takeModerationAction({
-      action: TAKEDOWN,
+    await sc.emitModerationEvent({
+      event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
       subject: {
         $type: 'com.atproto.admin.defs#repoRef',
         did: sc.dids['cara-wiegand69.test'],

package/tests/auto-moderator/fuzzy-matcher.test.ts

@@ -37,7 +37,8 @@ describe('fuzzy matcher', () => {
   const getAllReports = () => {
     return network.bsky.ctx.db
       .getPrimary()
-      .db.selectFrom('moderation_report')
+      .db.selectFrom('moderation_event')
+      .where('action', '=', 'com.atproto.admin.defs#modEventReport')
       .selectAll()
       .orderBy('id', 'asc')
       .execute()

package/tests/auto-moderator/takedowns.test.ts

@@ -77,28 +77,41 @@ describe('takedowner', () => {
     const post = await sc.post(alice, 'blah', undefined, [goodBlob, badBlob1])
     await network.processAll()
     await autoMod.processAll()
-    const modAction = await ctx.db.db
-      .selectFrom('moderation_action')
-      .where('subjectUri', '=', post.ref.uriStr)
-      .select(['action', 'id'])
-      .executeTakeFirst()
-    if (!modAction) {
+    const [modStatus, takedownEvent] = await Promise.all([
+      ctx.db.db
+        .selectFrom('moderation_subject_status')
+        .where('did', '=', alice)
+        .where(
+          'recordPath',
+          '=',
+          `${post.ref.uri.collection}/${post.ref.uri.rkey}`,
+        )
+        .select(['takendown', 'id'])
+        .executeTakeFirst(),
+      ctx.db.db
+        .selectFrom('moderation_event')
+        .where('subjectDid', '=', alice)
+        .where('action', '=', 'com.atproto.admin.defs#modEventTakedown')
+        .selectAll()
+        .executeTakeFirst(),
+    ])
+    if (!modStatus || !takedownEvent) {
       throw new Error('expected mod action')
     }
-    expect(modAction.action).toEqual('com.atproto.admin.defs#takedown')
+    expect(modStatus.takendown).toEqual(true)
     const record = await ctx.db.db
       .selectFrom('record')
       .where('uri', '=', post.ref.uriStr)
       .select('takedownId')
       .executeTakeFirst()
-    expect(record?.takedownId).toEqual(modAction.id)
+    expect(record?.takedownId).toBeGreaterThan(0)
 
     const recordPds = await network.pds.ctx.db.db
       .selectFrom('record')
       .where('uri', '=', post.ref.uriStr)
       .select('takedownRef')
       .executeTakeFirst()
-    expect(recordPds?.takedownRef).toEqual(modAction.id.toString())
+    expect(recordPds?.takedownRef).toEqual(takedownEvent.id.toString())
 
     expect(testInvalidator.invalidated.length).toBe(1)
     expect(testInvalidator.invalidated[0].subject).toBe(
@@ -119,28 +132,42 @@ describe('takedowner', () => {
       { headers: sc.getHeaders(alice), encoding: 'application/json' },
     )
     await network.processAll()
-    const modAction = await ctx.db.db
-      .selectFrom('moderation_action')
-      .where('subjectUri', '=', res.data.uri)
-      .select(['action', 'id'])
-      .executeTakeFirst()
-    if (!modAction) {
+    const [modStatus, takedownEvent] = await Promise.all([
+      ctx.db.db
+        .selectFrom('moderation_subject_status')
+        .where('did', '=', alice)
+        .where('recordPath', '=', `${ids.AppBskyActorProfile}/self`)
+        .select(['takendown', 'id'])
+        .executeTakeFirst(),
+      ctx.db.db
+        .selectFrom('moderation_event')
+        .where('subjectDid', '=', alice)
+        .where(
+          'subjectUri',
+          '=',
+          AtUri.make(alice, ids.AppBskyActorProfile, 'self').toString(),
+        )
+        .where('action', '=', 'com.atproto.admin.defs#modEventTakedown')
+        .selectAll()
+        .executeTakeFirst(),
+    ])
+    if (!modStatus || !takedownEvent) {
       throw new Error('expected mod action')
     }
-    expect(modAction.action).toEqual('com.atproto.admin.defs#takedown')
+    expect(modStatus.takendown).toEqual(true)
     const record = await ctx.db.db
       .selectFrom('record')
       .where('uri', '=', res.data.uri)
       .select('takedownId')
       .executeTakeFirst()
-    expect(record?.takedownId).toEqual(modAction.id)
+    expect(record?.takedownId).toBeGreaterThan(0)
 
     const recordPds = await network.pds.ctx.db.db
       .selectFrom('record')
       .where('uri', '=', res.data.uri)
       .select('takedownRef')
       .executeTakeFirst()
-    expect(recordPds?.takedownRef).toEqual(modAction.id.toString())
+    expect(recordPds?.takedownRef).toEqual(takedownEvent.id.toString())
 
     expect(testInvalidator.invalidated.length).toBe(2)
     expect(testInvalidator.invalidated[1].subject).toBe(

package/tests/feed-generation.test.ts

@@ -9,7 +9,6 @@ import {
 import { Handler as SkeletonHandler } from '../src/lexicon/types/app/bsky/feed/getFeedSkeleton'
 import { GeneratorView } from '@atproto/api/src/client/types/app/bsky/feed/defs'
 import { UnknownFeedError } from '@atproto/api/src/client/types/app/bsky/feed/getFeed'
-import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import { ids } from '../src/lexicon/lexicons'
 import {
   FeedViewPost,
@@ -17,6 +16,9 @@ import {
 } from '../src/lexicon/types/app/bsky/feed/defs'
 import basicSeed from './seeds/basic'
 import { forSnapshot, paginateAll } from './_util'
+import { AuthRequiredError } from '@atproto/xrpc-server'
+import assert from 'assert'
+import { XRPCError } from '@atproto/xrpc'
 
 describe('feed generation', () => {
   let network: TestNetwork
@@ -33,6 +35,7 @@ describe('feed generation', () => {
   let feedUriBadPagination: string
   let feedUriPrime: string // Taken-down
   let feedUriPrimeRef: RecordRef
+  let feedUriNeedsAuth: string
 
   beforeAll(async () => {
     network = await TestNetwork.create({
@@ -52,11 +55,17 @@ describe('feed generation', () => {
     )
     const evenUri = AtUri.make(alice, 'app.bsky.feed.generator', 'even')
     const primeUri = AtUri.make(alice, 'app.bsky.feed.generator', 'prime')
+    const needsAuthUri = AtUri.make(
+      alice,
+      'app.bsky.feed.generator',
+      'needs-auth',
+    )
     gen = await network.createFeedGen({
       [allUri.toString()]: feedGenHandler('all'),
       [evenUri.toString()]: feedGenHandler('even'),
       [feedUriBadPagination.toString()]: feedGenHandler('bad-pagination'),
       [primeUri.toString()]: feedGenHandler('prime'),
+      [needsAuthUri.toString()]: feedGenHandler('needs-auth'),
     })
 
     const feedSuggestions = [
@@ -137,10 +146,20 @@ describe('feed generation', () => {
       },
       sc.getHeaders(alice),
     )
+    const needsAuth = await pdsAgent.api.app.bsky.feed.generator.create(
+      { repo: alice, rkey: 'needs-auth' },
+      {
+        did: gen.did,
+        displayName: 'Needs Auth',
+        description: 'Provides all feed candidates when authed',
+        createdAt: new Date().toISOString(),
+      },
+      sc.getHeaders(alice),
+    )
     await network.processAll()
-    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: prime.uri,
@@ -161,6 +180,7 @@ describe('feed generation', () => {
     feedUriBadPagination = badPagination.uri
     feedUriPrime = prime.uri
     feedUriPrimeRef = new RecordRef(prime.uri, prime.cid)
+    feedUriNeedsAuth = needsAuth.uri
   })
 
   it('feed gen records can be updated', async () => {
@@ -198,11 +218,12 @@ describe('feed generation', () => {
 
     const paginatedAll: GeneratorView[] = results(await paginateAll(paginator))
 
-    expect(paginatedAll.length).toEqual(4)
+    expect(paginatedAll.length).toEqual(5)
     expect(paginatedAll[0].uri).toEqual(feedUriOdd)
-    expect(paginatedAll[1].uri).toEqual(feedUriBadPagination)
-    expect(paginatedAll[2].uri).toEqual(feedUriEven)
-    expect(paginatedAll[3].uri).toEqual(feedUriAll)
+    expect(paginatedAll[1].uri).toEqual(feedUriNeedsAuth)
+    expect(paginatedAll[2].uri).toEqual(feedUriBadPagination)
+    expect(paginatedAll[3].uri).toEqual(feedUriEven)
+    expect(paginatedAll[4].uri).toEqual(feedUriAll)
     expect(paginatedAll.map((fg) => fg.uri)).not.toContain(feedUriPrime) // taken-down
     expect(forSnapshot(paginatedAll)).toMatchSnapshot()
   })
@@ -348,7 +369,9 @@ describe('feed generation', () => {
           {},
           { headers: await network.serviceHeaders(sc.dids.bob) },
         )
-      expect(resEven.data.feeds.map((f) => f.likeCount)).toEqual([2, 0, 0, 0])
+      expect(resEven.data.feeds.map((f) => f.likeCount)).toEqual([
+        2, 0, 0, 0, 0,
+      ])
       expect(resEven.data.feeds.map((f) => f.uri)).not.toContain(feedUriPrime) // taken-down
     })
 
@@ -389,6 +412,16 @@ describe('feed generation', () => {
       expect(forSnapshot(feed.data.feed)).toMatchSnapshot()
     })
 
+    it('resolves basic feed contents without auth.', async () => {
+      const feed = await agent.api.app.bsky.feed.getFeed({ feed: feedUriEven })
+      expect(feed.data.feed.map((item) => item.post.uri)).toEqual([
+        sc.posts[sc.dids.alice][0].ref.uriStr,
+        sc.posts[sc.dids.carol][0].ref.uriStr,
+        sc.replies[sc.dids.carol][0].ref.uriStr,
+      ])
+      expect(forSnapshot(feed.data.feed)).toMatchSnapshot()
+    })
+
     it('paginates, handling replies and reposts.', async () => {
       const results = (results) => results.flatMap((res) => res.feed)
       const paginator = async (cursor?: string) => {
@@ -461,6 +494,16 @@ describe('feed generation', () => {
       expect(feed.data['$auth']?.['iss']).toEqual(alice)
     })
 
+    it('passes through auth error from feed.', async () => {
+      const tryGetFeed = agent.api.app.bsky.feed.getFeed({
+        feed: feedUriNeedsAuth,
+      })
+      const err = await tryGetFeed.catch((err) => err)
+      assert(err instanceof XRPCError)
+      expect(err.status).toBe(401)
+      expect(err.message).toBe('This feed requires auth')
+    })
+
     it('provides timing info in server-timing header.', async () => {
       const result = await agent.api.app.bsky.feed.getFeed(
         { feed: feedUriEven },
@@ -482,8 +525,13 @@ describe('feed generation', () => {
   })
 
   const feedGenHandler =
-    (feedName: 'even' | 'all' | 'prime' | 'bad-pagination'): SkeletonHandler =>
+    (
+      feedName: 'even' | 'all' | 'prime' | 'bad-pagination' | 'needs-auth',
+    ): SkeletonHandler =>
     async ({ req, params }) => {
+      if (feedName === 'needs-auth' && !req.headers.authorization) {
+        throw new AuthRequiredError('This feed requires auth')
+      }
       const { limit, cursor } = params
       const candidates: SkeletonFeedPost[] = [
         { post: sc.posts[sc.dids.alice][0].ref.uriStr },

package/tests/views/__snapshots__/block-lists.test.ts.snap

@@ -126,9 +126,6 @@ Object {
       "uri": "record(0)",
       "viewer": Object {},
     },
-    "viewer": Object {
-      "canReply": true,
-    },
   },
 }
 `;
@@ -204,9 +201,6 @@ Object {
       "viewer": Object {},
     },
     "replies": Array [],
-    "viewer": Object {
-      "canReply": true,
-    },
   },
 }
 `;
@@ -288,9 +282,6 @@ Object {
         "uri": "record(7)",
       },
     ],
-    "viewer": Object {
-      "canReply": true,
-    },
   },
 }
 `;
@@ -498,6 +489,7 @@ Object {
           "muted": false,
         },
       },
+      "uri": "record(4)",
     },
     Object {
       "subject": Object {
@@ -522,6 +514,7 @@ Object {
           "muted": false,
         },
       },
+      "uri": "record(5)",
     },
     Object {
       "subject": Object {
@@ -550,6 +543,7 @@ Object {
           "muted": false,
         },
       },
+      "uri": "record(6)",
     },
   ],
   "list": Object {

package/tests/views/__snapshots__/blocks.test.ts.snap

@@ -126,9 +126,6 @@ Object {
       "uri": "record(0)",
       "viewer": Object {},
     },
-    "viewer": Object {
-      "canReply": true,
-    },
   },
 }
 `;
@@ -204,9 +201,6 @@ Object {
       "viewer": Object {},
     },
     "replies": Array [],
-    "viewer": Object {
-      "canReply": true,
-    },
   },
 }
 `;
@@ -359,9 +353,6 @@ Object {
         },
       },
     ],
-    "viewer": Object {
-      "canReply": true,
-    },
   },
 }
 `;

package/tests/views/__snapshots__/mute-lists.test.ts.snap

@@ -292,9 +292,6 @@ Object {
       },
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -498,6 +495,7 @@ Object {
           "muted": false,
         },
       },
+      "uri": "record(3)",
     },
     Object {
       "subject": Object {
@@ -506,7 +504,7 @@ Object {
         "labels": Array [],
         "viewer": Object {
           "blockedBy": false,
-          "followedBy": "record(3)",
+          "followedBy": "record(5)",
           "muted": true,
           "mutedByList": Object {
             "avatar": "https://bsky.public.url/img/avatar/plain/user(0)/cids(1)@jpeg",
@@ -521,6 +519,7 @@ Object {
           },
         },
       },
+      "uri": "record(4)",
     },
     Object {
       "subject": Object {
@@ -533,7 +532,7 @@ Object {
         "labels": Array [],
         "viewer": Object {
           "blockedBy": false,
-          "following": "record(4)",
+          "following": "record(7)",
           "muted": true,
           "mutedByList": Object {
             "avatar": "https://bsky.public.url/img/avatar/plain/user(0)/cids(1)@jpeg",
@@ -548,6 +547,7 @@ Object {
           },
         },
       },
+      "uri": "record(6)",
     },
   ],
   "list": Object {

package/tests/views/__snapshots__/mutes.test.ts.snap

@@ -269,8 +269,5 @@ Object {
       },
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;

package/tests/views/__snapshots__/thread.test.ts.snap

@@ -195,9 +195,6 @@ Object {
     },
   },
   "replies": Array [],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -437,9 +434,6 @@ Object {
       ],
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -615,9 +609,6 @@ Object {
       },
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -771,9 +762,6 @@ Object {
       ],
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -826,9 +814,6 @@ Object {
     "viewer": Object {},
   },
   "replies": Array [],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -896,9 +881,6 @@ Object {
     "viewer": Object {},
   },
   "replies": Array [],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -968,9 +950,6 @@ Object {
     },
   },
   "replies": Array [],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -1040,9 +1019,6 @@ Object {
     },
   },
   "replies": Array [],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -1243,9 +1219,6 @@ Object {
       ],
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -1384,8 +1357,5 @@ Object {
       "replies": Array [],
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;

package/tests/views/actor-search.test.ts

@@ -1,7 +1,6 @@
 import AtpAgent from '@atproto/api'
 import { wait } from '@atproto/common'
 import { TestNetwork, SeedClient } from '@atproto/dev-env'
-import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import { forSnapshot, paginateAll, stripViewer } from '../_util'
 import usersBulkSeed from '../seeds/users-bulk'
 
@@ -240,9 +239,9 @@ describe.skip('pds actor search views', () => {
   })
 
   it('search blocks by actor takedown', async () => {
-    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: sc.dids['cara-wiegand69.test'],

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

@@ -2,7 +2,6 @@ import AtpAgent from '@atproto/api'
 import { TestNetwork, SeedClient } 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'
 import { isRecord } from '../../src/lexicon/types/app/bsky/feed/post'
 import { isView as isEmbedRecordWithMedia } from '../../src/lexicon/types/app/bsky/embed/recordWithMedia'
 import { isView as isImageEmbed } from '../../src/lexicon/types/app/bsky/embed/images'
@@ -146,22 +145,21 @@ describe('pds author feed views', () => {
 
     expect(preBlock.feed.length).toBeGreaterThan(0)
 
-    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 attempt = agent.api.app.bsky.feed.getAuthorFeed(
       { actor: alice },
@@ -170,9 +168,13 @@ describe('pds author feed views', () => {
     await expect(attempt).rejects.toThrow('Profile not found')
 
     // 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',
       },
@@ -193,23 +195,22 @@ describe('pds author feed views', () => {
 
     const post = preBlock.feed[0].post
 
-    const { data: action } =
-      await agent.api.com.atproto.admin.takeModerationAction(
-        {
-          action: TAKEDOWN,
-          subject: {
-            $type: 'com.atproto.repo.strongRef',
-            uri: post.uri,
-            cid: post.cid,
-          },
-          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.repo.strongRef',
+          uri: post.uri,
+          cid: post.cid,
         },
-      )
+        createdBy: 'did:example:admin',
+        reason: 'Y',
+      },
+      {
+        encoding: 'application/json',
+        headers: network.pds.adminAuthHeaders(),
+      },
+    )
 
     const { data: postBlock } = await agent.api.app.bsky.feed.getAuthorFeed(
       { actor: alice },
@@ -220,9 +221,14 @@ describe('pds author feed views', () => {
     expect(postBlock.feed.map((item) => item.post.uri)).not.toContain(post.uri)
 
     // 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.repo.strongRef',
+          uri: post.uri,
+          cid: post.cid,
+        },
         createdBy: 'did:example:admin',
         reason: 'Y',
       },