@atproto/bsky 0.0.273 → 0.0.274

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atproto/bsky
 
+## 0.0.274
+
+### Patch Changes
+
+- [#5365](https://github.com/bluesky-social/atproto/pull/5365) [`54edd67`](https://github.com/bluesky-social/atproto/commit/54edd671ebf3fd66ea88822fdb58c2a96e6140e5) Thanks [@ds-boyce](https://github.com/ds-boyce)! - Add batched canonical OP thread chains to post hydration so AppView can derive position metadata.
+
+- [#5375](https://github.com/bluesky-social/atproto/pull/5375) [`b31485e`](https://github.com/bluesky-social/atproto/commit/b31485ec5012f543fd60304df9a1684fac4e3dea) Thanks [@rafaeleyng](https://github.com/rafaeleyng)! - Fix pagination behavior
+
+- [#5382](https://github.com/bluesky-social/atproto/pull/5382) [`898c469`](https://github.com/bluesky-social/atproto/commit/898c469cf568b941f38f9c3371997a513ac05cfa) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply proper backpressure to image processing stream, avoiding memory pressure
+
+- [#5346](https://github.com/bluesky-social/atproto/pull/5346) [`68aaad8`](https://github.com/bluesky-social/atproto/commit/68aaad8ce22b3e58e768980ccb5e3556a6d71b23) Thanks [@cuducos](https://github.com/cuducos)! - Allow allowlisted feeds to be served by iris instead of their registered feed generator, behind the `iris:feed:enable` gate. Configured with `BSKY_IRIS_FEED_URIS`, which defaults to empty — leaving the routing off.
+
+- [#5378](https://github.com/bluesky-social/atproto/pull/5378) [`7f87e4a`](https://github.com/bluesky-social/atproto/commit/7f87e4a761ec6f3e0c25da25d0bc44b198b4bf80) Thanks [@cuducos](https://github.com/cuducos)! - Serve all trending topics traffic from iris and remove the experiment gate
+
+- [#5379](https://github.com/bluesky-social/atproto/pull/5379) [`6dac4dd`](https://github.com/bluesky-social/atproto/commit/6dac4dd01fa766c069b0eeab9dc55d3ae6297075) Thanks [@ds-boyce](https://github.com/ds-boyce)! - Expose canonical OP thread numbering on feed items.
+
+- Updated dependencies [[`898c469`](https://github.com/bluesky-social/atproto/commit/898c469cf568b941f38f9c3371997a513ac05cfa), [`c26b463`](https://github.com/bluesky-social/atproto/commit/c26b463a36124deb14b8d56ad1810eeddaa129cc), [`898c469`](https://github.com/bluesky-social/atproto/commit/898c469cf568b941f38f9c3371997a513ac05cfa), [`898c469`](https://github.com/bluesky-social/atproto/commit/898c469cf568b941f38f9c3371997a513ac05cfa), [`898c469`](https://github.com/bluesky-social/atproto/commit/898c469cf568b941f38f9c3371997a513ac05cfa), [`05305a7`](https://github.com/bluesky-social/atproto/commit/05305a7a18fc830262a23850dd659e8e98db0149), [`898c469`](https://github.com/bluesky-social/atproto/commit/898c469cf568b941f38f9c3371997a513ac05cfa), [`898c469`](https://github.com/bluesky-social/atproto/commit/898c469cf568b941f38f9c3371997a513ac05cfa), [`898c469`](https://github.com/bluesky-social/atproto/commit/898c469cf568b941f38f9c3371997a513ac05cfa)]:
+  - @atproto/common@0.8.0
+  - @atproto/api@0.20.40
+  - @atproto/repo@0.10.11
+  - @atproto/sync@0.4.4
+  - @atproto/xrpc-server@0.12.4
+  - @atproto-labs/xrpc-utils@0.1.17
+  - @atproto/lex@0.3.6
+
 ## 0.0.273
 
 ### Patch Changes

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

@@ -1 +1 @@
-{"version":3,"file":"getSuggestions.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/getSuggestions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAyB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAaxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAoCvD"}
+{"version":3,"file":"getSuggestions.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/getSuggestions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAyB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAaxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA0CvD"}

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

@@ -3,7 +3,7 @@ import { isDidString } from '@atproto/lex';
 import { parseString } from '../../../../hydration/util.js';
 import { app } from '../../../../lexicons/index.js';
 import { createPipeline } from '../../../../pipeline.js';
-import { resHeaders } from '../../../util.js';
+import { fillPage, resHeaders } from '../../../util.js';
 export default function (server, ctx) {
     const getSuggestions = createPipeline(skeleton, hydration, noBlocksOrMutes, presentation);
     server.add(app.bsky.actor.getSuggestions, {
@@ -18,7 +18,12 @@ export default function (server, ctx) {
                     ? req.headers['x-bsky-topics'].join(',')
                     : req.headers['x-bsky-topics'],
             });
-            const { resHeaders: resultHeaders, ...result } = await getSuggestions({ ...params, hydrateCtx, headers }, ctx);
+            const { resHeaders: resultHeaders, ...result } = await fillPage({
+                cursor: params.cursor,
+                limit: params.limit,
+                fetch: ({ cursor, limit }) => getSuggestions({ ...params, cursor, limit, hydrateCtx, headers }, ctx),
+                items: (r) => r.actors,
+            });
             const suggestionsResHeaders = noUndefinedVals({
                 'content-language': resultHeaders?.get('content-language'),
             });

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 { mapDefined, noUndefinedVals } from '@atproto/common'\nimport { type Client, type DidString, isDidString } from '@atproto/lex'\nimport type { Headers as HeadersMap, Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type { DataPlaneClient } from '../../../../data-plane/index.js'\nimport type {\n  HydrateCtx,\n  HydrationState,\n  Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { createPipeline } from '../../../../pipeline.js'\nimport type { Views } from '../../../../views/index.js'\nimport { resHeaders } from '../../../util.js'\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"]}
+{"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 { type Client, type DidString, isDidString } from '@atproto/lex'\nimport type { Headers as HeadersMap, Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type { DataPlaneClient } from '../../../../data-plane/index.js'\nimport type {\n  HydrateCtx,\n  HydrationState,\n  Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { createPipeline } from '../../../../pipeline.js'\nimport type { Views } from '../../../../views/index.js'\nimport { fillPage, resHeaders } from '../../../util.js'\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 fillPage({\n        cursor: params.cursor,\n        limit: params.limit,\n        fetch: ({ cursor, limit }) =>\n          getSuggestions(\n            { ...params, cursor, limit, hydrateCtx, headers },\n            ctx,\n          ),\n        items: (r) => r.actors,\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.map

@@ -1 +1 @@
-{"version":3,"file":"searchActors.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/searchActors.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAkBxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAwCvD"}
+{"version":3,"file":"searchActors.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/searchActors.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAkBxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAgDvD"}

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

@@ -3,7 +3,7 @@ import { asInvalidRequest, } from '../../../../data-plane/index.js';
 import { parseString } from '../../../../hydration/util.js';
 import { app } from '../../../../lexicons/index.js';
 import { createPipeline, } from '../../../../pipeline.js';
-import { resHeaders, resolveSearchV2Override } from '../../../util.js';
+import { fillPage, resHeaders, resolveSearchV2Override } from '../../../util.js';
 export default function (server, ctx) {
     const searchActors = createPipeline(skeleton, hydration, noBlocks, presentation);
     server.add(app.bsky.actor.searchActors, {
@@ -21,11 +21,18 @@ export default function (server, ctx) {
                     req,
                 })),
             });
-            const results = await searchActors({
-                ...params,
-                hydrateCtx,
-                isV2Override: resolveSearchV2Override(req, ctx.cfg),
-            }, ctx);
+            const results = await fillPage({
+                cursor: params.cursor,
+                limit: params.limit,
+                fetch: ({ cursor, limit }) => searchActors({
+                    ...params,
+                    cursor,
+                    limit,
+                    hydrateCtx,
+                    isV2Override: resolveSearchV2Override(req, ctx.cfg),
+                }, ctx),
+                items: (r) => r.actors,
+            });
             return {
                 encoding: 'application/json',
                 body: results,

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 { mapDefined } from '@atproto/common'\nimport type { Client, DidString } from '@atproto/lex'\nimport type { Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport {\n  type DataPlaneClient,\n  asInvalidRequest,\n} from '../../../../data-plane/index.js'\nimport type { HydrateCtx, Hydrator } from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  type HydrationFnInput,\n  type PresentationFnInput,\n  type RulesFnInput,\n  type SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport type { Views } from '../../../../views/index.js'\nimport { resHeaders, resolveSearchV2Override } from '../../../util.js'\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, skipViewerBlocks } =\n        ctx.authVerifier.parseCreds(auth)\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        viewer,\n        labelers,\n        includeTakedowns,\n        skipViewerBlocks,\n        features: ctx.featureGatesClient.scope(\n          ctx.featureGatesClient.parseUserContextFromHandler({\n            viewer,\n            req,\n          }),\n        ),\n      })\n      const results = await searchActors(\n        {\n          ...params,\n          hydrateCtx,\n          isV2Override: resolveSearchV2Override(req, ctx.cfg),\n        },\n        ctx,\n      )\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeletonV1 = 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 skeletonV2 = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const term = params.q ?? params.term ?? ''\n\n  // Surface dataplane InvalidArgument errors as a 400 rather than a 500.\n  const res = await ctx.dataplane\n    .searchActorsV2({\n      params: {\n        query: term,\n        viewer: params.hydrateCtx.viewer ?? undefined,\n        limit: params.limit,\n        cursor: params.cursor,\n      },\n    })\n    .catch(asInvalidRequest())\n  return {\n    dids: res.actors.map(({ did }) => did as DidString),\n    cursor: parseString(res.pageInfo?.cursor),\n  }\n}\n\nconst skeleton = async (input: SkeletonFnInput<Context, Params>) => {\n  const useV2 =\n    input.params.hydrateCtx.features.checkGate(\n      input.params.hydrateCtx.features.Gate.SearchV2Enable,\n    ) || input.params.isV2Override\n  const skeletonFn = useV2 ? skeletonV2 : skeletonV1\n  return skeletonFn(input)\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 & {\n  hydrateCtx: HydrateCtx\n  isV2Override: boolean\n}\n\ntype Skeleton = {\n  dids: DidString[]\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 type { Client, DidString } from '@atproto/lex'\nimport type { Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport {\n  type DataPlaneClient,\n  asInvalidRequest,\n} from '../../../../data-plane/index.js'\nimport type { HydrateCtx, Hydrator } from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  type HydrationFnInput,\n  type PresentationFnInput,\n  type RulesFnInput,\n  type SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport type { Views } from '../../../../views/index.js'\nimport { fillPage, resHeaders, resolveSearchV2Override } from '../../../util.js'\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, skipViewerBlocks } =\n        ctx.authVerifier.parseCreds(auth)\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        viewer,\n        labelers,\n        includeTakedowns,\n        skipViewerBlocks,\n        features: ctx.featureGatesClient.scope(\n          ctx.featureGatesClient.parseUserContextFromHandler({\n            viewer,\n            req,\n          }),\n        ),\n      })\n      const results = await fillPage({\n        cursor: params.cursor,\n        limit: params.limit,\n        fetch: ({ cursor, limit }) =>\n          searchActors(\n            {\n              ...params,\n              cursor,\n              limit,\n              hydrateCtx,\n              isV2Override: resolveSearchV2Override(req, ctx.cfg),\n            },\n            ctx,\n          ),\n        items: (r) => r.actors,\n      })\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeletonV1 = 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 skeletonV2 = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const term = params.q ?? params.term ?? ''\n\n  // Surface dataplane InvalidArgument errors as a 400 rather than a 500.\n  const res = await ctx.dataplane\n    .searchActorsV2({\n      params: {\n        query: term,\n        viewer: params.hydrateCtx.viewer ?? undefined,\n        limit: params.limit,\n        cursor: params.cursor,\n      },\n    })\n    .catch(asInvalidRequest())\n  return {\n    dids: res.actors.map(({ did }) => did as DidString),\n    cursor: parseString(res.pageInfo?.cursor),\n  }\n}\n\nconst skeleton = async (input: SkeletonFnInput<Context, Params>) => {\n  const useV2 =\n    input.params.hydrateCtx.features.checkGate(\n      input.params.hydrateCtx.features.Gate.SearchV2Enable,\n    ) || input.params.isV2Override\n  const skeletonFn = useV2 ? skeletonV2 : skeletonV1\n  return skeletonFn(input)\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 & {\n  hydrateCtx: HydrateCtx\n  isV2Override: boolean\n}\n\ntype Skeleton = {\n  dids: DidString[]\n  hitsTotal?: number\n  cursor?: string\n}\n"]}

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,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAiBxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA0BvD"}
+{"version":3,"file":"getBookmarks.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/getBookmarks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAiBxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAgCvD"}

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

@@ -1,7 +1,7 @@
 import { mapDefined } from '@atproto/common';
 import { app } from '../../../../lexicons/index.js';
 import { createPipeline, noRules, } from '../../../../pipeline.js';
-import { resHeaders } from '../../../util.js';
+import { fillPage, resHeaders } from '../../../util.js';
 export default function (server, ctx) {
     const getBookmarks = createPipeline(skeleton, hydration, noRules, // Blocks are included and handled on views. Mutes are included.
     presentation);
@@ -14,7 +14,12 @@ export default function (server, ctx) {
                 labelers,
                 viewer,
             });
-            const result = await getBookmarks({ ...params, hydrateCtx }, ctx);
+            const result = await fillPage({
+                cursor: params.cursor,
+                limit: params.limit,
+                fetch: ({ cursor, limit }) => getBookmarks({ ...params, cursor, limit, hydrateCtx }, ctx),
+                items: (r) => r.bookmarks,
+            });
             return {
                 encoding: 'application/json',
                 body: result,

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

@@ -1 +1 @@
-{"version":3,"file":"getBookmarks.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/getBookmarks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAO5C,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAIL,cAAc,EACd,OAAO,GACR,MAAM,yBAAyB,CAAA;AAGhC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,YAAY,GAAG,cAAc,CACjC,QAAQ,EACR,SAAS,EACT,OAAO,EAAE,gEAAgE;IACzE,YAAY,CACb,CAAA;IACD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE;QACzC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YACvC,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACnC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;YACrC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC;gBAClD,QAAQ;gBACR,MAAM;aACP,CAAC,CAAA;YAEF,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,EAAE,GAAG,CAAC,CAAA;YAEjE,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,UAAU,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;aACvD,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,QAAQ,GAAG,KAAK,EACpB,KAAuC,EACf,EAAE;IAC1B,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAA;IAC7B,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAA;IACzC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,iBAAiB,CAAC;QAC3E,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM;QAClC,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM;KACtB,CAAC,CAAA;IACF,OAAO;QACL,QAAQ;QACR,aAAa,EAAE,SAAS;QACxB,MAAM,EAAE,MAAM,IAAI,SAAS;KAC5B,CAAA;AACH,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,KAAK,EACrB,KAAuD,EACvD,EAAE;IACF,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;IACvC,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAA;IAClC,OAAO,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;AACxE,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CACnB,KAA0D,EAC1D,EAAE;IACF,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;IAC1C,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAA;IAC1C,MAAM,aAAa,GAAG,UAAU,CAAC,aAAa,EAAE,CAAC,YAAY,EAAE,EAAE,CAC/D,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAChD,CAAA;IACD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,CAAA;AAC7C,CAAC,CAAA","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type {\n  HydrateCtxWithViewer,\n  Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  type HydrationFnInput,\n  type PresentationFnInput,\n  type SkeletonFnInput,\n  createPipeline,\n  noRules,\n} from '../../../../pipeline.js'\nimport type { BookmarkInfo } from '../../../../proto/bsky_pb.js'\nimport type { Views } from '../../../../views/index.js'\nimport { resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getBookmarks = createPipeline(\n    skeleton,\n    hydration,\n    noRules, // Blocks are included and handled on views. Mutes are included.\n    presentation,\n  )\n  server.add(app.bsky.bookmark.getBookmarks, {\n    auth: ctx.authVerifier.standard,\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({\n        labelers,\n        viewer,\n      })\n\n      const result = await getBookmarks({ ...params, hydrateCtx }, ctx)\n\n      return {\n        encoding: 'application/json',\n        body: result,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  input: SkeletonFnInput<Context, Params>,\n): Promise<SkeletonState> => {\n  const { params, ctx } = input\n  const actorDid = params.hydrateCtx.viewer\n  const { bookmarks, cursor } = await ctx.hydrator.dataplane.getActorBookmarks({\n    actorDid: params.hydrateCtx.viewer,\n    limit: params.limit,\n    cursor: params.cursor,\n  })\n  return {\n    actorDid,\n    bookmarkInfos: bookmarks,\n    cursor: cursor || undefined,\n  }\n}\n\nconst hydration = async (\n  input: HydrationFnInput<Context, Params, SkeletonState>,\n) => {\n  const { ctx, params, skeleton } = input\n  const { bookmarkInfos } = skeleton\n  return ctx.hydrator.hydrateBookmarks(bookmarkInfos, params.hydrateCtx)\n}\n\nconst presentation = (\n  input: PresentationFnInput<Context, Params, SkeletonState>,\n) => {\n  const { ctx, hydration, skeleton } = input\n  const { bookmarkInfos, cursor } = skeleton\n  const bookmarkViews = mapDefined(bookmarkInfos, (bookmarkInfo) =>\n    ctx.views.bookmark(bookmarkInfo.key, hydration),\n  )\n  return { bookmarks: bookmarkViews, cursor }\n}\n\ntype Context = {\n  hydrator: Hydrator\n  views: Views\n}\n\ntype Params = app.bsky.bookmark.getBookmarks.$Params & {\n  hydrateCtx: HydrateCtxWithViewer\n}\n\ntype SkeletonState = {\n  actorDid: string\n  bookmarkInfos: BookmarkInfo[]\n  cursor?: string\n}\n"]}
+{"version":3,"file":"getBookmarks.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/bookmark/getBookmarks.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type {\n  HydrateCtxWithViewer,\n  Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  type HydrationFnInput,\n  type PresentationFnInput,\n  type SkeletonFnInput,\n  createPipeline,\n  noRules,\n} from '../../../../pipeline.js'\nimport type { BookmarkInfo } from '../../../../proto/bsky_pb.js'\nimport type { Views } from '../../../../views/index.js'\nimport { fillPage, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getBookmarks = createPipeline(\n    skeleton,\n    hydration,\n    noRules, // Blocks are included and handled on views. Mutes are included.\n    presentation,\n  )\n  server.add(app.bsky.bookmark.getBookmarks, {\n    auth: ctx.authVerifier.standard,\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({\n        labelers,\n        viewer,\n      })\n\n      const result = await fillPage({\n        cursor: params.cursor,\n        limit: params.limit,\n        fetch: ({ cursor, limit }) =>\n          getBookmarks({ ...params, cursor, limit, hydrateCtx }, ctx),\n        items: (r) => r.bookmarks,\n      })\n\n      return {\n        encoding: 'application/json',\n        body: result,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  input: SkeletonFnInput<Context, Params>,\n): Promise<SkeletonState> => {\n  const { params, ctx } = input\n  const actorDid = params.hydrateCtx.viewer\n  const { bookmarks, cursor } = await ctx.hydrator.dataplane.getActorBookmarks({\n    actorDid: params.hydrateCtx.viewer,\n    limit: params.limit,\n    cursor: params.cursor,\n  })\n  return {\n    actorDid,\n    bookmarkInfos: bookmarks,\n    cursor: cursor || undefined,\n  }\n}\n\nconst hydration = async (\n  input: HydrationFnInput<Context, Params, SkeletonState>,\n) => {\n  const { ctx, params, skeleton } = input\n  const { bookmarkInfos } = skeleton\n  return ctx.hydrator.hydrateBookmarks(bookmarkInfos, params.hydrateCtx)\n}\n\nconst presentation = (\n  input: PresentationFnInput<Context, Params, SkeletonState>,\n) => {\n  const { ctx, hydration, skeleton } = input\n  const { bookmarkInfos, cursor } = skeleton\n  const bookmarkViews = mapDefined(bookmarkInfos, (bookmarkInfo) =>\n    ctx.views.bookmark(bookmarkInfo.key, hydration),\n  )\n  return { bookmarks: bookmarkViews, cursor }\n}\n\ntype Context = {\n  hydrator: Hydrator\n  views: Views\n}\n\ntype Params = app.bsky.bookmark.getBookmarks.$Params & {\n  hydrateCtx: HydrateCtxWithViewer\n}\n\ntype SkeletonState = {\n  actorDid: string\n  bookmarkInfos: BookmarkInfo[]\n  cursor?: string\n}\n"]}

package/dist/api/app/bsky/contact/getMatches.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMatches.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/contact/getMatches.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAgBxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAuBvD"}
+{"version":3,"file":"getMatches.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/contact/getMatches.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAiBxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA6BvD"}

package/dist/api/app/bsky/contact/getMatches.js

@@ -1,6 +1,7 @@
 import { mapDefined } from '@atproto/common';
 import { app } from '../../../../lexicons/index.js';
 import { createPipeline, } from '../../../../pipeline.js';
+import { fillPage } from '../../../util.js';
 import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util.js';
 export default function (server, ctx) {
     const getMatches = createPipeline(skeleton, hydration, noBlocks, presentation);
@@ -14,7 +15,12 @@ export default function (server, ctx) {
                 labelers,
                 viewer,
             });
-            const result = await getMatches({ ...params, hydrateCtx }, ctx);
+            const result = await fillPage({
+                cursor: params.cursor,
+                limit: params.limit,
+                fetch: ({ cursor, limit }) => getMatches({ ...params, cursor, limit, hydrateCtx }, ctx),
+                items: (r) => r.matches,
+            });
             return {
                 encoding: 'application/json',
                 body: result,
@@ -51,6 +57,6 @@ const noBlocks = (inputs) => {
 const presentation = (input) => {
     const { ctx, skeleton, hydration } = input;
     const matches = mapDefined(skeleton.subjects, (did) => ctx.views.profile(did, hydration));
-    return { matches };
+    return { matches, cursor: skeleton.cursor };
 };
 //# sourceMappingURL=getMatches.js.map

package/dist/api/app/bsky/contact/getMatches.js.map

@@ -1 +1 @@
-{"version":3,"file":"getMatches.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/contact/getMatches.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { DidString } from '@atproto/lex'\nimport type { Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type {\n  HydrateCtxWithViewer,\n  HydrationState,\n  Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  type HydrationFnInput,\n  type SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport type { RolodexClient } from '../../../../rolodex.js'\nimport type { Views } from '../../../../views/index.js'\nimport { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getMatches = createPipeline(skeleton, hydration, noBlocks, presentation)\n\n  server.add(app.bsky.contact.getMatches, {\n    auth: ctx.authVerifier.standard,\n    handler: async ({ params, auth, req }) => {\n      assertRolodexOrThrowUnimplemented(ctx)\n\n      const viewer = auth.credentials.iss\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        labelers,\n        viewer,\n      })\n\n      const result = await getMatches({ ...params, hydrateCtx }, ctx)\n\n      return {\n        encoding: 'application/json',\n        body: result,\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  input: SkeletonFnInput<Context, Params>,\n): Promise<SkeletonState> => {\n  const { params, ctx } = input\n  const actor = params.hydrateCtx.viewer\n  const { cursor, subjects } = await callRolodexClient(\n    ctx.rolodexClient.getMatches({\n      actor: params.hydrateCtx.viewer,\n      limit: params.limit,\n      cursor: params.cursor,\n    }),\n  )\n  return {\n    actor,\n    subjects: subjects as DidString[],\n    cursor: cursor || undefined,\n  }\n}\n\nconst hydration = async (\n  input: HydrationFnInput<Context, Params, SkeletonState>,\n) => {\n  const { ctx, params, skeleton } = input\n  const { subjects } = skeleton\n  return ctx.hydrator.hydrateProfiles(subjects, params.hydrateCtx)\n}\n\nconst noBlocks = (inputs: {\n  ctx: Context\n  skeleton: SkeletonState\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = inputs\n  skeleton.subjects = skeleton.subjects.filter((subject) => {\n    return !ctx.views.viewerBlockExists(subject, hydration)\n  })\n  return skeleton\n}\n\nconst presentation = (input: {\n  ctx: Context\n  params: Params\n  skeleton: SkeletonState\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = input\n  const matches = mapDefined(skeleton.subjects, (did) =>\n    ctx.views.profile(did, hydration),\n  )\n  return { matches }\n}\n\ntype Context = {\n  hydrator: Hydrator\n  rolodexClient: RolodexClient\n  views: Views\n}\n\ntype Params = app.bsky.contact.getMatches.$Params & {\n  hydrateCtx: HydrateCtxWithViewer\n}\n\ntype SkeletonState = {\n  actor: string\n  subjects: DidString[]\n  cursor?: string\n}\n"]}
+{"version":3,"file":"getMatches.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/contact/getMatches.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { DidString } from '@atproto/lex'\nimport type { Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type {\n  HydrateCtxWithViewer,\n  HydrationState,\n  Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  type HydrationFnInput,\n  type SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport type { RolodexClient } from '../../../../rolodex.js'\nimport type { Views } from '../../../../views/index.js'\nimport { fillPage } from '../../../util.js'\nimport { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getMatches = createPipeline(skeleton, hydration, noBlocks, presentation)\n\n  server.add(app.bsky.contact.getMatches, {\n    auth: ctx.authVerifier.standard,\n    handler: async ({ params, auth, req }) => {\n      assertRolodexOrThrowUnimplemented(ctx)\n\n      const viewer = auth.credentials.iss\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        labelers,\n        viewer,\n      })\n\n      const result = await fillPage({\n        cursor: params.cursor,\n        limit: params.limit,\n        fetch: ({ cursor, limit }) =>\n          getMatches({ ...params, cursor, limit, hydrateCtx }, ctx),\n        items: (r) => r.matches,\n      })\n\n      return {\n        encoding: 'application/json',\n        body: result,\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  input: SkeletonFnInput<Context, Params>,\n): Promise<SkeletonState> => {\n  const { params, ctx } = input\n  const actor = params.hydrateCtx.viewer\n  const { cursor, subjects } = await callRolodexClient(\n    ctx.rolodexClient.getMatches({\n      actor: params.hydrateCtx.viewer,\n      limit: params.limit,\n      cursor: params.cursor,\n    }),\n  )\n  return {\n    actor,\n    subjects: subjects as DidString[],\n    cursor: cursor || undefined,\n  }\n}\n\nconst hydration = async (\n  input: HydrationFnInput<Context, Params, SkeletonState>,\n) => {\n  const { ctx, params, skeleton } = input\n  const { subjects } = skeleton\n  return ctx.hydrator.hydrateProfiles(subjects, params.hydrateCtx)\n}\n\nconst noBlocks = (inputs: {\n  ctx: Context\n  skeleton: SkeletonState\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = inputs\n  skeleton.subjects = skeleton.subjects.filter((subject) => {\n    return !ctx.views.viewerBlockExists(subject, hydration)\n  })\n  return skeleton\n}\n\nconst presentation = (input: {\n  ctx: Context\n  params: Params\n  skeleton: SkeletonState\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = input\n  const matches = mapDefined(skeleton.subjects, (did) =>\n    ctx.views.profile(did, hydration),\n  )\n  return { matches, cursor: skeleton.cursor }\n}\n\ntype Context = {\n  hydrator: Hydrator\n  rolodexClient: RolodexClient\n  views: Views\n}\n\ntype Params = app.bsky.contact.getMatches.$Params & {\n  hydrateCtx: HydrateCtxWithViewer\n}\n\ntype SkeletonState = {\n  actor: string\n  subjects: DidString[]\n  cursor?: string\n}\n"]}

package/dist/api/app/bsky/feed/getActorFeeds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getActorFeeds.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getActorFeeds.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAaxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAqBvD"}
+{"version":3,"file":"getActorFeeds.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getActorFeeds.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAaxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA2BvD"}

package/dist/api/app/bsky/feed/getActorFeeds.js

@@ -3,7 +3,7 @@ import { InvalidRequestError } from '@atproto/xrpc-server';
 import { parseString } from '../../../../hydration/util.js';
 import { app } from '../../../../lexicons/index.js';
 import { createPipeline, noRules } from '../../../../pipeline.js';
-import { clearlyBadCursor, resHeaders } from '../../../util.js';
+import { clearlyBadCursor, fillPage, resHeaders } from '../../../util.js';
 export default function (server, ctx) {
     const getActorFeeds = createPipeline(skeleton, hydration, noRules, presentation);
     server.add(app.bsky.feed.getActorFeeds, {
@@ -12,7 +12,12 @@ export default function (server, ctx) {
             const viewer = auth.credentials.iss;
             const labelers = ctx.reqLabelers(req);
             const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
-            const result = await getActorFeeds({ ...params, hydrateCtx }, ctx);
+            const result = await fillPage({
+                cursor: params.cursor,
+                limit: params.limit,
+                fetch: ({ cursor, limit }) => getActorFeeds({ ...params, cursor, limit, hydrateCtx }, ctx),
+                items: (r) => r.feeds,
+            });
             return {
                 encoding: 'application/json',
                 body: result,

package/dist/api/app/bsky/feed/getActorFeeds.js.map

@@ -1 +1 @@
-{"version":3,"file":"getActorFeeds.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getActorFeeds.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { AtUriString } from '@atproto/lex'\nimport { InvalidRequestError, type Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type { DataPlaneClient } from '../../../../data-plane/index.js'\nimport type {\n  HydrateCtx,\n  HydrationState,\n  Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { createPipeline, noRules } from '../../../../pipeline.js'\nimport type { Views } from '../../../../views/index.js'\nimport { clearlyBadCursor, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getActorFeeds = createPipeline(\n    skeleton,\n    hydration,\n    noRules,\n    presentation,\n  )\n  server.add(app.bsky.feed.getActorFeeds, {\n    auth: ctx.authVerifier.standardOptional,\n    handler: async ({ auth, params, req }) => {\n      const viewer = auth.credentials.iss\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })\n      const result = await getActorFeeds({ ...params, hydrateCtx }, ctx)\n      return {\n        encoding: 'application/json',\n        body: result,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (inputs: {\n  ctx: Context\n  params: Params\n}): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  if (clearlyBadCursor(params.cursor)) {\n    return { feedUris: [] }\n  }\n  const [did] = await ctx.hydrator.actor.getDids([params.actor])\n  if (!did) {\n    throw new InvalidRequestError('Profile not found')\n  }\n  const feedsRes = await ctx.dataplane.getActorFeeds({\n    actorDid: did,\n    cursor: params.cursor,\n    limit: params.limit,\n  })\n  return {\n    feedUris: feedsRes.uris as AtUriString[],\n    cursor: parseString(feedsRes.cursor),\n  }\n}\n\nconst hydration = async (inputs: {\n  ctx: Context\n  params: Params\n  skeleton: Skeleton\n}) => {\n  const { ctx, params, skeleton } = inputs\n  return await ctx.hydrator.hydrateFeedGens(\n    skeleton.feedUris,\n    params.hydrateCtx,\n  )\n}\n\nconst presentation = (inputs: {\n  ctx: Context\n  skeleton: Skeleton\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = inputs\n  const feeds = mapDefined(skeleton.feedUris, (uri) =>\n    ctx.views.feedGenerator(uri, hydration),\n  )\n  return {\n    feeds,\n    cursor: skeleton.cursor,\n  }\n}\n\ntype Context = {\n  hydrator: Hydrator\n  views: Views\n  dataplane: DataPlaneClient\n}\n\ntype Params = app.bsky.feed.getActorFeeds.$Params & { hydrateCtx: HydrateCtx }\n\ntype Skeleton = {\n  feedUris: AtUriString[]\n  cursor?: string\n}\n"]}
+{"version":3,"file":"getActorFeeds.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getActorFeeds.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { AtUriString } from '@atproto/lex'\nimport { InvalidRequestError, type Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type { DataPlaneClient } from '../../../../data-plane/index.js'\nimport type {\n  HydrateCtx,\n  HydrationState,\n  Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { createPipeline, noRules } from '../../../../pipeline.js'\nimport type { Views } from '../../../../views/index.js'\nimport { clearlyBadCursor, fillPage, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getActorFeeds = createPipeline(\n    skeleton,\n    hydration,\n    noRules,\n    presentation,\n  )\n  server.add(app.bsky.feed.getActorFeeds, {\n    auth: ctx.authVerifier.standardOptional,\n    handler: async ({ auth, params, req }) => {\n      const viewer = auth.credentials.iss\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })\n      const result = await fillPage({\n        cursor: params.cursor,\n        limit: params.limit,\n        fetch: ({ cursor, limit }) =>\n          getActorFeeds({ ...params, cursor, limit, hydrateCtx }, ctx),\n        items: (r) => r.feeds,\n      })\n      return {\n        encoding: 'application/json',\n        body: result,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (inputs: {\n  ctx: Context\n  params: Params\n}): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  if (clearlyBadCursor(params.cursor)) {\n    return { feedUris: [] }\n  }\n  const [did] = await ctx.hydrator.actor.getDids([params.actor])\n  if (!did) {\n    throw new InvalidRequestError('Profile not found')\n  }\n  const feedsRes = await ctx.dataplane.getActorFeeds({\n    actorDid: did,\n    cursor: params.cursor,\n    limit: params.limit,\n  })\n  return {\n    feedUris: feedsRes.uris as AtUriString[],\n    cursor: parseString(feedsRes.cursor),\n  }\n}\n\nconst hydration = async (inputs: {\n  ctx: Context\n  params: Params\n  skeleton: Skeleton\n}) => {\n  const { ctx, params, skeleton } = inputs\n  return await ctx.hydrator.hydrateFeedGens(\n    skeleton.feedUris,\n    params.hydrateCtx,\n  )\n}\n\nconst presentation = (inputs: {\n  ctx: Context\n  skeleton: Skeleton\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = inputs\n  const feeds = mapDefined(skeleton.feedUris, (uri) =>\n    ctx.views.feedGenerator(uri, hydration),\n  )\n  return {\n    feeds,\n    cursor: skeleton.cursor,\n  }\n}\n\ntype Context = {\n  hydrator: Hydrator\n  views: Views\n  dataplane: DataPlaneClient\n}\n\ntype Params = app.bsky.feed.getActorFeeds.$Params & { hydrateCtx: HydrateCtx }\n\ntype Skeleton = {\n  feedUris: AtUriString[]\n  cursor?: string\n}\n"]}

package/dist/api/app/bsky/feed/getActorLikes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getActorLikes.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getActorLikes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAexD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA4BvD"}
+{"version":3,"file":"getActorLikes.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getActorLikes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAexD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAkCvD"}

package/dist/api/app/bsky/feed/getActorLikes.js

@@ -4,7 +4,7 @@ import { parseString } from '../../../../hydration/util.js';
 import { app } from '../../../../lexicons/index.js';
 import { createPipeline } from '../../../../pipeline.js';
 import { uriToDid as creatorFromUri } from '../../../../util/uris.js';
-import { clearlyBadCursor, resHeaders } from '../../../util.js';
+import { clearlyBadCursor, fillPage, resHeaders } from '../../../util.js';
 export default function (server, ctx) {
     const getActorLikes = createPipeline(skeleton, hydration, noPostBlocks, presentation);
     server.add(app.bsky.feed.getActorLikes, {
@@ -13,7 +13,12 @@ export default function (server, ctx) {
             const viewer = auth.credentials.iss;
             const labelers = ctx.reqLabelers(req);
             const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
-            const result = await getActorLikes({ ...params, hydrateCtx }, ctx);
+            const result = await fillPage({
+                cursor: params.cursor,
+                limit: params.limit,
+                fetch: ({ cursor, limit }) => getActorLikes({ ...params, cursor, limit, hydrateCtx }, ctx),
+                items: (r) => r.feed,
+            });
             const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer);
             return {
                 encoding: 'application/json',

package/dist/api/app/bsky/feed/getActorLikes.js.map

@@ -1 +1 @@
-{"version":3,"file":"getActorLikes.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getActorLikes.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { AtUriString } from '@atproto/lex'\nimport { InvalidRequestError, type Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type { DataPlaneClient } from '../../../../data-plane/index.js'\nimport type { FeedItem } from '../../../../hydration/feed.js'\nimport type {\n  HydrateCtx,\n  HydrationState,\n  Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { createPipeline } from '../../../../pipeline.js'\nimport { uriToDid as creatorFromUri } from '../../../../util/uris.js'\nimport type { Views } from '../../../../views/index.js'\nimport { clearlyBadCursor, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getActorLikes = createPipeline(\n    skeleton,\n    hydration,\n    noPostBlocks,\n    presentation,\n  )\n  server.add(app.bsky.feed.getActorLikes, {\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\n      const result = await getActorLikes({ ...params, hydrateCtx }, ctx)\n\n      const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)\n\n      return {\n        encoding: 'application/json',\n        body: result,\n        headers: resHeaders({\n          repoRev,\n          labelers: hydrateCtx.labelers,\n        }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (inputs: {\n  ctx: Context\n  params: Params\n}): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const { actor, limit, cursor } = params\n  const viewer = params.hydrateCtx.viewer\n  if (clearlyBadCursor(cursor)) {\n    return { items: [] }\n  }\n  const [actorDid] = await ctx.hydrator.actor.getDids([actor])\n  if (!actorDid || !viewer || viewer !== actorDid) {\n    throw new InvalidRequestError('Profile not found')\n  }\n\n  const likesRes = await ctx.dataplane.getActorLikes({\n    actorDid,\n    limit,\n    cursor,\n  })\n\n  const items = likesRes.likes.map((l) => ({\n    post: { uri: l.subject as AtUriString },\n  }))\n\n  return {\n    items,\n    cursor: parseString(likesRes.cursor),\n  }\n}\n\nconst hydration = async (inputs: {\n  ctx: Context\n  params: Params\n  skeleton: Skeleton\n}) => {\n  const { ctx, params, skeleton } = inputs\n  return await ctx.hydrator.hydrateFeedItems(skeleton.items, params.hydrateCtx)\n}\n\nconst noPostBlocks = (inputs: {\n  ctx: Context\n  skeleton: Skeleton\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = inputs\n  skeleton.items = skeleton.items.filter((item) => {\n    const creator = creatorFromUri(item.post.uri)\n    return !ctx.views.viewerBlockExists(creator, hydration)\n  })\n  return skeleton\n}\n\nconst presentation = (inputs: {\n  ctx: Context\n  skeleton: Skeleton\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = inputs\n  const feed = mapDefined(skeleton.items, (item) =>\n    ctx.views.feedViewPost(item, hydration),\n  )\n  return {\n    feed,\n    cursor: skeleton.cursor,\n  }\n}\n\ntype Context = {\n  hydrator: Hydrator\n  views: Views\n  dataplane: DataPlaneClient\n}\n\ntype Params = app.bsky.feed.getActorLikes.$Params & { hydrateCtx: HydrateCtx }\n\ntype Skeleton = {\n  items: FeedItem[]\n  cursor?: string\n}\n"]}
+{"version":3,"file":"getActorLikes.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getActorLikes.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { AtUriString } from '@atproto/lex'\nimport { InvalidRequestError, type Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type { DataPlaneClient } from '../../../../data-plane/index.js'\nimport type { FeedItem } from '../../../../hydration/feed.js'\nimport type {\n  HydrateCtx,\n  HydrationState,\n  Hydrator,\n} from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { createPipeline } from '../../../../pipeline.js'\nimport { uriToDid as creatorFromUri } from '../../../../util/uris.js'\nimport type { Views } from '../../../../views/index.js'\nimport { clearlyBadCursor, fillPage, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getActorLikes = createPipeline(\n    skeleton,\n    hydration,\n    noPostBlocks,\n    presentation,\n  )\n  server.add(app.bsky.feed.getActorLikes, {\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\n      const result = await fillPage({\n        cursor: params.cursor,\n        limit: params.limit,\n        fetch: ({ cursor, limit }) =>\n          getActorLikes({ ...params, cursor, limit, hydrateCtx }, ctx),\n        items: (r) => r.feed,\n      })\n\n      const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)\n\n      return {\n        encoding: 'application/json',\n        body: result,\n        headers: resHeaders({\n          repoRev,\n          labelers: hydrateCtx.labelers,\n        }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (inputs: {\n  ctx: Context\n  params: Params\n}): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const { actor, limit, cursor } = params\n  const viewer = params.hydrateCtx.viewer\n  if (clearlyBadCursor(cursor)) {\n    return { items: [] }\n  }\n  const [actorDid] = await ctx.hydrator.actor.getDids([actor])\n  if (!actorDid || !viewer || viewer !== actorDid) {\n    throw new InvalidRequestError('Profile not found')\n  }\n\n  const likesRes = await ctx.dataplane.getActorLikes({\n    actorDid,\n    limit,\n    cursor,\n  })\n\n  const items = likesRes.likes.map((l) => ({\n    post: { uri: l.subject as AtUriString },\n  }))\n\n  return {\n    items,\n    cursor: parseString(likesRes.cursor),\n  }\n}\n\nconst hydration = async (inputs: {\n  ctx: Context\n  params: Params\n  skeleton: Skeleton\n}) => {\n  const { ctx, params, skeleton } = inputs\n  return await ctx.hydrator.hydrateFeedItems(skeleton.items, params.hydrateCtx)\n}\n\nconst noPostBlocks = (inputs: {\n  ctx: Context\n  skeleton: Skeleton\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = inputs\n  skeleton.items = skeleton.items.filter((item) => {\n    const creator = creatorFromUri(item.post.uri)\n    return !ctx.views.viewerBlockExists(creator, hydration)\n  })\n  return skeleton\n}\n\nconst presentation = (inputs: {\n  ctx: Context\n  skeleton: Skeleton\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = inputs\n  const feed = mapDefined(skeleton.items, (item) =>\n    ctx.views.feedViewPost(item, hydration),\n  )\n  return {\n    feed,\n    cursor: skeleton.cursor,\n  }\n}\n\ntype Context = {\n  hydrator: Hydrator\n  views: Views\n  dataplane: DataPlaneClient\n}\n\ntype Params = app.bsky.feed.getActorLikes.$Params & { hydrateCtx: HydrateCtx }\n\ntype Skeleton = {\n  items: FeedItem[]\n  cursor?: string\n}\n"]}

package/dist/api/app/bsky/feed/getAuthorFeed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAuthorFeed.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getAuthorFeed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACtE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAQ,MAAM,+BAA+B,CAAA;AACnE,OAAO,EACL,KAAK,UAAU,EAEf,KAAK,QAAQ,EAEd,MAAM,mCAAmC,CAAA;AAE1C,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AAInD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAGvD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAkCvD;AAUD,eAAO,MAAM,QAAQ,WAAkB;IACrC,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf,KAAG,OAAO,CAAC,QAAQ,CA2DnB,CAAA;AA+ED,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,QAAQ,CAAA;IAClB,KAAK,EAAE,KAAK,CAAA;IACZ,SAAS,EAAE,eAAe,CAAA;CAC3B,CAAA;AAED,KAAK,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG;IAClD,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,KAAK,QAAQ,GAAG;IACd,KAAK,EAAE,KAAK,CAAA;IACZ,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACrD,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA"}
+{"version":3,"file":"getAuthorFeed.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getAuthorFeed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACtE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAQ,MAAM,+BAA+B,CAAA;AACnE,OAAO,EACL,KAAK,UAAU,EAEf,KAAK,QAAQ,EAEd,MAAM,mCAAmC,CAAA;AAE1C,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AAInD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAGvD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAwCvD;AAUD,eAAO,MAAM,QAAQ,WAAkB;IACrC,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf,KAAG,OAAO,CAAC,QAAQ,CA2DnB,CAAA;AA+ED,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,QAAQ,CAAA;IAClB,KAAK,EAAE,KAAK,CAAA;IACZ,SAAS,EAAE,eAAe,CAAA;CAC3B,CAAA;AAED,KAAK,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG;IAClD,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,KAAK,QAAQ,GAAG;IACd,KAAK,EAAE,KAAK,CAAA;IACZ,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACrD,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA"}

package/dist/api/app/bsky/feed/getAuthorFeed.js

@@ -6,7 +6,7 @@ import { app } from '../../../../lexicons/index.js';
 import { createPipeline } from '../../../../pipeline.js';
 import { FeedType } from '../../../../proto/bsky_pb.js';
 import { safePinnedPost, uriToDid } from '../../../../util/uris.js';
-import { clearlyBadCursor, resHeaders } from '../../../util.js';
+import { clearlyBadCursor, fillPage, resHeaders } from '../../../util.js';
 export default function (server, ctx) {
     const getAuthorFeed = createPipeline(skeleton, hydration, noBlocksOrMutedReposts, presentation);
     server.add(app.bsky.feed.getAuthorFeed, {
@@ -20,7 +20,12 @@ export default function (server, ctx) {
                 includeTakedowns,
                 skipViewerBlocks,
             });
-            const result = await getAuthorFeed({ ...params, hydrateCtx }, ctx);
+            const result = await fillPage({
+                cursor: params.cursor,
+                limit: params.limit,
+                fetch: ({ cursor, limit }) => getAuthorFeed({ ...params, cursor, limit, hydrateCtx }, ctx),
+                items: (r) => r.feed,
+            });
             const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer);
             return {
                 encoding: 'application/json',

package/dist/api/app/bsky/feed/getAuthorFeed.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAuthorFeed.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getAuthorFeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,mBAAmB,EAAe,MAAM,sBAAsB,CAAA;AAKvE,OAAO,EAIL,WAAW,GACZ,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AACvD,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAEnE,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE/D,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,aAAa,GAAG,cAAc,CAClC,QAAQ,EACR,SAAS,EACT,sBAAsB,EACtB,YAAY,CACb,CAAA;IACD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;QACtC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,sBAAsB;QAC7C,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YACvC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAClD,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YACnC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;YACrC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC;gBAClD,QAAQ;gBACR,MAAM;gBACN,gBAAgB;gBAChB,gBAAgB;aACjB,CAAC,CAAA;YAEF,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,EAAE,GAAG,CAAC,CAAA;YAElE,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;YAE/D,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,UAAU,CAAC;oBAClB,OAAO;oBACP,QAAQ,EAAE,UAAU,CAAC,QAAQ;iBAC9B,CAAC;aACH,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,mBAAmB,GAAG;IAC1B,kBAAkB,EAAE,SAAS,EAAE,2CAA2C;IAC1E,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;IAC3C,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;IAC3C,wBAAwB,EAAE,QAAQ,CAAC,wBAAwB;IAC3D,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;CAC5C,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,MAG9B,EAAqB,EAAE;IACtB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;IAC9B,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9D,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,mBAAmB,CAAC,mBAAmB,CAAC,CAAA;IACpD,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE;QACvD,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,gBAAgB;QACpD,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,kBAAkB;KACvD,CAAC,CAAA;IACF,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC7B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,mBAAmB,CAAC,mBAAmB,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACpC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;IACpD,CAAC;IAED,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;IAC5D,MAAM,kBAAkB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAA;IACzC,MAAM,sBAAsB,GAC1B,kBAAkB;QAClB,MAAM,CAAC,WAAW;QAClB,UAAU;QACV,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,GAAG,CAAA;IAExC,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC;QAC5C,QAAQ,EAAE,GAAG;QACb,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,QAAQ,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC;KAC7C,CAAC,CAAA;IAEF,IAAI,KAAK,GAAe,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC/C,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAkB,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,SAAS,EAAE;QAClE,MAAM,EAAE,IAAI,CAAC,MAAM;YACjB,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,MAAqB,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,IAAI,SAAS,EAAE;YACvE,CAAC,CAAC,SAAS;KACd,CAAC,CAAC,CAAA;IAEH,IAAI,sBAAsB,IAAI,UAAU,EAAE,CAAC;QACzC,MAAM,UAAU,GAAG;YACjB,IAAI,EAAE;gBACJ,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,GAAG,EAAE,UAAU,CAAC,GAAG;aACpB;YACD,YAAY,EAAE,IAAI;SACnB,CAAA;QAED,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACrE,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAC3B,CAAC;IAED,OAAO;QACL,KAAK;QACL,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,KAAK;QACL,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC;KAChC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,KAAK,EAAE,MAIxB,EAA2B,EAAE;IAC5B,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IACxC,MAAM,CAAC,aAAa,EAAE,kBAAkB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC5D,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC;QAChE,GAAG,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;KAC5E,CAAC,CAAA;IACF,OAAO,WAAW,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAA;AACvD,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,CAAC,MAI/B,EAAY,EAAE;IACb,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;IAC3C,MAAM,YAAY,GAAG,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACtE,IACE,YAAY;QACZ,CAAC,YAAY,CAAC,QAAQ,IAAI,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,EAC5E,CAAC;QACD,MAAM,IAAI,mBAAmB,CAC3B,gCAAgC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,EACpD,cAAc,CACf,CAAA;IACH,CAAC;IACD,IACE,YAAY;QACZ,CAAC,YAAY,CAAC,SAAS,IAAI,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,EAC5E,CAAC;QACD,MAAM,IAAI,mBAAmB,CAC3B,kCAAkC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,EACtD,gBAAgB,CACjB,CAAA;IACH,CAAC;IAED,MAAM,mBAAmB,GAAG,CAAC,IAAc,EAAE,EAAE;QAC7C,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAC7D,OAAO,CACL,CAAC,GAAG,CAAC,aAAa;YAClB,CAAC,GAAG,CAAC,iBAAiB;YACtB,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC,0BAA0B;SACrE,CAAA;IACH,CAAC,CAAA;IAED,IAAI,QAAQ,CAAC,MAAM,KAAK,0BAA0B,EAAE,CAAC;QACnD,4DAA4D;QAC5D,+DAA+D;QAC/D,MAAM,UAAU,GAAG,IAAI,iBAAiB,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QACnE,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9C,OAAO,CACL,mBAAmB,CAAC,IAAI,CAAC;gBACzB,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,IAAI,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CACnE,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;SAAM,CAAC;QACN,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;IAC7D,CAAC;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,MAIrB,EAAE,EAAE;IACH,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;IAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAC/C,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CACxC,CAAA;IACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAA;AAC1C,CAAC,CAAA;AAmBD,MAAM,iBAAiB;IAIrB,YACE,KAAiB,EACT,SAAyB;QAAzB,cAAS,GAAT,SAAS,CAAgB;QALnC,aAAQ,GAAG,IAAI,GAAG,EAAe,CAAA;QACjC,UAAK,GAAG,IAAI,GAAG,EAAwB,CAAA;QAMrC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAClC,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,EAAE,CAAC,GAAgB,EAAE,IAAI,GAAG,IAAI,GAAG,EAAe;QAChD,yDAAyD;QACzD,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,CAAA;QACrC,CAAC;QACD,iBAAiB;QACjB,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YAC1B,OAAO,KAAK,CAAA;QACd,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACf,CAAC;QACD,2BAA2B;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAClC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QAC3B,OAAO,MAAM,CAAA;IACf,CAAC;IAEO,GAAG,CAAC,GAAgB,EAAE,IAAsB;QAClD,6CAA6C;QAC7C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAA;QACd,CAAC;QACD,+CAA+C;QAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA;QAC3C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAA;QACd,CAAC;QACD,yDAAyD;QACzD,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;QACpC,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACvB,OAAO,IAAI,CAAA;QACb,CAAC;QACD,oEAAoE;QACpE,OAAO,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IACjC,CAAC;CACF;AAED,SAAS,YAAY,CAAC,IAAU;IAC9B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,IAAI,IAAI,CAAA;AAC9C,CAAC","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { AtUriString } from '@atproto/lex'\nimport { InvalidRequestError, type Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type { DataPlaneClient } from '../../../../data-plane/index.js'\nimport type { Actor } from '../../../../hydration/actor.js'\nimport type { FeedItem, Post } from '../../../../hydration/feed.js'\nimport {\n  type HydrateCtx,\n  type HydrationState,\n  type Hydrator,\n  mergeStates,\n} from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { createPipeline } from '../../../../pipeline.js'\nimport { FeedType } from '../../../../proto/bsky_pb.js'\nimport { safePinnedPost, uriToDid } from '../../../../util/uris.js'\nimport type { Views } from '../../../../views/index.js'\nimport { clearlyBadCursor, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getAuthorFeed = createPipeline(\n    skeleton,\n    hydration,\n    noBlocksOrMutedReposts,\n    presentation,\n  )\n  server.add(app.bsky.feed.getAuthorFeed, {\n    auth: ctx.authVerifier.optionalStandardOrRole,\n    handler: async ({ params, auth, req }) => {\n      const { viewer, includeTakedowns, skipViewerBlocks } =\n        ctx.authVerifier.parseCreds(auth)\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        labelers,\n        viewer,\n        includeTakedowns,\n        skipViewerBlocks,\n      })\n\n      const result = await getAuthorFeed({ ...params, hydrateCtx }, ctx)\n\n      const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)\n\n      return {\n        encoding: 'application/json',\n        body: result,\n        headers: resHeaders({\n          repoRev,\n          labelers: hydrateCtx.labelers,\n        }),\n      }\n    },\n  })\n}\n\nconst FILTER_TO_FEED_TYPE = {\n  posts_with_replies: undefined, // default: all posts, replies, and reposts\n  posts_no_replies: FeedType.POSTS_NO_REPLIES,\n  posts_with_media: FeedType.POSTS_WITH_MEDIA,\n  posts_and_author_threads: FeedType.POSTS_AND_AUTHOR_THREADS,\n  posts_with_video: FeedType.POSTS_WITH_VIDEO,\n}\n\nexport const skeleton = async (inputs: {\n  ctx: Context\n  params: Params\n}): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const [did] = await ctx.hydrator.actor.getDids([params.actor])\n  if (!did) {\n    throw new InvalidRequestError('Profile not found')\n  }\n  const actors = await ctx.hydrator.actor.getActors([did], {\n    includeTakedowns: params.hydrateCtx.includeTakedowns,\n    skipCacheForDids: params.hydrateCtx.skipCacheForViewer,\n  })\n  const actor = actors.get(did)\n  if (!actor) {\n    throw new InvalidRequestError('Profile not found')\n  }\n  if (clearlyBadCursor(params.cursor)) {\n    return { actor, filter: params.filter, items: [] }\n  }\n\n  const pinnedPost = safePinnedPost(actor.profile?.pinnedPost)\n  const isFirstPageRequest = !params.cursor\n  const shouldInsertPinnedPost =\n    isFirstPageRequest &&\n    params.includePins &&\n    pinnedPost &&\n    uriToDid(pinnedPost.uri) === actor.did\n\n  const res = await ctx.dataplane.getAuthorFeed({\n    actorDid: did,\n    limit: params.limit,\n    cursor: params.cursor,\n    feedType: FILTER_TO_FEED_TYPE[params.filter],\n  })\n\n  let items: FeedItem[] = res.items.map((item) => ({\n    post: { uri: item.uri as AtUriString, cid: item.cid || undefined },\n    repost: item.repost\n      ? { uri: item.repost as AtUriString, cid: item.repostCid || undefined }\n      : undefined,\n  }))\n\n  if (shouldInsertPinnedPost && pinnedPost) {\n    const pinnedItem = {\n      post: {\n        uri: pinnedPost.uri,\n        cid: pinnedPost.cid,\n      },\n      authorPinned: true,\n    }\n\n    items = items.filter((item) => item.post.uri !== pinnedItem.post.uri)\n    items.unshift(pinnedItem)\n  }\n\n  return {\n    actor,\n    filter: params.filter,\n    items,\n    cursor: parseString(res.cursor),\n  }\n}\n\nconst hydration = async (inputs: {\n  ctx: Context\n  params: Params\n  skeleton: Skeleton\n}): Promise<HydrationState> => {\n  const { ctx, params, skeleton } = inputs\n  const [feedPostState, profileViewerState] = await Promise.all([\n    ctx.hydrator.hydrateFeedItems(skeleton.items, params.hydrateCtx),\n    ctx.hydrator.hydrateProfileViewers([skeleton.actor.did], params.hydrateCtx),\n  ])\n  return mergeStates(feedPostState, profileViewerState)\n}\n\nconst noBlocksOrMutedReposts = (inputs: {\n  ctx: Context\n  skeleton: Skeleton\n  hydration: HydrationState\n}): Skeleton => {\n  const { ctx, skeleton, hydration } = inputs\n  const relationship = hydration.profileViewers?.get(skeleton.actor.did)\n  if (\n    relationship &&\n    (relationship.blocking || ctx.views.blockingByList(relationship, hydration))\n  ) {\n    throw new InvalidRequestError(\n      `Requester has blocked actor: ${skeleton.actor.did}`,\n      'BlockedActor',\n    )\n  }\n  if (\n    relationship &&\n    (relationship.blockedBy || ctx.views.blockedByList(relationship, hydration))\n  ) {\n    throw new InvalidRequestError(\n      `Requester is blocked by actor: ${skeleton.actor.did}`,\n      'BlockedByActor',\n    )\n  }\n\n  const checkBlocksAndMutes = (item: FeedItem) => {\n    const bam = ctx.views.feedItemBlocksAndMutes(item, hydration)\n    return (\n      !bam.authorBlocked &&\n      !bam.originatorBlocked &&\n      (!bam.authorMuted || bam.originatorMuted) // repost of muted content\n    )\n  }\n\n  if (skeleton.filter === 'posts_and_author_threads') {\n    // ensure replies are only included if the feed contains all\n    // replies up to the thread root (i.e. a complete self-thread.)\n    const selfThread = new SelfThreadTracker(skeleton.items, hydration)\n    skeleton.items = skeleton.items.filter((item) => {\n      return (\n        checkBlocksAndMutes(item) &&\n        (item.repost || item.authorPinned || selfThread.ok(item.post.uri))\n      )\n    })\n  } else {\n    skeleton.items = skeleton.items.filter(checkBlocksAndMutes)\n  }\n\n  return skeleton\n}\n\nconst presentation = (inputs: {\n  ctx: Context\n  skeleton: Skeleton\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = inputs\n  const feed = mapDefined(skeleton.items, (item) =>\n    ctx.views.feedViewPost(item, hydration),\n  )\n  return { feed, cursor: skeleton.cursor }\n}\n\ntype Context = {\n  hydrator: Hydrator\n  views: Views\n  dataplane: DataPlaneClient\n}\n\ntype Params = app.bsky.feed.getAuthorFeed.$Params & {\n  hydrateCtx: HydrateCtx\n}\n\ntype Skeleton = {\n  actor: Actor\n  items: FeedItem[]\n  filter: app.bsky.feed.getAuthorFeed.$Params['filter']\n  cursor?: string\n}\n\nclass SelfThreadTracker {\n  feedUris = new Set<AtUriString>()\n  cache = new Map<AtUriString, boolean>()\n\n  constructor(\n    items: FeedItem[],\n    private hydration: HydrationState,\n  ) {\n    items.forEach((item) => {\n      if (!item.repost) {\n        this.feedUris.add(item.post.uri)\n      }\n    })\n  }\n\n  ok(uri: AtUriString, loop = new Set<AtUriString>()) {\n    // if we've already checked this uri, pull from the cache\n    if (this.cache.has(uri)) {\n      return this.cache.get(uri) ?? false\n    }\n    // loop detection\n    if (loop.has(uri)) {\n      this.cache.set(uri, false)\n      return false\n    } else {\n      loop.add(uri)\n    }\n    // cache through the result\n    const result = this._ok(uri, loop)\n    this.cache.set(uri, result)\n    return result\n  }\n\n  private _ok(uri: AtUriString, loop: Set<AtUriString>): boolean {\n    // must be in the feed to be in a self-thread\n    if (!this.feedUris.has(uri)) {\n      return false\n    }\n    // must be hydratable to be part of self-thread\n    const post = this.hydration.posts?.get(uri)\n    if (!post) {\n      return false\n    }\n    // root posts (no parent) are trivial case of self-thread\n    const parentUri = getParentUri(post)\n    if (parentUri === null) {\n      return true\n    }\n    // recurse w/ cache: this post is in a self-thread if its parent is.\n    return this.ok(parentUri, loop)\n  }\n}\n\nfunction getParentUri(post: Post) {\n  return post.record.reply?.parent.uri ?? null\n}\n"]}
+{"version":3,"file":"getAuthorFeed.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getAuthorFeed.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport type { AtUriString } from '@atproto/lex'\nimport { InvalidRequestError, type Server } from '@atproto/xrpc-server'\nimport type { AppContext } from '../../../../context.js'\nimport type { DataPlaneClient } from '../../../../data-plane/index.js'\nimport type { Actor } from '../../../../hydration/actor.js'\nimport type { FeedItem, Post } from '../../../../hydration/feed.js'\nimport {\n  type HydrateCtx,\n  type HydrationState,\n  type Hydrator,\n  mergeStates,\n} from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { createPipeline } from '../../../../pipeline.js'\nimport { FeedType } from '../../../../proto/bsky_pb.js'\nimport { safePinnedPost, uriToDid } from '../../../../util/uris.js'\nimport type { Views } from '../../../../views/index.js'\nimport { clearlyBadCursor, fillPage, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getAuthorFeed = createPipeline(\n    skeleton,\n    hydration,\n    noBlocksOrMutedReposts,\n    presentation,\n  )\n  server.add(app.bsky.feed.getAuthorFeed, {\n    auth: ctx.authVerifier.optionalStandardOrRole,\n    handler: async ({ params, auth, req }) => {\n      const { viewer, includeTakedowns, skipViewerBlocks } =\n        ctx.authVerifier.parseCreds(auth)\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        labelers,\n        viewer,\n        includeTakedowns,\n        skipViewerBlocks,\n      })\n\n      const result = await fillPage({\n        cursor: params.cursor,\n        limit: params.limit,\n        fetch: ({ cursor, limit }) =>\n          getAuthorFeed({ ...params, cursor, limit, hydrateCtx }, ctx),\n        items: (r) => r.feed,\n      })\n\n      const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)\n\n      return {\n        encoding: 'application/json',\n        body: result,\n        headers: resHeaders({\n          repoRev,\n          labelers: hydrateCtx.labelers,\n        }),\n      }\n    },\n  })\n}\n\nconst FILTER_TO_FEED_TYPE = {\n  posts_with_replies: undefined, // default: all posts, replies, and reposts\n  posts_no_replies: FeedType.POSTS_NO_REPLIES,\n  posts_with_media: FeedType.POSTS_WITH_MEDIA,\n  posts_and_author_threads: FeedType.POSTS_AND_AUTHOR_THREADS,\n  posts_with_video: FeedType.POSTS_WITH_VIDEO,\n}\n\nexport const skeleton = async (inputs: {\n  ctx: Context\n  params: Params\n}): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const [did] = await ctx.hydrator.actor.getDids([params.actor])\n  if (!did) {\n    throw new InvalidRequestError('Profile not found')\n  }\n  const actors = await ctx.hydrator.actor.getActors([did], {\n    includeTakedowns: params.hydrateCtx.includeTakedowns,\n    skipCacheForDids: params.hydrateCtx.skipCacheForViewer,\n  })\n  const actor = actors.get(did)\n  if (!actor) {\n    throw new InvalidRequestError('Profile not found')\n  }\n  if (clearlyBadCursor(params.cursor)) {\n    return { actor, filter: params.filter, items: [] }\n  }\n\n  const pinnedPost = safePinnedPost(actor.profile?.pinnedPost)\n  const isFirstPageRequest = !params.cursor\n  const shouldInsertPinnedPost =\n    isFirstPageRequest &&\n    params.includePins &&\n    pinnedPost &&\n    uriToDid(pinnedPost.uri) === actor.did\n\n  const res = await ctx.dataplane.getAuthorFeed({\n    actorDid: did,\n    limit: params.limit,\n    cursor: params.cursor,\n    feedType: FILTER_TO_FEED_TYPE[params.filter],\n  })\n\n  let items: FeedItem[] = res.items.map((item) => ({\n    post: { uri: item.uri as AtUriString, cid: item.cid || undefined },\n    repost: item.repost\n      ? { uri: item.repost as AtUriString, cid: item.repostCid || undefined }\n      : undefined,\n  }))\n\n  if (shouldInsertPinnedPost && pinnedPost) {\n    const pinnedItem = {\n      post: {\n        uri: pinnedPost.uri,\n        cid: pinnedPost.cid,\n      },\n      authorPinned: true,\n    }\n\n    items = items.filter((item) => item.post.uri !== pinnedItem.post.uri)\n    items.unshift(pinnedItem)\n  }\n\n  return {\n    actor,\n    filter: params.filter,\n    items,\n    cursor: parseString(res.cursor),\n  }\n}\n\nconst hydration = async (inputs: {\n  ctx: Context\n  params: Params\n  skeleton: Skeleton\n}): Promise<HydrationState> => {\n  const { ctx, params, skeleton } = inputs\n  const [feedPostState, profileViewerState] = await Promise.all([\n    ctx.hydrator.hydrateFeedItems(skeleton.items, params.hydrateCtx),\n    ctx.hydrator.hydrateProfileViewers([skeleton.actor.did], params.hydrateCtx),\n  ])\n  return mergeStates(feedPostState, profileViewerState)\n}\n\nconst noBlocksOrMutedReposts = (inputs: {\n  ctx: Context\n  skeleton: Skeleton\n  hydration: HydrationState\n}): Skeleton => {\n  const { ctx, skeleton, hydration } = inputs\n  const relationship = hydration.profileViewers?.get(skeleton.actor.did)\n  if (\n    relationship &&\n    (relationship.blocking || ctx.views.blockingByList(relationship, hydration))\n  ) {\n    throw new InvalidRequestError(\n      `Requester has blocked actor: ${skeleton.actor.did}`,\n      'BlockedActor',\n    )\n  }\n  if (\n    relationship &&\n    (relationship.blockedBy || ctx.views.blockedByList(relationship, hydration))\n  ) {\n    throw new InvalidRequestError(\n      `Requester is blocked by actor: ${skeleton.actor.did}`,\n      'BlockedByActor',\n    )\n  }\n\n  const checkBlocksAndMutes = (item: FeedItem) => {\n    const bam = ctx.views.feedItemBlocksAndMutes(item, hydration)\n    return (\n      !bam.authorBlocked &&\n      !bam.originatorBlocked &&\n      (!bam.authorMuted || bam.originatorMuted) // repost of muted content\n    )\n  }\n\n  if (skeleton.filter === 'posts_and_author_threads') {\n    // ensure replies are only included if the feed contains all\n    // replies up to the thread root (i.e. a complete self-thread.)\n    const selfThread = new SelfThreadTracker(skeleton.items, hydration)\n    skeleton.items = skeleton.items.filter((item) => {\n      return (\n        checkBlocksAndMutes(item) &&\n        (item.repost || item.authorPinned || selfThread.ok(item.post.uri))\n      )\n    })\n  } else {\n    skeleton.items = skeleton.items.filter(checkBlocksAndMutes)\n  }\n\n  return skeleton\n}\n\nconst presentation = (inputs: {\n  ctx: Context\n  skeleton: Skeleton\n  hydration: HydrationState\n}) => {\n  const { ctx, skeleton, hydration } = inputs\n  const feed = mapDefined(skeleton.items, (item) =>\n    ctx.views.feedViewPost(item, hydration),\n  )\n  return { feed, cursor: skeleton.cursor }\n}\n\ntype Context = {\n  hydrator: Hydrator\n  views: Views\n  dataplane: DataPlaneClient\n}\n\ntype Params = app.bsky.feed.getAuthorFeed.$Params & {\n  hydrateCtx: HydrateCtx\n}\n\ntype Skeleton = {\n  actor: Actor\n  items: FeedItem[]\n  filter: app.bsky.feed.getAuthorFeed.$Params['filter']\n  cursor?: string\n}\n\nclass SelfThreadTracker {\n  feedUris = new Set<AtUriString>()\n  cache = new Map<AtUriString, boolean>()\n\n  constructor(\n    items: FeedItem[],\n    private hydration: HydrationState,\n  ) {\n    items.forEach((item) => {\n      if (!item.repost) {\n        this.feedUris.add(item.post.uri)\n      }\n    })\n  }\n\n  ok(uri: AtUriString, loop = new Set<AtUriString>()) {\n    // if we've already checked this uri, pull from the cache\n    if (this.cache.has(uri)) {\n      return this.cache.get(uri) ?? false\n    }\n    // loop detection\n    if (loop.has(uri)) {\n      this.cache.set(uri, false)\n      return false\n    } else {\n      loop.add(uri)\n    }\n    // cache through the result\n    const result = this._ok(uri, loop)\n    this.cache.set(uri, result)\n    return result\n  }\n\n  private _ok(uri: AtUriString, loop: Set<AtUriString>): boolean {\n    // must be in the feed to be in a self-thread\n    if (!this.feedUris.has(uri)) {\n      return false\n    }\n    // must be hydratable to be part of self-thread\n    const post = this.hydration.posts?.get(uri)\n    if (!post) {\n      return false\n    }\n    // root posts (no parent) are trivial case of self-thread\n    const parentUri = getParentUri(post)\n    if (parentUri === null) {\n      return true\n    }\n    // recurse w/ cache: this post is in a self-thread if its parent is.\n    return this.ok(parentUri, loop)\n  }\n}\n\nfunction getParentUri(post: Post) {\n  return post.record.reply?.parent.uri ?? null\n}\n"]}

package/dist/api/app/bsky/feed/getFeed.d.ts

@@ -1,7 +1,20 @@
 import { type Headers as HeadersMap, type Server } from '@atproto/xrpc-server';
+import type { ServerConfig } from '../../../../config.js';
 import type { AppContext } from '../../../../context.js';
 import type { FeedItem } from '../../../../hydration/feed.js';
+import type { HydrateCtx } from '../../../../hydration/hydrator.js';
 export default function (server: Server, ctx: AppContext): void;
+/**
+ * Iris' endpoint, when it should serve this request in place of the feed's
+ * registered feed generator (seeemore).
+ */
+export declare const irisUrlForFeed: (cfg: Pick<ServerConfig, 'irisUrl' | 'irisFeedUris'>, params: {
+    feed: string;
+    hydrateCtx: {
+        viewer: HydrateCtx['viewer'];
+        features: Pick<HydrateCtx['features'], 'Gate' | 'checkGate'>;
+    };
+}) => string | undefined;
 export type AlgoResponse = {
     feedItems: AlgoResponseItem[];
     resHeaders?: HeadersMap;