@atproto/bsky 0.0.210 → 0.0.211

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.210",
+  "version": "0.0.211",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -24,6 +24,7 @@
     "@connectrpc/connect-express": "^1.1.4",
     "@connectrpc/connect-node": "^1.1.4",
     "@did-plc/lib": "^0.0.1",
+    "@growthbook/growthbook": "^1.6.2",
     "@hapi/address": "^5.1.1",
     "@types/http-errors": "^2.0.1",
     "compression": "^1.7.4",
@@ -45,7 +46,6 @@
     "pino": "^8.21.0",
     "pino-http": "^8.2.1",
     "sharp": "^0.33.5",
-    "statsig-node": "^5.23.1",
     "structured-headers": "^1.0.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
@@ -53,16 +53,16 @@
     "zod": "3.23.8",
     "@atproto-labs/fetch-node": "0.2.0",
     "@atproto-labs/xrpc-utils": "0.0.24",
-    "@atproto/api": "^0.18.13",
-    "@atproto/common": "^0.5.7",
+    "@atproto/api": "^0.18.17",
+    "@atproto/common": "^0.5.9",
     "@atproto/crypto": "^0.4.5",
     "@atproto/did": "^0.2.4",
     "@atproto/identity": "^0.4.10",
+    "@atproto/lexicon": "^0.6.1",
     "@atproto/repo": "^0.8.12",
     "@atproto/sync": "^0.1.39",
-    "@atproto/lexicon": "^0.6.0",
-    "@atproto/syntax": "^0.4.2",
-    "@atproto/xrpc-server": "^0.10.8"
+    "@atproto/syntax": "^0.4.3",
+    "@atproto/xrpc-server": "^0.10.10"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",
@@ -78,13 +78,13 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/api": "^0.18.13",
-    "@atproto/pds": "^0.4.203",
+    "@atproto/api": "^0.18.17",
     "@atproto/lex-cli": "^0.9.8",
+    "@atproto/pds": "^0.4.205",
     "@atproto/xrpc": "^0.7.7"
   },
   "scripts": {
-    "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/*",
+    "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/com/germnetwork/*",
     "build": "tsc --build tsconfig.build.json",
     "start": "node --enable-source-maps dist/bin.js",
     "test": "../dev-infra/with-test-redis-and-db.sh jest",

package/proto/bsky.proto

@@ -121,6 +121,14 @@ message GetNotificationDeclarationRecordsResponse {
   repeated Record records = 1;
 }
 
+message GetGermDeclarationRecordsRequest {
+  repeated string uris = 1;
+}
+
+message GetGermDeclarationRecordsResponse {
+  repeated Record records = 1;
+}
+
 message GetStatusRecordsRequest {
   repeated string uris = 1;
 }
@@ -378,6 +386,7 @@ message GetCountsForUsersResponse {
   repeated int32 lists = 5;
   repeated int32 feeds = 6;
   repeated int32 starter_packs = 7;
+  repeated int32 drafts = 8;
 }
 
 message GetStarterPackCountsRequest {
@@ -466,7 +475,6 @@ message GetActorsRequest {
 }
 
 message ActorInfo {
-  reserved 20; // DO NOT REMOVE — see dataplane repo
   bool exists = 1;
   string handle = 2;
   Record profile = 3;
@@ -488,6 +496,8 @@ message ActorInfo {
   Record status_record = 17;
   string allow_activity_subscriptions_from = 18;
   optional AgeAssuranceStatus age_assurance_status = 19;
+  reserved 20; // DO NOT REMOVE - see dataplane repo
+  Record germ_record = 21;
 }
 
 message AgeAssuranceStatus {
@@ -1291,6 +1301,29 @@ message GetActorBookmarksResponse {
   string cursor = 2;
 }
 
+//
+// Drafts
+//
+
+
+message GetActorDraftsRequest {
+  string actor_did = 1;
+  int32 limit = 2;
+  string cursor = 3;
+}
+
+message DraftInfo {
+  string key = 1; // stash key
+  google.protobuf.Timestamp created_at = 2;
+  google.protobuf.Timestamp updated_at = 3;
+  bytes payload = 4;
+}
+
+message GetActorDraftsResponse {
+  repeated DraftInfo drafts = 1;
+  string cursor = 2;
+}
+
 
 // Polo-backed Graph Endpoints
 
@@ -1365,6 +1398,7 @@ service Service {
   rpc GetProfileRecords(GetProfileRecordsRequest) returns (GetProfileRecordsResponse);
   rpc GetActorChatDeclarationRecords(GetActorChatDeclarationRecordsRequest) returns (GetActorChatDeclarationRecordsResponse);
   rpc GetNotificationDeclarationRecords(GetNotificationDeclarationRecordsRequest) returns (GetNotificationDeclarationRecordsResponse);
+  rpc GetGermDeclarationRecords(GetGermDeclarationRecordsRequest) returns (GetGermDeclarationRecordsResponse);
   rpc GetStatusRecords(GetStatusRecordsRequest) returns (GetStatusRecordsResponse);
   rpc GetRepostRecords(GetRepostRecordsRequest) returns (GetRepostRecordsResponse);
   rpc GetThreadGateRecords(GetThreadGateRecordsRequest) returns (GetThreadGateRecordsResponse);
@@ -1491,6 +1525,10 @@ service Service {
   // Returns the bookmarks created by the actor.
   rpc GetActorBookmarks(GetActorBookmarksRequest) returns (GetActorBookmarksResponse);
 
+  // Drafts
+  // Returns a page of drafts for a user.
+  rpc GetActorDrafts(GetActorDraftsRequest) returns (GetActorDraftsResponse);
+
   // Identity
   rpc GetIdentityByDid(GetIdentityByDidRequest) returns (GetIdentityByDidResponse);
   rpc GetIdentityByHandle(GetIdentityByHandleRequest) returns (GetIdentityByHandleResponse);

package/src/api/app/bsky/draft/createDraft.ts

@@ -0,0 +1,46 @@
+import { TID } from '@atproto/common'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { DraftWithId } from '../../../../lexicon/types/app/bsky/draft/defs'
+import { Namespaces } from '../../../../stash'
+
+export default function (server: Server, ctx: AppContext) {
+  server.app.bsky.draft.createDraft({
+    auth: ctx.authVerifier.standard,
+    handler: async ({ input, auth }) => {
+      const actorDid = auth.credentials.iss
+      const { draft } = input.body
+
+      const res = await ctx.dataplane.getCountsForUsers({
+        dids: [actorDid],
+      })
+
+      const draftsCount = res.drafts[0]
+      if (draftsCount >= ctx.cfg.draftsLimit) {
+        throw new InvalidRequestError(
+          `Drafts limit reached`,
+          'DraftLimitReached',
+        )
+      }
+
+      const draftId = TID.nextStr()
+      const draftWithId: DraftWithId = {
+        id: draftId,
+        draft,
+      }
+
+      await ctx.stashClient.create({
+        actorDid,
+        namespace: Namespaces.AppBskyDraftDefsDraftWithId,
+        payload: draftWithId,
+        key: draftId,
+      })
+
+      return {
+        encoding: 'application/json' as const,
+        body: { id: draftId },
+      }
+    },
+  })
+}

package/src/api/app/bsky/draft/deleteDraft.ts

@@ -0,0 +1,19 @@
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { Namespaces } from '../../../../stash'
+
+export default function (server: Server, ctx: AppContext) {
+  server.app.bsky.draft.deleteDraft({
+    auth: ctx.authVerifier.standard,
+    handler: async ({ input, auth }) => {
+      const actorDid = auth.credentials.iss
+      const { id } = input.body
+
+      await ctx.stashClient.delete({
+        actorDid,
+        namespace: Namespaces.AppBskyDraftDefsDraftWithId,
+        key: id,
+      })
+    },
+  })
+}

package/src/api/app/bsky/draft/getDrafts.ts

@@ -0,0 +1,46 @@
+import { jsonStringToLex } from '@atproto/lexicon'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import {
+  DraftView,
+  DraftWithId,
+} from '../../../../lexicon/types/app/bsky/draft/defs'
+
+export default function (server: Server, ctx: AppContext) {
+  server.app.bsky.draft.getDrafts({
+    auth: ctx.authVerifier.standard,
+    handler: async ({ params, auth }) => {
+      const viewer = auth.credentials.iss
+
+      const { cursor, drafts } = await ctx.hydrator.dataplane.getActorDrafts({
+        actorDid: viewer,
+        limit: params.limit,
+        cursor: params.cursor,
+      })
+
+      const draftViews = drafts.map((d): DraftView => {
+        const draftWithId = jsonStringToLex(
+          Buffer.from(d.payload).toString('utf8'),
+        ) as DraftWithId
+        return {
+          id: draftWithId.id,
+          draft: draftWithId.draft,
+          // The date should always be present, but we avoid required fields on protobuf by convention,
+          // so requires a fallback value to please TS.
+          createdAt:
+            d.createdAt?.toDate().toISOString() ?? new Date(0).toISOString(),
+          updatedAt:
+            d.updatedAt?.toDate().toISOString() ?? new Date(0).toISOString(),
+        }
+      })
+
+      return {
+        encoding: 'application/json',
+        body: {
+          cursor,
+          drafts: draftViews,
+        },
+      }
+    },
+  })
+}

package/src/api/app/bsky/draft/updateDraft.ts

@@ -0,0 +1,26 @@
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { DraftWithId } from '../../../../lexicon/types/app/bsky/draft/defs'
+import { Namespaces } from '../../../../stash'
+
+export default function (server: Server, ctx: AppContext) {
+  server.app.bsky.draft.updateDraft({
+    auth: ctx.authVerifier.standard,
+    handler: async ({ input, auth }) => {
+      const actorDid = auth.credentials.iss
+      const { draft: draftWithId } = input.body
+
+      // NOTE: update drafts does not enforce limits, because if it did, we would not allow updating when the limit is reached,
+      // which is not the desired behavior.
+      // But this means the consumer of the stash operations can't do an upsert behavior on update, and needs instead to drop non-existent
+      // drafts. This avoid misusing the update as a create that does not check limits.
+
+      await ctx.stashClient.update({
+        actorDid,
+        namespace: Namespaces.AppBskyDraftDefsDraftWithId,
+        payload: draftWithId satisfies DraftWithId,
+        key: draftWithId.id,
+      })
+    },
+  })
+}

package/src/api/app/bsky/feed/searchPosts.ts

@@ -40,8 +40,8 @@ export default function (server: Server, ctx: AppContext) {
         labelers,
         viewer,
         featureGates: ctx.featureGates.checkGates(
-          [ctx.featureGates.ids.SearchFilteringExploration],
-          ctx.featureGates.user({ did: viewer ?? '' }),
+          [ctx.featureGates.ids.SearchFilteringExplorationEnable],
+          ctx.featureGates.userContext({ did: viewer }),
         ),
       })
       const results = await searchPosts(
@@ -110,7 +110,7 @@ const hydration = async (
     undefined,
     {
       processDynamicTagsForView: params.hydrateCtx.featureGates.get(
-        FeatureGateID.SearchFilteringExploration,
+        FeatureGateID.SearchFilteringExplorationEnable,
       )
         ? 'search'
         : undefined,
@@ -140,7 +140,7 @@ const noBlocksOrTagged = (inputs: RulesFnInput<Context, Params, Skeleton>) => {
     let tagged = false
     if (
       params.hydrateCtx.featureGates.get(
-        FeatureGateID.SearchFilteringExploration,
+        FeatureGateID.SearchFilteringExplorationEnable,
       )
     ) {
       tagged = post.tags.has(ctx.cfg.visibilityTagHide)

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

@@ -8,7 +8,7 @@ import {
   mergeManyStates,
 } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getTrendingTopics'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getOnboardingSuggestedStarterPacks'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -37,11 +37,10 @@ export default function (server: Server, ctx: AppContext) {
           ? req.headers['x-bsky-topics'].join(',')
           : req.headers['x-bsky-topics'],
       })
-      const { ...result } = await getOnboardingSuggestedStarterPacks(
+      const result = await getOnboardingSuggestedStarterPacks(
         {
           ...params,
-          viewer: viewer ?? undefined,
-          hydrateCtx: hydrateCtx.copy({ viewer }),
+          hydrateCtx,
           headers,
         },
         ctx,
@@ -61,7 +60,7 @@ const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
       await ctx.topicsAgent.app.bsky.unspecced.getOnboardingSuggestedStarterPacksSkeleton(
         {
           limit: params.limit,
-          viewer: params.viewer,
+          viewer: params.hydrateCtx.viewer ?? undefined,
         },
         {
           headers: params.headers,
@@ -90,8 +89,9 @@ const hydration = async (
   }
   dids = dedupeStrs(dids)
   const pairs: Map<string, string[]> = new Map()
-  if (params.viewer) {
-    pairs.set(params.viewer, dids)
+  const viewer = params.hydrateCtx.viewer
+  if (viewer) {
+    pairs.set(viewer, dids)
   }
   const [starterPacksState, bidirectionalBlocks] = await Promise.all([
     ctx.hydrator.hydrateStarterPacks(skeleton.starterPacks, params.hydrateCtx),
@@ -103,12 +103,12 @@ const hydration = async (
 
 const noBlocks = (input: RulesFnInput<Context, Params, SkeletonState>) => {
   const { skeleton, params, hydration } = input
-
-  if (!params.viewer) {
+  const viewer = params.hydrateCtx.viewer
+  if (!viewer) {
     return skeleton
   }
 
-  const blocks = hydration.bidirectionalBlocks?.get(params.viewer)
+  const blocks = hydration.bidirectionalBlocks?.get(viewer)
   const filteredSkeleton: SkeletonState = {
     starterPacks: skeleton.starterPacks.filter((uri) => {
       let aturi: AtUri | undefined

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

@@ -34,8 +34,8 @@ export default function (server: Server, ctx: AppContext) {
         includeTakedowns,
         include3pBlocks,
         featureGates: ctx.featureGates.checkGates(
-          [ctx.featureGates.ids.ThreadsV2ReplyRankingExploration],
-          ctx.featureGates.user({ did: viewer ?? '' }),
+          [ctx.featureGates.ids.ThreadsReplyRankingExplorationEnable],
+          ctx.featureGates.userContext({ did: viewer }),
         ),
       })
 

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

@@ -4,7 +4,7 @@ import { InternalServerError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getTrendingTopics'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getSuggestedFeeds'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -28,11 +28,10 @@ export default function (server: Server, ctx: AppContext) {
           ? req.headers['x-bsky-topics'].join(',')
           : req.headers['x-bsky-topics'],
       })
-      const { ...result } = await getFeeds(
+      const result = await getFeeds(
         {
           ...params,
-          viewer: viewer ?? undefined,
-          hydrateCtx: hydrateCtx.copy({ viewer }),
+          hydrateCtx,
           headers,
         },
         ctx,
@@ -52,7 +51,7 @@ const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
       await ctx.topicsAgent.app.bsky.unspecced.getSuggestedFeedsSkeleton(
         {
           limit: params.limit,
-          viewer: params.viewer,
+          viewer: params.hydrateCtx.viewer ?? undefined,
         },
         {
           headers: params.headers,

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

@@ -8,7 +8,7 @@ import {
   mergeManyStates,
 } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getTrendingTopics'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getSuggestedStarterPacks'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -37,11 +37,10 @@ export default function (server: Server, ctx: AppContext) {
           ? req.headers['x-bsky-topics'].join(',')
           : req.headers['x-bsky-topics'],
       })
-      const { ...result } = await getSuggestedStarterPacks(
+      const result = await getSuggestedStarterPacks(
         {
           ...params,
-          viewer: viewer ?? undefined,
-          hydrateCtx: hydrateCtx.copy({ viewer }),
+          hydrateCtx,
           headers,
         },
         ctx,
@@ -61,7 +60,7 @@ const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
       await ctx.topicsAgent.app.bsky.unspecced.getSuggestedStarterPacksSkeleton(
         {
           limit: params.limit,
-          viewer: params.viewer,
+          viewer: params.hydrateCtx.viewer ?? undefined,
         },
         {
           headers: params.headers,
@@ -90,8 +89,9 @@ const hydration = async (
   }
   dids = dedupeStrs(dids)
   const pairs: Map<string, string[]> = new Map()
-  if (params.viewer) {
-    pairs.set(params.viewer, dids)
+  const viewer = params.hydrateCtx.viewer
+  if (viewer) {
+    pairs.set(viewer, dids)
   }
   const [starterPacksState, bidirectionalBlocks] = await Promise.all([
     ctx.hydrator.hydrateStarterPacks(skeleton.starterPacks, params.hydrateCtx),
@@ -103,12 +103,12 @@ const hydration = async (
 
 const noBlocks = (input: RulesFnInput<Context, Params, SkeletonState>) => {
   const { skeleton, params, hydration } = input
-
-  if (!params.viewer) {
+  const viewer = params.hydrateCtx.viewer
+  if (!viewer) {
     return skeleton
   }
 
-  const blocks = hydration.bidirectionalBlocks?.get(params.viewer)
+  const blocks = hydration.bidirectionalBlocks?.get(viewer)
   const filteredSkeleton: SkeletonState = {
     starterPacks: skeleton.starterPacks.filter((uri) => {
       let aturi: AtUri | undefined

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

@@ -2,13 +2,14 @@ import AtpAgent from '@atproto/api'
 import { dedupeStrs, mapDefined, noUndefinedVals } from '@atproto/common'
 import { InternalServerError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
+import { FeatureGates } from '../../../../feature-gates'
 import {
   HydrateCtx,
   Hydrator,
   mergeManyStates,
 } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getTrendingTopics'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getSuggestedUsers'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -37,11 +38,10 @@ export default function (server: Server, ctx: AppContext) {
           ? req.headers['x-bsky-topics'].join(',')
           : req.headers['x-bsky-topics'],
       })
-      const { ...result } = await getSuggestedUsers(
+      const result = await getSuggestedUsers(
         {
           ...params,
-          viewer: viewer ?? undefined,
-          hydrateCtx: hydrateCtx.copy({ viewer }),
+          hydrateCtx,
           headers,
         },
         ctx,
@@ -54,25 +54,56 @@ export default function (server: Server, ctx: AppContext) {
   })
 }
 
-const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
+// TODO: rename to `skeleton` once we can fully migrate to Discover
+const skeletonFromDiscover = async (
+  input: SkeletonFnInput<Context, Params>,
+) => {
   const { params, ctx } = input
-  if (ctx.topicsAgent) {
-    const res =
-      await ctx.topicsAgent.app.bsky.unspecced.getSuggestedUsersSkeleton(
-        {
-          limit: params.limit,
-          viewer: params.viewer,
-          category: params.category,
-        },
-        {
-          headers: params.headers,
-        },
-      )
+  if (!ctx.suggestionsAgent)
+    throw new InternalServerError('Suggestions agent not available')
+
+  const res =
+    await ctx.suggestionsAgent.app.bsky.unspecced.getSuggestedUsersSkeleton(
+      {
+        limit: params.limit,
+        viewer: params.hydrateCtx.viewer ?? undefined,
+        category: params.category,
+      },
+      {
+        headers: params.headers,
+      },
+    )
+
+  return res.data
+}
 
-    return res.data
-  } else {
+const skeletonFromTopics = async (input: SkeletonFnInput<Context, Params>) => {
+  const { params, ctx } = input
+  if (!ctx.topicsAgent)
     throw new InternalServerError('Topics agent not available')
-  }
+
+  const res =
+    await ctx.topicsAgent.app.bsky.unspecced.getSuggestedUsersSkeleton(
+      {
+        limit: params.limit,
+        viewer: params.hydrateCtx.viewer ?? undefined,
+        category: params.category,
+      },
+      {
+        headers: params.headers,
+      },
+    )
+
+  return res.data
+}
+
+const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
+  const useDiscover = input.ctx.featureGates.check(
+    input.ctx.featureGates.ids.SuggestedUsersDiscoverAgentEnable,
+    input.ctx.featureGates.userContext({ did: input.params.hydrateCtx.viewer }),
+  )
+  const skeletonFn = useDiscover ? skeletonFromDiscover : skeletonFromTopics
+  return skeletonFn(input)
 }
 
 const hydration = async (
@@ -81,8 +112,9 @@ const hydration = async (
   const { ctx, params, skeleton } = input
   const dids = dedupeStrs(skeleton.dids)
   const pairs: Map<string, string[]> = new Map()
-  if (params.viewer) {
-    pairs.set(params.viewer, dids)
+  const viewer = params.hydrateCtx.viewer
+  if (viewer) {
+    pairs.set(viewer, dids)
   }
   const [profilesState, bidirectionalBlocks] = await Promise.all([
     ctx.hydrator.hydrateProfiles(dids, params.hydrateCtx),
@@ -96,10 +128,11 @@ const noBlocksOrFollows = (
   input: RulesFnInput<Context, Params, SkeletonState>,
 ) => {
   const { ctx, skeleton, params, hydration } = input
-  if (!params.viewer) {
+  const viewer = params.hydrateCtx.viewer
+  if (!viewer) {
     return skeleton
   }
-  const blocks = hydration.bidirectionalBlocks?.get(params.viewer)
+  const blocks = hydration.bidirectionalBlocks?.get(viewer)
   return {
     ...skeleton,
     dids: skeleton.dids.filter((did) => {
@@ -125,6 +158,8 @@ type Context = {
   hydrator: Hydrator
   views: Views
   topicsAgent: AtpAgent | undefined
+  suggestionsAgent: AtpAgent | undefined
+  featureGates: FeatureGates
 }
 
 type Params = QueryParams & {
@@ -135,5 +170,5 @@ type Params = QueryParams & {
 
 type SkeletonState = {
   dids: string[]
-  recId?: number
+  recId?: string
 }

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

@@ -31,8 +31,12 @@ export default function (server: Server, ctx: AppContext) {
       const headers = noUndefinedVals({
         'accept-language': req.headers['accept-language'],
       })
-      const { ...result } = await getTrendingTopics(
-        { ...params, hydrateCtx: hydrateCtx.copy({ viewer }), headers },
+      const result = await getTrendingTopics(
+        {
+          ...params,
+          hydrateCtx,
+          headers,
+        },
         ctx,
       )
       return {
@@ -49,7 +53,7 @@ const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
     const res = await ctx.topicsAgent.app.bsky.unspecced.getTrendingTopics(
       {
         limit: params.limit,
-        viewer: params.viewer,
+        viewer: params.hydrateCtx.viewer ?? undefined,
       },
       {
         headers: params.headers,
@@ -87,8 +91,8 @@ type Context = {
   topicsAgent: AtpAgent | undefined
 }
 
-type Params = QueryParams & {
-  hydrateCtx: HydrateCtx & { viewer: string | null }
+type Params = Omit<QueryParams, 'viewer'> & {
+  hydrateCtx: HydrateCtx
   headers: Record<string, string>
 }