@atproto/pds 0.3.16 → 0.3.17

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atproto/pds
 
+## 0.3.17
+
+### Patch Changes
+
+- Updated dependencies [[`e4ec7af03`](https://github.com/bluesky-social/atproto/commit/e4ec7af03608949fc3b00a845f547a77599b5ad0)]:
+  - @atproto/api@0.9.6
+
 ## 0.3.16
 
 ### Patch Changes

package/LICENSE.txt

@@ -1,6 +1,6 @@
 Dual MIT/Apache-2.0 License
 
-Copyright (c) 2022-2023 Bluesky PBC, and Contributors
+Copyright (c) 2022-2024 Bluesky PBC, and Contributors
 
 Except as otherwise noted in individual files, this software is licensed under the MIT license (<http://opensource.org/licenses/MIT>), or the Apache License, Version 2.0 (<http://www.apache.org/licenses/LICENSE-2.0>).
 

package/dist/account-manager/helpers/email-token.d.ts

@@ -1,5 +1,6 @@
 import { AccountDb, EmailTokenPurpose } from '../db';
 export declare const createEmailToken: (db: AccountDb, did: string, purpose: EmailTokenPurpose) => Promise<string>;
 export declare const deleteEmailToken: (db: AccountDb, did: string, purpose: EmailTokenPurpose) => Promise<void>;
+export declare const deleteAllEmailTokens: (db: AccountDb, did: string) => Promise<void>;
 export declare const assertValidToken: (db: AccountDb, did: string, purpose: EmailTokenPurpose, token: string, expirationLen?: number) => Promise<void>;
 export declare const assertValidTokenAndFindDid: (db: AccountDb, purpose: EmailTokenPurpose, token: string, expirationLen?: number) => Promise<string>;

package/dist/account-manager/index.d.ts

@@ -73,7 +73,6 @@ export declare class AccountManager {
     updateEmail(opts: {
         did: string;
         email: string;
-        token?: string;
     }): Promise<void>;
     resetPassword(opts: {
         password: string;

package/dist/index.js

@@ -212622,7 +212622,8 @@ var 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#modEventEmail",
+              "lex:com.atproto.admin.defs#modEventResolveAppeal"
             ]
           },
           subject: {
@@ -212679,6 +212680,7 @@ var 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"
             ]
           },
@@ -213968,6 +213970,16 @@ var schemaDict = {
               enum: ["asc", "desc"],
               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"
@@ -213983,6 +213995,34 @@ var 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"
             }
@@ -220547,54 +220587,6 @@ var 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",
@@ -220862,7 +220854,6 @@ var ids = {
   AppBskyUnspeccedDefs: "app.bsky.unspecced.defs",
   AppBskyUnspeccedGetPopularFeedGenerators: "app.bsky.unspecced.getPopularFeedGenerators",
   AppBskyUnspeccedGetTaggedSuggestions: "app.bsky.unspecced.getTaggedSuggestions",
-  AppBskyUnspeccedGetTimelineSkeleton: "app.bsky.unspecced.getTimelineSkeleton",
   AppBskyUnspeccedSearchActorsSkeleton: "app.bsky.unspecced.searchActorsSkeleton",
   AppBskyUnspeccedSearchPostsSkeleton: "app.bsky.unspecced.searchPostsSkeleton"
 };
@@ -231715,7 +231706,7 @@ function sendEmail_default(server, ctx) {
         throw new InvalidRequestError("account does not have an email address");
       }
       await ctx.moderationMailer.send({ 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",
           subjectLine: subject,
@@ -235715,6 +235706,18 @@ function reserveSigningKey_default(server, ctx) {
 // src/api/com/atproto/server/requestAccountDelete.ts
 function requestAccountDelete_default(server, ctx) {
   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 did2 = auth.credentials.did;
@@ -235767,18 +235770,30 @@ function deleteAccount_default2(server, ctx) {
 
 // src/api/com/atproto/server/requestPasswordReset.ts
 function requestPasswordReset_default(server, ctx) {
-  server.com.atproto.server.requestPasswordReset(async ({ input, req }) => {
-    const email = input.body.email.toLowerCase();
-    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;
+  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);
+      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 });
   });
 }
 
@@ -235805,6 +235820,18 @@ function resetPassword_default(server, ctx) {
 // src/api/com/atproto/server/requestEmailConfirmation.ts
 function requestEmailConfirmation_default(server, ctx) {
   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 did2 = auth.credentials.did;
@@ -235851,6 +235878,18 @@ function confirmEmail_default(server, ctx) {
 // src/api/com/atproto/server/requestEmailUpdate.ts
 function requestEmailUpdate_default(server, ctx) {
   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 did2 = auth.credentials.did;
@@ -235995,7 +236034,7 @@ function updateEmail_default(server, ctx) {
         await ctx.accountManager.assertValidEmailToken(did2, "update_email", token);
       }
       try {
-        await ctx.accountManager.updateEmail({ did: did2, email, token });
+        await ctx.accountManager.updateEmail({ did: did2, email });
       } catch (err) {
         if (err instanceof UserAlreadyExistsError) {
           throw new InvalidRequestError("This email address is already in use, please use a different email.");
@@ -236769,6 +236808,24 @@ function sync_default(server, ctx) {
   getHead_default(server, ctx);
 }
 
+// src/api/com/atproto/temp/checkSignupQueue.ts
+function checkSignupQueue_default(server, ctx) {
+  server.com.atproto.temp.checkSignupQueue({
+    auth: ctx.authVerifier.accessDeactived,
+    handler: async ({ req }) => {
+      if (!ctx.entrywayAgent) {
+        return {
+          encoding: "application/json",
+          body: {
+            activated: true
+          }
+        };
+      }
+      return resultPassthru(await ctx.entrywayAgent.com.atproto.temp.checkSignupQueue(void 0, authPassthru(req)));
+    }
+  });
+}
+
 // src/api/com/atproto/temp/importRepo.ts
 var import_stream8 = require("stream");
 var import_assert4 = __toESM(require("assert"));
@@ -237032,6 +237089,7 @@ var verifyDidAndPlcOp = async (ctx, did2, handle2, signingKey, plcOp) => {
 
 // src/api/com/atproto/temp/index.ts
 function temp_default(server, ctx) {
+  checkSignupQueue_default(server, ctx);
   importRepo_default(server, ctx);
   pushBlob_default(server, ctx);
   transferAccount_default(server, ctx);
@@ -237790,7 +237848,8 @@ var schemaDict2 = {
               "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#modEventEmail",
+              "lex:com.atproto.admin.defs#modEventResolveAppeal"
             ]
           },
           subject: {
@@ -237847,6 +237906,7 @@ var schemaDict2 = {
               "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"
             ]
           },
@@ -239136,6 +239196,16 @@ var schemaDict2 = {
               enum: ["asc", "desc"],
               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"
@@ -239151,6 +239221,34 @@ var schemaDict2 = {
               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"
             }
@@ -245715,54 +245813,6 @@ var schemaDict2 = {
       }
     }
   },
-  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",
@@ -247047,27 +247097,13 @@ function toKnownErr116(e) {
   return e;
 }
 
-// ../api/src/client/types/app/bsky/unspecced/getTimelineSkeleton.ts
-var UnknownFeedError3 = class extends XRPCError {
-  constructor(src3) {
-    super(src3.status, src3.error, src3.message, src3.headers);
-  }
-};
-function toKnownErr117(e) {
-  if (e instanceof XRPCError) {
-    if (e.error === "UnknownFeed")
-      return new UnknownFeedError3(e);
-  }
-  return e;
-}
-
 // ../api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
 var BadQueryStringError2 = class extends XRPCError {
   constructor(src3) {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr118(e) {
+function toKnownErr117(e) {
   if (e instanceof XRPCError) {
     if (e.error === "BadQueryString")
       return new BadQueryStringError2(e);
@@ -247081,7 +247117,7 @@ var BadQueryStringError3 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr119(e) {
+function toKnownErr118(e) {
   if (e instanceof XRPCError) {
     if (e.error === "BadQueryString")
       return new BadQueryStringError3(e);
@@ -248109,19 +248145,14 @@ var AppBskyUnspeccedNS = class {
       throw toKnownErr116(e);
     });
   }
-  getTimelineSkeleton(params2, opts) {
-    return this._service.xrpc.call("app.bsky.unspecced.getTimelineSkeleton", params2, void 0, opts).catch((e) => {
-      throw toKnownErr117(e);
-    });
-  }
   searchActorsSkeleton(params2, opts) {
     return this._service.xrpc.call("app.bsky.unspecced.searchActorsSkeleton", params2, void 0, opts).catch((e) => {
-      throw toKnownErr118(e);
+      throw toKnownErr117(e);
     });
   }
   searchPostsSkeleton(params2, opts) {
     return this._service.xrpc.call("app.bsky.unspecced.searchPostsSkeleton", params2, void 0, opts).catch((e) => {
-      throw toKnownErr119(e);
+      throw toKnownErr118(e);
     });
   }
 };
@@ -250500,10 +250531,6 @@ var AppBskyUnspeccedNS2 = class {
     const nsid2 = "app.bsky.unspecced.getTaggedSuggestions";
     return this._server.xrpc.method(nsid2, cfg);
   }
-  getTimelineSkeleton(cfg) {
-    const nsid2 = "app.bsky.unspecced.getTimelineSkeleton";
-    return this._server.xrpc.method(nsid2, cfg);
-  }
   searchActorsSkeleton(cfg) {
     const nsid2 = "app.bsky.unspecced.searchActorsSkeleton";
     return this._server.xrpc.method(nsid2, cfg);
@@ -251088,6 +251115,9 @@ var createEmailToken = async (db, did2, purpose) => {
 var deleteEmailToken = async (db, did2, purpose) => {
   await db.executeWithRetry(db.db.deleteFrom("email_token").where("did", "=", did2).where("purpose", "=", purpose));
 };
+var deleteAllEmailTokens = async (db, did2) => {
+  await db.executeWithRetry(db.db.deleteFrom("email_token").where("did", "=", did2));
+};
 var assertValidToken = async (db, did2, purpose, token, expirationLen = 15 * MINUTE) => {
   const res = await db.db.selectFrom("email_token").selectAll().where("purpose", "=", purpose).where("did", "=", did2).where("token", "=", token.toUpperCase()).executeTakeFirst();
   if (!res) {
@@ -251296,15 +251326,11 @@ var AccountManager = class {
     ]));
   }
   async updateEmail(opts) {
-    const { did: did2, email, token } = opts;
-    if (token) {
-      await this.db.transaction((dbTxn) => Promise.all([
-        updateEmail(dbTxn, did2, email),
-        deleteEmailToken(dbTxn, did2, "update_email")
-      ]));
-    } else {
-      return updateEmail(this.db, did2, email);
-    }
+    const { did: did2, email } = opts;
+    await this.db.transaction((dbTxn) => Promise.all([
+      updateEmail(dbTxn, did2, email),
+      deleteAllEmailTokens(dbTxn, did2)
+    ]));
   }
   async resetPassword(opts) {
     const did2 = await assertValidTokenAndFindDid(this.db, "reset_password", opts.token);