@atproto/pds 0.4.77 → 0.4.79

package/src/lexicon/lexicons.ts

@@ -2412,6 +2412,11 @@ export const schemaDict = {
               authFactorToken: {
                 type: 'string',
               },
+              allowTakendown: {
+                type: 'boolean',
+                description:
+                  'When true, instead of throwing error for takendown accounts, a valid response with a narrow scoped token will be returned',
+              },
             },
           },
         },
@@ -12377,6 +12382,20 @@ export const schemaDict = {
         parameters: {
           type: 'params',
           properties: {
+            queueCount: {
+              type: 'integer',
+              description:
+                'Number of queues being used by moderators. Subjects will be split among all queues.',
+            },
+            queueIndex: {
+              type: 'integer',
+              description:
+                'Index of the queue to fetch subjects from. Works only when queueCount value is specified.',
+            },
+            queueSeed: {
+              type: 'string',
+              description: 'A seeder to shuffle/balance the queue items.',
+            },
             includeAllUserRecords: {
               type: 'boolean',
               description:
@@ -12498,6 +12517,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/src/lexicon/types/com/atproto/server/createSession.ts

@@ -15,6 +15,8 @@ export interface InputSchema {
   identifier: string
   password: string
   authFactorToken?: string
+  /** When true, instead of throwing error for takendown accounts, a valid response with a narrow scoped token will be returned */
+  allowTakendown?: boolean
   [k: string]: unknown
 }
 

package/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts

@@ -10,6 +10,12 @@ import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
 export interface QueryParams {
+  /** Number of queues being used by moderators. Subjects will be split among all queues. */
+  queueCount?: number
+  /** Index of the queue to fetch subjects from. Works only when queueCount value is specified. */
+  queueIndex?: number
+  /** A seeder to shuffle/balance the queue items. */
+  queueSeed?: string
   /** All subjects, or subjects from given 'collections' param, belonging to the account specified in the 'subject' param will be returned. */
   includeAllUserRecords?: boolean
   /** The subject to get the status for. */

package/src/pipethrough.ts

@@ -28,7 +28,6 @@ export const proxyHandler = (ctx: AppContext): CatchallHandler => {
   const accessStandard = ctx.authVerifier.accessStandard()
   return async (req, res, next) => {
     // /!\ Hot path
-
     try {
       if (
         req.method !== 'GET' &&
@@ -207,7 +206,7 @@ export async function pipethrough(
 // Request setup/formatting
 // -------------------
 
-async function parseProxyInfo(
+export async function parseProxyInfo(
   ctx: AppContext,
   req: express.Request,
   lxm: string,

package/tests/__snapshots__/takedown-appeal.test.ts.snap

@@ -0,0 +1,30 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`appeal account takedown actor takedown allows appeal request. 1`] = `
+Object {
+  "appealed": true,
+  "createdAt": "1970-01-01T00:00:00.000Z",
+  "hosting": Object {
+    "$type": "tools.ozone.moderation.defs#accountHosting",
+    "status": "unknown",
+  },
+  "id": 1,
+  "lastAppealedAt": "1970-01-01T00:00:00.000Z",
+  "lastReportedAt": "1970-01-01T00:00:00.000Z",
+  "lastReviewedAt": "1970-01-01T00:00:00.000Z",
+  "lastReviewedBy": "user(0)",
+  "reviewState": "tools.ozone.moderation.defs#reviewEscalated",
+  "subject": Object {
+    "$type": "com.atproto.admin.defs#repoRef",
+    "did": "user(1)",
+  },
+  "subjectBlobCids": Array [],
+  "subjectRepoHandle": "jeff.test",
+  "tags": Array [
+    "lang:und",
+    "report:appeal",
+  ],
+  "takendown": true,
+  "updatedAt": "1970-01-01T00:00:00.000Z",
+}
+`;

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/auth.test.ts

@@ -1,6 +1,6 @@
 import * as jose from 'jose'
 import { AtpAgent } from '@atproto/api'
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { createRefreshToken } from '../src/account-manager/helpers/auth'
 
 describe('auth', () => {
@@ -19,11 +19,11 @@ describe('auth', () => {
   })
 
   const createAccount = async (info) => {
-    const { data } = await agent.api.com.atproto.server.createAccount(info)
+    const { data } = await agent.com.atproto.server.createAccount(info)
     return data
   }
   const getSession = async (jwt) => {
-    const { data } = await agent.api.com.atproto.server.getSession(
+    const { data } = await agent.com.atproto.server.getSession(
       {},
       {
         headers: SeedClient.getHeaders(jwt),
@@ -32,19 +32,18 @@ describe('auth', () => {
     return data
   }
   const createSession = async (info) => {
-    const { data } = await agent.api.com.atproto.server.createSession(info)
+    const { data } = await agent.com.atproto.server.createSession(info)
     return data
   }
   const deleteSession = async (jwt) => {
-    await agent.api.com.atproto.server.deleteSession(undefined, {
+    await agent.com.atproto.server.deleteSession(undefined, {
       headers: SeedClient.getHeaders(jwt),
     })
   }
   const refreshSession = async (jwt: string) => {
-    const { data } = await agent.api.com.atproto.server.refreshSession(
-      undefined,
-      { headers: SeedClient.getHeaders(jwt) },
-    )
+    const { data } = await agent.com.atproto.server.refreshSession(undefined, {
+      headers: SeedClient.getHeaders(jwt),
+    })
     return data
   }
 
@@ -269,7 +268,7 @@ describe('auth', () => {
       email: 'iris@test.com',
       password: 'password',
     })
-    await agent.api.com.atproto.admin.updateSubjectStatus(
+    await agent.com.atproto.admin.updateSubjectStatus(
       {
         subject: {
           $type: 'com.atproto.admin.defs#repoRef',
@@ -295,7 +294,7 @@ describe('auth', () => {
       email: 'jared@test.com',
       password: 'password',
     })
-    await agent.api.com.atproto.admin.updateSubjectStatus(
+    await agent.com.atproto.admin.updateSubjectStatus(
       {
         subject: {
           $type: 'com.atproto.admin.defs#repoRef',

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",