@atproto/bsky 0.0.221 → 0.0.223

package/dist/api/app/bsky/actor/getSuggestions.js

@@ -2,12 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const common_1 = require("@atproto/common");
+const lex_1 = require("@atproto/lex");
 const util_1 = require("../../../../hydration/util");
+const index_js_1 = require("../../../../lexicons/index.js");
 const pipeline_1 = require("../../../../pipeline");
 const util_2 = require("../../../util");
 function default_1(server, ctx) {
     const getSuggestions = (0, pipeline_1.createPipeline)(skeleton, hydration, noBlocksOrMutes, presentation);
-    server.app.bsky.actor.getSuggestions({
+    server.add(index_js_1.app.bsky.actor.getSuggestions, {
         auth: ctx.authVerifier.standardOptional,
         handler: async ({ params, auth, req }) => {
             const viewer = auth.credentials.iss;
@@ -21,7 +23,7 @@ function default_1(server, ctx) {
             });
             const { resHeaders: resultHeaders, ...result } = await getSuggestions({ ...params, hydrateCtx, headers }, ctx);
             const suggestionsResHeaders = (0, common_1.noUndefinedVals)({
-                'content-language': resultHeaders?.['content-language'],
+                'content-language': resultHeaders?.get('content-language'),
             });
             return {
                 encoding: 'application/json',
@@ -37,17 +39,21 @@ function default_1(server, ctx) {
 const skeleton = async (input) => {
     const { ctx, params } = input;
     const viewer = params.hydrateCtx.viewer;
-    if (ctx.suggestionsAgent) {
-        const res = await ctx.suggestionsAgent.api.app.bsky.unspecced.getSuggestionsSkeleton({
-            viewer: viewer ?? undefined,
-            limit: params.limit,
-            cursor: params.cursor,
-        }, { headers: params.headers });
+    if (viewer && ctx.suggestionsClient) {
+        const res = await ctx.suggestionsClient.xrpc(index_js_1.app.bsky.unspecced.getSuggestionsSkeleton, {
+            headers: params.headers,
+            params: {
+                relativeToDid: viewer,
+                viewer: viewer ?? undefined,
+                limit: params.limit,
+                cursor: params.cursor,
+            },
+        });
         return {
-            dids: res.data.actors.map((a) => a.did),
-            cursor: res.data.cursor,
-            recId: res.data.recId,
-            recIdStr: res.data.recIdStr,
+            dids: res.body.actors.map((a) => a.did),
+            cursor: res.body.cursor,
+            recId: res.body.recId,
+            recIdStr: res.body.recIdStr,
             resHeaders: res.headers,
         };
     }
@@ -58,7 +64,8 @@ const skeleton = async (input) => {
             cursor: params.cursor,
             limit: params.limit,
         });
-        let dids = suggestions.dids;
+        // @NOTE filtering to avoid type casting
+        let dids = suggestions.dids.filter(lex_1.isDidString);
         if (viewer !== null) {
             const follows = await ctx.dataplane.getActorFollowsActors({
                 actorDid: viewer,

package/dist/api/app/bsky/actor/getSuggestions.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSuggestions.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/getSuggestions.ts"],"names":[],"mappings":"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","sourcesContent":["import { AtpAgent } from '@atproto/api'\nimport { mapDefined, noUndefinedVals } from '@atproto/common'\nimport { HeadersMap } from '@atproto/xrpc'\nimport { AppContext } from '../../../../context'\nimport { DataPlaneClient } from '../../../../data-plane'\nimport {\n  HydrateCtx,\n  HydrationState,\n  Hydrator,\n} from '../../../../hydration/hydrator'\nimport { parseString } from '../../../../hydration/util'\nimport { Server } from '../../../../lexicon'\nimport { QueryParams } from '../../../../lexicon/types/app/bsky/actor/getSuggestions'\nimport { createPipeline } from '../../../../pipeline'\nimport { Views } from '../../../../views'\nimport { resHeaders } from '../../../util'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getSuggestions = createPipeline(\n    skeleton,\n    hydration,\n    noBlocksOrMutes,\n    presentation,\n  )\n  server.app.bsky.actor.getSuggestions({\n    auth: ctx.authVerifier.standardOptional,\n    handler: async ({ params, auth, req }) => {\n      const viewer = auth.credentials.iss\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({ viewer, labelers })\n      const headers = noUndefinedVals({\n        'accept-language': req.headers['accept-language'],\n        'x-bsky-topics': Array.isArray(req.headers['x-bsky-topics'])\n          ? req.headers['x-bsky-topics'].join(',')\n          : req.headers['x-bsky-topics'],\n      })\n      const { resHeaders: resultHeaders, ...result } = await getSuggestions(\n        { ...params, hydrateCtx, headers },\n        ctx,\n      )\n      const suggestionsResHeaders = noUndefinedVals({\n        'content-language': resultHeaders?.['content-language'],\n      })\n      return {\n        encoding: 'application/json',\n        body: result,\n        headers: {\n          ...suggestionsResHeaders,\n          ...resHeaders({ labelers: hydrateCtx.labelers }),\n        },\n      }\n    },\n  })\n}\n\nconst skeleton = async (input: {\n  ctx: Context\n  params: Params\n}): Promise<Skeleton> => {\n  const { ctx, params } = input\n  const viewer = params.hydrateCtx.viewer\n  if (ctx.suggestionsAgent) {\n    const res =\n      await ctx.suggestionsAgent.api.app.bsky.unspecced.getSuggestionsSkeleton(\n        {\n          viewer: viewer ?? undefined,\n          limit: params.limit,\n          cursor: params.cursor,\n        },\n        { headers: params.headers },\n      )\n    return {\n      dids: res.data.actors.map((a) => a.did),\n      cursor: res.data.cursor,\n      recId: res.data.recId,\n      recIdStr: res.data.recIdStr,\n      resHeaders: res.headers,\n    }\n  } else {\n    // @NOTE for appview swap moving to rkey-based cursors which are somewhat permissive, should not hard-break pagination\n    const suggestions = await ctx.dataplane.getFollowSuggestions({\n      actorDid: viewer ?? undefined,\n      cursor: params.cursor,\n      limit: params.limit,\n    })\n    let dids = suggestions.dids\n    if (viewer !== null) {\n      const follows = await ctx.dataplane.getActorFollowsActors({\n        actorDid: viewer,\n        targetDids: dids,\n      })\n      dids = dids.filter((did, i) => !follows.uris[i] && did !== viewer)\n    }\n    return { dids, cursor: parseString(suggestions.cursor) }\n  }\n}\n\nconst hydration = async (input: {\n  ctx: Context\n  params: Params\n  skeleton: Skeleton\n}) => {\n  const { ctx, params, skeleton } = input\n  return ctx.hydrator.hydrateProfilesDetailed(skeleton.dids, params.hydrateCtx)\n}\n\nconst noBlocksOrMutes = (input: {\n  ctx: Context\n  params: Params\n  skeleton: Skeleton\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = input\n  skeleton.dids = skeleton.dids.filter(\n    (did) =>\n      !ctx.views.viewerBlockExists(did, hydration) &&\n      !ctx.views.viewerMuteExists(did, hydration),\n  )\n  return skeleton\n}\n\nconst presentation = (input: {\n  ctx: Context\n  params: Params\n  skeleton: Skeleton\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = input\n  const actors = mapDefined(skeleton.dids, (did) =>\n    ctx.views.profileKnownFollowers(did, hydration),\n  )\n  return {\n    actors,\n    cursor: skeleton.cursor,\n    recId: skeleton.recId,\n    recIdStr: skeleton.recIdStr,\n    resHeaders: skeleton.resHeaders,\n  }\n}\n\ntype Context = {\n  suggestionsAgent: AtpAgent | undefined\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n}\n\ntype Params = QueryParams & {\n  hydrateCtx: HydrateCtx\n  headers: HeadersMap\n}\n\ntype Skeleton = {\n  dids: string[]\n  cursor?: string\n  recId?: number\n  recIdStr?: string\n  resHeaders?: HeadersMap\n}\n"]}
+{"version":3,"file":"getSuggestions.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/getSuggestions.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined, noUndefinedVals } from '@atproto/common'\nimport { Client, DidString, isDidString } from '@atproto/lex'\nimport { Headers as HeadersMap, Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { DataPlaneClient } from '../../../../data-plane'\nimport {\n  HydrateCtx,\n  HydrationState,\n  Hydrator,\n} from '../../../../hydration/hydrator'\nimport { parseString } from '../../../../hydration/util'\nimport { app } from '../../../../lexicons/index.js'\nimport { createPipeline } from '../../../../pipeline'\nimport { Views } from '../../../../views'\nimport { resHeaders } from '../../../util'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getSuggestions = createPipeline(\n    skeleton,\n    hydration,\n    noBlocksOrMutes,\n    presentation,\n  )\n  server.add(app.bsky.actor.getSuggestions, {\n    auth: ctx.authVerifier.standardOptional,\n    handler: async ({ params, auth, req }) => {\n      const viewer = auth.credentials.iss\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({ viewer, labelers })\n      const headers = noUndefinedVals({\n        'accept-language': req.headers['accept-language'],\n        'x-bsky-topics': Array.isArray(req.headers['x-bsky-topics'])\n          ? req.headers['x-bsky-topics'].join(',')\n          : req.headers['x-bsky-topics'],\n      })\n      const { resHeaders: resultHeaders, ...result } = await getSuggestions(\n        { ...params, hydrateCtx, headers },\n        ctx,\n      )\n      const suggestionsResHeaders = noUndefinedVals({\n        'content-language': resultHeaders?.get('content-language'),\n      })\n      return {\n        encoding: 'application/json',\n        body: result,\n        headers: {\n          ...suggestionsResHeaders,\n          ...resHeaders({ labelers: hydrateCtx.labelers }),\n        },\n      }\n    },\n  })\n}\n\nconst skeleton = async (input: {\n  ctx: Context\n  params: Params\n}): Promise<Skeleton> => {\n  const { ctx, params } = input\n  const viewer = params.hydrateCtx.viewer\n\n  if (viewer && ctx.suggestionsClient) {\n    const res = await ctx.suggestionsClient.xrpc(\n      app.bsky.unspecced.getSuggestionsSkeleton,\n      {\n        headers: params.headers,\n        params: {\n          relativeToDid: viewer,\n          viewer: viewer ?? undefined,\n          limit: params.limit,\n          cursor: params.cursor,\n        },\n      },\n    )\n    return {\n      dids: res.body.actors.map((a) => a.did),\n      cursor: res.body.cursor,\n      recId: res.body.recId,\n      recIdStr: res.body.recIdStr,\n      resHeaders: res.headers,\n    }\n  } else {\n    // @NOTE for appview swap moving to rkey-based cursors which are somewhat permissive, should not hard-break pagination\n    const suggestions = await ctx.dataplane.getFollowSuggestions({\n      actorDid: viewer ?? undefined,\n      cursor: params.cursor,\n      limit: params.limit,\n    })\n    // @NOTE filtering to avoid type casting\n    let dids = suggestions.dids.filter(isDidString)\n    if (viewer !== null) {\n      const follows = await ctx.dataplane.getActorFollowsActors({\n        actorDid: viewer,\n        targetDids: dids,\n      })\n      dids = dids.filter((did, i) => !follows.uris[i] && did !== viewer)\n    }\n    return { dids, cursor: parseString(suggestions.cursor) }\n  }\n}\n\nconst hydration = async (input: {\n  ctx: Context\n  params: Params\n  skeleton: Skeleton\n}) => {\n  const { ctx, params, skeleton } = input\n  return ctx.hydrator.hydrateProfilesDetailed(skeleton.dids, params.hydrateCtx)\n}\n\nconst noBlocksOrMutes = (input: {\n  ctx: Context\n  params: Params\n  skeleton: Skeleton\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = input\n  skeleton.dids = skeleton.dids.filter(\n    (did) =>\n      !ctx.views.viewerBlockExists(did, hydration) &&\n      !ctx.views.viewerMuteExists(did, hydration),\n  )\n  return skeleton\n}\n\nconst presentation = (input: {\n  ctx: Context\n  params: Params\n  skeleton: Skeleton\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = input\n  const actors = mapDefined(skeleton.dids, (did) =>\n    ctx.views.profileKnownFollowers(did, hydration),\n  )\n  return {\n    actors,\n    cursor: skeleton.cursor,\n    recId: skeleton.recId,\n    recIdStr: skeleton.recIdStr,\n    resHeaders: skeleton.resHeaders,\n  }\n}\n\ntype Context = {\n  suggestionsClient: Client | undefined\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n}\n\ntype Params = app.bsky.actor.getSuggestions.$Params & {\n  hydrateCtx: HydrateCtx\n  headers: HeadersMap\n}\n\ntype Skeleton = {\n  dids: DidString[]\n  cursor?: string\n  recId?: number\n  recIdStr?: string\n  resHeaders?: Headers\n}\n"]}

package/dist/api/app/bsky/actor/searchActors.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=searchActors.d.ts.map

package/dist/api/app/bsky/actor/searchActors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"searchActors.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/searchActors.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAIhD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAY5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAyBvD"}
+{"version":3,"file":"searchActors.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/searchActors.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAehD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAyBvD"}

package/dist/api/app/bsky/actor/searchActors.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const common_1 = require("@atproto/common");
 const util_1 = require("../../../../hydration/util");
+const index_js_1 = require("../../../../lexicons/index.js");
 const pipeline_1 = require("../../../../pipeline");
 const util_2 = require("../../../util");
 function default_1(server, ctx) {
     const searchActors = (0, pipeline_1.createPipeline)(skeleton, hydration, noBlocks, presentation);
-    server.app.bsky.actor.searchActors({
+    server.add(index_js_1.app.bsky.actor.searchActors, {
         auth: ctx.authVerifier.standardOptional,
         handler: async ({ auth, params, req }) => {
             const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth);
@@ -31,9 +32,9 @@ const skeleton = async (inputs) => {
     const term = params.q ?? params.term ?? '';
     // @TODO
     // add hits total
-    if (ctx.searchAgent) {
+    if (ctx.searchClient) {
         // @NOTE cursors won't change on appview swap
-        const { data: res } = await ctx.searchAgent.app.bsky.unspecced.searchActorsSkeleton({
+        const res = await ctx.searchClient.call(index_js_1.app.bsky.unspecced.searchActorsSkeleton, {
             q: term,
             cursor: params.cursor,
             limit: params.limit,

package/dist/api/app/bsky/actor/searchActors.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchActors.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/searchActors.ts"],"names":[],"mappings":"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","sourcesContent":["import { AtpAgent } from '@atproto/api'\nimport { mapDefined } from '@atproto/common'\nimport { AppContext } from '../../../../context'\nimport { DataPlaneClient } from '../../../../data-plane'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'\nimport { parseString } from '../../../../hydration/util'\nimport { Server } from '../../../../lexicon'\nimport { QueryParams } from '../../../../lexicon/types/app/bsky/actor/searchActors'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline'\nimport { Views } from '../../../../views'\nimport { resHeaders } from '../../../util'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchActors = createPipeline(\n    skeleton,\n    hydration,\n    noBlocks,\n    presentation,\n  )\n  server.app.bsky.actor.searchActors({\n    auth: ctx.authVerifier.standardOptional,\n    handler: async ({ auth, params, req }) => {\n      const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth)\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        viewer,\n        labelers,\n        includeTakedowns,\n      })\n      const results = await searchActors({ ...params, hydrateCtx }, ctx)\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (inputs: SkeletonFnInput<Context, Params>) => {\n  const { ctx, params } = inputs\n  const term = params.q ?? params.term ?? ''\n\n  // @TODO\n  // add hits total\n\n  if (ctx.searchAgent) {\n    // @NOTE cursors won't change on appview swap\n    const { data: res } =\n      await ctx.searchAgent.app.bsky.unspecced.searchActorsSkeleton({\n        q: term,\n        cursor: params.cursor,\n        limit: params.limit,\n        viewer: params.hydrateCtx.viewer ?? undefined,\n      })\n    return {\n      dids: res.actors.map(({ did }) => did),\n      cursor: parseString(res.cursor),\n    }\n  }\n\n  const res = await ctx.dataplane.searchActors({\n    term,\n    limit: params.limit,\n    cursor: params.cursor,\n  })\n  return {\n    dids: res.dids,\n    cursor: parseString(res.cursor),\n  }\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  return ctx.hydrator.hydrateProfiles(skeleton.dids, params.hydrateCtx)\n}\n\nconst noBlocks = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, skeleton, hydration } = inputs\n  skeleton.dids = skeleton.dids.filter(\n    (did) => !ctx.views.viewerBlockExists(did, hydration),\n  )\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const actors = mapDefined(skeleton.dids, (did) =>\n    ctx.views.profile(did, hydration),\n  )\n  return {\n    actors,\n    cursor: skeleton.cursor,\n  }\n}\n\ntype Context = {\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n  searchAgent?: AtpAgent\n}\n\ntype Params = QueryParams & { hydrateCtx: HydrateCtx }\n\ntype Skeleton = {\n  dids: string[]\n  hitsTotal?: number\n  cursor?: string\n}\n"]}
+{"version":3,"file":"searchActors.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/searchActors.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport { Client, DidString } from '@atproto/lex'\nimport { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { DataPlaneClient } from '../../../../data-plane'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'\nimport { parseString } from '../../../../hydration/util'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline'\nimport { Views } from '../../../../views'\nimport { resHeaders } from '../../../util'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchActors = createPipeline(\n    skeleton,\n    hydration,\n    noBlocks,\n    presentation,\n  )\n  server.add(app.bsky.actor.searchActors, {\n    auth: ctx.authVerifier.standardOptional,\n    handler: async ({ auth, params, req }) => {\n      const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth)\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        viewer,\n        labelers,\n        includeTakedowns,\n      })\n      const results = await searchActors({ ...params, hydrateCtx }, ctx)\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const term = params.q ?? params.term ?? ''\n\n  // @TODO\n  // add hits total\n\n  if (ctx.searchClient) {\n    // @NOTE cursors won't change on appview swap\n    const res = await ctx.searchClient.call(\n      app.bsky.unspecced.searchActorsSkeleton,\n      {\n        q: term,\n        cursor: params.cursor,\n        limit: params.limit,\n        viewer: params.hydrateCtx.viewer ?? undefined,\n      },\n    )\n    return {\n      dids: res.actors.map(({ did }) => did as DidString),\n      cursor: parseString(res.cursor),\n    }\n  }\n\n  const res = await ctx.dataplane.searchActors({\n    term,\n    limit: params.limit,\n    cursor: params.cursor,\n  })\n  return {\n    dids: res.dids as DidString[],\n    cursor: parseString(res.cursor),\n  }\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  return ctx.hydrator.hydrateProfiles(skeleton.dids, params.hydrateCtx)\n}\n\nconst noBlocks = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, skeleton, hydration } = inputs\n  skeleton.dids = skeleton.dids.filter(\n    (did) => !ctx.views.viewerBlockExists(did, hydration),\n  )\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const actors = mapDefined(skeleton.dids, (did) =>\n    ctx.views.profile(did, hydration),\n  )\n  return {\n    actors,\n    cursor: skeleton.cursor,\n  }\n}\n\ntype Context = {\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n  searchClient?: Client\n}\n\ntype Params = app.bsky.actor.searchActors.$Params & { hydrateCtx: HydrateCtx }\n\ntype Skeleton = {\n  dids: DidString[]\n  hitsTotal?: number\n  cursor?: string\n}\n"]}

package/dist/api/app/bsky/actor/searchActorsTypeahead.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=searchActorsTypeahead.d.ts.map

package/dist/api/app/bsky/actor/searchActorsTypeahead.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"searchActorsTypeahead.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/searchActorsTypeahead.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAIhD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAY5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAwBvD"}
+{"version":3,"file":"searchActorsTypeahead.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/searchActorsTypeahead.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAchD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAwBvD"}

package/dist/api/app/bsky/actor/searchActorsTypeahead.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const common_1 = require("@atproto/common");
-const util_1 = require("../../../../hydration/util");
+const index_js_1 = require("../../../../lexicons/index.js");
 const pipeline_1 = require("../../../../pipeline");
-const util_2 = require("../../../util");
+const util_1 = require("../../../util");
 function default_1(server, ctx) {
     const searchActorsTypeahead = (0, pipeline_1.createPipeline)(skeleton, hydration, noBlocks, presentation);
-    server.app.bsky.actor.searchActorsTypeahead({
+    server.add(index_js_1.app.bsky.actor.searchActorsTypeahead, {
         auth: ctx.authVerifier.standardOptional,
         handler: async ({ params, auth, req }) => {
             const viewer = auth.credentials.iss;
@@ -17,7 +17,7 @@ function default_1(server, ctx) {
             return {
                 encoding: 'application/json',
                 body: results,
-                headers: (0, util_2.resHeaders)({ labelers: hydrateCtx.labelers }),
+                headers: (0, util_1.resHeaders)({ labelers: hydrateCtx.labelers }),
             };
         },
     });
@@ -28,16 +28,15 @@ const skeleton = async (inputs) => {
     // @TODO
     // add typeahead option
     // add hits total
-    if (ctx.searchAgent) {
-        const { data: res } = await ctx.searchAgent.app.bsky.unspecced.searchActorsSkeleton({
+    if (ctx.searchClient) {
+        const { actors } = await ctx.searchClient.call(index_js_1.app.bsky.unspecced.searchActorsSkeleton, {
             typeahead: true,
             q: term,
             limit: params.limit,
             viewer: params.hydrateCtx.viewer ?? undefined,
         });
         return {
-            dids: res.actors.map(({ did }) => did),
-            cursor: (0, util_1.parseString)(res.cursor),
+            dids: actors.map(({ did }) => did),
         };
     }
     const res = await ctx.dataplane.searchActors({
@@ -46,7 +45,6 @@ const skeleton = async (inputs) => {
     });
     return {
         dids: res.dids,
-        cursor: (0, util_1.parseString)(res.cursor),
     };
 };
 const hydration = async (inputs) => {

package/dist/api/app/bsky/actor/searchActorsTypeahead.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchActorsTypeahead.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/searchActorsTypeahead.ts"],"names":[],"mappings":"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","sourcesContent":["import { AtpAgent } from '@atproto/api'\nimport { mapDefined } from '@atproto/common'\nimport { AppContext } from '../../../../context'\nimport { DataPlaneClient } from '../../../../data-plane'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'\nimport { parseString } from '../../../../hydration/util'\nimport { Server } from '../../../../lexicon'\nimport { QueryParams } from '../../../../lexicon/types/app/bsky/actor/searchActorsTypeahead'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline'\nimport { Views } from '../../../../views'\nimport { resHeaders } from '../../../util'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchActorsTypeahead = createPipeline(\n    skeleton,\n    hydration,\n    noBlocks,\n    presentation,\n  )\n  server.app.bsky.actor.searchActorsTypeahead({\n    auth: ctx.authVerifier.standardOptional,\n    handler: async ({ params, auth, req }) => {\n      const viewer = auth.credentials.iss\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })\n      const results = await searchActorsTypeahead(\n        { ...params, hydrateCtx },\n        ctx,\n      )\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (inputs: SkeletonFnInput<Context, Params>) => {\n  const { ctx, params } = inputs\n  const term = params.q ?? params.term ?? ''\n\n  // @TODO\n  // add typeahead option\n  // add hits total\n\n  if (ctx.searchAgent) {\n    const { data: res } =\n      await ctx.searchAgent.app.bsky.unspecced.searchActorsSkeleton({\n        typeahead: true,\n        q: term,\n        limit: params.limit,\n        viewer: params.hydrateCtx.viewer ?? undefined,\n      })\n    return {\n      dids: res.actors.map(({ did }) => did),\n      cursor: parseString(res.cursor),\n    }\n  }\n\n  const res = await ctx.dataplane.searchActors({\n    term,\n    limit: params.limit,\n  })\n  return {\n    dids: res.dids,\n    cursor: parseString(res.cursor),\n  }\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  return ctx.hydrator.hydrateProfilesBasic(skeleton.dids, params.hydrateCtx)\n}\n\nconst noBlocks = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, skeleton, hydration, params } = inputs\n  skeleton.dids = skeleton.dids.filter((did) => {\n    const actor = hydration.actors?.get(did)\n    if (!actor) return false\n    // Always display exact matches so that users can find profiles that they have blocked\n    const term = (params.q ?? params.term ?? '').toLowerCase()\n    const isExactMatch = actor.handle?.toLowerCase() === term\n    return isExactMatch || !ctx.views.viewerBlockExists(did, hydration)\n  })\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const actors = mapDefined(skeleton.dids, (did) =>\n    ctx.views.profileBasic(did, hydration),\n  )\n  return {\n    actors,\n  }\n}\n\ntype Context = {\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n  searchAgent?: AtpAgent\n}\n\ntype Params = QueryParams & { hydrateCtx: HydrateCtx }\n\ntype Skeleton = {\n  dids: string[]\n}\n"]}
+{"version":3,"file":"searchActorsTypeahead.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/searchActorsTypeahead.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport { Client, DidString } from '@atproto/lex'\nimport { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { DataPlaneClient } from '../../../../data-plane'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline'\nimport { Views } from '../../../../views'\nimport { resHeaders } from '../../../util'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchActorsTypeahead = createPipeline(\n    skeleton,\n    hydration,\n    noBlocks,\n    presentation,\n  )\n  server.add(app.bsky.actor.searchActorsTypeahead, {\n    auth: ctx.authVerifier.standardOptional,\n    handler: async ({ params, auth, req }) => {\n      const viewer = auth.credentials.iss\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })\n      const results = await searchActorsTypeahead(\n        { ...params, hydrateCtx },\n        ctx,\n      )\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const term = params.q ?? params.term ?? ''\n\n  // @TODO\n  // add typeahead option\n  // add hits total\n\n  if (ctx.searchClient) {\n    const { actors } = await ctx.searchClient.call(\n      app.bsky.unspecced.searchActorsSkeleton,\n      {\n        typeahead: true,\n        q: term,\n        limit: params.limit,\n        viewer: params.hydrateCtx.viewer ?? undefined,\n      },\n    )\n    return {\n      dids: actors.map(({ did }) => did),\n    }\n  }\n\n  const res = await ctx.dataplane.searchActors({\n    term,\n    limit: params.limit,\n  })\n  return {\n    dids: res.dids as DidString[],\n  }\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  return ctx.hydrator.hydrateProfilesBasic(skeleton.dids, params.hydrateCtx)\n}\n\nconst noBlocks = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, skeleton, hydration, params } = inputs\n  skeleton.dids = skeleton.dids.filter((did) => {\n    const actor = hydration.actors?.get(did)\n    if (!actor) return false\n    // Always display exact matches so that users can find profiles that they have blocked\n    const term = (params.q ?? params.term ?? '').toLowerCase()\n    const isExactMatch = actor.handle?.toLowerCase() === term\n    return isExactMatch || !ctx.views.viewerBlockExists(did, hydration)\n  })\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const actors = mapDefined(skeleton.dids, (did) =>\n    ctx.views.profileBasic(did, hydration),\n  )\n  return {\n    actors,\n  }\n}\n\ntype Context = {\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n  searchClient?: Client\n}\n\ntype Params = app.bsky.actor.searchActorsTypeahead.$Params & {\n  hydrateCtx: HydrateCtx\n}\n\ntype Skeleton = {\n  dids: DidString[]\n}\n"]}

package/dist/api/app/bsky/ageassurance/begin.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=begin.d.ts.map

package/dist/api/app/bsky/ageassurance/begin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"begin.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/ageassurance/begin.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAkB5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAkHvD"}
+{"version":3,"file":"begin.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/ageassurance/begin.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,MAAM,EACP,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAmBhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAkHvD"}

package/dist/api/app/bsky/ageassurance/begin.js

@@ -9,6 +9,7 @@ const address_1 = require("@hapi/address");
 const disposable_email_domains_js_1 = require("disposable-email-domains-js");
 const api_1 = require("@atproto/api");
 const xrpc_server_1 = require("@atproto/xrpc-server");
+const index_js_1 = require("../../../../lexicons/index.js");
 const logger_1 = require("../../../../logger");
 const const_1 = require("../../../age-assurance/const");
 const const_2 = require("../../../age-assurance/kws/const");
@@ -17,7 +18,7 @@ const stash_1 = require("../../../age-assurance/stash");
 const util_1 = require("../../../age-assurance/util");
 const util_2 = require("../../../kws/util");
 function default_1(server, ctx) {
-    server.app.bsky.ageassurance.begin({
+    server.add(index_js_1.app.bsky.ageassurance.begin, {
         auth: ctx.authVerifier.standard,
         handler: async ({ auth, input, req }) => {
             if (!ctx.kwsClient) {

package/dist/api/app/bsky/ageassurance/begin.js.map

@@ -1 +1 @@
-{"version":3,"file":"begin.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/ageassurance/begin.ts"],"names":[],"mappings":"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","sourcesContent":["import crypto from 'node:crypto'\nimport { isEmailValid } from '@hapi/address'\nimport { isDisposableEmail } from 'disposable-email-domains-js'\nimport { getAgeAssuranceRegionConfig } from '@atproto/api'\nimport {\n  InvalidRequestError,\n  MethodNotImplementedError,\n} from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { InputSchema } from '../../../../lexicon/types/app/bsky/ageassurance/begin'\nimport { httpLogger as log } from '../../../../logger'\nimport { ActorInfo } from '../../../../proto/bsky_pb'\nimport { AGE_ASSURANCE_CONFIG } from '../../../age-assurance/const'\nimport {\n  KWS_SUPPORTED_LANGUAGES,\n  KWS_V2_COUNTRIES,\n} from '../../../age-assurance/kws/const'\nimport {\n  KWSExternalPayloadTooLargeError,\n  KWSExternalPayloadVersion,\n  serializeKWSExternalPayloadV2,\n} from '../../../age-assurance/kws/external-payload'\nimport { createEvent } from '../../../age-assurance/stash'\nimport { createLocationString } from '../../../age-assurance/util'\nimport { getClientUa } from '../../../kws/util'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.app.bsky.ageassurance.begin({\n    auth: ctx.authVerifier.standard,\n    handler: async ({ auth, input, req }) => {\n      if (!ctx.kwsClient) {\n        throw new MethodNotImplementedError(\n          'This service is not configured to support age assurance.',\n        )\n      }\n\n      const actorDid = auth.credentials.iss\n      const actorInfo = await getAgeVerificationState(ctx, actorDid)\n      const existingStatus = actorInfo?.ageAssuranceStatus?.status\n      const existingAccess = actorInfo?.ageAssuranceStatus?.access\n\n      if (existingStatus === 'blocked') {\n        throw new InvalidRequestError(\n          `Cannot initiate age assurance flow from current state: ${existingStatus}`,\n          'InvalidInitiation',\n        )\n      }\n\n      const attemptId = crypto.randomUUID()\n      const { email, language, countryCode, regionCode } = validateInput(\n        input.body,\n      )\n\n      let externalPayload: string\n      try {\n        externalPayload = serializeKWSExternalPayloadV2({\n          version: KWSExternalPayloadVersion.V2,\n          actorDid,\n          attemptId,\n          countryCode,\n          regionCode,\n        })\n      } catch (err) {\n        if (err instanceof KWSExternalPayloadTooLargeError) {\n          log.error({ err, actorDid }, err.message)\n          throw new InvalidRequestError(\n            'Age Assurance flow failed because DID is too long',\n            'DidTooLong',\n          )\n        }\n        throw err\n      }\n\n      /*\n       * Determine if age assurance config exists for this region. The calling\n       * application should already have checked for this, so this is just a\n       * safeguard.\n       */\n      const region = getAgeAssuranceRegionConfig(AGE_ASSURANCE_CONFIG, {\n        countryCode,\n        regionCode,\n      })\n      if (!region) {\n        const message = 'Age Assurance is not required in this region'\n        log.error({ actorDid, countryCode, regionCode }, message)\n        throw new InvalidRequestError(message, 'RegionNotSupported')\n      }\n\n      const location = createLocationString(countryCode, regionCode)\n\n      if (KWS_V2_COUNTRIES.has(region.countryCode)) {\n        // `age-verified` flow\n        await ctx.kwsClient.sendAgeVerifiedFlowEmail({\n          location,\n          email,\n          externalPayload,\n          language,\n        })\n      } else {\n        // `adult-verified` flow is what we've been using prior to `age-verified`\n        await ctx.kwsClient.sendAdultVerifiedFlowEmail({\n          location,\n          email,\n          externalPayload,\n          language,\n        })\n      }\n\n      // If we have existing status/access for this region, retain it.\n      const nextStatus =\n        existingStatus && existingStatus !== 'unknown'\n          ? existingStatus\n          : 'pending'\n      const nextAccess =\n        existingAccess && existingAccess !== 'unknown'\n          ? existingAccess\n          : 'unknown'\n\n      const event = await createEvent(ctx, actorDid, {\n        attemptId,\n        email,\n        // Assumes `app.set('trust proxy', ...)` configured with `true` or specific values.\n        initIp: req.ip,\n        initUa: getClientUa(req),\n        status: nextStatus,\n        access: nextAccess,\n        countryCode,\n        regionCode,\n      })\n\n      return {\n        encoding: 'application/json',\n        body: {\n          lastInitiatedAt: event.createdAt,\n          status: nextStatus,\n          access: nextAccess,\n        },\n      }\n    },\n  })\n}\n\nfunction validateInput({ email, language, ...rest }: InputSchema): InputSchema {\n  if (!isEmailValid(email) || isDisposableEmail(email)) {\n    throw new InvalidRequestError(\n      'This email address is not supported, please use a different email.',\n      'InvalidEmail',\n    )\n  }\n\n  return {\n    email,\n    language: KWS_SUPPORTED_LANGUAGES.has(language) ? language : 'en',\n    ...rest,\n  }\n}\n\nasync function getAgeVerificationState(\n  ctx: AppContext,\n  actorDid: string,\n): Promise<ActorInfo | undefined> {\n  try {\n    const res = await ctx.dataplane.getActors({\n      dids: [actorDid],\n      returnAgeAssuranceForDids: [actorDid],\n      skipCacheForDids: [actorDid],\n    })\n\n    return res.actors[0]\n  } catch (err) {\n    return undefined\n  }\n}\n"]}
+{"version":3,"file":"begin.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/ageassurance/begin.ts"],"names":[],"mappings":"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","sourcesContent":["import crypto from 'node:crypto'\nimport { isEmailValid } from '@hapi/address'\nimport { isDisposableEmail } from 'disposable-email-domains-js'\nimport { getAgeAssuranceRegionConfig } from '@atproto/api'\nimport {\n  InvalidRequestError,\n  MethodNotImplementedError,\n  Server,\n} from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\ntype InputSchema = app.bsky.ageassurance.begin.$InputBody\nimport { app } from '../../../../lexicons/index.js'\nimport { httpLogger as log } from '../../../../logger'\nimport { ActorInfo } from '../../../../proto/bsky_pb'\nimport { AGE_ASSURANCE_CONFIG } from '../../../age-assurance/const'\nimport {\n  KWS_SUPPORTED_LANGUAGES,\n  KWS_V2_COUNTRIES,\n} from '../../../age-assurance/kws/const'\nimport {\n  KWSExternalPayloadTooLargeError,\n  KWSExternalPayloadVersion,\n  serializeKWSExternalPayloadV2,\n} from '../../../age-assurance/kws/external-payload'\nimport { createEvent } from '../../../age-assurance/stash'\nimport { createLocationString } from '../../../age-assurance/util'\nimport { getClientUa } from '../../../kws/util'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(app.bsky.ageassurance.begin, {\n    auth: ctx.authVerifier.standard,\n    handler: async ({ auth, input, req }) => {\n      if (!ctx.kwsClient) {\n        throw new MethodNotImplementedError(\n          'This service is not configured to support age assurance.',\n        )\n      }\n\n      const actorDid = auth.credentials.iss\n      const actorInfo = await getAgeVerificationState(ctx, actorDid)\n      const existingStatus = actorInfo?.ageAssuranceStatus?.status\n      const existingAccess = actorInfo?.ageAssuranceStatus?.access\n\n      if (existingStatus === 'blocked') {\n        throw new InvalidRequestError(\n          `Cannot initiate age assurance flow from current state: ${existingStatus}`,\n          'InvalidInitiation',\n        )\n      }\n\n      const attemptId = crypto.randomUUID()\n      const { email, language, countryCode, regionCode } = validateInput(\n        input.body,\n      )\n\n      let externalPayload: string\n      try {\n        externalPayload = serializeKWSExternalPayloadV2({\n          version: KWSExternalPayloadVersion.V2,\n          actorDid,\n          attemptId,\n          countryCode,\n          regionCode,\n        })\n      } catch (err) {\n        if (err instanceof KWSExternalPayloadTooLargeError) {\n          log.error({ err, actorDid }, err.message)\n          throw new InvalidRequestError(\n            'Age Assurance flow failed because DID is too long',\n            'DidTooLong',\n          )\n        }\n        throw err\n      }\n\n      /*\n       * Determine if age assurance config exists for this region. The calling\n       * application should already have checked for this, so this is just a\n       * safeguard.\n       */\n      const region = getAgeAssuranceRegionConfig(AGE_ASSURANCE_CONFIG, {\n        countryCode,\n        regionCode,\n      })\n      if (!region) {\n        const message = 'Age Assurance is not required in this region'\n        log.error({ actorDid, countryCode, regionCode }, message)\n        throw new InvalidRequestError(message, 'RegionNotSupported')\n      }\n\n      const location = createLocationString(countryCode, regionCode)\n\n      if (KWS_V2_COUNTRIES.has(region.countryCode)) {\n        // `age-verified` flow\n        await ctx.kwsClient.sendAgeVerifiedFlowEmail({\n          location,\n          email,\n          externalPayload,\n          language,\n        })\n      } else {\n        // `adult-verified` flow is what we've been using prior to `age-verified`\n        await ctx.kwsClient.sendAdultVerifiedFlowEmail({\n          location,\n          email,\n          externalPayload,\n          language,\n        })\n      }\n\n      // If we have existing status/access for this region, retain it.\n      const nextStatus =\n        existingStatus && existingStatus !== 'unknown'\n          ? existingStatus\n          : 'pending'\n      const nextAccess =\n        existingAccess && existingAccess !== 'unknown'\n          ? existingAccess\n          : 'unknown'\n\n      const event = await createEvent(ctx, actorDid, {\n        attemptId,\n        email,\n        // Assumes `app.set('trust proxy', ...)` configured with `true` or specific values.\n        initIp: req.ip,\n        initUa: getClientUa(req),\n        status: nextStatus,\n        access: nextAccess,\n        countryCode,\n        regionCode,\n      })\n\n      return {\n        encoding: 'application/json',\n        body: {\n          lastInitiatedAt: event.createdAt,\n          status: nextStatus,\n          access: nextAccess,\n        },\n      }\n    },\n  })\n}\n\nfunction validateInput({ email, language, ...rest }: InputSchema): InputSchema {\n  if (!isEmailValid(email) || isDisposableEmail(email)) {\n    throw new InvalidRequestError(\n      'This email address is not supported, please use a different email.',\n      'InvalidEmail',\n    )\n  }\n\n  return {\n    email,\n    language: KWS_SUPPORTED_LANGUAGES.has(language) ? language : 'en',\n    ...rest,\n  }\n}\n\nasync function getAgeVerificationState(\n  ctx: AppContext,\n  actorDid: string,\n): Promise<ActorInfo | undefined> {\n  try {\n    const res = await ctx.dataplane.getActors({\n      dids: [actorDid],\n      returnAgeAssuranceForDids: [actorDid],\n      skipCacheForDids: [actorDid],\n    })\n\n    return res.actors[0]\n  } catch (err) {\n    return undefined\n  }\n}\n"]}

package/dist/api/app/bsky/ageassurance/getConfig.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=getConfig.d.ts.map

package/dist/api/app/bsky/ageassurance/getConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getConfig.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/ageassurance/getConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAUvD"}
+{"version":3,"file":"getConfig.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/ageassurance/getConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAUvD"}

package/dist/api/app/bsky/ageassurance/getConfig.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const const_1 = require("../../../../api/age-assurance/const");
+const index_js_1 = require("../../../../lexicons/index.js");
 function default_1(server, ctx) {
-    server.app.bsky.ageassurance.getConfig({
+    server.add(index_js_1.app.bsky.ageassurance.getConfig, {
         auth: ctx.authVerifier.standardOptional,
         handler: async () => {
             return {

package/dist/api/app/bsky/ageassurance/getConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"getConfig.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/ageassurance/getConfig.ts"],"names":[],"mappings":";;AAIA,4BAUC;AAdD,+DAA0E;AAI1E,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC;QACrC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,gBAAgB;QACvC,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE,4BAAoB;aAC3B,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { AGE_ASSURANCE_CONFIG } from '../../../../api/age-assurance/const'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.app.bsky.ageassurance.getConfig({\n    auth: ctx.authVerifier.standardOptional,\n    handler: async () => {\n      return {\n        encoding: 'application/json',\n        body: AGE_ASSURANCE_CONFIG,\n      }\n    },\n  })\n}\n"]}
+{"version":3,"file":"getConfig.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/ageassurance/getConfig.ts"],"names":[],"mappings":";;AAKA,4BAUC;AAdD,+DAA0E;AAE1E,4DAAmD;AAEnD,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE;QAC1C,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,gBAAgB;QACvC,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE,4BAAoB;aAC3B,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { Server } from '@atproto/xrpc-server'\nimport { AGE_ASSURANCE_CONFIG } from '../../../../api/age-assurance/const'\nimport { AppContext } from '../../../../context'\nimport { app } from '../../../../lexicons/index.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(app.bsky.ageassurance.getConfig, {\n    auth: ctx.authVerifier.standardOptional,\n    handler: async () => {\n      return {\n        encoding: 'application/json',\n        body: AGE_ASSURANCE_CONFIG,\n      }\n    },\n  })\n}\n"]}

package/dist/api/app/bsky/ageassurance/getState.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=getState.d.ts.map

package/dist/api/app/bsky/ageassurance/getState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getState.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/ageassurance/getState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAG5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA0BvD"}
+{"version":3,"file":"getState.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/ageassurance/getState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAwB,MAAM,sBAAsB,CAAA;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAIhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA8BvD"}

package/dist/api/app/bsky/ageassurance/getState.js

@@ -2,24 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const xrpc_server_1 = require("@atproto/xrpc-server");
+const index_js_1 = require("../../../../lexicons/index.js");
 function default_1(server, ctx) {
-    server.app.bsky.ageassurance.getState({
+    server.add(index_js_1.app.bsky.ageassurance.getState, {
         auth: ctx.authVerifier.standard,
-        handler: async ({ auth }) => {
+        handler: async ({ auth, }) => {
             const viewer = auth.credentials.iss;
             const actor = await getActorInfo(ctx, viewer);
+            const lastInitiatedAt = actor.ageAssuranceStatus?.lastInitiatedAt;
             return {
                 encoding: 'application/json',
                 body: {
                     state: {
-                        lastInitiatedAt: actor.ageAssuranceStatus?.lastInitiatedAt
-                            ?.toDate()
-                            .toISOString() || undefined,
+                        lastInitiatedAt: lastInitiatedAt
+                            ? lastInitiatedAt.toDate().toISOString()
+                            : undefined,
                         status: actor.ageAssuranceStatus?.status || 'unknown',
                         access: actor.ageAssuranceStatus?.access || 'unknown',
                     },
                     metadata: {
-                        accountCreatedAt: actor.createdAt?.toDate().toISOString() || undefined,
+                        accountCreatedAt: actor.createdAt
+                            ? actor.createdAt.toDate().toISOString()
+                            : undefined,
                     },
                 },
             };

package/dist/api/app/bsky/ageassurance/getState.js.map

@@ -1 +1 @@
-{"version":3,"file":"getState.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/ageassurance/getState.ts"],"names":[],"mappings":";;AAKA,4BA0BC;AA/BD,sDAA2D;AAK3D,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;QACpC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACnC,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;YAE7C,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE;oBACJ,KAAK,EAAE;wBACL,eAAe,EACb,KAAK,CAAC,kBAAkB,EAAE,eAAe;4BACvC,EAAE,MAAM,EAAE;6BACT,WAAW,EAAE,IAAI,SAAS;wBAC/B,MAAM,EAAE,KAAK,CAAC,kBAAkB,EAAE,MAAM,IAAI,SAAS;wBACrD,MAAM,EAAE,KAAK,CAAC,kBAAkB,EAAE,MAAM,IAAI,SAAS;qBACtD;oBACD,QAAQ,EAAE;wBACR,gBAAgB,EACd,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,WAAW,EAAE,IAAI,SAAS;qBACvD;iBACF;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,YAAY,GAAG,KAAK,EACxB,GAAe,EACf,QAAgB,EACI,EAAE;IACtB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,CAAC,QAAQ,CAAC;YAChB,yBAAyB,EAAE,CAAC,QAAQ,CAAC;YACrC,gBAAgB,EAAE,CAAC,QAAQ,CAAC;SAC7B,CAAC,CAAA;QAEF,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACtB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,kCAAoB,CAC5B,wCAAwC,EACxC,4BAA4B,EAC5B,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAA;IACH,CAAC;AACH,CAAC,CAAA","sourcesContent":["import { UpstreamFailureError } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { ActorInfo } from '../../../../proto/bsky_pb'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.app.bsky.ageassurance.getState({\n    auth: ctx.authVerifier.standard,\n    handler: async ({ auth }) => {\n      const viewer = auth.credentials.iss\n      const actor = await getActorInfo(ctx, viewer)\n\n      return {\n        encoding: 'application/json',\n        body: {\n          state: {\n            lastInitiatedAt:\n              actor.ageAssuranceStatus?.lastInitiatedAt\n                ?.toDate()\n                .toISOString() || undefined,\n            status: actor.ageAssuranceStatus?.status || 'unknown',\n            access: actor.ageAssuranceStatus?.access || 'unknown',\n          },\n          metadata: {\n            accountCreatedAt:\n              actor.createdAt?.toDate().toISOString() || undefined,\n          },\n        },\n      }\n    },\n  })\n}\n\nconst getActorInfo = async (\n  ctx: AppContext,\n  actorDid: string,\n): Promise<ActorInfo> => {\n  try {\n    const res = await ctx.dataplane.getActors({\n      dids: [actorDid],\n      returnAgeAssuranceForDids: [actorDid],\n      skipCacheForDids: [actorDid],\n    })\n\n    return res.actors[0]\n  } catch (err) {\n    throw new UpstreamFailureError(\n      'Cannot get current age assurance state',\n      'GetAgeAssuranceStateFailed',\n      { cause: err },\n    )\n  }\n}\n"]}
+{"version":3,"file":"getState.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/ageassurance/getState.ts"],"names":[],"mappings":";;AAMA,4BA8BC;AAnCD,sDAAmE;AAEnE,4DAAmD;AAGnD,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE;QACzC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EACd,IAAI,GACL,EAAmD,EAAE;YACpD,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACnC,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;YAE7C,MAAM,eAAe,GAAG,KAAK,CAAC,kBAAkB,EAAE,eAAe,CAAA;YAEjE,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE;oBACJ,KAAK,EAAE;wBACL,eAAe,EAAE,eAAe;4BAC9B,CAAC,CAAE,eAAe,CAAC,MAAM,EAAE,CAAC,WAAW,EAAqB;4BAC5D,CAAC,CAAC,SAAS;wBACb,MAAM,EAAE,KAAK,CAAC,kBAAkB,EAAE,MAAM,IAAI,SAAS;wBACrD,MAAM,EAAE,KAAK,CAAC,kBAAkB,EAAE,MAAM,IAAI,SAAS;qBACtD;oBACD,QAAQ,EAAE;wBACR,gBAAgB,EAAE,KAAK,CAAC,SAAS;4BAC/B,CAAC,CAAE,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,WAAW,EAAqB;4BAC5D,CAAC,CAAC,SAAS;qBACd;iBACF;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,YAAY,GAAG,KAAK,EACxB,GAAe,EACf,QAAgB,EACI,EAAE;IACtB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,CAAC,QAAQ,CAAC;YAChB,yBAAyB,EAAE,CAAC,QAAQ,CAAC;YACrC,gBAAgB,EAAE,CAAC,QAAQ,CAAC;SAC7B,CAAC,CAAA;QAEF,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACtB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,kCAAoB,CAC5B,wCAAwC,EACxC,4BAA4B,EAC5B,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAA;IACH,CAAC;AACH,CAAC,CAAA","sourcesContent":["import { DatetimeString } from '@atproto/syntax'\nimport { Server, UpstreamFailureError } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { app } from '../../../../lexicons/index.js'\nimport { ActorInfo } from '../../../../proto/bsky_pb'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(app.bsky.ageassurance.getState, {\n    auth: ctx.authVerifier.standard,\n    handler: async ({\n      auth,\n    }): Promise<app.bsky.ageassurance.getState.$Output> => {\n      const viewer = auth.credentials.iss\n      const actor = await getActorInfo(ctx, viewer)\n\n      const lastInitiatedAt = actor.ageAssuranceStatus?.lastInitiatedAt\n\n      return {\n        encoding: 'application/json',\n        body: {\n          state: {\n            lastInitiatedAt: lastInitiatedAt\n              ? (lastInitiatedAt.toDate().toISOString() as DatetimeString)\n              : undefined,\n            status: actor.ageAssuranceStatus?.status || 'unknown',\n            access: actor.ageAssuranceStatus?.access || 'unknown',\n          },\n          metadata: {\n            accountCreatedAt: actor.createdAt\n              ? (actor.createdAt.toDate().toISOString() as DatetimeString)\n              : undefined,\n          },\n        },\n      }\n    },\n  })\n}\n\nconst getActorInfo = async (\n  ctx: AppContext,\n  actorDid: string,\n): Promise<ActorInfo> => {\n  try {\n    const res = await ctx.dataplane.getActors({\n      dids: [actorDid],\n      returnAgeAssuranceForDids: [actorDid],\n      skipCacheForDids: [actorDid],\n    })\n\n    return res.actors[0]\n  } catch (err) {\n    throw new UpstreamFailureError(\n      'Cannot get current age assurance state',\n      'GetAgeAssuranceStateFailed',\n      { cause: err },\n    )\n  }\n}\n"]}

package/dist/api/app/bsky/bookmark/createBookmark.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=createBookmark.d.ts.map

package/dist/api/app/bsky/bookmark/createBookmark.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBookmark.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/createBookmark.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAK5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA+BvD"}
+{"version":3,"file":"createBookmark.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/createBookmark.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAKhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA+BvD"}

package/dist/api/app/bsky/bookmark/createBookmark.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const common_1 = require("@atproto/common");
+const index_js_1 = require("../../../../lexicons/index.js");
 const stash_1 = require("../../../../stash");
 const util_1 = require("./util");
 function default_1(server, ctx) {
-    server.app.bsky.bookmark.createBookmark({
+    server.add(index_js_1.app.bsky.bookmark.createBookmark, {
         auth: ctx.authVerifier.standard,
         handler: async ({ input, auth }) => {
             const actorDid = auth.credentials.iss;

package/dist/api/app/bsky/bookmark/createBookmark.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBookmark.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/createBookmark.ts"],"names":[],"mappings":";;AAOA,4BA+BC;AAtCD,4CAAqC;AAIrC,6CAA8C;AAC9C,iCAAoC;AAEpC,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;QACtC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACrC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YAC/B,IAAA,kBAAW,EAAC,GAAG,CAAC,CAAA;YAEhB,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,8BAA8B,CAAC;gBAC7D,QAAQ;gBACR,IAAI,EAAE,CAAC,GAAG,CAAC;aACZ,CAAC,CAAA;YACF,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,SAAS,CAAA;YAChC,IAAI,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;gBACtB,uCAAuC;gBACvC,OAAM;YACR,CAAC;YAED,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;gBAC3B,QAAQ;gBACR,SAAS,EAAE,kBAAU,CAAC,2BAA2B;gBACjD,OAAO,EAAE;oBACP,OAAO,EAAE;wBACP,GAAG;wBACH,GAAG;qBACJ;iBACiB;gBACpB,GAAG,EAAE,YAAG,CAAC,OAAO,EAAE;aACnB,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { TID } from '@atproto/common'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { Bookmark } from '../../../../lexicon/types/app/bsky/bookmark/defs'\nimport { Namespaces } from '../../../../stash'\nimport { validateUri } from './util'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.app.bsky.bookmark.createBookmark({\n    auth: ctx.authVerifier.standard,\n    handler: async ({ input, auth }) => {\n      const actorDid = auth.credentials.iss\n      const { cid, uri } = input.body\n      validateUri(uri)\n\n      const res = await ctx.dataplane.getBookmarksByActorAndSubjects({\n        actorDid,\n        uris: [uri],\n      })\n      const [existing] = res.bookmarks\n      if (existing.ref?.key) {\n        // Idempotent, return without creating.\n        return\n      }\n\n      await ctx.stashClient.create({\n        actorDid,\n        namespace: Namespaces.AppBskyBookmarkDefsBookmark,\n        payload: {\n          subject: {\n            cid,\n            uri,\n          },\n        } satisfies Bookmark,\n        key: TID.nextStr(),\n      })\n    },\n  })\n}\n"]}
+{"version":3,"file":"createBookmark.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/createBookmark.ts"],"names":[],"mappings":";;AAOA,4BA+BC;AAtCD,4CAAqC;AAGrC,4DAAmD;AACnD,6CAA8C;AAC9C,iCAAoC;AAEpC,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE;QAC3C,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACrC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YAC/B,IAAA,kBAAW,EAAC,GAAG,CAAC,CAAA;YAEhB,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,8BAA8B,CAAC;gBAC7D,QAAQ;gBACR,IAAI,EAAE,CAAC,GAAG,CAAC;aACZ,CAAC,CAAA;YACF,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,SAAS,CAAA;YAChC,IAAI,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;gBACtB,uCAAuC;gBACvC,OAAM;YACR,CAAC;YAED,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;gBAC3B,QAAQ;gBACR,SAAS,EAAE,kBAAU,CAAC,2BAA2B;gBACjD,OAAO,EAAE;oBACP,OAAO,EAAE;wBACP,GAAG;wBACH,GAAG;qBACJ;iBACwC;gBAC3C,GAAG,EAAE,YAAG,CAAC,OAAO,EAAE;aACnB,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { TID } from '@atproto/common'\nimport { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { app } from '../../../../lexicons/index.js'\nimport { Namespaces } from '../../../../stash'\nimport { validateUri } from './util'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(app.bsky.bookmark.createBookmark, {\n    auth: ctx.authVerifier.standard,\n    handler: async ({ input, auth }) => {\n      const actorDid = auth.credentials.iss\n      const { cid, uri } = input.body\n      validateUri(uri)\n\n      const res = await ctx.dataplane.getBookmarksByActorAndSubjects({\n        actorDid,\n        uris: [uri],\n      })\n      const [existing] = res.bookmarks\n      if (existing.ref?.key) {\n        // Idempotent, return without creating.\n        return\n      }\n\n      await ctx.stashClient.create({\n        actorDid,\n        namespace: Namespaces.AppBskyBookmarkDefsBookmark,\n        payload: {\n          subject: {\n            cid,\n            uri,\n          },\n        } satisfies app.bsky.bookmark.defs.Bookmark,\n        key: TID.nextStr(),\n      })\n    },\n  })\n}\n"]}

package/dist/api/app/bsky/bookmark/deleteBookmark.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=deleteBookmark.d.ts.map

package/dist/api/app/bsky/bookmark/deleteBookmark.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteBookmark.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/deleteBookmark.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAI5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAyBvD"}
+{"version":3,"file":"deleteBookmark.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/deleteBookmark.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAKhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAyBvD"}

package/dist/api/app/bsky/bookmark/deleteBookmark.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+const index_js_1 = require("../../../../lexicons/index.js");
 const stash_1 = require("../../../../stash");
 const util_1 = require("./util");
 function default_1(server, ctx) {
-    server.app.bsky.bookmark.deleteBookmark({
+    server.add(index_js_1.app.bsky.bookmark.deleteBookmark, {
         auth: ctx.authVerifier.standard,
         handler: async ({ input, auth }) => {
             const actorDid = auth.credentials.iss;

package/dist/api/app/bsky/bookmark/deleteBookmark.js.map

@@ -1 +1 @@
-{"version":3,"file":"deleteBookmark.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/deleteBookmark.ts"],"names":[],"mappings":";;AAKA,4BAyBC;AA5BD,6CAA8C;AAC9C,iCAAoC;AAEpC,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;QACtC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACrC,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YAC1B,IAAA,kBAAW,EAAC,GAAG,CAAC,CAAA;YAEhB,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,8BAA8B,CAAC;gBAC7D,QAAQ;gBACR,IAAI,EAAE,CAAC,GAAG,CAAC;aACZ,CAAC,CAAA;YACF,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,SAAS,CAAA;YAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;gBACvB,uCAAuC;gBACvC,OAAM;YACR,CAAC;YAED,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;gBAC3B,QAAQ;gBACR,SAAS,EAAE,kBAAU,CAAC,2BAA2B;gBACjD,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG;aACtB,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { Namespaces } from '../../../../stash'\nimport { validateUri } from './util'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.app.bsky.bookmark.deleteBookmark({\n    auth: ctx.authVerifier.standard,\n    handler: async ({ input, auth }) => {\n      const actorDid = auth.credentials.iss\n      const { uri } = input.body\n      validateUri(uri)\n\n      const res = await ctx.dataplane.getBookmarksByActorAndSubjects({\n        actorDid,\n        uris: [uri],\n      })\n      const [existing] = res.bookmarks\n      if (!existing.ref?.key) {\n        // Idempotent, return without deleting.\n        return\n      }\n\n      await ctx.stashClient.delete({\n        actorDid,\n        namespace: Namespaces.AppBskyBookmarkDefsBookmark,\n        key: existing.ref.key,\n      })\n    },\n  })\n}\n"]}
+{"version":3,"file":"deleteBookmark.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/deleteBookmark.ts"],"names":[],"mappings":";;AAMA,4BAyBC;AA7BD,4DAAmD;AACnD,6CAA8C;AAC9C,iCAAoC;AAEpC,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE;QAC3C,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACrC,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YAC1B,IAAA,kBAAW,EAAC,GAAG,CAAC,CAAA;YAEhB,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,8BAA8B,CAAC;gBAC7D,QAAQ;gBACR,IAAI,EAAE,CAAC,GAAG,CAAC;aACZ,CAAC,CAAA;YACF,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,SAAS,CAAA;YAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;gBACvB,uCAAuC;gBACvC,OAAM;YACR,CAAC;YAED,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;gBAC3B,QAAQ;gBACR,SAAS,EAAE,kBAAU,CAAC,2BAA2B;gBACjD,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG;aACtB,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { app } from '../../../../lexicons/index.js'\nimport { Namespaces } from '../../../../stash'\nimport { validateUri } from './util'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(app.bsky.bookmark.deleteBookmark, {\n    auth: ctx.authVerifier.standard,\n    handler: async ({ input, auth }) => {\n      const actorDid = auth.credentials.iss\n      const { uri } = input.body\n      validateUri(uri)\n\n      const res = await ctx.dataplane.getBookmarksByActorAndSubjects({\n        actorDid,\n        uris: [uri],\n      })\n      const [existing] = res.bookmarks\n      if (!existing.ref?.key) {\n        // Idempotent, return without deleting.\n        return\n      }\n\n      await ctx.stashClient.delete({\n        actorDid,\n        namespace: Namespaces.AppBskyBookmarkDefsBookmark,\n        key: existing.ref.key,\n      })\n    },\n  })\n}\n"]}

package/dist/api/app/bsky/bookmark/getBookmarks.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=getBookmarks.d.ts.map

package/dist/api/app/bsky/bookmark/getBookmarks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getBookmarks.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/getBookmarks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAa5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA6BvD"}
+{"version":3,"file":"getBookmarks.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/getBookmarks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAchD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA6BvD"}

package/dist/api/app/bsky/bookmark/getBookmarks.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const common_1 = require("@atproto/common");
+const index_js_1 = require("../../../../lexicons/index.js");
 const pipeline_1 = require("../../../../pipeline");
 const util_1 = require("../../../util");
 function default_1(server, ctx) {
     const getBookmarks = (0, pipeline_1.createPipeline)(skeleton, hydration, pipeline_1.noRules, // Blocks are included and handled on views. Mutes are included.
     presentation);
-    server.app.bsky.bookmark.getBookmarks({
+    server.add(index_js_1.app.bsky.bookmark.getBookmarks, {
         auth: ctx.authVerifier.standard,
         handler: async ({ params, auth, req }) => {
             const viewer = auth.credentials.iss;