@atproto/pds 0.4.94 → 0.4.96

package/src/repo/prepare.ts

@@ -24,12 +24,13 @@ import {
 } from '@atproto/syntax'
 import { hasExplicitSlur } from '../handle/explicit-slurs'
 import * as lex from '../lexicon/lexicons'
-import { isRecord as isProfile } from '../lexicon/types/app/bsky/actor/profile'
-import { isRecord as isFeedGenerator } from '../lexicon/types/app/bsky/feed/generator'
-import { isRecord as isPost } from '../lexicon/types/app/bsky/feed/post'
-import { isRecord as isList } from '../lexicon/types/app/bsky/graph/list'
-import { isRecord as isStarterPack } from '../lexicon/types/app/bsky/graph/starterpack'
+import * as AppBskyActorProfile from '../lexicon/types/app/bsky/actor/profile'
+import * as AppBskyFeedGenerator from '../lexicon/types/app/bsky/feed/generator'
+import * as AppBskyFeedPost from '../lexicon/types/app/bsky/feed/post'
+import * as AppBskyGraphList from '../lexicon/types/app/bsky/graph/list'
+import * as AppBskyGraphStarterpack from '../lexicon/types/app/bsky/graph/starterpack'
 import { isTag } from '../lexicon/types/app/bsky/richtext/facet'
+import { asPredicate } from '../lexicon/util'
 import {
   InvalidRecordError,
   PreparedBlobRef,
@@ -40,6 +41,12 @@ import {
   ValidationStatus,
 } from './types'
 
+const isValidFeedGenerator = asPredicate(AppBskyFeedGenerator.validateRecord)
+const isValidStarterPack = asPredicate(AppBskyGraphStarterpack.validateRecord)
+const isValidPost = asPredicate(AppBskyFeedPost.validateRecord)
+const isValidList = asPredicate(AppBskyGraphList.validateRecord)
+const isValidProfile = asPredicate(AppBskyActorProfile.validateRecord)
+
 export const assertValidRecordWithStatus = (
   record: Record<string, unknown>,
   opts: { requireLexicon: boolean },
@@ -222,30 +229,31 @@ async function cidForSafeRecord(record: RepoRecord) {
 }
 
 function assertNoExplicitSlurs(rkey: string, record: RepoRecord) {
-  let toCheck = ''
-  if (isProfile(record)) {
-    toCheck += ' ' + record.displayName
-  } else if (isList(record)) {
-    toCheck += ' ' + record.name
-  } else if (isStarterPack(record)) {
-    toCheck += ' ' + record.name
-  } else if (isFeedGenerator(record)) {
-    toCheck += ' ' + rkey
-    toCheck += ' ' + record.displayName
-  } else if (isPost(record)) {
+  const toCheck: string[] = []
+
+  if (isValidProfile(record)) {
+    if (record.displayName) toCheck.push(record.displayName)
+  } else if (isValidList(record)) {
+    toCheck.push(record.name)
+  } else if (isValidStarterPack(record)) {
+    toCheck.push(record.name)
+  } else if (isValidFeedGenerator(record)) {
+    toCheck.push(rkey)
+    toCheck.push(record.displayName)
+  } else if (isValidPost(record)) {
     if (record.tags) {
-      toCheck += record.tags.join(' ')
+      toCheck.push(...record.tags)
     }
 
     for (const facet of record.facets || []) {
       for (const feat of facet.features) {
         if (isTag(feat)) {
-          toCheck += ' ' + feat.tag
+          toCheck.push(feat.tag)
         }
       }
     }
   }
-  if (hasExplicitSlur(toCheck)) {
+  if (hasExplicitSlur(toCheck.join(' '))) {
     throw new InvalidRecordError('Unacceptable slur in record')
   }
 }

package/tests/_util.ts

@@ -5,7 +5,10 @@ import { CID } from 'multiformats/cid'
 import { ToolsOzoneModerationDefs } from '@atproto/api'
 import { lexToJson } from '@atproto/lexicon'
 import { AtUri } from '@atproto/syntax'
-import { FeedViewPost } from '../src/lexicon/types/app/bsky/feed/defs'
+import {
+  FeedViewPost,
+  isReasonRepost,
+} from '../src/lexicon/types/app/bsky/feed/defs'
 
 // Swap out identifiers and dates with stable
 // values for the purpose of snapshot testing
@@ -98,10 +101,10 @@ export const forSnapshot = (obj: unknown) => {
 // Feed testing utils
 
 export const getOriginator = (item: FeedViewPost) => {
-  if (!item.reason) {
-    return item.post.author.did
+  if (isReasonRepost(item.reason)) {
+    return item.reason.by.did
   } else {
-    return (item.reason.by as { [did: string]: string }).did
+    return item.post.author.did
   }
 }
 

package/tests/app-passwords.test.ts

@@ -73,7 +73,7 @@ describe('app_passwords', () => {
   it('allows actions to be performed from app', async () => {
     await appAgent.api.app.bsky.feed.post.create(
       {
-        repo: appAgent.session?.did,
+        repo: appAgent.assertDid,
       },
       {
         text: 'Testing testing',
@@ -82,7 +82,7 @@ describe('app_passwords', () => {
     )
     await priviAgent.api.app.bsky.feed.post.create(
       {
-        repo: priviAgent.session?.did,
+        repo: priviAgent.assertDid,
       },
       {
         text: 'testing again',
@@ -142,7 +142,7 @@ describe('app_passwords', () => {
     // allows any access auth
     await appAgent.api.app.bsky.feed.post.create(
       {
-        repo: appAgent.session?.did,
+        repo: appAgent.assertDid,
       },
       {
         text: 'Testing testing',
@@ -188,7 +188,7 @@ describe('app_passwords', () => {
     // allows any access auth
     await priviAgent.api.app.bsky.feed.post.create(
       {
-        repo: priviAgent.session?.did,
+        repo: priviAgent.assertDid,
       },
       {
         text: 'Testing testing',

package/tests/create-post.test.ts

@@ -4,6 +4,7 @@ import {
   AtUri,
   AtpAgent,
   RichText,
+  Un$Typed,
 } from '@atproto/api'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import basicSeed from './seeds/basic'
@@ -28,7 +29,7 @@ describe('pds posts record creation', () => {
   })
 
   it('allows for creating posts with tags', async () => {
-    const post: AppBskyFeedPost.Record = {
+    const post: Un$Typed<AppBskyFeedPost.Record> = {
       text: 'hello world',
       tags: ['javascript', 'hehe'],
       createdAt: new Date().toISOString(),
@@ -52,7 +53,7 @@ describe('pds posts record creation', () => {
     const rt = new RichText({ text: 'hello #world' })
     await rt.detectFacets(agent)
 
-    const post: AppBskyFeedPost.Record = {
+    const post: Un$Typed<AppBskyFeedPost.Record> = {
       text: rt.text,
       facets: rt.facets,
       createdAt: new Date().toISOString(),

package/tests/crud.test.ts

@@ -8,6 +8,7 @@ import { BlobNotFoundError } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
 import { AppContext } from '../src/context'
 import { ids, lexicons } from '../src/lexicon/lexicons'
+import { isMain as isImagesEmbed } from '../src/lexicon/types/app/bsky/embed/images'
 import * as Post from '../src/lexicon/types/app/bsky/feed/post'
 import { forSnapshot, paginateAll } from './_util'
 
@@ -185,7 +186,8 @@ describe('crud operations', () => {
       rkey: postUri.rkey,
       repo: aliceAgent.accountDid,
     })
-    const images = post.value.embed?.images as { image: BlobRef }[]
+    assert(isImagesEmbed(post.value.embed))
+    const images = post.value.embed.images
     expect(images.length).toEqual(1)
     expect(uploaded.ref.equals(images[0].image.ref)).toBeTruthy()
     // Ensure that the uploaded image is now in the blobstore, i.e. doesn't throw BlobNotFoundError
@@ -768,7 +770,6 @@ describe('crud operations', () => {
         writes: [
           {
             $type: `${ids.ComAtprotoRepoApplyWrites}#create`,
-            action: 'create',
             collection: ids.AppBskyFeedPost,
             value: {
               $type: ids.AppBskyFeedPost,
@@ -778,14 +779,12 @@ describe('crud operations', () => {
           },
           {
             $type: `${ids.ComAtprotoRepoApplyWrites}#update`,
-            action: 'update',
             collection: 'com.example.record',
             rkey: new AtUri(existing1.data.uri).rkey,
             value: {},
           },
           {
             $type: `${ids.ComAtprotoRepoApplyWrites}#delete`,
-            action: 'delete',
             collection: 'com.example.record',
             rkey: new AtUri(existing2.data.uri).rkey,
           },
@@ -1145,7 +1144,6 @@ describe('crud operations', () => {
         writes: [
           {
             $type: `${ids.ComAtprotoRepoApplyWrites}#create`,
-            action: 'create',
             collection: ids.AppBskyFeedPost,
             value: { $type: ids.AppBskyFeedPost, ...postRecord() },
           },
@@ -1170,7 +1168,6 @@ describe('crud operations', () => {
         writes: [
           {
             $type: `${ids.ComAtprotoRepoApplyWrites}#create`,
-            action: 'create',
             collection: ids.AppBskyFeedPost,
             value: { $type: ids.AppBskyFeedPost, ...postRecord() },
           },

package/tests/file-uploads.test.ts

@@ -182,6 +182,7 @@ describe('file uploads', () => {
       repo: alice,
       rkey: 'self',
     })
+    // @ts-expect-error "cid" is not documented as "com.atproto.repo.uploadBlob" output
     expect((profileA.value as any).avatar.cid).toEqual(uploadA.cid)
     await sc.updateProfile(bob, {
       displayName: 'Bob',
@@ -191,6 +192,7 @@ describe('file uploads', () => {
       repo: bob,
       rkey: 'self',
     })
+    // @ts-expect-error "cid" is not documented as "com.atproto.repo.uploadBlob" output
     expect((profileB.value as any).avatar.cid).toEqual(uploadA.cid)
     const { data: uploadAfterPermanent } =
       await agent.api.com.atproto.repo.uploadBlob(file, {

package/tests/moderation.test.ts

@@ -1,11 +1,18 @@
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
 import { ImageRef, SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { BlobNotFoundError } from '@atproto/repo'
 import {
   RepoBlobRef,
   RepoRef,
+  isRepoBlobRef,
+  isRepoRef,
 } from '../src/lexicon/types/com/atproto/admin/defs'
-import { Main as StrongRef } from '../src/lexicon/types/com/atproto/repo/strongRef'
+import {
+  Main as StrongRef,
+  isMain as isStrongRef,
+} from '../src/lexicon/types/com/atproto/repo/strongRef'
+import { $Typed } from '../src/lexicon/util'
 import basicSeed from './seeds/basic'
 
 describe('moderation', () => {
@@ -13,9 +20,9 @@ describe('moderation', () => {
   let agent: AtpAgent
   let sc: SeedClient
 
-  let repoSubject: RepoRef
-  let recordSubject: StrongRef
-  let blobSubject: RepoBlobRef
+  let repoSubject: $Typed<RepoRef>
+  let recordSubject: $Typed<StrongRef>
+  let blobSubject: $Typed<RepoBlobRef>
   let blobRef: ImageRef
 
   beforeAll(async () => {
@@ -66,6 +73,7 @@ describe('moderation', () => {
       },
       { headers: network.pds.adminAuthHeaders() },
     )
+    assert(isRepoRef(res.data.subject))
     expect(res.data.subject.did).toEqual(sc.dids.bob)
     expect(res.data.takedown?.applied).toBe(true)
     expect(res.data.takedown?.ref).toBe('test-repo')
@@ -88,6 +96,7 @@ describe('moderation', () => {
       },
       { headers: network.pds.adminAuthHeaders() },
     )
+    assert(isRepoRef(res.data.subject))
     expect(res.data.subject.did).toEqual(sc.dids.bob)
     expect(res.data.takedown?.applied).toBe(false)
     expect(res.data.takedown?.ref).toBeUndefined()
@@ -110,6 +119,7 @@ describe('moderation', () => {
       },
       { headers: network.pds.adminAuthHeaders() },
     )
+    assert(isStrongRef(res.data.subject))
     expect(res.data.subject.uri).toEqual(recordSubject.uri)
     expect(res.data.takedown?.applied).toBe(true)
     expect(res.data.takedown?.ref).toBe('test-record')
@@ -132,6 +142,7 @@ describe('moderation', () => {
       },
       { headers: network.pds.adminAuthHeaders() },
     )
+    assert(isStrongRef(res.data.subject))
     expect(res.data.subject.uri).toEqual(recordSubject.uri)
     expect(res.data.takedown?.applied).toBe(false)
     expect(res.data.takedown?.ref).toBeUndefined()
@@ -156,7 +167,9 @@ describe('moderation', () => {
         },
         { headers: network.pds.adminAuthHeaders() },
       )
+      assert(isRepoBlobRef(res.data.subject))
       expect(res.data.subject.did).toEqual(blobSubject.did)
+      assert(isRepoBlobRef(res.data.subject))
       expect(res.data.subject.cid).toEqual(blobSubject.cid)
       expect(res.data.takedown?.applied).toBe(true)
       expect(res.data.takedown?.ref).toBe('test-blob')

package/tests/moderator-auth.test.ts

@@ -1,10 +1,12 @@
+import assert from 'node:assert'
 import * as plc from '@did-plc/lib'
 import { AtpAgent } from '@atproto/api'
 import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
 import { ids } from '../src/lexicon/lexicons'
-import { RepoRef } from '../src/lexicon/types/com/atproto/admin/defs'
+import { RepoRef, isRepoRef } from '../src/lexicon/types/com/atproto/admin/defs'
+import { $Typed } from '../src/lexicon/util'
 import usersSeed from './seeds/users'
 
 describe('moderator auth', () => {
@@ -12,7 +14,7 @@ describe('moderator auth', () => {
   let agent: AtpAgent
   let sc: SeedClient
 
-  let repoSubject: RepoRef
+  let repoSubject: $Typed<RepoRef>
 
   let modServiceDid: string
   let altModDid: string
@@ -103,6 +105,7 @@ describe('moderator auth', () => {
       },
       getHeaders,
     )
+    assert(isRepoRef(res.data.subject))
     expect(res.data.subject.did).toBe(repoSubject.did)
     expect(res.data.takedown?.applied).toBe(true)
   })

package/tests/preferences.test.ts

@@ -163,6 +163,7 @@ describe('user preferences', () => {
           { $type: 'app.bsky.actor.defs#adultContentPref', enabled: false },
           {
             $type: 'com.atproto.server.defs#unknown',
+            // @ts-expect-error un-spec'ed prop
             hello: 'world',
           },
         ],
@@ -179,6 +180,7 @@ describe('user preferences', () => {
       {
         preferences: [
           { $type: 'app.bsky.actor.defs#adultContentPref', enabled: false },
+          // @ts-expect-error this is what we are testing !
           {
             label: 'dogs',
             visibility: 'warn',

package/tests/proxied/__snapshots__/admin.test.ts.snap

@@ -136,7 +136,7 @@ Object {
   },
   "id": 2,
   "subject": Object {
-    "$type": "com.atproto.admin.defs#repoView",
+    "$type": "tools.ozone.moderation.defs#repoView",
     "did": "user(0)",
     "handle": "bob.test",
     "indexedAt": "1970-01-01T00:00:00.000Z",

package/tests/proxied/admin.test.ts

@@ -116,6 +116,7 @@ describe('proxies admin requests', () => {
           cid: post.ref.cidStr,
         },
         createdBy: 'did:example:admin',
+        // @ts-expect-error
         reason: 'Y',
       },
       {
@@ -132,6 +133,7 @@ describe('proxies admin requests', () => {
           did: sc.dids.bob,
         },
         createdBy: 'did:example:admin',
+        // @ts-expect-error
         reason: 'Y',
       },
       {
@@ -216,6 +218,7 @@ describe('proxies admin requests', () => {
           did: sc.dids.alice,
         },
         createdBy: 'did:example:admin',
+        // @ts-expect-error
         reason: 'Y',
         createLabelVals: ['dogs'],
         negateLabelVals: ['cats'],
@@ -247,6 +250,7 @@ describe('proxies admin requests', () => {
           $type: 'tools.ozone.moderation.defs#modEventReverseTakedown',
         },
         createdBy: 'did:example:admin',
+        // @ts-expect-error
         reason: 'X',
       },
       {
@@ -279,6 +283,7 @@ describe('proxies admin requests', () => {
           cid: post.ref.cidStr,
         },
         createdBy: 'did:example:admin',
+        // @ts-expect-error
         reason: 'Y',
         createLabelVals: ['dogs'],
         negateLabelVals: ['cats'],
@@ -311,6 +316,7 @@ describe('proxies admin requests', () => {
         },
         event: { $type: 'tools.ozone.moderation.defs#modEventReverseTakedown' },
         createdBy: 'did:example:admin',
+        // @ts-expect-error
         reason: 'X',
       },
       {

package/tests/proxied/read-after-write.test.ts

@@ -3,10 +3,13 @@ import util from 'node:util'
 import { request } from 'undici'
 import { AtpAgent } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork } from '@atproto/dev-env'
-import { View as ExternalEmbedView } from '../../src/lexicon/types/app/bsky/embed/external'
-import { View as ImagesEmbedView } from '../../src/lexicon/types/app/bsky/embed/images'
-import { View as RecordEmbedView } from '../../src/lexicon/types/app/bsky/embed/record'
-import { ThreadViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
+import { isView as isExternalEmbedView } from '../../src/lexicon/types/app/bsky/embed/external'
+import { isView as isImagesEmbedView } from '../../src/lexicon/types/app/bsky/embed/images'
+import { isView as isRecordEmbedView } from '../../src/lexicon/types/app/bsky/embed/record'
+import {
+  ThreadViewPost,
+  isThreadViewPost,
+} from '../../src/lexicon/types/app/bsky/feed/defs'
 import basicSeed from '../seeds/basic'
 
 describe('proxy read after write', () => {
@@ -202,11 +205,17 @@ describe('proxy read after write', () => {
       { uri: sc.posts[alice][2].ref.uriStr },
       { headers: { ...sc.getHeaders(alice) } },
     )
-    const replies = res.data.thread.replies as ThreadViewPost[]
+    assert(isThreadViewPost(res.data.thread))
+    // @ts-ignore "pnpm verify:types" fails though VSCode doesn't complain
+    assert(res.data.thread.replies, 'replies is undefined')
+    // @ts-ignore "pnpm verify:types" fails though VSCode doesn't complain
+    const { replies } = res.data.thread
     expect(replies.length).toBe(1)
+    assert(isThreadViewPost(replies[0]))
     expect(replies[0].post.uri).toEqual(replyRes1.uri)
-    const imgs = replies[0].post.embed as ImagesEmbedView
-    expect(imgs.images[0].fullsize).toEqual(
+    const { embed } = replies[0].post
+    assert(isImagesEmbedView(embed))
+    expect(embed.images[0].fullsize).toEqual(
       util.format(
         network.pds.ctx.cfg.bskyAppView.cdnUrlPattern,
         'feed_fullsize',
@@ -214,13 +223,14 @@ describe('proxy read after write', () => {
         img.image.ref.toString(),
       ),
     )
-    expect(imgs.images[0].aspectRatio).toEqual({ height: 2, width: 1 })
-    expect(imgs.images[0].alt).toBe('alt text')
-    expect(replies[0].replies?.length).toBe(1)
-    // @ts-ignore
+    expect(embed.images[0].aspectRatio).toEqual({ height: 2, width: 1 })
+    expect(embed.images[0].alt).toBe('alt text')
+    assert(replies[0].replies, 'replies[0].replies is undefined')
+    expect(replies[0].replies.length).toBe(1)
+    assert(isThreadViewPost(replies[0].replies[0]))
     expect(replies[0].replies[0].post.uri).toEqual(replyRes2.uri)
-    // @ts-ignore
-    const external = replies[0].replies[0].post.embed as ExternalEmbedView
+    const external = replies[0].replies[0].post.embed
+    assert(isExternalEmbedView(external))
     expect(external.external.title).toEqual('TestImage')
     expect(external.external.thumb).toEqual(
       util.format(
@@ -253,10 +263,15 @@ describe('proxy read after write', () => {
       { uri: sc.posts[carol][0].ref.uriStr },
       { headers: { ...sc.getHeaders(alice) } },
     )
-    const replies = res.data.thread.replies as ThreadViewPost[]
+    assert(isThreadViewPost(res.data.thread))
+    assert(res.data.thread.replies, 'replies is undefined')
+    const { replies } = res.data.thread
     expect(replies.length).toBe(1)
+    assert(isThreadViewPost(replies[0]))
     expect(replies[0].post.uri).toEqual(replyRes.uri)
-    const embed = replies[0].post.embed as RecordEmbedView
+    const embed = replies[0].post.embed
+    assert(isRecordEmbedView(embed))
+    assert('uri' in embed.record) // @TODO: assert based in "$type"
     expect(embed.record.uri).toEqual(sc.posts[alice][0].ref.uriStr)
   })
 

package/tests/seeds/basic.ts

@@ -61,7 +61,7 @@ export default async (
         index: { byteStart: 0, byteEnd: 18 },
         features: [
           {
-            $type: `${ids.AppBskyRichtextFacet}#mention`,
+            $type: `${ids.AppBskyRichtextFacet}#mention` as const,
             did: alice,
           },
         ],