@atproto/pds 0.4.77 → 0.4.78

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.77",
+  "version": "0.4.78",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
@@ -46,7 +46,7 @@
     "undici": "^6.19.8",
     "zod": "^3.23.8",
     "@atproto-labs/fetch-node": "0.1.4",
-    "@atproto/api": "^0.13.21",
+    "@atproto/api": "^0.13.22",
     "@atproto/aws": "^0.2.10",
     "@atproto/common": "^0.4.5",
     "@atproto/crypto": "^0.4.2",
@@ -75,9 +75,9 @@
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
     "ws": "^8.12.0",
-    "@atproto/api": "^0.13.21",
-    "@atproto/bsky": "^0.0.99",
-    "@atproto/lex-cli": "^0.5.3",
+    "@atproto/api": "^0.13.22",
+    "@atproto/bsky": "^0.0.100",
+    "@atproto/lex-cli": "^0.5.4",
     "@atproto/oauth-client-browser-example": "0.0.0"
   },
   "scripts": {

package/src/lexicon/index.ts

@@ -2638,13 +2638,13 @@ export class ToolsOzoneTeamNS {
 
 type SharedRateLimitOpts<T> = {
   name: string
-  calcKey?: (ctx: T) => string
+  calcKey?: (ctx: T) => string | null
   calcPoints?: (ctx: T) => number
 }
 type RouteRateLimitOpts<T> = {
   durationMs: number
   points: number
-  calcKey?: (ctx: T) => string
+  calcKey?: (ctx: T) => string | null
   calcPoints?: (ctx: T) => number
 }
 type HandlerOpts = { blobLimit?: number }

package/src/lexicon/lexicons.ts

@@ -12498,6 +12498,9 @@ export const schemaDict = {
               type: 'array',
               items: {
                 type: 'string',
+                maxLength: 25,
+                description:
+                  'Items in this array are applied with OR filters. To apply AND filter, put all tags in the same string and separate using && characters',
               },
             },
             excludeTags: {

package/tests/account-deactivation.test.ts

@@ -28,7 +28,7 @@ describe('account deactivation', () => {
 
     aliceAvatar = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/key-portrait-small.jpg',
+      '../dev-env/assets/key-portrait-small.jpg',
       'image/jpeg',
     )
     await sc.updateProfile(alice, {

package/tests/account-migration.test.ts

@@ -44,17 +44,17 @@ describe('account migration', () => {
     }
     const img1 = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/at.png',
+      '../dev-env/assets/at.png',
       'image/png',
     )
     const img2 = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/key-alt.jpg',
+      '../dev-env/assets/key-alt.jpg',
       'image/jpeg',
     )
     const img3 = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/key-landscape-small.jpg',
+      '../dev-env/assets/key-landscape-small.jpg',
       'image/jpeg',
     )
 

package/tests/blob-deletes.test.ts

@@ -48,7 +48,7 @@ describe('blob deletes', () => {
   it('deletes blob when record is deleted', async () => {
     const img = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/key-portrait-small.jpg',
+      '../dev-env/assets/key-portrait-small.jpg',
       'image/jpeg',
     )
     const post = await sc.post(alice, 'test', undefined, [img])
@@ -65,12 +65,12 @@ describe('blob deletes', () => {
   it('deletes blob when blob-ref in record is updated', async () => {
     const img = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/key-portrait-small.jpg',
+      '../dev-env/assets/key-portrait-small.jpg',
       'image/jpeg',
     )
     const img2 = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/key-landscape-small.jpg',
+      '../dev-env/assets/key-landscape-small.jpg',
       'image/jpeg',
     )
     await updateProfile(sc, alice, img.image, img.image)
@@ -94,12 +94,12 @@ describe('blob deletes', () => {
   it('does not delete blob when blob-ref in record is not updated', async () => {
     const img = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/key-portrait-small.jpg',
+      '../dev-env/assets/key-portrait-small.jpg',
       'image/jpeg',
     )
     const img2 = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/key-landscape-small.jpg',
+      '../dev-env/assets/key-landscape-small.jpg',
       'image/jpeg',
     )
     await updateProfile(sc, alice, img.image, img.image)
@@ -120,7 +120,7 @@ describe('blob deletes', () => {
   it('does not delete blob when blob is reused by another record in same commit', async () => {
     const img = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/key-portrait-small.jpg',
+      '../dev-env/assets/key-portrait-small.jpg',
       'image/jpeg',
     )
     const post = await sc.post(alice, 'post', undefined, [img])
@@ -167,12 +167,12 @@ describe('blob deletes', () => {
   it('does delete blob from user blob store if another user is using it', async () => {
     const imgAlice = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/key-landscape-small.jpg',
+      '../dev-env/assets/key-landscape-small.jpg',
       'image/jpeg',
     )
     const imgBob = await sc.uploadFile(
       bob,
-      '../dev-env/src/seed/img/key-landscape-small.jpg',
+      '../dev-env/assets/key-landscape-small.jpg',
       'image/jpeg',
     )
     const postAlice = await sc.post(alice, 'post', undefined, [imgAlice])

package/tests/crud.test.ts

@@ -156,9 +156,7 @@ describe('crud operations', () => {
   })
 
   it('attaches images to a post', async () => {
-    const file = await fs.readFile(
-      '../dev-env/src/seed/img/key-landscape-small.jpg',
-    )
+    const file = await fs.readFile('../dev-env/assets/key-landscape-small.jpg')
     const uploadedRes = await aliceAgent.api.com.atproto.repo.uploadBlob(file, {
       encoding: 'image/jpeg',
     })
@@ -516,9 +514,7 @@ describe('crud operations', () => {
     // @TODO remove after migrating legacy blobs
     it('updates a legacy blob ref when updating profile', async () => {
       const { repo } = bobAgent.api.com.atproto
-      const file = await fs.readFile(
-        '../dev-env/src/seed/img/key-portrait-small.jpg',
-      )
+      const file = await fs.readFile('../dev-env/assets/key-portrait-small.jpg')
       const uploadedRes = await repo.uploadBlob(file, {
         encoding: 'image/jpeg',
       })
@@ -812,9 +808,7 @@ describe('crud operations', () => {
     })
 
     it('correctly associates images with unknown record types', async () => {
-      const file = await fs.readFile(
-        '../dev-env/src/seed/img/key-portrait-small.jpg',
-      )
+      const file = await fs.readFile('../dev-env/assets/key-portrait-small.jpg')
       const uploadedRes = await aliceAgent.api.com.atproto.repo.uploadBlob(
         file,
         {
@@ -867,9 +861,7 @@ describe('crud operations', () => {
     })
 
     it('enforces blob ref format even when unvalidated', async () => {
-      const file = await fs.readFile(
-        '../dev-env/src/seed/img/key-portrait-small.jpg',
-      )
+      const file = await fs.readFile('../dev-env/assets/key-portrait-small.jpg')
       const uploadedRes = await aliceAgent.api.com.atproto.repo.uploadBlob(
         file,
         {

package/tests/file-uploads.test.ts

@@ -72,9 +72,7 @@ describe('file uploads', () => {
   })
 
   it('uploads files', async () => {
-    smallFile = await fs.readFile(
-      '../dev-env/src/seed/img/key-portrait-small.jpg',
-    )
+    smallFile = await fs.readFile('../dev-env/assets/key-portrait-small.jpg')
     const res = await agent.api.com.atproto.repo.uploadBlob(smallFile, {
       headers: sc.getHeaders(alice),
       encoding: 'image/jpeg',
@@ -130,7 +128,7 @@ describe('file uploads', () => {
   let largeFile: Uint8Array
 
   it('does not allow referencing a file that is outside blob constraints', async () => {
-    largeFile = await fs.readFile('../dev-env/src/seed/img/hd-key.jpg')
+    largeFile = await fs.readFile('../dev-env/assets/hd-key.jpg')
     const res = await agent.api.com.atproto.repo.uploadBlob(largeFile, {
       headers: sc.getHeaders(alice),
       encoding: 'image/jpeg',
@@ -159,9 +157,7 @@ describe('file uploads', () => {
   })
 
   it('permits duplicate uploads of the same file', async () => {
-    const file = await fs.readFile(
-      '../dev-env/src/seed/img/key-landscape-small.jpg',
-    )
+    const file = await fs.readFile('../dev-env/assets/key-landscape-small.jpg')
     const { data: uploadA } = await agent.api.com.atproto.repo.uploadBlob(
       file,
       {
@@ -225,9 +221,7 @@ describe('file uploads', () => {
   })
 
   it('corrects a bad mimetype', async () => {
-    const file = await fs.readFile(
-      '../dev-env/src/seed/img/key-landscape-large.jpg',
-    )
+    const file = await fs.readFile('../dev-env/assets/key-landscape-large.jpg')
     const res = await agent.api.com.atproto.repo.uploadBlob(file, {
       headers: sc.getHeaders(alice),
       encoding: 'video/mp4',
@@ -245,7 +239,7 @@ describe('file uploads', () => {
   })
 
   it('handles pngs', async () => {
-    const file = await fs.readFile('../dev-env/src/seed/img/at.png')
+    const file = await fs.readFile('../dev-env/assets/at.png')
     const res = await agent.api.com.atproto.repo.uploadBlob(file, {
       headers: sc.getHeaders(alice),
       encoding: 'image/png',

package/tests/moderation.test.ts

@@ -177,7 +177,7 @@ describe('moderation', () => {
     it('prevents blob from being reuploaded', async () => {
       const attempt = sc.uploadFile(
         sc.dids.carol,
-        '../dev-env/src/seed/img/key-alt.jpg',
+        '../dev-env/assets/key-alt.jpg',
         'image/jpeg',
       )
       await expect(attempt).rejects.toThrow(

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

@@ -35,7 +35,7 @@ Array [
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventAcknowledge",
     },
-    "id": 6,
+    "id": 7,
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
       "did": "user(0)",
@@ -46,6 +46,25 @@ Array [
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
     "createdBy": "user(2)",
+    "creatorHandle": "mod-authority.test",
+    "event": Object {
+      "$type": "tools.ozone.moderation.defs#modEventTag",
+      "add": Array [
+        "report:other",
+      ],
+      "remove": Array [],
+    },
+    "id": 4,
+    "subject": Object {
+      "$type": "com.atproto.admin.defs#repoRef",
+      "did": "user(0)",
+    },
+    "subjectBlobCids": Array [],
+    "subjectHandle": "bob.test",
+  },
+  Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "createdBy": "user(3)",
     "creatorHandle": "carol.test",
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventReport",
@@ -63,11 +82,12 @@ Array [
   },
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
-    "createdBy": "user(3)",
+    "createdBy": "user(2)",
     "creatorHandle": "mod-authority.test",
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventTag",
       "add": Array [
+        "report:spam",
         "lang:en",
         "lang:i",
       ],
@@ -108,6 +128,7 @@ Object {
   "event": Object {
     "$type": "tools.ozone.moderation.defs#modEventTag",
     "add": Array [
+      "report:spam",
       "lang:en",
       "lang:i",
     ],
@@ -138,8 +159,10 @@ Object {
         "subjectBlobCids": Array [],
         "subjectRepoHandle": "bob.test",
         "tags": Array [
+          "report:spam",
           "lang:en",
           "lang:i",
+          "report:other",
         ],
         "takendown": false,
         "updatedAt": "1970-01-01T00:00:00.000Z",
@@ -180,7 +203,7 @@ Array [
       ],
       "remove": Array [],
     },
-    "id": 5,
+    "id": 6,
     "subject": Object {
       "$type": "com.atproto.repo.strongRef",
       "cid": "cids(0)",
@@ -196,7 +219,7 @@ Array [
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventAcknowledge",
     },
-    "id": 4,
+    "id": 5,
     "subject": Object {
       "$type": "com.atproto.repo.strongRef",
       "cid": "cids(0)",
@@ -222,7 +245,7 @@ Object {
         "$type": "tools.ozone.moderation.defs#recordHosting",
         "status": "unknown",
       },
-      "id": 4,
+      "id": 5,
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
       "reviewState": "tools.ozone.moderation.defs#reviewClosed",
@@ -295,8 +318,10 @@ Object {
         "subjectBlobCids": Array [],
         "subjectRepoHandle": "bob.test",
         "tags": Array [
+          "report:spam",
           "lang:en",
           "lang:i",
+          "report:other",
         ],
         "takendown": false,
         "updatedAt": "1970-01-01T00:00:00.000Z",
@@ -401,7 +426,7 @@ Object {
   "event": Object {
     "$type": "tools.ozone.moderation.defs#modEventAcknowledge",
   },
-  "id": 4,
+  "id": 5,
   "subject": Object {
     "$type": "com.atproto.repo.strongRef",
     "cid": "cids(0)",
@@ -418,7 +443,7 @@ Object {
   "event": Object {
     "$type": "tools.ozone.moderation.defs#modEventAcknowledge",
   },
-  "id": 6,
+  "id": 7,
   "subject": Object {
     "$type": "com.atproto.admin.defs#repoRef",
     "did": "user(0)",

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

@@ -87,12 +87,12 @@ Object {
             "$type": "app.bsky.embed.images#view",
             "images": Array [
               Object {
-                "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                "alt": "../dev-env/assets/key-landscape-small.jpg",
                 "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(4)@jpeg",
                 "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(4)@jpeg",
               },
               Object {
-                "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                "alt": "../dev-env/assets/key-alt.jpg",
                 "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(5)@jpeg",
                 "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(5)@jpeg",
               },
@@ -149,7 +149,7 @@ Object {
               "$type": "app.bsky.embed.images",
               "images": Array [
                 Object {
-                  "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                  "alt": "../dev-env/assets/key-landscape-small.jpg",
                   "image": Object {
                     "$type": "blob",
                     "mimeType": "image/jpeg",
@@ -160,7 +160,7 @@ Object {
                   },
                 },
                 Object {
-                  "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                  "alt": "../dev-env/assets/key-alt.jpg",
                   "image": Object {
                     "$type": "blob",
                     "mimeType": "image/jpeg",