@atproto/bsky 0.0.251 → 0.0.253

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

@@ -1,143 +0,0 @@
-import { dedupeStrs, mapDefined, noUndefinedVals } from '@atproto/common'
-import { Client, DidString } from '@atproto/lex'
-import { MethodNotImplementedError, Server } from '@atproto/xrpc-server'
-import { AppContext } from '../../../../context.js'
-import {
-  HydrateCtx,
-  Hydrator,
-  mergeManyStates,
-} from '../../../../hydration/hydrator.js'
-import { app } from '../../../../lexicons/index.js'
-import {
-  HydrationFnInput,
-  PresentationFnInput,
-  RulesFnInput,
-  SkeletonFnInput,
-  createPipeline,
-} from '../../../../pipeline.js'
-import { Views } from '../../../../views/index.js'
-
-export default function (server: Server, ctx: AppContext) {
-  const getSuggestedOnboardingUsers = createPipeline(
-    skeleton,
-    hydration,
-    noBlocksOrFollows,
-    presentation,
-  )
-  server.add(app.bsky.unspecced.getSuggestedOnboardingUsers, {
-    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,
-      })
-      const headers = noUndefinedVals({
-        'accept-language': req.headers['accept-language'],
-        'x-bsky-topics': Array.isArray(req.headers['x-bsky-topics'])
-          ? req.headers['x-bsky-topics'].join(',')
-          : req.headers['x-bsky-topics'],
-      })
-      const result = await getSuggestedOnboardingUsers(
-        {
-          ...params,
-          hydrateCtx,
-          headers,
-        },
-        ctx,
-      )
-      return {
-        encoding: 'application/json',
-        body: result,
-      }
-    },
-  })
-}
-
-const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
-  const { params, ctx } = input
-  if (!ctx.suggestionsClient) {
-    throw new MethodNotImplementedError('Suggestions agent not available')
-  }
-
-  return ctx.suggestionsClient.call(
-    app.bsky.unspecced.getOnboardingSuggestedUsersSkeleton,
-    {
-      limit: params.limit,
-      viewer: params.hydrateCtx.viewer ?? undefined,
-      category: params.category,
-    },
-    {
-      headers: params.headers,
-    },
-  )
-}
-
-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 {
-    recId: skeleton.recId,
-    recIdStr: skeleton.recIdStr,
-    actors: mapDefined(skeleton.dids, (did) =>
-      ctx.views.profile(did, hydration),
-    ),
-  }
-}
-
-type Context = {
-  hydrator: Hydrator
-  views: Views
-  topicsClient: Client | undefined
-  suggestionsClient: Client | undefined
-}
-
-type Params = app.bsky.unspecced.getSuggestedOnboardingUsers.$Params & {
-  hydrateCtx: HydrateCtx & { viewer: string | null }
-  headers: Record<string, string>
-  category?: string
-}
-
-type SkeletonState = {
-  dids: DidString[]
-  recId?: string
-  recIdStr?: string
-}

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

@@ -1,165 +0,0 @@
-import { mapDefined, noUndefinedVals } from '@atproto/common'
-import { Client } from '@atproto/lex'
-import { AtUri, AtUriString, DidString } from '@atproto/syntax'
-import { MethodNotImplementedError, Server } from '@atproto/xrpc-server'
-import { AppContext } from '../../../../context.js'
-import {
-  HydrateCtx,
-  Hydrator,
-  mergeManyStates,
-} from '../../../../hydration/hydrator.js'
-import { app } from '../../../../lexicons/index.js'
-import {
-  HydrationFnInput,
-  PresentationFnInput,
-  RulesFnInput,
-  SkeletonFnInput,
-  createPipeline,
-} from '../../../../pipeline.js'
-import { Views } from '../../../../views/index.js'
-
-export default function (server: Server, ctx: AppContext) {
-  const getSuggestedStarterPacks = createPipeline(
-    skeleton,
-    hydration,
-    noBlocks,
-    presentation,
-  )
-  server.add(app.bsky.unspecced.getSuggestedStarterPacks, {
-    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 })
-      const headers = noUndefinedVals({
-        'accept-language': req.headers['accept-language'],
-        'x-bsky-topics': Array.isArray(req.headers['x-bsky-topics'])
-          ? req.headers['x-bsky-topics'].join(',')
-          : req.headers['x-bsky-topics'],
-      })
-      const result = await getSuggestedStarterPacks(
-        {
-          ...params,
-          hydrateCtx,
-          headers,
-        },
-        ctx,
-      )
-      return {
-        encoding: 'application/json',
-        body: result,
-      }
-    },
-  })
-}
-
-const skeleton = async (
-  input: SkeletonFnInput<Context, Params>,
-): Promise<SkeletonState> => {
-  const { params, ctx } = input
-
-  if (!ctx.topicsClient) {
-    // Use 501 instead of 500 as these are not considered retry-able by clients
-    throw new MethodNotImplementedError('Topics agent not available')
-  }
-
-  const skeleton = await ctx.topicsClient.call(
-    app.bsky.unspecced.getSuggestedStarterPacksSkeleton,
-    {
-      limit: params.limit,
-      viewer: params.hydrateCtx.viewer ?? undefined,
-    },
-    {
-      headers: params.headers,
-    },
-  )
-
-  // @TODO Make sure upstream always provides this
-  skeleton.starterPacks ??= []
-
-  return skeleton
-}
-
-const hydration = async (
-  input: HydrationFnInput<Context, Params, SkeletonState>,
-) => {
-  const { ctx, params, skeleton } = input
-
-  const pairs: Map<DidString, DidString[]> = new Map()
-  const viewer = params.hydrateCtx.viewer
-  if (viewer) {
-    pairs.set(viewer, getUniqueDidsFromStarterPacks(skeleton.starterPacks))
-  }
-  const [starterPacksState, bidirectionalBlocks] = await Promise.all([
-    ctx.hydrator.hydrateStarterPacks(skeleton.starterPacks, params.hydrateCtx),
-    ctx.hydrator.hydrateBidirectionalBlocks(pairs, params.hydrateCtx),
-  ])
-
-  return mergeManyStates(starterPacksState, { bidirectionalBlocks })
-}
-
-const noBlocks = (input: RulesFnInput<Context, Params, SkeletonState>) => {
-  const { skeleton, params, hydration } = input
-  const viewer = params.hydrateCtx.viewer
-  if (!viewer) {
-    return skeleton
-  }
-
-  const blocks = hydration.bidirectionalBlocks?.get(viewer)
-  const filteredSkeleton: SkeletonState = {
-    starterPacks: skeleton.starterPacks.filter((uri) => {
-      try {
-        return !blocks?.get(new AtUri(uri).did)
-      } catch {
-        return false
-      }
-    }),
-  }
-
-  return filteredSkeleton
-}
-
-const presentation = (
-  input: PresentationFnInput<Context, Params, SkeletonState>,
-) => {
-  const { ctx, skeleton, hydration } = input
-
-  return {
-    starterPacks: mapDefined(skeleton.starterPacks, (uri) =>
-      ctx.views.starterPack(uri, hydration),
-    ),
-  }
-}
-
-type Context = {
-  hydrator: Hydrator
-  views: Views
-  topicsClient: Client | undefined
-}
-
-type Params = app.bsky.unspecced.getSuggestedStarterPacks.$Params & {
-  hydrateCtx: HydrateCtx & { viewer: string | null }
-  headers: Record<string, string>
-}
-
-type SkeletonState = {
-  starterPacks: AtUriString[]
-}
-
-function getUniqueDidsFromStarterPacks(
-  starterPacks?: AtUriString[],
-): DidString[] {
-  if (!starterPacks) return []
-
-  const dids = new Set<DidString>()
-
-  for (const uri of starterPacks) {
-    try {
-      dids.add(new AtUri(uri).did)
-    } catch {
-      continue
-    }
-  }
-
-  return Array.from(dids)
-}

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

@@ -1,183 +0,0 @@
-import { dedupeStrs, mapDefined, noUndefinedVals } from '@atproto/common'
-import { Client, DidString } from '@atproto/lex'
-import { MethodNotImplementedError, Server } from '@atproto/xrpc-server'
-import { AppContext } from '../../../../context.js'
-import {
-  HydrateCtx,
-  Hydrator,
-  mergeManyStates,
-} from '../../../../hydration/hydrator.js'
-import { app } from '../../../../lexicons/index.js'
-import {
-  HydrationFnInput,
-  PresentationFnInput,
-  RulesFnInput,
-  SkeletonFnInput,
-  createPipeline,
-} from '../../../../pipeline.js'
-import { Views } from '../../../../views/index.js'
-
-export default function (server: Server, ctx: AppContext) {
-  const getSuggestedUsers = createPipeline(
-    skeleton,
-    hydration,
-    noBlocksOrFollows,
-    presentation,
-  )
-  server.add(app.bsky.unspecced.getSuggestedUsers, {
-    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'],
-        'x-bsky-topics': Array.isArray(req.headers['x-bsky-topics'])
-          ? req.headers['x-bsky-topics'].join(',')
-          : req.headers['x-bsky-topics'],
-      })
-      const result = await getSuggestedUsers(
-        {
-          ...params,
-          hydrateCtx,
-          headers,
-        },
-        ctx,
-      )
-      return {
-        encoding: 'application/json',
-        body: result,
-      }
-    },
-  })
-}
-
-// TODO: rename to `skeleton` once we can fully migrate to Discover
-const skeletonFromDiscover = 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,
-    },
-  )
-}
-
-const skeletonFromTopics = async (
-  input: SkeletonFnInput<Context, Params>,
-): Promise<SkeletonState> => {
-  const { params, ctx } = input
-
-  if (!ctx.topicsClient) {
-    // Use 501 instead of 500 as these are not considered retry-able by clients
-    throw new MethodNotImplementedError('Topics agent not available')
-  }
-
-  return ctx.topicsClient.call(
-    app.bsky.unspecced.getSuggestedUsersSkeleton,
-    {
-      limit: params.limit,
-      category: params.category,
-      viewer: params.hydrateCtx.viewer ?? undefined,
-    },
-    {
-      headers: params.headers,
-    },
-  )
-}
-
-const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
-  const useDiscover = input.params.hydrateCtx.features.checkGate(
-    input.params.hydrateCtx.features.Gate.SuggestedUsersDiscoverEnable,
-  )
-  const skeletonFn = useDiscover ? skeletonFromDiscover : skeletonFromTopics
-  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 {
-    recId: skeleton.recId,
-    recIdStr: skeleton.recIdStr,
-    actors: mapDefined(skeleton.dids, (did) =>
-      ctx.views.profile(did, hydration),
-    ),
-  }
-}
-
-type Context = {
-  hydrator: Hydrator
-  views: Views
-  topicsClient: Client | undefined
-  suggestionsClient: Client | undefined
-}
-
-type Params = app.bsky.unspecced.getSuggestedUsers.$Params & {
-  hydrateCtx: HydrateCtx & { viewer: string | null }
-  headers: Record<string, string>
-  category?: string
-}
-
-type SkeletonState = {
-  dids: DidString[]
-  recId?: string
-  recIdStr?: string
-}

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

@@ -1,175 +0,0 @@
-import { dedupeStrs, mapDefined, noUndefinedVals } from '@atproto/common'
-import { Client, DidString } from '@atproto/lex'
-import { MethodNotImplementedError, Server } from '@atproto/xrpc-server'
-import { AppContext } from '../../../../context.js'
-import {
-  HydrateCtx,
-  Hydrator,
-  mergeManyStates,
-} from '../../../../hydration/hydrator.js'
-import { app } from '../../../../lexicons/index.js'
-import {
-  HydrationFnInput,
-  PresentationFnInput,
-  RulesFnInput,
-  SkeletonFnInput,
-  createPipeline,
-} from '../../../../pipeline.js'
-import { Views } from '../../../../views/index.js'
-
-export default function (server: Server, ctx: AppContext) {
-  const getSuggestedUsersForDiscover = createPipeline(
-    skeleton,
-    hydration,
-    noBlocksOrFollows,
-    presentation,
-  )
-  server.add(app.bsky.unspecced.getSuggestedUsersForDiscover, {
-    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 getSuggestedUsersForDiscover(
-        {
-          ...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,
-      viewer: params.hydrateCtx.viewer ?? undefined,
-    },
-    {
-      headers: params.headers,
-    },
-  )
-}
-
-// TODO: rename to `skeleton` once we can fully migrate to the new endpoint
-const skeletonFromGetSuggestedUsersForDiscoverSkeleton = 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.getSuggestedUsersForDiscoverSkeleton,
-    {
-      limit: params.limit,
-      viewer: params.hydrateCtx.viewer ?? undefined,
-    },
-    {
-      headers: params.headers,
-    },
-  )
-}
-
-const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
-  const useDiscover = input.params.hydrateCtx.features.checkGate(
-    input.params.hydrateCtx.features.Gate.SuggestedUsersForDiscoverEnable,
-  )
-  const skeletonFn = useDiscover
-    ? skeletonFromGetSuggestedUsersForDiscoverSkeleton
-    : 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.getSuggestedUsersForDiscover.$Params & {
-  hydrateCtx: HydrateCtx & { viewer: string | null }
-  headers: Record<string, string>
-}
-
-type SkeletonState = {
-  dids: DidString[]
-  recIdStr?: string
-}