@atproto/pds 0.3.16 → 0.3.17

package/dist/lexicon/index.d.ts

@@ -117,7 +117,6 @@ import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/
 import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen';
 import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators';
 import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions';
-import * as AppBskyUnspeccedGetTimelineSkeleton from './types/app/bsky/unspecced/getTimelineSkeleton';
 import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton';
 import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton';
 export declare const COM_ATPROTO_ADMIN: {
@@ -355,7 +354,6 @@ export declare class AppBskyUnspeccedNS {
     constructor(server: Server);
     getPopularFeedGenerators<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedGetPopularFeedGenerators.Handler<ExtractAuth<AV>>, AppBskyUnspeccedGetPopularFeedGenerators.HandlerReqCtx<ExtractAuth<AV>>>): void;
     getTaggedSuggestions<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedGetTaggedSuggestions.Handler<ExtractAuth<AV>>, AppBskyUnspeccedGetTaggedSuggestions.HandlerReqCtx<ExtractAuth<AV>>>): void;
-    getTimelineSkeleton<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedGetTimelineSkeleton.Handler<ExtractAuth<AV>>, AppBskyUnspeccedGetTimelineSkeleton.HandlerReqCtx<ExtractAuth<AV>>>): void;
     searchActorsSkeleton<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedSearchActorsSkeleton.Handler<ExtractAuth<AV>>, AppBskyUnspeccedSearchActorsSkeleton.HandlerReqCtx<ExtractAuth<AV>>>): void;
     searchPostsSkeleton<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedSearchPostsSkeleton.Handler<ExtractAuth<AV>>, AppBskyUnspeccedSearchPostsSkeleton.HandlerReqCtx<ExtractAuth<AV>>>): void;
 }

package/dist/lexicon/lexicons.d.ts

@@ -1296,6 +1296,16 @@ export declare const schemaDict: {
                             enum: string[];
                             description: string;
                         };
+                        createdAfter: {
+                            type: string;
+                            format: string;
+                            description: string;
+                        };
+                        createdBefore: {
+                            type: string;
+                            format: string;
+                            description: string;
+                        };
                         subject: {
                             type: string;
                             format: string;
@@ -1311,6 +1321,34 @@ export declare const schemaDict: {
                             maximum: number;
                             default: number;
                         };
+                        hasComment: {
+                            type: string;
+                            description: string;
+                        };
+                        comment: {
+                            type: string;
+                            description: string;
+                        };
+                        addedLabels: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                            description: string;
+                        };
+                        removedLabels: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                            description: string;
+                        };
+                        reportTypes: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                        };
                         cursor: {
                             type: string;
                         };
@@ -7602,52 +7640,6 @@ export declare const schemaDict: {
             };
         };
     };
-    AppBskyUnspeccedGetTimelineSkeleton: {
-        lexicon: number;
-        id: string;
-        defs: {
-            main: {
-                type: string;
-                description: string;
-                parameters: {
-                    type: string;
-                    properties: {
-                        limit: {
-                            type: string;
-                            minimum: number;
-                            maximum: number;
-                            default: number;
-                        };
-                        cursor: {
-                            type: string;
-                        };
-                    };
-                };
-                output: {
-                    encoding: string;
-                    schema: {
-                        type: string;
-                        required: string[];
-                        properties: {
-                            cursor: {
-                                type: string;
-                            };
-                            feed: {
-                                type: string;
-                                items: {
-                                    type: string;
-                                    ref: string;
-                                };
-                            };
-                        };
-                    };
-                };
-                errors: {
-                    name: string;
-                }[];
-            };
-        };
-    };
     AppBskyUnspeccedSearchActorsSkeleton: {
         lexicon: number;
         id: string;
@@ -7911,7 +7903,6 @@ export declare const ids: {
     AppBskyUnspeccedDefs: string;
     AppBskyUnspeccedGetPopularFeedGenerators: string;
     AppBskyUnspeccedGetTaggedSuggestions: string;
-    AppBskyUnspeccedGetTimelineSkeleton: string;
     AppBskyUnspeccedSearchActorsSkeleton: string;
     AppBskyUnspeccedSearchPostsSkeleton: string;
 };

package/dist/lexicon/types/com/atproto/admin/defs.d.ts

@@ -12,7 +12,7 @@ export declare function isStatusAttr(v: unknown): v is StatusAttr;
 export declare function validateStatusAttr(v: unknown): ValidationResult;
 export interface ModEventView {
     id: number;
-    event: ModEventTakedown | ModEventReverseTakedown | ModEventComment | ModEventReport | ModEventLabel | ModEventAcknowledge | ModEventEscalate | ModEventMute | ModEventEmail | {
+    event: ModEventTakedown | ModEventReverseTakedown | ModEventComment | ModEventReport | ModEventLabel | ModEventAcknowledge | ModEventEscalate | ModEventMute | ModEventEmail | ModEventResolveAppeal | {
         $type: string;
         [k: string]: unknown;
     };
@@ -31,7 +31,7 @@ export declare function isModEventView(v: unknown): v is ModEventView;
 export declare function validateModEventView(v: unknown): ValidationResult;
 export interface ModEventViewDetail {
     id: number;
-    event: ModEventTakedown | ModEventReverseTakedown | ModEventComment | ModEventReport | ModEventLabel | ModEventAcknowledge | ModEventEscalate | ModEventMute | ModEventResolveAppeal | {
+    event: ModEventTakedown | ModEventReverseTakedown | ModEventComment | ModEventReport | ModEventLabel | ModEventAcknowledge | ModEventEscalate | ModEventMute | ModEventEmail | ModEventResolveAppeal | {
         $type: string;
         [k: string]: unknown;
     };

package/dist/lexicon/types/com/atproto/admin/queryModerationEvents.d.ts

@@ -5,9 +5,16 @@ export interface QueryParams {
     types?: string[];
     createdBy?: string;
     sortDirection: 'asc' | 'desc';
+    createdAfter?: string;
+    createdBefore?: string;
     subject?: string;
     includeAllUserRecords: boolean;
     limit: number;
+    hasComment?: boolean;
+    comment?: string;
+    addedLabels?: string[];
+    removedLabels?: string[];
+    reportTypes?: string[];
     cursor?: string;
 }
 export type InputSchema = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.3.16",
+  "version": "0.3.17",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
@@ -44,7 +44,7 @@
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
     "zod": "^3.21.4",
-    "@atproto/api": "^0.9.5",
+    "@atproto/api": "^0.9.6",
     "@atproto/aws": "^0.1.6",
     "@atproto/common": "^0.3.3",
     "@atproto/crypto": "^0.3.0",
@@ -68,9 +68,9 @@
     "axios": "^0.27.2",
     "get-port": "^6.1.2",
     "ws": "^8.12.0",
-    "@atproto/api": "^0.9.5",
-    "@atproto/bsky": "^0.0.28",
-    "@atproto/dev-env": "^0.2.28",
+    "@atproto/api": "^0.9.6",
+    "@atproto/bsky": "^0.0.29",
+    "@atproto/dev-env": "^0.2.29",
     "@atproto/lex-cli": "^0.3.0"
   },
   "scripts": {

package/src/account-manager/helpers/email-token.ts

@@ -34,6 +34,12 @@ export const deleteEmailToken = async (
   )
 }
 
+export const deleteAllEmailTokens = async (db: AccountDb, did: string) => {
+  await db.executeWithRetry(
+    db.db.deleteFrom('email_token').where('did', '=', did),
+  )
+}
+
 export const assertValidToken = async (
   db: AccountDb,
   did: string,

package/src/account-manager/index.ts

@@ -321,18 +321,14 @@ export class AccountManager {
     )
   }
 
-  async updateEmail(opts: { did: string; email: string; token?: string }) {
-    const { did, email, token } = opts
-    if (token) {
-      await this.db.transaction((dbTxn) =>
-        Promise.all([
-          account.updateEmail(dbTxn, did, email),
-          emailToken.deleteEmailToken(dbTxn, did, 'update_email'),
-        ]),
-      )
-    } else {
-      return account.updateEmail(this.db, did, email)
-    }
+  async updateEmail(opts: { did: string; email: string }) {
+    const { did, email } = opts
+    await this.db.transaction((dbTxn) =>
+      Promise.all([
+        account.updateEmail(dbTxn, did, email),
+        emailToken.deleteAllEmailTokens(dbTxn, did),
+      ]),
+    )
   }
 
   async resetPassword(opts: { password: string; token: string }) {

package/src/api/com/atproto/admin/sendEmail.ts

@@ -40,7 +40,7 @@ export default function (server: Server, ctx: AppContext) {
         { content },
         { subject, to: account.email },
       )
-      await ctx.appViewAgent.api.com.atproto.admin.emitModerationEvent(
+      await ctx.moderationAgent.api.com.atproto.admin.emitModerationEvent(
         {
           event: {
             $type: 'com.atproto.admin.defs#modEventEmail',

package/src/api/com/atproto/server/requestAccountDelete.ts

@@ -1,3 +1,4 @@
+import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
@@ -5,6 +6,18 @@ import { authPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.requestAccountDelete({
+    rateLimit: [
+      {
+        durationMs: DAY,
+        points: 15,
+        calcKey: ({ auth }) => auth.credentials.did,
+      },
+      {
+        durationMs: HOUR,
+        points: 5,
+        calcKey: ({ auth }) => auth.credentials.did,
+      },
+    ],
     auth: ctx.authVerifier.accessCheckTakedown,
     handler: async ({ auth, req }) => {
       const did = auth.credentials.did

package/src/api/com/atproto/server/requestEmailConfirmation.ts

@@ -1,3 +1,4 @@
+import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
@@ -5,6 +6,18 @@ import { authPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.requestEmailConfirmation({
+    rateLimit: [
+      {
+        durationMs: DAY,
+        points: 15,
+        calcKey: ({ auth }) => auth.credentials.did,
+      },
+      {
+        durationMs: HOUR,
+        points: 5,
+        calcKey: ({ auth }) => auth.credentials.did,
+      },
+    ],
     auth: ctx.authVerifier.accessCheckTakedown,
     handler: async ({ auth, req }) => {
       const did = auth.credentials.did

package/src/api/com/atproto/server/requestEmailUpdate.ts

@@ -1,3 +1,4 @@
+import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
@@ -5,6 +6,18 @@ import { authPassthru, resultPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.requestEmailUpdate({
+    rateLimit: [
+      {
+        durationMs: DAY,
+        points: 15,
+        calcKey: ({ auth }) => auth.credentials.did,
+      },
+      {
+        durationMs: HOUR,
+        points: 5,
+        calcKey: ({ auth }) => auth.credentials.did,
+      },
+    ],
     auth: ctx.authVerifier.accessCheckTakedown,
     handler: async ({ auth, req }) => {
       const did = auth.credentials.did

package/src/api/com/atproto/server/requestPasswordReset.ts

@@ -1,32 +1,45 @@
+import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import AppContext from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { authPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
-  server.com.atproto.server.requestPasswordReset(async ({ input, req }) => {
-    const email = input.body.email.toLowerCase()
+  server.com.atproto.server.requestPasswordReset({
+    rateLimit: [
+      {
+        durationMs: DAY,
+        points: 50,
+      },
+      {
+        durationMs: HOUR,
+        points: 15,
+      },
+    ],
+    handler: async ({ input, req }) => {
+      const email = input.body.email.toLowerCase()
 
-    const account = await ctx.accountManager.getAccountByEmail(email)
+      const account = await ctx.accountManager.getAccountByEmail(email)
 
-    if (!account?.email) {
-      if (ctx.entrywayAgent) {
-        await ctx.entrywayAgent.com.atproto.server.requestPasswordReset(
-          input.body,
-          authPassthru(req, true),
-        )
-        return
+      if (!account?.email) {
+        if (ctx.entrywayAgent) {
+          await ctx.entrywayAgent.com.atproto.server.requestPasswordReset(
+            input.body,
+            authPassthru(req, true),
+          )
+          return
+        }
+        throw new InvalidRequestError('account does not have an email address')
       }
-      throw new InvalidRequestError('account does not have an email address')
-    }
 
-    const token = await ctx.accountManager.createEmailToken(
-      account.did,
-      'reset_password',
-    )
-    await ctx.mailer.sendResetPassword(
-      { identifier: account.handle ?? account.email, token },
-      { to: account.email },
-    )
+      const token = await ctx.accountManager.createEmailToken(
+        account.did,
+        'reset_password',
+      )
+      await ctx.mailer.sendResetPassword(
+        { identifier: account.handle ?? account.email, token },
+        { to: account.email },
+      )
+    },
   })
 }

package/src/api/com/atproto/server/updateEmail.ts

@@ -45,7 +45,7 @@ export default function (server: Server, ctx: AppContext) {
       }
 
       try {
-        await ctx.accountManager.updateEmail({ did, email, token })
+        await ctx.accountManager.updateEmail({ did, email })
       } catch (err) {
         if (err instanceof UserAlreadyExistsError) {
           throw new InvalidRequestError(

package/src/api/com/atproto/temp/index.ts

@@ -1,10 +1,12 @@
 import AppContext from '../../../../context'
 import { Server } from '../../../../lexicon'
+import checkSignupQueue from './checkSignupQueue'
 import importRepo from './importRepo'
 import pushBlob from './pushBlob'
 import transferAccount from './transferAccount'
 
 export default function (server: Server, ctx: AppContext) {
+  checkSignupQueue(server, ctx)
   importRepo(server, ctx)
   pushBlob(server, ctx)
   transferAccount(server, ctx)

package/src/lexicon/index.ts

@@ -127,7 +127,6 @@ import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/
 import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen'
 import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators'
 import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions'
-import * as AppBskyUnspeccedGetTimelineSkeleton from './types/app/bsky/unspecced/getTimelineSkeleton'
 import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton'
 import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton'
 
@@ -1649,17 +1648,6 @@ export class AppBskyUnspeccedNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
-  getTimelineSkeleton<AV extends AuthVerifier>(
-    cfg: ConfigOf<
-      AV,
-      AppBskyUnspeccedGetTimelineSkeleton.Handler<ExtractAuth<AV>>,
-      AppBskyUnspeccedGetTimelineSkeleton.HandlerReqCtx<ExtractAuth<AV>>
-    >,
-  ) {
-    const nsid = 'app.bsky.unspecced.getTimelineSkeleton' // @ts-ignore
-    return this._server.xrpc.method(nsid, cfg)
-  }
-
   searchActorsSkeleton<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,

package/src/lexicon/lexicons.ts

@@ -91,6 +91,7 @@ export const schemaDict = {
               'lex:com.atproto.admin.defs#modEventEscalate',
               'lex:com.atproto.admin.defs#modEventMute',
               'lex:com.atproto.admin.defs#modEventEmail',
+              'lex:com.atproto.admin.defs#modEventResolveAppeal',
             ],
           },
           subject: {
@@ -147,6 +148,7 @@ export const schemaDict = {
               'lex:com.atproto.admin.defs#modEventAcknowledge',
               'lex:com.atproto.admin.defs#modEventEscalate',
               'lex:com.atproto.admin.defs#modEventMute',
+              'lex:com.atproto.admin.defs#modEventEmail',
               'lex:com.atproto.admin.defs#modEventResolveAppeal',
             ],
           },
@@ -1450,6 +1452,16 @@ export const schemaDict = {
               description:
                 'Sort direction for the events. Defaults to descending order of created at timestamp.',
             },
+            createdAfter: {
+              type: 'string',
+              format: 'datetime',
+              description: 'Retrieve events created after a given timestamp',
+            },
+            createdBefore: {
+              type: 'string',
+              format: 'datetime',
+              description: 'Retrieve events created before a given timestamp',
+            },
             subject: {
               type: 'string',
               format: 'uri',
@@ -1466,6 +1478,37 @@ export const schemaDict = {
               maximum: 100,
               default: 50,
             },
+            hasComment: {
+              type: 'boolean',
+              description: 'If true, only events with comments are returned',
+            },
+            comment: {
+              type: 'string',
+              description:
+                'If specified, only events with comments containing the keyword are returned',
+            },
+            addedLabels: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+              description:
+                'If specified, only events where all of these labels were added are returned',
+            },
+            removedLabels: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+              description:
+                'If specified, only events where all of these labels were removed are returned',
+            },
+            reportTypes: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
             cursor: {
               type: 'string',
             },
@@ -8100,55 +8143,6 @@ export const schemaDict = {
       },
     },
   },
-  AppBskyUnspeccedGetTimelineSkeleton: {
-    lexicon: 1,
-    id: 'app.bsky.unspecced.getTimelineSkeleton',
-    defs: {
-      main: {
-        type: 'query',
-        description:
-          'DEPRECATED: a skeleton of a timeline. Unspecced and will be unavailable soon.',
-        parameters: {
-          type: 'params',
-          properties: {
-            limit: {
-              type: 'integer',
-              minimum: 1,
-              maximum: 100,
-              default: 50,
-            },
-            cursor: {
-              type: 'string',
-            },
-          },
-        },
-        output: {
-          encoding: 'application/json',
-          schema: {
-            type: 'object',
-            required: ['feed'],
-            properties: {
-              cursor: {
-                type: 'string',
-              },
-              feed: {
-                type: 'array',
-                items: {
-                  type: 'ref',
-                  ref: 'lex:app.bsky.feed.defs#skeletonFeedPost',
-                },
-              },
-            },
-          },
-        },
-        errors: [
-          {
-            name: 'UnknownFeed',
-          },
-        ],
-      },
-    },
-  },
   AppBskyUnspeccedSearchActorsSkeleton: {
     lexicon: 1,
     id: 'app.bsky.unspecced.searchActorsSkeleton',
@@ -8438,7 +8432,6 @@ export const ids = {
     'app.bsky.unspecced.getPopularFeedGenerators',
   AppBskyUnspeccedGetTaggedSuggestions:
     'app.bsky.unspecced.getTaggedSuggestions',
-  AppBskyUnspeccedGetTimelineSkeleton: 'app.bsky.unspecced.getTimelineSkeleton',
   AppBskyUnspeccedSearchActorsSkeleton:
     'app.bsky.unspecced.searchActorsSkeleton',
   AppBskyUnspeccedSearchPostsSkeleton: 'app.bsky.unspecced.searchPostsSkeleton',

package/src/lexicon/types/com/atproto/admin/defs.ts

@@ -40,6 +40,7 @@ export interface ModEventView {
     | ModEventEscalate
     | ModEventMute
     | ModEventEmail
+    | ModEventResolveAppeal
     | { $type: string; [k: string]: unknown }
   subject:
     | RepoRef
@@ -76,6 +77,7 @@ export interface ModEventViewDetail {
     | ModEventAcknowledge
     | ModEventEscalate
     | ModEventMute
+    | ModEventEmail
     | ModEventResolveAppeal
     | { $type: string; [k: string]: unknown }
   subject:

package/src/lexicon/types/com/atproto/admin/queryModerationEvents.ts

@@ -15,10 +15,23 @@ export interface QueryParams {
   createdBy?: string
   /** Sort direction for the events. Defaults to descending order of created at timestamp. */
   sortDirection: 'asc' | 'desc'
+  /** Retrieve events created after a given timestamp */
+  createdAfter?: string
+  /** Retrieve events created before a given timestamp */
+  createdBefore?: string
   subject?: string
   /** If true, events on all record types (posts, lists, profile etc.) owned by the did are returned */
   includeAllUserRecords: boolean
   limit: number
+  /** If true, only events with comments are returned */
+  hasComment?: boolean
+  /** If specified, only events with comments containing the keyword are returned */
+  comment?: string
+  /** If specified, only events where all of these labels were added are returned */
+  addedLabels?: string[]
+  /** If specified, only events where all of these labels were removed are returned */
+  removedLabels?: string[]
+  reportTypes?: string[]
   cursor?: string
 }