@atproto/bsky 0.0.238 → 0.0.240

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atproto/bsky
 
+## 0.0.240
+
+### Patch Changes
+
+- [#5048](https://github.com/bluesky-social/atproto/pull/5048) [`5140be2`](https://github.com/bluesky-social/atproto/commit/5140be267b649288502cd7ace8f07bce4b098bc0) Thanks [@blackmichael](https://github.com/blackmichael)! - Add support for gallery image embeds to data-plane and dev-env
+
+- Updated dependencies [[`24c7311`](https://github.com/bluesky-social/atproto/commit/24c7311427b8ccd5d8529a70ed93b4d77f38a516), [`1f89abb`](https://github.com/bluesky-social/atproto/commit/1f89abb908ce1214638f91c19ef957553b7ebc03)]:
+  - @atproto/api@0.20.12
+
+## 0.0.239
+
+### Patch Changes
+
+- [#5035](https://github.com/bluesky-social/atproto/pull/5035) [`0d62d5b`](https://github.com/bluesky-social/atproto/commit/0d62d5b4c6086189793d3a1e0c51ecd764df6a83) Thanks [@treethought](https://github.com/treethought)! - Route appview search through new V2 dataplane RPCs behind the `search:v2:enable` feature gate.
+
+- [#5039](https://github.com/bluesky-social/atproto/pull/5039) [`16c8a94`](https://github.com/bluesky-social/atproto/commit/16c8a948b71d473568917f33f4d43dbd85b2a599) Thanks [@rafaeleyng](https://github.com/rafaeleyng)! - Set timeout when getting feed skeletons
+
+- Updated dependencies [[`77a3861`](https://github.com/bluesky-social/atproto/commit/77a3861561691ea51a94f96de86069c7875772da), [`4280e58`](https://github.com/bluesky-social/atproto/commit/4280e585b63b1e53704fee8c68a8347224f74253)]:
+  - @atproto/api@0.20.10
+
 ## 0.0.238
 
 ### Patch Changes

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

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

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

@@ -15,6 +15,10 @@ export default function (server, ctx) {
                 labelers,
                 includeTakedowns,
                 skipViewerBlocks,
+                features: ctx.featureGatesClient.scope(ctx.featureGatesClient.parseUserContextFromHandler({
+                    viewer,
+                    req,
+                })),
             });
             const results = await searchActors({ ...params, hydrateCtx }, ctx);
             return {
@@ -25,7 +29,7 @@ export default function (server, ctx) {
         },
     });
 }
-const skeleton = async (inputs) => {
+const skeletonV1 = async (inputs) => {
     const { ctx, params } = inputs;
     const term = params.q ?? params.term ?? '';
     // @TODO
@@ -53,6 +57,27 @@ const skeleton = async (inputs) => {
         cursor: parseString(res.cursor),
     };
 };
+const skeletonV2 = async (inputs) => {
+    const { ctx, params } = inputs;
+    const term = params.q ?? params.term ?? '';
+    const res = await ctx.dataplane.searchActorsV2({
+        params: {
+            query: term,
+            viewer: params.hydrateCtx.viewer ?? undefined,
+            limit: params.limit,
+            cursor: params.cursor,
+        },
+    });
+    return {
+        dids: res.actors.map(({ did }) => did),
+        cursor: parseString(res.pageInfo?.cursor),
+    };
+};
+const skeleton = async (input) => {
+    const useV2 = input.params.hydrateCtx.features.checkGate(input.params.hydrateCtx.features.Gate.SearchV2Enable);
+    const skeletonFn = useV2 ? skeletonV2 : skeletonV1;
+    return skeletonFn(input);
+};
 const hydration = async (inputs) => {
     const { ctx, params, skeleton } = inputs;
     return ctx.hydrator.hydrateProfiles(skeleton.dids, params.hydrateCtx);

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

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

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

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

@@ -9,7 +9,14 @@ export default function (server, ctx) {
         handler: async ({ params, auth, req }) => {
             const viewer = auth.credentials.iss;
             const labelers = ctx.reqLabelers(req);
-            const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
+            const hydrateCtx = await ctx.hydrator.createContext({
+                labelers,
+                viewer,
+                features: ctx.featureGatesClient.scope(ctx.featureGatesClient.parseUserContextFromHandler({
+                    viewer,
+                    req,
+                })),
+            });
             const results = await searchActorsTypeahead({ ...params, hydrateCtx }, ctx);
             return {
                 encoding: 'application/json',
@@ -19,7 +26,7 @@ export default function (server, ctx) {
         },
     });
 }
-const skeleton = async (inputs) => {
+const skeletonV1 = async (inputs) => {
     const { ctx, params } = inputs;
     const term = params.q ?? params.term ?? '';
     // @TODO
@@ -44,6 +51,23 @@ const skeleton = async (inputs) => {
         dids: res.dids,
     };
 };
+const skeletonV2 = async (inputs) => {
+    const { ctx, params } = inputs;
+    const term = params.q ?? params.term ?? '';
+    const res = await ctx.dataplane.searchActorsTypeahead({
+        viewer: params.hydrateCtx.viewer ?? undefined,
+        query: term,
+        limit: params.limit,
+    });
+    return {
+        dids: res.actors.map(({ did }) => did),
+    };
+};
+const skeleton = async (input) => {
+    const useV2 = input.params.hydrateCtx.features.checkGate(input.params.hydrateCtx.features.Gate.SearchV2Enable);
+    const skeletonFn = useV2 ? skeletonV2 : skeletonV1;
+    return skeletonFn(input);
+};
 const hydration = async (inputs) => {
     const { ctx, params, skeleton } = inputs;
     return ctx.hydrator.hydrateProfilesBasic(skeleton.dids, params.hydrateCtx);

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"getFeed.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getFeed.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,OAAO,IAAI,UAAU,EAErB,MAAM,EAKP,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAOnD,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AAaxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAgDvD;AAuLD,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE,gBAAgB,EAAE,CAAA;IAC7B,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG;IACxC,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA"}
+{"version":3,"file":"getFeed.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getFeed.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,OAAO,IAAI,UAAU,EAErB,MAAM,EAKP,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAOnD,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AAaxD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAgDvD;AAwLD,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE,gBAAgB,EAAE,CAAA;IAC7B,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG;IACxC,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA"}

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

@@ -122,6 +122,7 @@ const skeletonFromFeedGen = async (ctx, params) => {
     // @TODO currently passthrough auth headers from pds
     const result = await xrpcSafe(fgEndpoint, app.bsky.feed.getFeedSkeleton, {
         strictResponseProcessing: false,
+        signal: AbortSignal.timeout(10_000),
         headers,
         params: {
             feed: params.feed,

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

@@ -1 +1 @@
-{"version":3,"file":"getFeed.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getFeed.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined, noUndefinedVals } from '@atproto/common'\nimport {\n  XrpcInvalidResponseError,\n  XrpcResponseError,\n  xrpcSafe,\n} from '@atproto/lex'\nimport {\n  Headers as HeadersMap,\n  InvalidRequestError,\n  Server,\n  ServerTimer,\n  UpstreamFailureError,\n  XRPCError,\n  serverTimingHeader,\n} from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport {\n  Code,\n  getServiceEndpoint,\n  isDataplaneError,\n  unpackIdentityServices,\n} from '../../../../data-plane/index.js'\nimport { FeedItem } from '../../../../hydration/feed.js'\nimport { HydrateCtx } from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport { GetIdentityByDidResponse } from '../../../../proto/bsky_pb.js'\nimport { BSKY_USER_AGENT, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getFeed = createPipeline(\n    skeleton,\n    hydration,\n    noBlocksOrMutes,\n    presentation,\n  )\n  server.add(app.bsky.feed.getFeed, {\n    auth: ctx.authVerifier.standardOptionalParameterized({\n      lxmCheck: (method) => {\n        return (\n          method === app.bsky.feed.getFeedSkeleton.$lxm ||\n          method === app.bsky.feed.getFeed.$lxm\n        )\n      },\n      skipAudCheck: true,\n    }),\n    handler: async ({ params, auth, req }) => {\n      const viewer = auth.credentials.iss\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })\n      const headers = noUndefinedVals({\n        'user-agent': BSKY_USER_AGENT,\n        authorization: req.headers['authorization'],\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      // @NOTE feed cursors should not be affected by appview swap\n      const {\n        timerSkele,\n        timerHydr,\n        resHeaders: feedResHeaders,\n        ...result\n      } = await getFeed({ ...params, hydrateCtx, headers }, ctx)\n\n      return {\n        encoding: 'application/json',\n        body: result,\n        headers: {\n          ...feedResHeaders,\n          ...resHeaders({ labelers: hydrateCtx.labelers }),\n          'server-timing': serverTimingHeader([timerSkele, timerHydr]),\n        },\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const timerSkele = new ServerTimer('skele').start()\n  const {\n    feedItems: algoItems,\n    reqId,\n    cursor,\n    resHeaders,\n    ...passthrough\n  } = await skeletonFromFeedGen(ctx, params)\n\n  return {\n    cursor,\n    items: algoItems,\n    reqId,\n    timerSkele: timerSkele.stop(),\n    timerHydr: new ServerTimer('hydr').start(),\n    resHeaders,\n    passthrough,\n  }\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  const timerHydr = new ServerTimer('hydr').start()\n  const hydration = await ctx.hydrator.hydrateFeedItems(\n    skeleton.items,\n    params.hydrateCtx,\n  )\n  skeleton.timerHydr = timerHydr.stop()\n  return hydration\n}\n\nconst noBlocksOrMutes = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, skeleton, hydration } = inputs\n  skeleton.items = skeleton.items.filter((item) => {\n    const bam = ctx.views.feedItemBlocksAndMutes(item, hydration)\n    return (\n      !bam.authorBlocked &&\n      !bam.authorMuted &&\n      !bam.originatorBlocked &&\n      !bam.originatorMuted &&\n      !bam.ancestorAuthorBlocked\n    )\n  })\n\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const feed = mapDefined(skeleton.items, (item) => {\n    const post = ctx.views.feedViewPost(item, hydration)\n    if (!post) return\n    return {\n      ...post,\n      feedContext: item.feedContext,\n    }\n  })\n  return {\n    feed: feed.map((fi) => ({ ...fi, reqId: skeleton.reqId })),\n    cursor: skeleton.cursor,\n    timerSkele: skeleton.timerSkele,\n    timerHydr: skeleton.timerHydr,\n    resHeaders: skeleton.resHeaders,\n    ...skeleton.passthrough,\n  }\n}\n\ntype Context = AppContext\n\ntype Params = app.bsky.feed.getFeed.$Params & {\n  hydrateCtx: HydrateCtx\n  headers: HeadersMap\n}\n\ntype Skeleton = {\n  items: AlgoResponseItem[]\n  reqId?: string\n  passthrough: Record<string, unknown> // pass through additional items in feedgen response\n  resHeaders?: HeadersMap\n  cursor?: string\n  timerSkele: ServerTimer\n  timerHydr: ServerTimer\n}\n\nconst skeletonFromFeedGen = async (\n  ctx: Context,\n  params: Params,\n): Promise<AlgoResponse> => {\n  const { feed, headers } = params\n  const found = await ctx.hydrator.feed.getFeedGens([feed], true)\n  const feedDid = found.get(feed)?.record.did\n  if (!feedDid) {\n    throw new InvalidRequestError('could not find feed')\n  }\n\n  let identity: GetIdentityByDidResponse\n  try {\n    identity = await ctx.dataplane.getIdentityByDid({ did: feedDid })\n  } catch (err) {\n    if (isDataplaneError(err, Code.NotFound)) {\n      throw new InvalidRequestError(`could not resolve identity: ${feedDid}`)\n    }\n    throw err\n  }\n\n  const services = unpackIdentityServices(identity.services)\n  const fgEndpoint = getServiceEndpoint(services, {\n    id: 'bsky_fg',\n    type: 'BskyFeedGenerator',\n  })\n  if (!fgEndpoint) {\n    throw new InvalidRequestError(\n      `invalid feed generator service details in did document: ${feedDid}`,\n    )\n  }\n\n  // @TODO currently passthrough auth headers from pds\n  const result = await xrpcSafe(fgEndpoint, app.bsky.feed.getFeedSkeleton, {\n    strictResponseProcessing: false,\n    headers,\n    params: {\n      feed: params.feed,\n      // The feedgen is not guaranteed to honor the limit, but we try it.\n      limit: params.limit,\n      cursor: params.cursor,\n    },\n  })\n\n  if (!result.success) {\n    const cause = result.reason\n\n    // Pass through structurally valid XRPC error response (4xx/5xx), such as\n    // auth errors\n    if (cause instanceof XrpcResponseError) {\n      const { status, body } = cause.toDownstreamError()\n      throw new XRPCError(status, body.message, body.error, { cause })\n    }\n\n    // The response does not match the schema\n    if (cause instanceof XrpcInvalidResponseError) {\n      throw new UpstreamFailureError(\n        'feed provided an invalid response',\n        'InvalidFeedResponse',\n        { cause },\n      )\n    }\n\n    // Typically a network error.\n    throw new UpstreamFailureError('feed unavailable', undefined, { cause })\n  }\n\n  const { feed: feedSkele, cursor, ...skele } = result.body\n  const feedItems = feedSkele.slice(0, params.limit).map((item) => ({\n    post: { uri: item.post },\n    repost:\n      item.reason != null &&\n      app.bsky.feed.defs.skeletonReasonRepost.$isTypeOf(item.reason)\n        ? { uri: item.reason.repost }\n        : undefined,\n    feedContext: item.feedContext,\n  }))\n\n  const contentLang = result.headers.get('content-language')\n\n  return {\n    ...skele,\n    resHeaders: contentLang ? { 'content-language': contentLang } : undefined,\n    feedItems,\n    // Prevents loops if the custom feed echoes the input cursor back.\n    cursor: cursor === params.cursor ? undefined : cursor,\n  }\n}\n\nexport type AlgoResponse = {\n  feedItems: AlgoResponseItem[]\n  resHeaders?: HeadersMap\n  cursor?: string\n  reqId?: string\n}\n\nexport type AlgoResponseItem = FeedItem & {\n  feedContext?: string\n}\n"]}
+{"version":3,"file":"getFeed.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/getFeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,QAAQ,GACT,MAAM,cAAc,CAAA;AACrB,OAAO,EAEL,mBAAmB,EAEnB,WAAW,EACX,oBAAoB,EACpB,SAAS,EACT,kBAAkB,GACnB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EACL,IAAI,EACJ,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,iCAAiC,CAAA;AAGxC,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAKL,cAAc,GACf,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE9D,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,OAAO,GAAG,cAAc,CAC5B,QAAQ,EACR,SAAS,EACT,eAAe,EACf,YAAY,CACb,CAAA;IACD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QAChC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,6BAA6B,CAAC;YACnD,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;gBACnB,OAAO,CACL,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI;oBAC7C,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CACtC,CAAA;YACH,CAAC;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;QACF,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,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;YACzE,MAAM,OAAO,GAAG,eAAe,CAAC;gBAC9B,YAAY,EAAE,eAAe;gBAC7B,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;gBAC3C,iBAAiB,EAAE,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC;gBACjD,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;oBAC1D,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;oBACxC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;aACjC,CAAC,CAAA;YACF,4DAA4D;YAC5D,MAAM,EACJ,UAAU,EACV,SAAS,EACT,UAAU,EAAE,cAAc,EAC1B,GAAG,MAAM,EACV,GAAG,MAAM,OAAO,CAAC,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,GAAG,CAAC,CAAA;YAE1D,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE;oBACP,GAAG,cAAc;oBACjB,GAAG,UAAU,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;oBAChD,eAAe,EAAE,kBAAkB,CAAC,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;iBAC7D;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,QAAQ,GAAG,KAAK,EACpB,MAAwC,EACrB,EAAE;IACrB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;IAC9B,MAAM,UAAU,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAA;IACnD,MAAM,EACJ,SAAS,EAAE,SAAS,EACpB,KAAK,EACL,MAAM,EACN,UAAU,EACV,GAAG,WAAW,EACf,GAAG,MAAM,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAE1C,OAAO;QACL,MAAM;QACN,KAAK,EAAE,SAAS;QAChB,KAAK;QACL,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE;QAC7B,SAAS,EAAE,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE;QAC1C,UAAU;QACV,WAAW;KACZ,CAAA;AACH,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,KAAK,EACrB,MAAmD,EACnD,EAAE;IACF,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IACxC,MAAM,SAAS,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAA;IACjD,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CACnD,QAAQ,CAAC,KAAK,EACd,MAAM,CAAC,UAAU,CAClB,CAAA;IACD,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC,IAAI,EAAE,CAAA;IACrC,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,MAA+C,EAAE,EAAE;IAC1E,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;IAC3C,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QAC9C,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,WAAW;YAChB,CAAC,GAAG,CAAC,iBAAiB;YACtB,CAAC,GAAG,CAAC,eAAe;YACpB,CAAC,GAAG,CAAC,qBAAqB,CAC3B,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CACnB,MAAsD,EACtD,EAAE;IACF,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;QAC/C,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QACpD,IAAI,CAAC,IAAI;YAAE,OAAM;QACjB,OAAO;YACL,GAAG,IAAI;YACP,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAA;IACH,CAAC,CAAC,CAAA;IACF,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1D,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,GAAG,QAAQ,CAAC,WAAW;KACxB,CAAA;AACH,CAAC,CAAA;AAmBD,MAAM,mBAAmB,GAAG,KAAK,EAC/B,GAAY,EACZ,MAAc,EACS,EAAE;IACzB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;IAChC,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAA;IAC/D,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,GAAG,CAAA;IAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,mBAAmB,CAAC,qBAAqB,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,QAAkC,CAAA;IACtC,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAA;IACnE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,mBAAmB,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAA;QACzE,CAAC;QACD,MAAM,GAAG,CAAA;IACX,CAAC;IAED,MAAM,QAAQ,GAAG,sBAAsB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC1D,MAAM,UAAU,GAAG,kBAAkB,CAAC,QAAQ,EAAE;QAC9C,EAAE,EAAE,SAAS;QACb,IAAI,EAAE,mBAAmB;KAC1B,CAAC,CAAA;IACF,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,mBAAmB,CAC3B,2DAA2D,OAAO,EAAE,CACrE,CAAA;IACH,CAAC;IAED,oDAAoD;IACpD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;QACvE,wBAAwB,EAAE,KAAK;QAC/B,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;QACnC,OAAO;QACP,MAAM,EAAE;YACN,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,mEAAmE;YACnE,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB;KACF,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAA;QAE3B,yEAAyE;QACzE,cAAc;QACd,IAAI,KAAK,YAAY,iBAAiB,EAAE,CAAC;YACvC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,iBAAiB,EAAE,CAAA;YAClD,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAClE,CAAC;QAED,yCAAyC;QACzC,IAAI,KAAK,YAAY,wBAAwB,EAAE,CAAC;YAC9C,MAAM,IAAI,oBAAoB,CAC5B,mCAAmC,EACnC,qBAAqB,EACrB,EAAE,KAAK,EAAE,CACV,CAAA;QACH,CAAC;QAED,6BAA6B;QAC7B,MAAM,IAAI,oBAAoB,CAAC,kBAAkB,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;IAC1E,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,CAAC,IAAI,CAAA;IACzD,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChE,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE;QACxB,MAAM,EACJ,IAAI,CAAC,MAAM,IAAI,IAAI;YACnB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC;YAC5D,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAC7B,CAAC,CAAC,SAAS;QACf,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAC,CAAA;IAEH,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IAE1D,OAAO;QACL,GAAG,KAAK;QACR,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS;QACzE,SAAS;QACT,kEAAkE;QAClE,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;KACtD,CAAA;AACH,CAAC,CAAA","sourcesContent":["import { mapDefined, noUndefinedVals } from '@atproto/common'\nimport {\n  XrpcInvalidResponseError,\n  XrpcResponseError,\n  xrpcSafe,\n} from '@atproto/lex'\nimport {\n  Headers as HeadersMap,\n  InvalidRequestError,\n  Server,\n  ServerTimer,\n  UpstreamFailureError,\n  XRPCError,\n  serverTimingHeader,\n} from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport {\n  Code,\n  getServiceEndpoint,\n  isDataplaneError,\n  unpackIdentityServices,\n} from '../../../../data-plane/index.js'\nimport { FeedItem } from '../../../../hydration/feed.js'\nimport { HydrateCtx } from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport { GetIdentityByDidResponse } from '../../../../proto/bsky_pb.js'\nimport { BSKY_USER_AGENT, resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const getFeed = createPipeline(\n    skeleton,\n    hydration,\n    noBlocksOrMutes,\n    presentation,\n  )\n  server.add(app.bsky.feed.getFeed, {\n    auth: ctx.authVerifier.standardOptionalParameterized({\n      lxmCheck: (method) => {\n        return (\n          method === app.bsky.feed.getFeedSkeleton.$lxm ||\n          method === app.bsky.feed.getFeed.$lxm\n        )\n      },\n      skipAudCheck: true,\n    }),\n    handler: async ({ params, auth, req }) => {\n      const viewer = auth.credentials.iss\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })\n      const headers = noUndefinedVals({\n        'user-agent': BSKY_USER_AGENT,\n        authorization: req.headers['authorization'],\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      // @NOTE feed cursors should not be affected by appview swap\n      const {\n        timerSkele,\n        timerHydr,\n        resHeaders: feedResHeaders,\n        ...result\n      } = await getFeed({ ...params, hydrateCtx, headers }, ctx)\n\n      return {\n        encoding: 'application/json',\n        body: result,\n        headers: {\n          ...feedResHeaders,\n          ...resHeaders({ labelers: hydrateCtx.labelers }),\n          'server-timing': serverTimingHeader([timerSkele, timerHydr]),\n        },\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const timerSkele = new ServerTimer('skele').start()\n  const {\n    feedItems: algoItems,\n    reqId,\n    cursor,\n    resHeaders,\n    ...passthrough\n  } = await skeletonFromFeedGen(ctx, params)\n\n  return {\n    cursor,\n    items: algoItems,\n    reqId,\n    timerSkele: timerSkele.stop(),\n    timerHydr: new ServerTimer('hydr').start(),\n    resHeaders,\n    passthrough,\n  }\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  const timerHydr = new ServerTimer('hydr').start()\n  const hydration = await ctx.hydrator.hydrateFeedItems(\n    skeleton.items,\n    params.hydrateCtx,\n  )\n  skeleton.timerHydr = timerHydr.stop()\n  return hydration\n}\n\nconst noBlocksOrMutes = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, skeleton, hydration } = inputs\n  skeleton.items = skeleton.items.filter((item) => {\n    const bam = ctx.views.feedItemBlocksAndMutes(item, hydration)\n    return (\n      !bam.authorBlocked &&\n      !bam.authorMuted &&\n      !bam.originatorBlocked &&\n      !bam.originatorMuted &&\n      !bam.ancestorAuthorBlocked\n    )\n  })\n\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const feed = mapDefined(skeleton.items, (item) => {\n    const post = ctx.views.feedViewPost(item, hydration)\n    if (!post) return\n    return {\n      ...post,\n      feedContext: item.feedContext,\n    }\n  })\n  return {\n    feed: feed.map((fi) => ({ ...fi, reqId: skeleton.reqId })),\n    cursor: skeleton.cursor,\n    timerSkele: skeleton.timerSkele,\n    timerHydr: skeleton.timerHydr,\n    resHeaders: skeleton.resHeaders,\n    ...skeleton.passthrough,\n  }\n}\n\ntype Context = AppContext\n\ntype Params = app.bsky.feed.getFeed.$Params & {\n  hydrateCtx: HydrateCtx\n  headers: HeadersMap\n}\n\ntype Skeleton = {\n  items: AlgoResponseItem[]\n  reqId?: string\n  passthrough: Record<string, unknown> // pass through additional items in feedgen response\n  resHeaders?: HeadersMap\n  cursor?: string\n  timerSkele: ServerTimer\n  timerHydr: ServerTimer\n}\n\nconst skeletonFromFeedGen = async (\n  ctx: Context,\n  params: Params,\n): Promise<AlgoResponse> => {\n  const { feed, headers } = params\n  const found = await ctx.hydrator.feed.getFeedGens([feed], true)\n  const feedDid = found.get(feed)?.record.did\n  if (!feedDid) {\n    throw new InvalidRequestError('could not find feed')\n  }\n\n  let identity: GetIdentityByDidResponse\n  try {\n    identity = await ctx.dataplane.getIdentityByDid({ did: feedDid })\n  } catch (err) {\n    if (isDataplaneError(err, Code.NotFound)) {\n      throw new InvalidRequestError(`could not resolve identity: ${feedDid}`)\n    }\n    throw err\n  }\n\n  const services = unpackIdentityServices(identity.services)\n  const fgEndpoint = getServiceEndpoint(services, {\n    id: 'bsky_fg',\n    type: 'BskyFeedGenerator',\n  })\n  if (!fgEndpoint) {\n    throw new InvalidRequestError(\n      `invalid feed generator service details in did document: ${feedDid}`,\n    )\n  }\n\n  // @TODO currently passthrough auth headers from pds\n  const result = await xrpcSafe(fgEndpoint, app.bsky.feed.getFeedSkeleton, {\n    strictResponseProcessing: false,\n    signal: AbortSignal.timeout(10_000),\n    headers,\n    params: {\n      feed: params.feed,\n      // The feedgen is not guaranteed to honor the limit, but we try it.\n      limit: params.limit,\n      cursor: params.cursor,\n    },\n  })\n\n  if (!result.success) {\n    const cause = result.reason\n\n    // Pass through structurally valid XRPC error response (4xx/5xx), such as\n    // auth errors\n    if (cause instanceof XrpcResponseError) {\n      const { status, body } = cause.toDownstreamError()\n      throw new XRPCError(status, body.message, body.error, { cause })\n    }\n\n    // The response does not match the schema\n    if (cause instanceof XrpcInvalidResponseError) {\n      throw new UpstreamFailureError(\n        'feed provided an invalid response',\n        'InvalidFeedResponse',\n        { cause },\n      )\n    }\n\n    // Typically a network error.\n    throw new UpstreamFailureError('feed unavailable', undefined, { cause })\n  }\n\n  const { feed: feedSkele, cursor, ...skele } = result.body\n  const feedItems = feedSkele.slice(0, params.limit).map((item) => ({\n    post: { uri: item.post },\n    repost:\n      item.reason != null &&\n      app.bsky.feed.defs.skeletonReasonRepost.$isTypeOf(item.reason)\n        ? { uri: item.reason.repost }\n        : undefined,\n    feedContext: item.feedContext,\n  }))\n\n  const contentLang = result.headers.get('content-language')\n\n  return {\n    ...skele,\n    resHeaders: contentLang ? { 'content-language': contentLang } : undefined,\n    feedItems,\n    // Prevents loops if the custom feed echoes the input cursor back.\n    cursor: cursor === params.cursor ? undefined : cursor,\n  }\n}\n\nexport type AlgoResponse = {\n  feedItems: AlgoResponseItem[]\n  resHeaders?: HeadersMap\n  cursor?: string\n  reqId?: string\n}\n\nexport type AlgoResponseItem = FeedItem & {\n  feedContext?: string\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"searchPosts.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/searchPosts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAoBnD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAoCvD"}
+{"version":3,"file":"searchPosts.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/searchPosts.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAqBnD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAoCvD"}

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

@@ -1,8 +1,10 @@
+import { Timestamp } from '@bufbuild/protobuf';
 import { mapDefined } from '@atproto/common';
 import { parsePostSearchQuery, } from '../../../../data-plane/server/util.js';
 import { parseString } from '../../../../hydration/util.js';
 import { app } from '../../../../lexicons/index.js';
 import { createPipeline, } from '../../../../pipeline.js';
+import { SearchSortOrder } from '../../../../proto/bsky_pb.js';
 import { uriToDid as creatorFromUri } from '../../../../util/uris.js';
 import { resHeaders } from '../../../util.js';
 export default function (server, ctx) {
@@ -30,7 +32,7 @@ export default function (server, ctx) {
         },
     });
 }
-const skeleton = async (inputs) => {
+const skeletonV1 = async (inputs) => {
     const { ctx, params } = inputs;
     const parsedQuery = parsePostSearchQuery(params.q, {
         author: params.author,
@@ -69,6 +71,44 @@ const skeleton = async (inputs) => {
         parsedQuery,
     };
 };
+const skeletonV2 = async (inputs) => {
+    const { ctx, params } = inputs;
+    const parsedQuery = parsePostSearchQuery(params.q, {
+        author: params.author,
+    });
+    const res = await ctx.dataplane.searchPostsV2({
+        params: {
+            query: params.q,
+            viewer: params.hydrateCtx.viewer ?? undefined,
+            limit: params.limit,
+            cursor: params.cursor,
+        },
+        sort: postSortToV2(params.sort),
+        filters: {
+            authors: params.author ? [params.author] : [],
+            mentions: params.mentions ? [params.mentions] : [],
+            domains: params.domain ? [params.domain] : [],
+            urls: params.url ? [params.url] : [],
+            hashtags: params.tag ?? [],
+        },
+        since: parseTimestamp(params.since),
+        until: parseTimestamp(params.until),
+        language: params.lang,
+    });
+    return {
+        posts: res.posts.map(({ uri }) => uri),
+        cursor: parseString(res.pageInfo?.cursor),
+        hitsTotal: res.pageInfo?.hitsTotal
+            ? Number(res.pageInfo.hitsTotal)
+            : undefined,
+        parsedQuery,
+    };
+};
+const skeleton = async (input) => {
+    const useV2 = input.params.hydrateCtx.features.checkGate(input.params.hydrateCtx.features.Gate.SearchV2Enable);
+    const skeletonFn = useV2 ? skeletonV2 : skeletonV1;
+    return skeletonFn(input);
+};
 const hydration = async (inputs) => {
     const { ctx, params, skeleton } = inputs;
     return ctx.hydrator.hydratePosts(skeleton.posts.map((uri) => ({ uri })), params.hydrateCtx, undefined, {
@@ -125,4 +165,19 @@ const presentation = (inputs) => {
         hitsTotal: skeleton.hitsTotal,
     };
 };
+const postSortToV2 = (sort) => {
+    if (sort === 'top')
+        return SearchSortOrder.TOP;
+    if (sort === 'latest')
+        return SearchSortOrder.RECENT;
+    return SearchSortOrder.UNSPECIFIED;
+};
+const parseTimestamp = (value) => {
+    if (!value)
+        return undefined;
+    const date = new Date(value);
+    if (isNaN(date.getTime()))
+        return undefined;
+    return Timestamp.fromDate(date);
+};
 //# sourceMappingURL=searchPosts.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"searchPosts.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/searchPosts.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport { AtUriString, Client } from '@atproto/lex'\nimport { Server } from '@atproto/xrpc-server'\nimport { ServerConfig } from '../../../../config.js'\nimport { AppContext } from '../../../../context.js'\nimport { DataPlaneClient } from '../../../../data-plane/index.js'\nimport {\n  PostSearchQuery,\n  parsePostSearchQuery,\n} from '../../../../data-plane/server/util.js'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport { uriToDid as creatorFromUri } from '../../../../util/uris.js'\nimport { Views } from '../../../../views/index.js'\nimport { resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchPosts = createPipeline(\n    skeleton,\n    hydration,\n    noBlocksOrTagged,\n    presentation,\n  )\n  server.add(app.bsky.feed.searchPosts, {\n    auth: ctx.authVerifier.standardOptional,\n    handler: async ({ auth, params, req }) => {\n      const { viewer, isModService, skipViewerBlocks } =\n        ctx.authVerifier.parseCreds(auth)\n\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        labelers,\n        viewer,\n        skipViewerBlocks,\n        features: ctx.featureGatesClient.scope(\n          ctx.featureGatesClient.parseUserContextFromHandler({\n            viewer,\n            req,\n          }),\n        ),\n      })\n      const results = await searchPosts(\n        { ...params, hydrateCtx, isModService },\n        ctx,\n      )\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const parsedQuery = parsePostSearchQuery(params.q, {\n    author: params.author,\n  })\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.searchPostsSkeleton,\n      {\n        q: params.q,\n        cursor: params.cursor,\n        limit: params.limit,\n        author: params.author,\n        domain: params.domain,\n        lang: params.lang,\n        mentions: params.mentions,\n        since: params.since,\n        sort: params.sort,\n        tag: params.tag,\n        until: params.until,\n        url: params.url,\n        viewer: params.hydrateCtx.viewer ?? undefined,\n      },\n    )\n    return {\n      posts: res.posts.map(({ uri }) => uri as AtUriString),\n      cursor: parseString(res.cursor),\n      parsedQuery,\n    }\n  }\n\n  const res = await ctx.dataplane.searchPosts({\n    term: params.q,\n    limit: params.limit,\n    cursor: params.cursor,\n  })\n  return {\n    posts: res.uris as AtUriString[],\n    cursor: parseString(res.cursor),\n    parsedQuery,\n  }\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  return ctx.hydrator.hydratePosts(\n    skeleton.posts.map((uri) => ({ uri })),\n    params.hydrateCtx,\n    undefined,\n    {\n      processDynamicTagsForView: params.hydrateCtx.features?.checkGate(\n        params.hydrateCtx.features.Gate.SearchFilteringExplorationEnable,\n      )\n        ? 'search'\n        : undefined,\n    },\n  )\n}\n\nconst noBlocksOrTagged = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, params, skeleton, hydration } = inputs\n  const { parsedQuery } = skeleton\n\n  skeleton.posts = skeleton.posts.filter((uri) => {\n    const post = hydration.posts?.get(uri)\n    if (!post) return\n\n    const creator = creatorFromUri(uri)\n    const isCuratedSearch = params.sort === 'top'\n    const isPostByViewer = creator === params.hydrateCtx.viewer\n\n    // Cases to always show.\n    if (isPostByViewer) return true\n    if (params.isModService) return true\n\n    // Cases to never show.\n    if (ctx.views.viewerBlockExists(creator, hydration)) return false\n\n    let tagged = false\n    if (\n      params.hydrateCtx.features?.checkGate(\n        params.hydrateCtx.features.Gate.SearchFilteringExplorationEnable,\n      )\n    ) {\n      tagged = post.tags.has(ctx.cfg.visibilityTagHide)\n    } else {\n      tagged = [...ctx.cfg.searchTagsHide].some((t) => post.tags.has(t))\n    }\n\n    // Cases to conditionally show based on tagging.\n    if (isCuratedSearch && tagged) return false\n    if (!parsedQuery.author && tagged) return false\n    return true\n  })\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const posts = mapDefined(skeleton.posts, (uri) => {\n    const post = hydration.posts?.get(uri)\n    if (!post) return\n\n    return ctx.views.post(uri, hydration)\n  })\n  return {\n    posts,\n    cursor: skeleton.cursor,\n    hitsTotal: skeleton.hitsTotal,\n  }\n}\n\ntype Context = {\n  cfg: ServerConfig\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n  searchClient?: Client\n}\n\ntype Params = app.bsky.feed.searchPosts.$Params & {\n  hydrateCtx: HydrateCtx\n  isModService: boolean\n}\n\ntype Skeleton = {\n  posts: AtUriString[]\n  hitsTotal?: number\n  cursor?: string\n  parsedQuery: PostSearchQuery\n}\n"]}
+{"version":3,"file":"searchPosts.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/searchPosts.ts"],"names":[],"mappings":"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","sourcesContent":["import { Timestamp } from '@bufbuild/protobuf'\nimport { mapDefined } from '@atproto/common'\nimport { AtUriString, Client } from '@atproto/lex'\nimport { Server } from '@atproto/xrpc-server'\nimport { ServerConfig } from '../../../../config.js'\nimport { AppContext } from '../../../../context.js'\nimport { DataPlaneClient } from '../../../../data-plane/index.js'\nimport {\n  PostSearchQuery,\n  parsePostSearchQuery,\n} from '../../../../data-plane/server/util.js'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport { SearchSortOrder } from '../../../../proto/bsky_pb.js'\nimport { uriToDid as creatorFromUri } from '../../../../util/uris.js'\nimport { Views } from '../../../../views/index.js'\nimport { resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchPosts = createPipeline(\n    skeleton,\n    hydration,\n    noBlocksOrTagged,\n    presentation,\n  )\n  server.add(app.bsky.feed.searchPosts, {\n    auth: ctx.authVerifier.standardOptional,\n    handler: async ({ auth, params, req }) => {\n      const { viewer, isModService, skipViewerBlocks } =\n        ctx.authVerifier.parseCreds(auth)\n\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        labelers,\n        viewer,\n        skipViewerBlocks,\n        features: ctx.featureGatesClient.scope(\n          ctx.featureGatesClient.parseUserContextFromHandler({\n            viewer,\n            req,\n          }),\n        ),\n      })\n      const results = await searchPosts(\n        { ...params, hydrateCtx, isModService },\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 parsedQuery = parsePostSearchQuery(params.q, {\n    author: params.author,\n  })\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.searchPostsSkeleton,\n      {\n        q: params.q,\n        cursor: params.cursor,\n        limit: params.limit,\n        author: params.author,\n        domain: params.domain,\n        lang: params.lang,\n        mentions: params.mentions,\n        since: params.since,\n        sort: params.sort,\n        tag: params.tag,\n        until: params.until,\n        url: params.url,\n        viewer: params.hydrateCtx.viewer ?? undefined,\n      },\n    )\n    return {\n      posts: res.posts.map(({ uri }) => uri as AtUriString),\n      cursor: parseString(res.cursor),\n      parsedQuery,\n    }\n  }\n\n  const res = await ctx.dataplane.searchPosts({\n    term: params.q,\n    limit: params.limit,\n    cursor: params.cursor,\n  })\n  return {\n    posts: res.uris as AtUriString[],\n    cursor: parseString(res.cursor),\n    parsedQuery,\n  }\n}\n\nconst skeletonV2 = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const parsedQuery = parsePostSearchQuery(params.q, {\n    author: params.author,\n  })\n  const res = await ctx.dataplane.searchPostsV2({\n    params: {\n      query: params.q,\n      viewer: params.hydrateCtx.viewer ?? undefined,\n      limit: params.limit,\n      cursor: params.cursor,\n    },\n    sort: postSortToV2(params.sort),\n    filters: {\n      authors: params.author ? [params.author] : [],\n      mentions: params.mentions ? [params.mentions] : [],\n      domains: params.domain ? [params.domain] : [],\n      urls: params.url ? [params.url] : [],\n      hashtags: params.tag ?? [],\n    },\n    since: parseTimestamp(params.since),\n    until: parseTimestamp(params.until),\n    language: params.lang,\n  })\n  return {\n    posts: res.posts.map(({ uri }) => uri as AtUriString),\n    cursor: parseString(res.pageInfo?.cursor),\n    hitsTotal: res.pageInfo?.hitsTotal\n      ? Number(res.pageInfo.hitsTotal)\n      : undefined,\n    parsedQuery,\n  }\n}\n\nconst skeleton = async (input: SkeletonFnInput<Context, Params>) => {\n  const useV2 = input.params.hydrateCtx.features.checkGate(\n    input.params.hydrateCtx.features.Gate.SearchV2Enable,\n  )\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.hydratePosts(\n    skeleton.posts.map((uri) => ({ uri })),\n    params.hydrateCtx,\n    undefined,\n    {\n      processDynamicTagsForView: params.hydrateCtx.features?.checkGate(\n        params.hydrateCtx.features.Gate.SearchFilteringExplorationEnable,\n      )\n        ? 'search'\n        : undefined,\n    },\n  )\n}\n\nconst noBlocksOrTagged = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, params, skeleton, hydration } = inputs\n  const { parsedQuery } = skeleton\n\n  skeleton.posts = skeleton.posts.filter((uri) => {\n    const post = hydration.posts?.get(uri)\n    if (!post) return\n\n    const creator = creatorFromUri(uri)\n    const isCuratedSearch = params.sort === 'top'\n    const isPostByViewer = creator === params.hydrateCtx.viewer\n\n    // Cases to always show.\n    if (isPostByViewer) return true\n    if (params.isModService) return true\n\n    // Cases to never show.\n    if (ctx.views.viewerBlockExists(creator, hydration)) return false\n\n    let tagged = false\n    if (\n      params.hydrateCtx.features?.checkGate(\n        params.hydrateCtx.features.Gate.SearchFilteringExplorationEnable,\n      )\n    ) {\n      tagged = post.tags.has(ctx.cfg.visibilityTagHide)\n    } else {\n      tagged = [...ctx.cfg.searchTagsHide].some((t) => post.tags.has(t))\n    }\n\n    // Cases to conditionally show based on tagging.\n    if (isCuratedSearch && tagged) return false\n    if (!parsedQuery.author && tagged) return false\n    return true\n  })\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const posts = mapDefined(skeleton.posts, (uri) => {\n    const post = hydration.posts?.get(uri)\n    if (!post) return\n\n    return ctx.views.post(uri, hydration)\n  })\n  return {\n    posts,\n    cursor: skeleton.cursor,\n    hitsTotal: skeleton.hitsTotal,\n  }\n}\n\ntype Context = {\n  cfg: ServerConfig\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n  searchClient?: Client\n}\n\ntype Params = app.bsky.feed.searchPosts.$Params & {\n  hydrateCtx: HydrateCtx\n  isModService: boolean\n}\n\ntype Skeleton = {\n  posts: AtUriString[]\n  hitsTotal?: number\n  cursor?: string\n  parsedQuery: PostSearchQuery\n}\n\nconst postSortToV2 = (sort: string | undefined): SearchSortOrder => {\n  if (sort === 'top') return SearchSortOrder.TOP\n  if (sort === 'latest') return SearchSortOrder.RECENT\n  return SearchSortOrder.UNSPECIFIED\n}\n\nconst parseTimestamp = (value: string | undefined): Timestamp | undefined => {\n  if (!value) return undefined\n  const date = new Date(value)\n  if (isNaN(date.getTime())) return undefined\n  return Timestamp.fromDate(date)\n}\n"]}

package/dist/api/app/bsky/graph/searchStarterPacks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"searchStarterPacks.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/graph/searchStarterPacks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAgBnD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA2BvD"}
+{"version":3,"file":"searchStarterPacks.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/graph/searchStarterPacks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAgBnD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAiCvD"}

package/dist/api/app/bsky/graph/searchStarterPacks.js

@@ -16,6 +16,10 @@ export default function (server, ctx) {
                 labelers,
                 includeTakedowns,
                 skipViewerBlocks,
+                features: ctx.featureGatesClient.scope(ctx.featureGatesClient.parseUserContextFromHandler({
+                    viewer,
+                    req,
+                })),
             });
             const results = await searchStarterPacks({ ...params, hydrateCtx }, ctx);
             return {
@@ -26,7 +30,7 @@ export default function (server, ctx) {
         },
     });
 }
-const skeleton = async (inputs) => {
+const skeletonV1 = async (inputs) => {
     const { ctx, params } = inputs;
     const { q } = params;
     if (ctx.searchClient) {
@@ -52,6 +56,27 @@ const skeleton = async (inputs) => {
         cursor: parseString(res.cursor),
     };
 };
+const skeletonV2 = async (inputs) => {
+    const { ctx, params } = inputs;
+    const { q } = params;
+    const res = await ctx.dataplane.searchStarterPacksV2({
+        params: {
+            query: q,
+            viewer: params.hydrateCtx.viewer ?? undefined,
+            limit: params.limit,
+            cursor: params.cursor,
+        },
+    });
+    return {
+        uris: res.starterPacks.map(({ uri }) => uri),
+        cursor: parseString(res.pageInfo?.cursor),
+    };
+};
+const skeleton = async (input) => {
+    const useV2 = input.params.hydrateCtx.features.checkGate(input.params.hydrateCtx.features.Gate.SearchV2Enable);
+    const skeletonFn = useV2 ? skeletonV2 : skeletonV1;
+    return skeletonFn(input);
+};
 const hydration = async (inputs) => {
     const { ctx, params, skeleton } = inputs;
     return ctx.hydrator.hydrateStarterPacksBasic(skeleton.uris, params.hydrateCtx);

package/dist/api/app/bsky/graph/searchStarterPacks.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchStarterPacks.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/graph/searchStarterPacks.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport { AtUriString, Client } from '@atproto/lex'\nimport { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { DataPlaneClient } from '../../../../data-plane/index.js'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport { uriToDid as creatorFromUri } from '../../../../util/uris.js'\nimport { Views } from '../../../../views/index.js'\nimport { resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchStarterPacks = createPipeline(\n    skeleton,\n    hydration,\n    noBlocks,\n    presentation,\n  )\n  server.add(app.bsky.graph.searchStarterPacks, {\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      })\n      const results = await searchStarterPacks({ ...params, hydrateCtx }, ctx)\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const { q } = params\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.searchStarterPacksSkeleton,\n      {\n        q,\n        cursor: params.cursor,\n        limit: params.limit,\n        viewer: params.hydrateCtx.viewer ?? undefined,\n      },\n    )\n    return {\n      uris: res.starterPacks.map(({ uri }) => uri),\n      cursor: parseString(res.cursor),\n    }\n  }\n\n  const res = await ctx.dataplane.searchStarterPacks({\n    term: q,\n    limit: params.limit,\n    cursor: params.cursor,\n  })\n  return {\n    uris: res.uris as AtUriString[],\n    cursor: parseString(res.cursor),\n  }\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  return ctx.hydrator.hydrateStarterPacksBasic(skeleton.uris, params.hydrateCtx)\n}\n\nconst noBlocks = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, skeleton, hydration } = inputs\n  skeleton.uris = skeleton.uris.filter((uri) => {\n    const creator = creatorFromUri(uri)\n    return !ctx.views.viewerBlockExists(creator, hydration)\n  })\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const starterPacks = mapDefined(skeleton.uris, (uri) =>\n    ctx.views.starterPackBasic(uri, hydration),\n  )\n  return {\n    starterPacks: starterPacks,\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.graph.searchStarterPacks.$Params & {\n  hydrateCtx: HydrateCtx\n}\n\ntype Skeleton = {\n  uris: AtUriString[]\n  cursor?: string\n}\n"]}
+{"version":3,"file":"searchStarterPacks.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/graph/searchStarterPacks.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport { AtUriString, Client } from '@atproto/lex'\nimport { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { DataPlaneClient } from '../../../../data-plane/index.js'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport { uriToDid as creatorFromUri } from '../../../../util/uris.js'\nimport { Views } from '../../../../views/index.js'\nimport { resHeaders } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchStarterPacks = createPipeline(\n    skeleton,\n    hydration,\n    noBlocks,\n    presentation,\n  )\n  server.add(app.bsky.graph.searchStarterPacks, {\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 searchStarterPacks({ ...params, hydrateCtx }, ctx)\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 { q } = params\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.searchStarterPacksSkeleton,\n      {\n        q,\n        cursor: params.cursor,\n        limit: params.limit,\n        viewer: params.hydrateCtx.viewer ?? undefined,\n      },\n    )\n    return {\n      uris: res.starterPacks.map(({ uri }) => uri),\n      cursor: parseString(res.cursor),\n    }\n  }\n\n  const res = await ctx.dataplane.searchStarterPacks({\n    term: q,\n    limit: params.limit,\n    cursor: params.cursor,\n  })\n  return {\n    uris: res.uris as AtUriString[],\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 { q } = params\n\n  const res = await ctx.dataplane.searchStarterPacksV2({\n    params: {\n      query: q,\n      viewer: params.hydrateCtx.viewer ?? undefined,\n      limit: params.limit,\n      cursor: params.cursor,\n    },\n  })\n  return {\n    uris: res.starterPacks.map(({ uri }) => uri as AtUriString),\n    cursor: parseString(res.pageInfo?.cursor),\n  }\n}\n\nconst skeleton = async (input: SkeletonFnInput<Context, Params>) => {\n  const useV2 = input.params.hydrateCtx.features.checkGate(\n    input.params.hydrateCtx.features.Gate.SearchV2Enable,\n  )\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.hydrateStarterPacksBasic(skeleton.uris, params.hydrateCtx)\n}\n\nconst noBlocks = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, skeleton, hydration } = inputs\n  skeleton.uris = skeleton.uris.filter((uri) => {\n    const creator = creatorFromUri(uri)\n    return !ctx.views.viewerBlockExists(creator, hydration)\n  })\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const starterPacks = mapDefined(skeleton.uris, (uri) =>\n    ctx.views.starterPackBasic(uri, hydration),\n  )\n  return {\n    starterPacks: starterPacks,\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.graph.searchStarterPacks.$Params & {\n  hydrateCtx: HydrateCtx\n}\n\ntype Skeleton = {\n  uris: AtUriString[]\n  cursor?: string\n}\n"]}

package/dist/api/app/bsky/unspecced/getPopularFeedGenerators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPopularFeedGenerators.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/unspecced/getPopularFeedGenerators.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAQnD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAkDvD"}
+{"version":3,"file":"getPopularFeedGenerators.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/unspecced/getPopularFeedGenerators.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAQnD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAwEvD"}

package/dist/api/app/bsky/unspecced/getPopularFeedGenerators.js

@@ -11,7 +11,15 @@ export default function (server, ctx) {
         handler: async ({ auth, params, req }) => {
             const viewer = auth.credentials.iss;
             const labelers = ctx.reqLabelers(req);
-            const hydrateCtx = await ctx.hydrator.createContext({ viewer, labelers });
+            const features = ctx.featureGatesClient.scope(ctx.featureGatesClient.parseUserContextFromHandler({
+                viewer,
+                req,
+            }));
+            const hydrateCtx = await ctx.hydrator.createContext({
+                viewer,
+                labelers,
+                features,
+            });
             if (clearlyBadCursor(params.cursor)) {
                 return {
                     encoding: 'application/json',
@@ -22,11 +30,24 @@ export default function (server, ctx) {
             let cursor;
             const query = params.query?.trim() ?? '';
             if (query) {
-                const res = await ctx.dataplane.searchFeedGenerators({
-                    query,
-                    limit: params.limit,
-                });
-                uris = res.uris;
+                const useV2 = features.checkGate(features.Gate.SearchV2Enable);
+                if (useV2) {
+                    const res = await ctx.dataplane.searchFeedGeneratorsV2({
+                        params: {
+                            query,
+                            viewer: viewer ?? undefined,
+                            limit: params.limit,
+                        },
+                    });
+                    uris = res.feedGenerators.map(({ uri }) => uri);
+                }
+                else {
+                    const res = await ctx.dataplane.searchFeedGenerators({
+                        query,
+                        limit: params.limit,
+                    });
+                    uris = res.uris;
+                }
             }
             else {
                 const res = await ctx.dataplane.getSuggestedFeeds({