@atproto/bsky 0.0.222 → 0.0.224

package/src/api/app/bsky/unspecced/getSuggestedUsersForExplore.ts

@@ -0,0 +1,178 @@
+import { dedupeStrs, mapDefined, noUndefinedVals } from '@atproto/common'
+import { Client, DidString } from '@atproto/lex'
+import { MethodNotImplementedError, Server } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import {
+  HydrateCtx,
+  Hydrator,
+  mergeManyStates,
+} from '../../../../hydration/hydrator'
+import { app } from '../../../../lexicons/index.js'
+import {
+  HydrationFnInput,
+  PresentationFnInput,
+  RulesFnInput,
+  SkeletonFnInput,
+  createPipeline,
+} from '../../../../pipeline'
+import { Views } from '../../../../views'
+
+export default function (server: Server, ctx: AppContext) {
+  const getSuggestedUsersForExplore = createPipeline(
+    skeleton,
+    hydration,
+    noBlocksOrFollows,
+    presentation,
+  )
+  server.add(app.bsky.unspecced.getSuggestedUsersForExplore, {
+    auth: ctx.authVerifier.standardOptional,
+    handler: async ({ auth, params, req }) => {
+      const viewer = auth.credentials.iss
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = await ctx.hydrator.createContext({
+        labelers,
+        viewer,
+        features: ctx.featureGatesClient.scope(
+          ctx.featureGatesClient.parseUserContextFromHandler({
+            viewer,
+            req,
+          }),
+        ),
+      })
+      const headers = noUndefinedVals({
+        'accept-language': req.headers['accept-language'],
+      })
+      const result = await getSuggestedUsersForExplore(
+        {
+          ...params,
+          hydrateCtx,
+          headers,
+        },
+        ctx,
+      )
+      return {
+        encoding: 'application/json',
+        body: result,
+      }
+    },
+  })
+}
+
+const skeletonFromGetSuggestedUsersSkeleton = async (
+  input: SkeletonFnInput<Context, Params>,
+): Promise<SkeletonState> => {
+  const { params, ctx } = input
+  if (!ctx.suggestionsClient) {
+    throw new MethodNotImplementedError('Suggestions agent not available')
+  }
+
+  return ctx.suggestionsClient.call(
+    app.bsky.unspecced.getSuggestedUsersSkeleton,
+    {
+      limit: params.limit,
+      category: params.category,
+      viewer: params.hydrateCtx.viewer ?? undefined,
+    },
+    {
+      headers: params.headers,
+    },
+  )
+}
+
+// TODO: rename to `skeleton` once we can fully migrate to the new endpoint
+const skeletonFromGetSuggestedUsersForExploreSkeleton = async (
+  input: SkeletonFnInput<Context, Params>,
+): Promise<SkeletonState> => {
+  const { params, ctx } = input
+
+  if (!ctx.suggestionsClient) {
+    throw new MethodNotImplementedError('Suggestions agent not available')
+  }
+
+  return ctx.suggestionsClient.call(
+    app.bsky.unspecced.getSuggestedUsersForExploreSkeleton,
+    {
+      limit: params.limit,
+      category: params.category,
+      viewer: params.hydrateCtx.viewer ?? undefined,
+    },
+    {
+      headers: params.headers,
+    },
+  )
+}
+
+const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
+  const useExplore = input.params.hydrateCtx.features.checkGate(
+    input.params.hydrateCtx.features.Gate.SuggestedUsersForExploreEnable,
+  )
+  const skeletonFn = useExplore
+    ? skeletonFromGetSuggestedUsersForExploreSkeleton
+    : skeletonFromGetSuggestedUsersSkeleton
+  return skeletonFn(input)
+}
+
+const hydration = async (
+  input: HydrationFnInput<Context, Params, SkeletonState>,
+) => {
+  const { ctx, params, skeleton } = input
+  const dids = dedupeStrs(skeleton.dids)
+  const pairs: Map<DidString, DidString[]> = new Map()
+  const viewer = params.hydrateCtx.viewer
+  if (viewer) {
+    pairs.set(viewer, dids)
+  }
+  const [profilesState, bidirectionalBlocks] = await Promise.all([
+    ctx.hydrator.hydrateProfiles(dids, params.hydrateCtx),
+    ctx.hydrator.hydrateBidirectionalBlocks(pairs, params.hydrateCtx),
+  ])
+
+  return mergeManyStates(profilesState, { bidirectionalBlocks })
+}
+
+const noBlocksOrFollows = (
+  input: RulesFnInput<Context, Params, SkeletonState>,
+) => {
+  const { ctx, skeleton, params, hydration } = input
+  const viewer = params.hydrateCtx.viewer
+  if (!viewer) {
+    return skeleton
+  }
+  const blocks = hydration.bidirectionalBlocks?.get(viewer)
+  return {
+    ...skeleton,
+    dids: skeleton.dids.filter((did) => {
+      const viewer = ctx.views.profileViewer(did, hydration)
+      return !blocks?.get(did) && !viewer?.following
+    }),
+  }
+}
+
+const presentation = (
+  input: PresentationFnInput<Context, Params, SkeletonState>,
+) => {
+  const { ctx, skeleton, hydration } = input
+  return {
+    recIdStr: skeleton.recIdStr,
+    actors: mapDefined(skeleton.dids, (did) =>
+      ctx.views.profile(did, hydration),
+    ),
+  }
+}
+
+type Context = {
+  hydrator: Hydrator
+  views: Views
+  suggestionsClient: Client | undefined
+}
+
+type Params = app.bsky.unspecced.getSuggestedUsersForExplore.$Params & {
+  hydrateCtx: HydrateCtx & { viewer: string | null }
+  headers: Record<string, string>
+  category?: string
+}
+
+type SkeletonState = {
+  dids: DidString[]
+  recIdStr?: string
+}

package/src/api/app/bsky/unspecced/getSuggestedUsersForSeeMore.ts

@@ -0,0 +1,178 @@
+import { dedupeStrs, mapDefined, noUndefinedVals } from '@atproto/common'
+import { Client, DidString } from '@atproto/lex'
+import { MethodNotImplementedError, Server } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import {
+  HydrateCtx,
+  Hydrator,
+  mergeManyStates,
+} from '../../../../hydration/hydrator'
+import { app } from '../../../../lexicons/index.js'
+import {
+  HydrationFnInput,
+  PresentationFnInput,
+  RulesFnInput,
+  SkeletonFnInput,
+  createPipeline,
+} from '../../../../pipeline'
+import { Views } from '../../../../views'
+
+export default function (server: Server, ctx: AppContext) {
+  const getSuggestedUsersForSeeMore = createPipeline(
+    skeleton,
+    hydration,
+    noBlocksOrFollows,
+    presentation,
+  )
+  server.add(app.bsky.unspecced.getSuggestedUsersForSeeMore, {
+    auth: ctx.authVerifier.standardOptional,
+    handler: async ({ auth, params, req }) => {
+      const viewer = auth.credentials.iss
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = await ctx.hydrator.createContext({
+        labelers,
+        viewer,
+        features: ctx.featureGatesClient.scope(
+          ctx.featureGatesClient.parseUserContextFromHandler({
+            viewer,
+            req,
+          }),
+        ),
+      })
+      const headers = noUndefinedVals({
+        'accept-language': req.headers['accept-language'],
+      })
+      const result = await getSuggestedUsersForSeeMore(
+        {
+          ...params,
+          hydrateCtx,
+          headers,
+        },
+        ctx,
+      )
+      return {
+        encoding: 'application/json',
+        body: result,
+      }
+    },
+  })
+}
+
+const skeletonFromGetSuggestedUsersSkeleton = async (
+  input: SkeletonFnInput<Context, Params>,
+): Promise<SkeletonState> => {
+  const { params, ctx } = input
+  if (!ctx.suggestionsClient) {
+    throw new MethodNotImplementedError('Suggestions agent not available')
+  }
+
+  return ctx.suggestionsClient.call(
+    app.bsky.unspecced.getSuggestedUsersSkeleton,
+    {
+      limit: params.limit,
+      category: params.category,
+      viewer: params.hydrateCtx.viewer ?? undefined,
+    },
+    {
+      headers: params.headers,
+    },
+  )
+}
+
+// TODO: rename to `skeleton` once we can fully migrate to the new endpoint
+const skeletonFromGetSuggestedUsersForSeeMoreSkeleton = async (
+  input: SkeletonFnInput<Context, Params>,
+): Promise<SkeletonState> => {
+  const { params, ctx } = input
+
+  if (!ctx.suggestionsClient) {
+    throw new MethodNotImplementedError('Suggestions agent not available')
+  }
+
+  return ctx.suggestionsClient.call(
+    app.bsky.unspecced.getSuggestedUsersForSeeMoreSkeleton,
+    {
+      limit: params.limit,
+      category: params.category,
+      viewer: params.hydrateCtx.viewer ?? undefined,
+    },
+    {
+      headers: params.headers,
+    },
+  )
+}
+
+const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
+  const useSeeMore = input.params.hydrateCtx.features.checkGate(
+    input.params.hydrateCtx.features.Gate.SuggestedUsersForSeeMoreEnable,
+  )
+  const skeletonFn = useSeeMore
+    ? skeletonFromGetSuggestedUsersForSeeMoreSkeleton
+    : skeletonFromGetSuggestedUsersSkeleton
+  return skeletonFn(input)
+}
+
+const hydration = async (
+  input: HydrationFnInput<Context, Params, SkeletonState>,
+) => {
+  const { ctx, params, skeleton } = input
+  const dids = dedupeStrs(skeleton.dids)
+  const pairs: Map<DidString, DidString[]> = new Map()
+  const viewer = params.hydrateCtx.viewer
+  if (viewer) {
+    pairs.set(viewer, dids)
+  }
+  const [profilesState, bidirectionalBlocks] = await Promise.all([
+    ctx.hydrator.hydrateProfiles(dids, params.hydrateCtx),
+    ctx.hydrator.hydrateBidirectionalBlocks(pairs, params.hydrateCtx),
+  ])
+
+  return mergeManyStates(profilesState, { bidirectionalBlocks })
+}
+
+const noBlocksOrFollows = (
+  input: RulesFnInput<Context, Params, SkeletonState>,
+) => {
+  const { ctx, skeleton, params, hydration } = input
+  const viewer = params.hydrateCtx.viewer
+  if (!viewer) {
+    return skeleton
+  }
+  const blocks = hydration.bidirectionalBlocks?.get(viewer)
+  return {
+    ...skeleton,
+    dids: skeleton.dids.filter((did) => {
+      const viewer = ctx.views.profileViewer(did, hydration)
+      return !blocks?.get(did) && !viewer?.following
+    }),
+  }
+}
+
+const presentation = (
+  input: PresentationFnInput<Context, Params, SkeletonState>,
+) => {
+  const { ctx, skeleton, hydration } = input
+  return {
+    recIdStr: skeleton.recIdStr,
+    actors: mapDefined(skeleton.dids, (did) =>
+      ctx.views.profile(did, hydration),
+    ),
+  }
+}
+
+type Context = {
+  hydrator: Hydrator
+  views: Views
+  suggestionsClient: Client | undefined
+}
+
+type Params = app.bsky.unspecced.getSuggestedUsersForSeeMore.$Params & {
+  hydrateCtx: HydrateCtx & { viewer: string | null }
+  headers: Record<string, string>
+  category?: string
+}
+
+type SkeletonState = {
+  dids: DidString[]
+  recIdStr?: string
+}

package/src/api/index.ts

@@ -82,6 +82,9 @@ import getUnspeccedSuggestedFeeds from './app/bsky/unspecced/getSuggestedFeeds'
 import getSuggestedOnboardingUsers from './app/bsky/unspecced/getSuggestedOnboardingUsers'
 import getSuggestedStarterPacks from './app/bsky/unspecced/getSuggestedStarterPacks'
 import getSuggestedUsers from './app/bsky/unspecced/getSuggestedUsers'
+import getSuggestedUsersForDiscover from './app/bsky/unspecced/getSuggestedUsersForDiscover'
+import getSuggestedUsersForExplore from './app/bsky/unspecced/getSuggestedUsersForExplore'
+import getSuggestedUsersForSeeMore from './app/bsky/unspecced/getSuggestedUsersForSeeMore'
 import getTaggedSuggestions from './app/bsky/unspecced/getTaggedSuggestions'
 import getTrendingTopics from './app/bsky/unspecced/getTrendingTopics'
 import getTrends from './app/bsky/unspecced/getTrends'
@@ -169,6 +172,9 @@ export default function (server: Server, ctx: AppContext) {
   getSuggestedOnboardingUsers(server, ctx)
   getSuggestedStarterPacks(server, ctx)
   getSuggestedUsers(server, ctx)
+  getSuggestedUsersForDiscover(server, ctx)
+  getSuggestedUsersForExplore(server, ctx)
+  getSuggestedUsersForSeeMore(server, ctx)
   getUnspeccedSuggestedFeeds(server, ctx)
   getLabelerServices(server, ctx)
   searchActors(server, ctx)

package/src/feature-gates/gates.ts

@@ -8,6 +8,9 @@ export enum Gate {
   SuggestedUsersSocialProofEnable = 'suggested_users:social_proof:enable',
   ThreadsReplyRankingExplorationEnable = 'threads:reply_ranking_exploration:enable',
   SearchFilteringExplorationEnable = 'search:filtering_exploration:enable',
+  SuggestedUsersForExploreEnable = 'suggested_users:for_explore:enable',
+  SuggestedUsersForDiscoverEnable = 'suggested_users:for_discover:enable',
+  SuggestedUsersForSeeMoreEnable = 'suggested_users:for_see_more:enable',
 
   // temp
   AATest = 'aa-test-appview',