@atproto/bsky 0.0.273 → 0.0.275

package/dist/data-plane/server/routes/notifs.js

@@ -41,8 +41,8 @@ export default (db) => ({
             cursor,
             limit,
         });
-        const notifsRes = await builder.execute();
-        const notifications = notifsRes.map((notif) => ({
+        const page = key.page(await builder.execute(), limit);
+        const notifications = page.items.map((notif) => ({
             recipientDid: actorDid,
             uri: notif.uri,
             reason: notif.reason,
@@ -52,7 +52,7 @@ export default (db) => ({
         }));
         return {
             notifications,
-            cursor: key.packFromResult(notifsRes),
+            cursor: page.cursor,
         };
     },
     async getNotificationSeen(req) {

package/dist/data-plane/server/routes/notifs.js.map

@@ -1 +1 @@
-{"version":3,"file":"notifs.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/notifs.ts"],"names":[],"mappings":"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","sourcesContent":["import { Timestamp } from '@bufbuild/protobuf'\nimport type { ServiceImpl } from '@connectrpc/connect'\nimport { sql } from 'kysely'\nimport { keyBy } from '@atproto/common'\nimport { lexParse } from '@atproto/lex'\nimport type { app } from '../../../lexicons/index.js'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport {\n  FilterableNotificationPreference,\n  NotificationInclude,\n  NotificationPreference,\n  NotificationPreferences,\n} from '../../../proto/bsky_pb.js'\nimport { Namespaces } from '../../../stash.js'\nimport type { Database } from '../db/index.js'\nimport { IsoSortAtKey } from '../db/pagination.js'\nimport { countAll, notSoftDeletedClause } from '../db/util.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getNotifications(req) {\n    const { actorDid, limit, cursor, priority } = req\n    const { ref } = db.db.dynamic\n    const priorityFollowQb = db.db\n      .selectFrom('follow')\n      .select(sql<boolean>`${true}`.as('val'))\n      .where('creator', '=', actorDid)\n      .whereRef('subjectDid', '=', ref('notif.author'))\n      .limit(1)\n\n    let builder = db.db\n      .selectFrom('notification as notif')\n      .where('notif.did', '=', actorDid)\n      .where((eb) =>\n        eb.or([\n          eb('reasonSubject', 'is', null),\n          eb.exists(\n            db.db\n              .selectFrom('record as subject')\n              .selectAll()\n              .whereRef('subject.uri', '=', ref('notif.reasonSubject')),\n          ),\n        ]),\n      )\n      .$if(priority, (qb) => qb.where(({ exists }) => exists(priorityFollowQb)))\n      .select([\n        'notif.author as authorDid',\n        'notif.recordUri as uri',\n        'notif.recordCid as cid',\n        'notif.reason as reason',\n        'notif.reasonSubject as reasonSubject',\n        'notif.sortAt as sortAt',\n      ])\n      .select(priorityFollowQb.as('priority'))\n\n    const key = new IsoSortAtKey(ref('notif.sortAt'))\n    builder = key.paginate(builder, {\n      cursor,\n      limit,\n    })\n\n    const notifsRes = await builder.execute()\n    const notifications = notifsRes.map((notif) => ({\n      recipientDid: actorDid,\n      uri: notif.uri,\n      reason: notif.reason,\n      reasonSubject: notif.reasonSubject ?? undefined,\n      timestamp: Timestamp.fromDate(new Date(notif.sortAt)),\n      priority: notif.priority ?? false,\n    }))\n    return {\n      notifications,\n      cursor: key.packFromResult(notifsRes),\n    }\n  },\n\n  async getNotificationSeen(req) {\n    const { actorDid, priority } = req\n    const res = await db.db\n      .selectFrom('actor_state')\n      .where('did', '=', actorDid)\n      .selectAll()\n      .executeTakeFirst()\n    if (!res) {\n      return {}\n    }\n    const lastSeen =\n      priority && res.lastSeenPriorityNotifs\n        ? res.lastSeenPriorityNotifs\n        : res.lastSeenNotifs\n    return {\n      timestamp: Timestamp.fromDate(new Date(lastSeen)),\n    }\n  },\n\n  async getUnreadNotificationCount(req) {\n    const { actorDid, priority } = req\n    const { ref } = db.db.dynamic\n    const lastSeenRes = await db.db\n      .selectFrom('actor_state')\n      .where('did', '=', actorDid)\n      .selectAll()\n      .executeTakeFirst()\n    const lastSeen =\n      priority && lastSeenRes?.lastSeenPriorityNotifs\n        ? lastSeenRes.lastSeenPriorityNotifs\n        : lastSeenRes?.lastSeenNotifs\n\n    const result = await db.db\n      .selectFrom('notification')\n      .select(countAll.as('count'))\n      .innerJoin('actor', 'actor.did', 'notification.did')\n      .leftJoin('actor_state', 'actor_state.did', 'actor.did')\n      .innerJoin('record', 'record.uri', 'notification.recordUri')\n      .where(notSoftDeletedClause(ref('record')))\n      .where(notSoftDeletedClause(ref('actor')))\n      // Ensure to hit notification_did_sortat_idx, handling case where lastSeenNotifs is null.\n      .where('notification.did', '=', actorDid)\n      .where('notification.sortAt', '>', lastSeen ?? '')\n      .$if(priority, (qb) =>\n        qb.where(({ exists }) =>\n          exists(\n            db.db\n              .selectFrom('follow')\n              .select(sql<boolean>`${true}`.as('val'))\n              .where('creator', '=', actorDid)\n              .whereRef('subjectDid', '=', ref('notification.author')),\n          ),\n        ),\n      )\n      .executeTakeFirst()\n\n    return {\n      count: result?.count,\n    }\n  },\n\n  async updateNotificationSeen(req) {\n    const { actorDid, timestamp, priority } = req\n    if (!timestamp) {\n      return\n    }\n    const timestampIso = timestamp.toDate().toISOString()\n    let builder = db.db\n      .updateTable('actor_state')\n      .where('did', '=', actorDid)\n      .returningAll()\n    if (priority) {\n      builder = builder.set({ lastSeenPriorityNotifs: timestampIso })\n    } else {\n      builder = builder.set({ lastSeenNotifs: timestampIso })\n    }\n    const updateRes = await builder.executeTakeFirst()\n    if (updateRes) {\n      return\n    }\n    await db.db\n      .insertInto('actor_state')\n      .values({\n        did: actorDid,\n        lastSeenNotifs: timestampIso,\n        priorityNotifs: priority,\n        lastSeenPriorityNotifs: priority ? timestampIso : undefined,\n      })\n      .onConflict((oc) => oc.doNothing())\n      .executeTakeFirst()\n  },\n\n  async getNotificationPreferences(req) {\n    const { dids } = req\n    if (dids.length === 0) {\n      return { preferences: [] }\n    }\n\n    const res = await db.db\n      .selectFrom('private_data')\n      .selectAll()\n      .where('actorDid', 'in', dids)\n      .where(\n        'namespace',\n        '=',\n        Namespaces.AppBskyNotificationDefsPreferences.$type,\n      )\n      .where('key', '=', 'self')\n      .execute()\n\n    const byDid = keyBy(res, 'actorDid')\n    const preferences = dids.map((did) => {\n      const row = byDid.get(did)\n      if (!row) {\n        return {}\n      }\n      const p = lexParse<app.bsky.notification.defs.Preferences>(row.payload)\n      return notificationPreferencesLexToProtobuf(p, row.payload)\n    })\n\n    return { preferences }\n  },\n})\n\nexport const notificationPreferencesLexToProtobuf = (\n  p: app.bsky.notification.defs.Preferences,\n  json: string,\n): NotificationPreferences => {\n  const lexFilterablePreferenceToProtobuf = (\n    p: app.bsky.notification.defs.FilterablePreference,\n  ): FilterableNotificationPreference =>\n    new FilterableNotificationPreference({\n      include:\n        p.include === 'follows'\n          ? NotificationInclude.FOLLOWS\n          : NotificationInclude.ALL,\n      list: { enabled: p.list ?? true },\n      push: { enabled: p.push ?? true },\n    })\n\n  const lexPreferenceToProtobuf = (\n    p: app.bsky.notification.defs.Preference,\n  ): NotificationPreference =>\n    new NotificationPreference({\n      list: { enabled: p.list ?? true },\n      push: { enabled: p.push ?? true },\n    })\n\n  return new NotificationPreferences({\n    entry: Buffer.from(json),\n    follow: lexFilterablePreferenceToProtobuf(p.follow),\n    like: lexFilterablePreferenceToProtobuf(p.like),\n    likeViaRepost: lexFilterablePreferenceToProtobuf(p.likeViaRepost),\n    mention: lexFilterablePreferenceToProtobuf(p.mention),\n    quote: lexFilterablePreferenceToProtobuf(p.quote),\n    reply: lexFilterablePreferenceToProtobuf(p.reply),\n    repost: lexFilterablePreferenceToProtobuf(p.repost),\n    repostViaRepost: lexFilterablePreferenceToProtobuf(p.repostViaRepost),\n    starterpackJoined: lexPreferenceToProtobuf(p.starterpackJoined),\n    subscribedPost: lexPreferenceToProtobuf(p.subscribedPost),\n    unverified: lexPreferenceToProtobuf(p.unverified),\n    verified: lexPreferenceToProtobuf(p.verified),\n  })\n}\n"]}
+{"version":3,"file":"notifs.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/notifs.ts"],"names":[],"mappings":"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","sourcesContent":["import { Timestamp } from '@bufbuild/protobuf'\nimport type { ServiceImpl } from '@connectrpc/connect'\nimport { sql } from 'kysely'\nimport { keyBy } from '@atproto/common'\nimport { lexParse } from '@atproto/lex'\nimport type { app } from '../../../lexicons/index.js'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport {\n  FilterableNotificationPreference,\n  NotificationInclude,\n  NotificationPreference,\n  NotificationPreferences,\n} from '../../../proto/bsky_pb.js'\nimport { Namespaces } from '../../../stash.js'\nimport type { Database } from '../db/index.js'\nimport { IsoSortAtKey } from '../db/pagination.js'\nimport { countAll, notSoftDeletedClause } from '../db/util.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getNotifications(req) {\n    const { actorDid, limit, cursor, priority } = req\n    const { ref } = db.db.dynamic\n    const priorityFollowQb = db.db\n      .selectFrom('follow')\n      .select(sql<boolean>`${true}`.as('val'))\n      .where('creator', '=', actorDid)\n      .whereRef('subjectDid', '=', ref('notif.author'))\n      .limit(1)\n\n    let builder = db.db\n      .selectFrom('notification as notif')\n      .where('notif.did', '=', actorDid)\n      .where((eb) =>\n        eb.or([\n          eb('reasonSubject', 'is', null),\n          eb.exists(\n            db.db\n              .selectFrom('record as subject')\n              .selectAll()\n              .whereRef('subject.uri', '=', ref('notif.reasonSubject')),\n          ),\n        ]),\n      )\n      .$if(priority, (qb) => qb.where(({ exists }) => exists(priorityFollowQb)))\n      .select([\n        'notif.author as authorDid',\n        'notif.recordUri as uri',\n        'notif.recordCid as cid',\n        'notif.reason as reason',\n        'notif.reasonSubject as reasonSubject',\n        'notif.sortAt as sortAt',\n      ])\n      .select(priorityFollowQb.as('priority'))\n\n    const key = new IsoSortAtKey(ref('notif.sortAt'))\n    builder = key.paginate(builder, {\n      cursor,\n      limit,\n    })\n\n    const page = key.page(await builder.execute(), limit)\n    const notifications = page.items.map((notif) => ({\n      recipientDid: actorDid,\n      uri: notif.uri,\n      reason: notif.reason,\n      reasonSubject: notif.reasonSubject ?? undefined,\n      timestamp: Timestamp.fromDate(new Date(notif.sortAt)),\n      priority: notif.priority ?? false,\n    }))\n    return {\n      notifications,\n      cursor: page.cursor,\n    }\n  },\n\n  async getNotificationSeen(req) {\n    const { actorDid, priority } = req\n    const res = await db.db\n      .selectFrom('actor_state')\n      .where('did', '=', actorDid)\n      .selectAll()\n      .executeTakeFirst()\n    if (!res) {\n      return {}\n    }\n    const lastSeen =\n      priority && res.lastSeenPriorityNotifs\n        ? res.lastSeenPriorityNotifs\n        : res.lastSeenNotifs\n    return {\n      timestamp: Timestamp.fromDate(new Date(lastSeen)),\n    }\n  },\n\n  async getUnreadNotificationCount(req) {\n    const { actorDid, priority } = req\n    const { ref } = db.db.dynamic\n    const lastSeenRes = await db.db\n      .selectFrom('actor_state')\n      .where('did', '=', actorDid)\n      .selectAll()\n      .executeTakeFirst()\n    const lastSeen =\n      priority && lastSeenRes?.lastSeenPriorityNotifs\n        ? lastSeenRes.lastSeenPriorityNotifs\n        : lastSeenRes?.lastSeenNotifs\n\n    const result = await db.db\n      .selectFrom('notification')\n      .select(countAll.as('count'))\n      .innerJoin('actor', 'actor.did', 'notification.did')\n      .leftJoin('actor_state', 'actor_state.did', 'actor.did')\n      .innerJoin('record', 'record.uri', 'notification.recordUri')\n      .where(notSoftDeletedClause(ref('record')))\n      .where(notSoftDeletedClause(ref('actor')))\n      // Ensure to hit notification_did_sortat_idx, handling case where lastSeenNotifs is null.\n      .where('notification.did', '=', actorDid)\n      .where('notification.sortAt', '>', lastSeen ?? '')\n      .$if(priority, (qb) =>\n        qb.where(({ exists }) =>\n          exists(\n            db.db\n              .selectFrom('follow')\n              .select(sql<boolean>`${true}`.as('val'))\n              .where('creator', '=', actorDid)\n              .whereRef('subjectDid', '=', ref('notification.author')),\n          ),\n        ),\n      )\n      .executeTakeFirst()\n\n    return {\n      count: result?.count,\n    }\n  },\n\n  async updateNotificationSeen(req) {\n    const { actorDid, timestamp, priority } = req\n    if (!timestamp) {\n      return\n    }\n    const timestampIso = timestamp.toDate().toISOString()\n    let builder = db.db\n      .updateTable('actor_state')\n      .where('did', '=', actorDid)\n      .returningAll()\n    if (priority) {\n      builder = builder.set({ lastSeenPriorityNotifs: timestampIso })\n    } else {\n      builder = builder.set({ lastSeenNotifs: timestampIso })\n    }\n    const updateRes = await builder.executeTakeFirst()\n    if (updateRes) {\n      return\n    }\n    await db.db\n      .insertInto('actor_state')\n      .values({\n        did: actorDid,\n        lastSeenNotifs: timestampIso,\n        priorityNotifs: priority,\n        lastSeenPriorityNotifs: priority ? timestampIso : undefined,\n      })\n      .onConflict((oc) => oc.doNothing())\n      .executeTakeFirst()\n  },\n\n  async getNotificationPreferences(req) {\n    const { dids } = req\n    if (dids.length === 0) {\n      return { preferences: [] }\n    }\n\n    const res = await db.db\n      .selectFrom('private_data')\n      .selectAll()\n      .where('actorDid', 'in', dids)\n      .where(\n        'namespace',\n        '=',\n        Namespaces.AppBskyNotificationDefsPreferences.$type,\n      )\n      .where('key', '=', 'self')\n      .execute()\n\n    const byDid = keyBy(res, 'actorDid')\n    const preferences = dids.map((did) => {\n      const row = byDid.get(did)\n      if (!row) {\n        return {}\n      }\n      const p = lexParse<app.bsky.notification.defs.Preferences>(row.payload)\n      return notificationPreferencesLexToProtobuf(p, row.payload)\n    })\n\n    return { preferences }\n  },\n})\n\nexport const notificationPreferencesLexToProtobuf = (\n  p: app.bsky.notification.defs.Preferences,\n  json: string,\n): NotificationPreferences => {\n  const lexFilterablePreferenceToProtobuf = (\n    p: app.bsky.notification.defs.FilterablePreference,\n  ): FilterableNotificationPreference =>\n    new FilterableNotificationPreference({\n      include:\n        p.include === 'follows'\n          ? NotificationInclude.FOLLOWS\n          : NotificationInclude.ALL,\n      list: { enabled: p.list ?? true },\n      push: { enabled: p.push ?? true },\n    })\n\n  const lexPreferenceToProtobuf = (\n    p: app.bsky.notification.defs.Preference,\n  ): NotificationPreference =>\n    new NotificationPreference({\n      list: { enabled: p.list ?? true },\n      push: { enabled: p.push ?? true },\n    })\n\n  return new NotificationPreferences({\n    entry: Buffer.from(json),\n    follow: lexFilterablePreferenceToProtobuf(p.follow),\n    like: lexFilterablePreferenceToProtobuf(p.like),\n    likeViaRepost: lexFilterablePreferenceToProtobuf(p.likeViaRepost),\n    mention: lexFilterablePreferenceToProtobuf(p.mention),\n    quote: lexFilterablePreferenceToProtobuf(p.quote),\n    reply: lexFilterablePreferenceToProtobuf(p.reply),\n    repost: lexFilterablePreferenceToProtobuf(p.repost),\n    repostViaRepost: lexFilterablePreferenceToProtobuf(p.repostViaRepost),\n    starterpackJoined: lexPreferenceToProtobuf(p.starterpackJoined),\n    subscribedPost: lexPreferenceToProtobuf(p.subscribedPost),\n    unverified: lexPreferenceToProtobuf(p.unverified),\n    verified: lexPreferenceToProtobuf(p.verified),\n  })\n}\n"]}

package/dist/data-plane/server/routes/quotes.js

@@ -15,10 +15,10 @@ export default (db) => ({
             cursor,
             keyset,
         });
-        const quotes = await builder.execute();
+        const page = keyset.page(await builder.execute(), limit);
         return {
-            uris: quotes.map((q) => q.uri),
-            cursor: keyset.packFromResult(quotes),
+            uris: page.items.map((q) => q.uri),
+            cursor: page.cursor,
         };
     },
 });

package/dist/data-plane/server/routes/quotes.js.map

@@ -1 +1 @@
-{"version":3,"file":"quotes.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/quotes.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE7D,eAAe,CAAC,EAAY,EAAwC,EAAE,CAAC,CAAC;IACtE,KAAK,CAAC,wBAAwB,CAAC,GAAG;QAChC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAA;QACtC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,CAAA;QAE7B,IAAI,CAAC,OAAO,EAAE,GAAG;YAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAA;QAEtC,IAAI,OAAO,GAAG,EAAE,CAAC,EAAE;aAChB,UAAU,CAAC,OAAO,CAAC;aACnB,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC;aACxC,MAAM,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC,CAAA;QAErD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC,CAAA;QACvE,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE;YAC1B,KAAK;YACL,MAAM;YACN,MAAM;SACP,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;QAEtC,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;YAC9B,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC;SACtC,CAAA;IACH,CAAC;CACF,CAAC,CAAA","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport { TimeCidKeyset, paginate } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getQuotesBySubjectSorted(req) {\n    const { subject, cursor, limit } = req\n    const { ref } = db.db.dynamic\n\n    if (!subject?.uri) return { uris: [] }\n\n    let builder = db.db\n      .selectFrom('quote')\n      .where('quote.subject', '=', subject.uri)\n      .select(['quote.uri', 'quote.cid', 'quote.sortAt'])\n\n    const keyset = new TimeCidKeyset(ref('quote.sortAt'), ref('quote.cid'))\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n\n    const quotes = await builder.execute()\n\n    return {\n      uris: quotes.map((q) => q.uri),\n      cursor: keyset.packFromResult(quotes),\n    }\n  },\n})\n"]}
+{"version":3,"file":"quotes.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/quotes.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE7D,eAAe,CAAC,EAAY,EAAwC,EAAE,CAAC,CAAC;IACtE,KAAK,CAAC,wBAAwB,CAAC,GAAG;QAChC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAA;QACtC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,CAAA;QAE7B,IAAI,CAAC,OAAO,EAAE,GAAG;YAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAA;QAEtC,IAAI,OAAO,GAAG,EAAE,CAAC,EAAE;aAChB,UAAU,CAAC,OAAO,CAAC;aACnB,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC;aACxC,MAAM,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC,CAAA;QAErD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC,CAAA;QACvE,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE;YAC1B,KAAK;YACL,MAAM;YACN,MAAM;SACP,CAAC,CAAA;QAEF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAA;QAExD,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;YAClC,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAA;IACH,CAAC;CACF,CAAC,CAAA","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport { TimeCidKeyset, paginate } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getQuotesBySubjectSorted(req) {\n    const { subject, cursor, limit } = req\n    const { ref } = db.db.dynamic\n\n    if (!subject?.uri) return { uris: [] }\n\n    let builder = db.db\n      .selectFrom('quote')\n      .where('quote.subject', '=', subject.uri)\n      .select(['quote.uri', 'quote.cid', 'quote.sortAt'])\n\n    const keyset = new TimeCidKeyset(ref('quote.sortAt'), ref('quote.cid'))\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n\n    const page = keyset.page(await builder.execute(), limit)\n\n    return {\n      uris: page.items.map((q) => q.uri),\n      cursor: page.cursor,\n    }\n  },\n})\n"]}

package/dist/data-plane/server/routes/records.d.ts

@@ -1,7 +1,7 @@
 import type { ServiceImpl } from '@connectrpc/connect';
 import { l } from '@atproto/lex';
 import type { Service } from '../../../proto/bsky_connect.js';
-import { PostRecordMeta, Record } from '../../../proto/bsky_pb.js';
+import { OpThread, PostRecordMeta, Record } from '../../../proto/bsky_pb.js';
 import type { Database } from '../db/index.js';
 export default _default;
 declare function _default(db: Database): Partial<ServiceImpl<typeof Service>>;
@@ -12,8 +12,10 @@ export declare const getRecords: (db: Database, ns?: l.Main<l.RecordSchema>) =>
 }>;
 export declare const getPostRecords: (db: Database) => (req: {
     uris: string[];
+    includeOpThreadMetadata?: boolean;
 }) => Promise<{
     records: Record[];
     meta: PostRecordMeta[];
+    opThreads: OpThread[];
 }>;
 //# sourceMappingURL=records.d.ts.map

package/dist/data-plane/server/routes/records.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"records.d.ts","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/records.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,EAAE,CAAC,EAAE,MAAM,cAAc,CAAA;AAGhC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;;0BAE9B,EAAE,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,OAAO,CAAC,CAAC;AAyBnE,eAAO,MAAM,UAAU,OAAQ,QAAQ,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,WAG/C;IAAE,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,KAAG,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAoCtE,CAAA;AAED,eAAO,MAAM,cAAc,OAAQ,QAAQ,WAEtB;IACjB,IAAI,EAAE,MAAM,EAAE,CAAA;CACf,KAAG,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,cAAc,EAAE,CAAA;CAAE,CA4B1D,CAAA"}
+{"version":3,"file":"records.d.ts","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/records.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,EAAE,CAAC,EAAE,MAAM,cAAc,CAAA;AAIhC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AAC7D,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAC5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;;0BAG9B,EAAE,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,OAAO,CAAC,CAAC;AAyBnE,eAAO,MAAM,UAAU,OAAQ,QAAQ,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,WAG/C;IAAE,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,KAAG,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAoCtE,CAAA;AAED,eAAO,MAAM,cAAc,OAAQ,QAAQ,WAEtB;IACjB,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAClC,KAAG,OAAO,CAAC;IACV,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,IAAI,EAAE,cAAc,EAAE,CAAA;IACtB,SAAS,EAAE,QAAQ,EAAE,CAAA;CACtB,CA6BF,CAAA"}

package/dist/data-plane/server/routes/records.js

@@ -4,7 +4,9 @@ import { keyBy } from '@atproto/common';
 import { l } from '@atproto/lex';
 import { AtUri } from '@atproto/syntax';
 import { app, chat, com } from '../../../lexicons/index.js';
-import { PostRecordMeta, Record } from '../../../proto/bsky_pb.js';
+import { dataplaneLogger } from '../../../logger.js';
+import { OpThread, PostRecordMeta, Record } from '../../../proto/bsky_pb.js';
+import { resolveCanonicalOpThread } from '../op-thread.js';
 export default (db) => ({
     getBlockRecords: getRecords(db, app.bsky.graph.block),
     getFeedGeneratorRecords: getRecords(db, app.bsky.feed.generator),
@@ -68,10 +70,10 @@ export const getRecords = (db, ns) => {
 export const getPostRecords = (db) => {
     const getBaseRecords = getRecords(db, app.bsky.feed.post);
     return async (req) => {
-        const [{ records }, details] = await Promise.all([
+        const [{ records }, details, opThreads] = await Promise.all([
             getBaseRecords(req),
             req.uris.length
-                ? await db.db
+                ? db.db
                     .selectFrom('post')
                     .where('uri', 'in', req.uris)
                     .select([
@@ -83,6 +85,7 @@ export const getPostRecords = (db) => {
                 ])
                     .execute()
                 : [],
+            req.includeOpThreadMetadata ? getOpThreads(db, req.uris) : [],
         ]);
         const byKey = keyBy(details, 'uri');
         const meta = req.uris.map((uri) => {
@@ -93,9 +96,43 @@ export const getPostRecords = (db) => {
                 hasPostGate: !!byKey.get(uri)?.hasPostGate,
             });
         });
-        return { records, meta };
+        return { records, meta, opThreads };
     };
 };
+const getOpThreads = async (db, uris) => {
+    if (!uris.length)
+        return [];
+    const requestedRoots = db.db
+        .selectFrom('post')
+        .where('uri', 'in', uris)
+        .select((eb) => eb.fn.coalesce('replyRoot', 'uri').as('rootUri'))
+        .distinct();
+    const rows = await db.db
+        .selectFrom('op_thread_reply')
+        .innerJoin(requestedRoots.as('requested_root'), 'requested_root.rootUri', 'op_thread_reply.rootUri')
+        .select([
+        'op_thread_reply.rootUri',
+        'op_thread_reply.uri',
+        'op_thread_reply.parentUri',
+        'op_thread_reply.deletedAt',
+    ])
+        .execute();
+    const repliesByRoot = new Map();
+    for (const row of rows) {
+        const replies = repliesByRoot.get(row.rootUri) ?? [];
+        replies.push(row);
+        repliesByRoot.set(row.rootUri, replies);
+    }
+    const opThreads = [];
+    for (const [rootUri, replies] of repliesByRoot) {
+        const opThread = resolveCanonicalOpThread(rootUri, replies);
+        if (!opThread)
+            continue;
+        opThreads.push(new OpThread({ rootUri, uris: opThread }));
+    }
+    dataplaneLogger.debug({ uris: uris.length, roots: repliesByRoot.size, rows: rows.length }, 'op threads resolved');
+    return opThreads;
+};
 const compositeTime = (ts1, ts2) => {
     if (!ts1)
         return ts2;

package/dist/data-plane/server/routes/records.js.map

@@ -1 +1 @@
-{"version":3,"file":"records.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/records.ts"],"names":[],"mappings":"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","sourcesContent":["import { Timestamp } from '@bufbuild/protobuf'\nimport type { ServiceImpl } from '@connectrpc/connect'\nimport * as ui8 from 'uint8arrays'\nimport { keyBy } from '@atproto/common'\nimport { l } from '@atproto/lex'\nimport { AtUri } from '@atproto/syntax'\nimport { app, chat, com } from '../../../lexicons/index.js'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport { PostRecordMeta, Record } from '../../../proto/bsky_pb.js'\nimport type { Database } from '../db/index.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  getBlockRecords: getRecords(db, app.bsky.graph.block),\n  getFeedGeneratorRecords: getRecords(db, app.bsky.feed.generator),\n  getFollowRecords: getRecords(db, app.bsky.graph.follow),\n  getLikeRecords: getRecords(db, app.bsky.feed.like),\n  getListBlockRecords: getRecords(db, app.bsky.graph.listblock),\n  getListItemRecords: getRecords(db, app.bsky.graph.listitem),\n  getListRecords: getRecords(db, app.bsky.graph.list),\n  getPostRecords: getPostRecords(db),\n  getProfileRecords: getRecords(db, app.bsky.actor.profile),\n  getRepostRecords: getRecords(db, app.bsky.feed.repost),\n  getThreadGateRecords: getRecords(db, app.bsky.feed.threadgate),\n  getPostgateRecords: getRecords(db, app.bsky.feed.postgate),\n  getLabelerRecords: getRecords(db, app.bsky.labeler.service),\n  getActorChatDeclarationRecords: getRecords(db, chat.bsky.actor.declaration),\n  getNotificationDeclarationRecords: getRecords(\n    db,\n    app.bsky.notification.declaration,\n  ),\n  getGermDeclarationRecords: getRecords(db, com.germnetwork.declaration),\n  getStarterPackRecords: getRecords(db, app.bsky.graph.starterpack),\n  getVerificationRecords: getRecords(db, app.bsky.graph.verification),\n  getStatusRecords: getRecords(db, app.bsky.actor.status),\n})\n\nexport const getRecords = (db: Database, ns?: l.Main<l.RecordSchema>) => {\n  const collection = ns ? l.getMain(ns).$type : undefined\n\n  return async (req: { uris: string[] }): Promise<{ records: Record[] }> => {\n    const validUris = collection\n      ? req.uris.filter((uri) => new AtUri(uri).collection === collection)\n      : req.uris\n    const res = validUris.length\n      ? await db.db\n          .selectFrom('record')\n          .selectAll()\n          .where('uri', 'in', validUris)\n          .execute()\n      : []\n    const byUri = keyBy(res, 'uri')\n    const records: Record[] = req.uris.map((uri) => {\n      const row = byUri.get(uri)\n      const json = row ? row.json : JSON.stringify(null)\n      const createdAtRaw = new Date(JSON.parse(json)?.['createdAt'])\n      const createdAt = !isNaN(createdAtRaw.getTime())\n        ? Timestamp.fromDate(createdAtRaw)\n        : undefined\n      const indexedAt = row?.indexedAt\n        ? Timestamp.fromDate(new Date(row?.indexedAt))\n        : undefined\n      const recordBytes = ui8.fromString(json, 'utf8')\n      return new Record({\n        record: recordBytes as Uint8Array<ArrayBuffer>,\n        cid: row?.cid,\n        createdAt,\n        indexedAt,\n        sortedAt: compositeTime(createdAt, indexedAt),\n        takenDown: !!row?.takedownRef,\n        takedownRef: row?.takedownRef ?? undefined,\n        tags: row?.tags ?? undefined,\n      })\n    })\n    return { records }\n  }\n}\n\nexport const getPostRecords = (db: Database) => {\n  const getBaseRecords = getRecords(db, app.bsky.feed.post)\n  return async (req: {\n    uris: string[]\n  }): Promise<{ records: Record[]; meta: PostRecordMeta[] }> => {\n    const [{ records }, details] = await Promise.all([\n      getBaseRecords(req),\n      req.uris.length\n        ? await db.db\n            .selectFrom('post')\n            .where('uri', 'in', req.uris)\n            .select([\n              'uri',\n              'violatesThreadGate',\n              'violatesEmbeddingRules',\n              'hasThreadGate',\n              'hasPostGate',\n            ])\n            .execute()\n        : [],\n    ])\n    const byKey = keyBy(details, 'uri')\n    const meta = req.uris.map((uri) => {\n      return new PostRecordMeta({\n        violatesThreadGate: !!byKey.get(uri)?.violatesThreadGate,\n        violatesEmbeddingRules: !!byKey.get(uri)?.violatesEmbeddingRules,\n        hasThreadGate: !!byKey.get(uri)?.hasThreadGate,\n        hasPostGate: !!byKey.get(uri)?.hasPostGate,\n      })\n    })\n    return { records, meta }\n  }\n}\n\nconst compositeTime = (\n  ts1: Timestamp | undefined,\n  ts2: Timestamp | undefined,\n) => {\n  if (!ts1) return ts2\n  if (!ts2) return ts1\n  return ts1.toDate() < ts2.toDate() ? ts1 : ts2\n}\n"]}
+{"version":3,"file":"records.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/records.ts"],"names":[],"mappings":"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","sourcesContent":["import { Timestamp } from '@bufbuild/protobuf'\nimport type { ServiceImpl } from '@connectrpc/connect'\nimport * as ui8 from 'uint8arrays'\nimport { keyBy } from '@atproto/common'\nimport { l } from '@atproto/lex'\nimport { AtUri } from '@atproto/syntax'\nimport { app, chat, com } from '../../../lexicons/index.js'\nimport { dataplaneLogger } from '../../../logger.js'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport { OpThread, PostRecordMeta, Record } from '../../../proto/bsky_pb.js'\nimport type { Database } from '../db/index.js'\nimport { resolveCanonicalOpThread } from '../op-thread.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  getBlockRecords: getRecords(db, app.bsky.graph.block),\n  getFeedGeneratorRecords: getRecords(db, app.bsky.feed.generator),\n  getFollowRecords: getRecords(db, app.bsky.graph.follow),\n  getLikeRecords: getRecords(db, app.bsky.feed.like),\n  getListBlockRecords: getRecords(db, app.bsky.graph.listblock),\n  getListItemRecords: getRecords(db, app.bsky.graph.listitem),\n  getListRecords: getRecords(db, app.bsky.graph.list),\n  getPostRecords: getPostRecords(db),\n  getProfileRecords: getRecords(db, app.bsky.actor.profile),\n  getRepostRecords: getRecords(db, app.bsky.feed.repost),\n  getThreadGateRecords: getRecords(db, app.bsky.feed.threadgate),\n  getPostgateRecords: getRecords(db, app.bsky.feed.postgate),\n  getLabelerRecords: getRecords(db, app.bsky.labeler.service),\n  getActorChatDeclarationRecords: getRecords(db, chat.bsky.actor.declaration),\n  getNotificationDeclarationRecords: getRecords(\n    db,\n    app.bsky.notification.declaration,\n  ),\n  getGermDeclarationRecords: getRecords(db, com.germnetwork.declaration),\n  getStarterPackRecords: getRecords(db, app.bsky.graph.starterpack),\n  getVerificationRecords: getRecords(db, app.bsky.graph.verification),\n  getStatusRecords: getRecords(db, app.bsky.actor.status),\n})\n\nexport const getRecords = (db: Database, ns?: l.Main<l.RecordSchema>) => {\n  const collection = ns ? l.getMain(ns).$type : undefined\n\n  return async (req: { uris: string[] }): Promise<{ records: Record[] }> => {\n    const validUris = collection\n      ? req.uris.filter((uri) => new AtUri(uri).collection === collection)\n      : req.uris\n    const res = validUris.length\n      ? await db.db\n          .selectFrom('record')\n          .selectAll()\n          .where('uri', 'in', validUris)\n          .execute()\n      : []\n    const byUri = keyBy(res, 'uri')\n    const records: Record[] = req.uris.map((uri) => {\n      const row = byUri.get(uri)\n      const json = row ? row.json : JSON.stringify(null)\n      const createdAtRaw = new Date(JSON.parse(json)?.['createdAt'])\n      const createdAt = !isNaN(createdAtRaw.getTime())\n        ? Timestamp.fromDate(createdAtRaw)\n        : undefined\n      const indexedAt = row?.indexedAt\n        ? Timestamp.fromDate(new Date(row?.indexedAt))\n        : undefined\n      const recordBytes = ui8.fromString(json, 'utf8')\n      return new Record({\n        record: recordBytes as Uint8Array<ArrayBuffer>,\n        cid: row?.cid,\n        createdAt,\n        indexedAt,\n        sortedAt: compositeTime(createdAt, indexedAt),\n        takenDown: !!row?.takedownRef,\n        takedownRef: row?.takedownRef ?? undefined,\n        tags: row?.tags ?? undefined,\n      })\n    })\n    return { records }\n  }\n}\n\nexport const getPostRecords = (db: Database) => {\n  const getBaseRecords = getRecords(db, app.bsky.feed.post)\n  return async (req: {\n    uris: string[]\n    includeOpThreadMetadata?: boolean\n  }): Promise<{\n    records: Record[]\n    meta: PostRecordMeta[]\n    opThreads: OpThread[]\n  }> => {\n    const [{ records }, details, opThreads] = await Promise.all([\n      getBaseRecords(req),\n      req.uris.length\n        ? db.db\n            .selectFrom('post')\n            .where('uri', 'in', req.uris)\n            .select([\n              'uri',\n              'violatesThreadGate',\n              'violatesEmbeddingRules',\n              'hasThreadGate',\n              'hasPostGate',\n            ])\n            .execute()\n        : [],\n      req.includeOpThreadMetadata ? getOpThreads(db, req.uris) : [],\n    ])\n    const byKey = keyBy(details, 'uri')\n    const meta = req.uris.map((uri) => {\n      return new PostRecordMeta({\n        violatesThreadGate: !!byKey.get(uri)?.violatesThreadGate,\n        violatesEmbeddingRules: !!byKey.get(uri)?.violatesEmbeddingRules,\n        hasThreadGate: !!byKey.get(uri)?.hasThreadGate,\n        hasPostGate: !!byKey.get(uri)?.hasPostGate,\n      })\n    })\n    return { records, meta, opThreads }\n  }\n}\n\nconst getOpThreads = async (\n  db: Database,\n  uris: string[],\n): Promise<OpThread[]> => {\n  if (!uris.length) return []\n\n  const requestedRoots = db.db\n    .selectFrom('post')\n    .where('uri', 'in', uris)\n    .select((eb) => eb.fn.coalesce('replyRoot', 'uri').as('rootUri'))\n    .distinct()\n\n  const rows = await db.db\n    .selectFrom('op_thread_reply')\n    .innerJoin(\n      requestedRoots.as('requested_root'),\n      'requested_root.rootUri',\n      'op_thread_reply.rootUri',\n    )\n    .select([\n      'op_thread_reply.rootUri',\n      'op_thread_reply.uri',\n      'op_thread_reply.parentUri',\n      'op_thread_reply.deletedAt',\n    ])\n    .execute()\n\n  const repliesByRoot = new Map<\n    string,\n    { uri: string; parentUri: string; deletedAt: string | null }[]\n  >()\n  for (const row of rows) {\n    const replies = repliesByRoot.get(row.rootUri) ?? []\n    replies.push(row)\n    repliesByRoot.set(row.rootUri, replies)\n  }\n\n  const opThreads: OpThread[] = []\n  for (const [rootUri, replies] of repliesByRoot) {\n    const opThread = resolveCanonicalOpThread(rootUri, replies)\n    if (!opThread) continue\n\n    opThreads.push(new OpThread({ rootUri, uris: opThread }))\n  }\n\n  dataplaneLogger.debug(\n    { uris: uris.length, roots: repliesByRoot.size, rows: rows.length },\n    'op threads resolved',\n  )\n\n  return opThreads\n}\n\nconst compositeTime = (\n  ts1: Timestamp | undefined,\n  ts2: Timestamp | undefined,\n) => {\n  if (!ts1) return ts2\n  if (!ts2) return ts1\n  return ts1.toDate() < ts2.toDate() ? ts1 : ts2\n}\n"]}

package/dist/data-plane/server/routes/reposts.js

@@ -14,10 +14,10 @@ export default (db) => ({
             cursor,
             keyset,
         });
-        const reposts = await builder.execute();
+        const page = keyset.page(await builder.execute(), limit);
         return {
-            uris: reposts.map((l) => l.uri),
-            cursor: keyset.packFromResult(reposts),
+            uris: page.items.map((l) => l.uri),
+            cursor: page.cursor,
         };
     },
     async getRepostsByActorAndSubjects(req) {
@@ -48,10 +48,10 @@ export default (db) => ({
             cursor,
             keyset,
         });
-        const reposts = await builder.execute();
+        const page = keyset.page(await builder.execute(), limit);
         return {
-            uris: reposts.map((l) => l.uri),
-            cursor: keyset.packFromResult(reposts),
+            uris: page.items.map((l) => l.uri),
+            cursor: page.cursor,
         };
     },
 });

package/dist/data-plane/server/routes/reposts.js.map

@@ -1 +1 @@
-{"version":3,"file":"reposts.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/reposts.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport { keyBy } from '@atproto/common'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport { TimeCidKeyset, paginate } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getRepostsBySubject(req) {\n    const { subject, cursor, limit } = req\n    const { ref } = db.db.dynamic\n\n    let builder = db.db\n      .selectFrom('repost')\n      .where('repost.subject', '=', subject?.uri ?? '')\n      .selectAll('repost')\n\n    const keyset = new TimeCidKeyset(ref('repost.sortAt'), ref('repost.cid'))\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n\n    const reposts = await builder.execute()\n\n    return {\n      uris: reposts.map((l) => l.uri),\n      cursor: keyset.packFromResult(reposts),\n    }\n  },\n\n  async getRepostsByActorAndSubjects(req) {\n    const { actorDid, refs } = req\n    if (refs.length === 0) {\n      return { uris: [] }\n    }\n    const res = await db.db\n      .selectFrom('repost')\n      .where('creator', '=', actorDid)\n      .where(\n        'subject',\n        'in',\n        refs.map(({ uri }) => uri),\n      )\n      .selectAll()\n      .execute()\n    const bySubject = keyBy(res, 'subject')\n    const uris = refs.map(({ uri }) => bySubject.get(uri)?.uri ?? '')\n    return { uris }\n  },\n\n  async getActorReposts(req) {\n    const { actorDid, limit, cursor } = req\n    const { ref } = db.db.dynamic\n\n    let builder = db.db\n      .selectFrom('repost')\n      .where('repost.creator', '=', actorDid)\n      .selectAll()\n\n    const keyset = new TimeCidKeyset(ref('repost.sortAt'), ref('repost.cid'))\n\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n\n    const reposts = await builder.execute()\n\n    return {\n      uris: reposts.map((l) => l.uri),\n      cursor: keyset.packFromResult(reposts),\n    }\n  },\n})\n"]}
+{"version":3,"file":"reposts.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/reposts.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport { keyBy } from '@atproto/common'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport { TimeCidKeyset, paginate } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getRepostsBySubject(req) {\n    const { subject, cursor, limit } = req\n    const { ref } = db.db.dynamic\n\n    let builder = db.db\n      .selectFrom('repost')\n      .where('repost.subject', '=', subject?.uri ?? '')\n      .selectAll('repost')\n\n    const keyset = new TimeCidKeyset(ref('repost.sortAt'), ref('repost.cid'))\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n\n    const page = keyset.page(await builder.execute(), limit)\n\n    return {\n      uris: page.items.map((l) => l.uri),\n      cursor: page.cursor,\n    }\n  },\n\n  async getRepostsByActorAndSubjects(req) {\n    const { actorDid, refs } = req\n    if (refs.length === 0) {\n      return { uris: [] }\n    }\n    const res = await db.db\n      .selectFrom('repost')\n      .where('creator', '=', actorDid)\n      .where(\n        'subject',\n        'in',\n        refs.map(({ uri }) => uri),\n      )\n      .selectAll()\n      .execute()\n    const bySubject = keyBy(res, 'subject')\n    const uris = refs.map(({ uri }) => bySubject.get(uri)?.uri ?? '')\n    return { uris }\n  },\n\n  async getActorReposts(req) {\n    const { actorDid, limit, cursor } = req\n    const { ref } = db.db.dynamic\n\n    let builder = db.db\n      .selectFrom('repost')\n      .where('repost.creator', '=', actorDid)\n      .selectAll()\n\n    const keyset = new TimeCidKeyset(ref('repost.sortAt'), ref('repost.cid'))\n\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n\n    const page = keyset.page(await builder.execute(), limit)\n\n    return {\n      uris: page.items.map((l) => l.uri),\n      cursor: page.cursor,\n    }\n  },\n})\n"]}

package/dist/data-plane/server/routes/search.js

@@ -15,10 +15,10 @@ export default (db) => {
             keyset,
             tryIndex: true,
         });
-        const res = await builder.execute();
+        const page = keyset.page(await builder.execute(), limit);
         return {
-            dids: res.map((row) => row.did),
-            cursor: keyset.packFromResult(res),
+            dids: page.items.map((row) => row.did),
+            cursor: page.cursor,
         };
     };
     const searchPostsImpl = async (req) => {
@@ -48,10 +48,10 @@ export default (db) => {
             keyset,
             tryIndex: true,
         });
-        const res = await builder.execute();
+        const page = keyset.page(await builder.execute(), limit);
         return {
-            uris: res.map((row) => row.uri),
-            cursor: keyset.packFromResult(res),
+            uris: page.items.map((row) => row.uri),
+            cursor: page.cursor,
         };
     };
     const searchStarterPacksImpl = async (req) => {
@@ -68,10 +68,10 @@ export default (db) => {
             keyset,
             tryIndex: true,
         });
-        const res = await builder.execute();
+        const page = keyset.page(await builder.execute(), limit);
         return {
-            uris: res.map((row) => row.uri),
-            cursor: keyset.packFromResult(res),
+            uris: page.items.map((row) => row.uri),
+            cursor: page.cursor,
         };
     };
     return {

package/dist/data-plane/server/routes/search.js.map

@@ -1 +1 @@
-{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/search.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,QAAQ,GACT,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEjD,eAAe,CAAC,EAAY,EAAwC,EAAE;IACpE,MAAM,gBAAgB,GAAG,KAAK,EAAE,GAI/B,EAAE,EAAE;QACH,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,CAAA;QACnC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,CAAA;QAC7B,IAAI,OAAO,GAAG,EAAE,CAAC,EAAE;aAChB,UAAU,CAAC,OAAO,CAAC;aACnB,KAAK,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;aACtD,SAAS,EAAE,CAAA;QAEd,MAAM,MAAM,GAAG,IAAI,kBAAkB,CACnC,GAAG,CAAC,iBAAiB,CAAC,EACtB,GAAG,CAAC,WAAW,CAAC,CACjB,CAAA;QACD,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE;YAC1B,KAAK;YACL,MAAM;YACN,MAAM;YACN,QAAQ,EAAE,IAAI;SACf,CAAC,CAAA;QAEF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;QAEnC,OAAO;YACL,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC;YAC/B,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC;SACnC,CAAA;IACH,CAAC,CAAA;IAED,MAAM,eAAe,GAAG,KAAK,EAAE,GAI9B,EAAE,EAAE;QACH,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,CAAA;QACnC,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAA;QAEhD,IAAI,SAAS,GAAG,MAAM,CAAA;QACtB,IAAI,MAAM,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1C,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,EAAE;iBACpB,UAAU,CAAC,OAAO,CAAC;iBACnB,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,CAAC;iBAC5B,SAAS,EAAE;iBACX,gBAAgB,EAAE,CAAA;YACrB,SAAS,GAAG,GAAG,EAAE,GAAG,CAAA;QACtB,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,CAAA;QAC7B,IAAI,OAAO,GAAG,EAAE,CAAC,EAAE;aAChB,UAAU,CAAC,MAAM,CAAC;aAClB,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC;aACpC,SAAS,EAAE,CAAA;QAEd,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,SAAS,CAAC,CAAA;QACzD,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAA;QACrE,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE;YAC1B,KAAK;YACL,MAAM;YACN,MAAM;YACN,QAAQ,EAAE,IAAI;SACf,CAAC,CAAA;QAEF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;QACnC,OAAO;YACL,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC;YAC/B,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC;SACnC,CAAA;IACH,CAAC,CAAA;IAED,MAAM,sBAAsB,GAAG,KAAK,EAAE,GAIrC,EAAE,EAAE;QACH,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,CAAA;QACnC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,CAAA;QAC7B,IAAI,OAAO,GAAG,EAAE,CAAC,EAAE;aAChB,UAAU,CAAC,cAAc,CAAC;aAC1B,KAAK,CAAC,mBAAmB,EAAE,OAAO,EAAE,IAAI,IAAI,GAAG,CAAC;aAChD,SAAS,EAAE,CAAA;QAEd,MAAM,MAAM,GAAG,IAAI,aAAa,CAC9B,GAAG,CAAC,qBAAqB,CAAC,EAC1B,GAAG,CAAC,kBAAkB,CAAC,CACxB,CAAA;QAED,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE;YAC1B,KAAK;YACL,MAAM;YACN,MAAM;YACN,QAAQ,EAAE,IAAI;SACf,CAAC,CAAA;QAEF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;QAEnC,OAAO;YACL,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC;YAC/B,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC;SACnC,CAAA;IACH,CAAC,CAAA;IAED,OAAO;QACL,iEAAiE;QACjE,YAAY,EAAE,gBAAgB;QAE9B,gEAAgE;QAChE,WAAW,EAAE,eAAe;QAE5B,kBAAkB,EAAE,sBAAsB;QAE1C,sEAAsE;QACtE,KAAK,CAAC,cAAc,CAAC,GAAG;YACtB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC;gBAC9C,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;gBAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;gBAC9B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM;aAC3B,CAAC,CAAA;YACF,OAAO;gBACL,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC9C,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,IAAI,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;aAClD,CAAA;QACH,CAAC;QAED,KAAK,CAAC,qBAAqB,CAAC,GAAG;YAC7B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC;gBACtC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;gBAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;aAC/B,CAAC,CAAA;YACF,OAAO;gBACL,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;aAC/C,CAAA;QACH,CAAC;QAED,KAAK,CAAC,aAAa,CAAC,GAAG;YACrB,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAA;YACxC,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAA;YACzC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,SAAS,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;YAC/D,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,eAAe,CAAC;gBAC7C,IAAI;gBACJ,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;gBAC9B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM;aAC3B,CAAC,CAAA;YACF,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC7C,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,IAAI,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;gBACjD,sBAAsB,EAAE,EAAE;aAC3B,CAAA;QACH,CAAC;QAED,KAAK,CAAC,oBAAoB,CAAC,GAAG;YAC5B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,sBAAsB,CAAC;gBACpD,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;gBAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;gBAC9B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM;aAC3B,CAAC,CAAA;YACF,OAAO;gBACL,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;gBACpD,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,IAAI,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;aAClD,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAED,sDAAsD;AACtD,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport {\n  IndexedAtDidKeyset,\n  TimeCidKeyset,\n  paginate,\n} from '../db/pagination.js'\nimport { parsePostSearchQuery } from '../util.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => {\n  const searchActorsImpl = async (req: {\n    term: string\n    limit: number\n    cursor?: string\n  }) => {\n    const { term, limit, cursor } = req\n    const { ref } = db.db.dynamic\n    let builder = db.db\n      .selectFrom('actor')\n      .where('actor.handle', 'like', `%${cleanQuery(term)}%`)\n      .selectAll()\n\n    const keyset = new IndexedAtDidKeyset(\n      ref('actor.indexedAt'),\n      ref('actor.did'),\n    )\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n    })\n\n    const res = await builder.execute()\n\n    return {\n      dids: res.map((row) => row.did),\n      cursor: keyset.packFromResult(res),\n    }\n  }\n\n  const searchPostsImpl = async (req: {\n    term: string\n    limit: number\n    cursor?: string\n  }) => {\n    const { term, limit, cursor } = req\n    const { q, author } = parsePostSearchQuery(term)\n\n    let authorDid = author\n    if (author && !author?.startsWith('did:')) {\n      const res = await db.db\n        .selectFrom('actor')\n        .where('handle', '=', author)\n        .selectAll()\n        .executeTakeFirst()\n      authorDid = res?.did\n    }\n\n    const { ref } = db.db.dynamic\n    let builder = db.db\n      .selectFrom('post')\n      .where('post.text', 'like', `%${q}%`)\n      .selectAll()\n\n    if (authorDid) {\n      builder = builder.where('post.creator', '=', authorDid)\n    }\n\n    const keyset = new TimeCidKeyset(ref('post.sortAt'), ref('post.cid'))\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n    })\n\n    const res = await builder.execute()\n    return {\n      uris: res.map((row) => row.uri),\n      cursor: keyset.packFromResult(res),\n    }\n  }\n\n  const searchStarterPacksImpl = async (req: {\n    term: string\n    limit: number\n    cursor?: string\n  }) => {\n    const { term, limit, cursor } = req\n    const { ref } = db.db.dynamic\n    let builder = db.db\n      .selectFrom('starter_pack')\n      .where('starter_pack.name', 'ilike', `%${term}%`)\n      .selectAll()\n\n    const keyset = new TimeCidKeyset(\n      ref('starter_pack.sortAt'),\n      ref('starter_pack.cid'),\n    )\n\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n    })\n\n    const res = await builder.execute()\n\n    return {\n      uris: res.map((row) => row.uri),\n      cursor: keyset.packFromResult(res),\n    }\n  }\n\n  return {\n    // @TODO actor search endpoints still fall back to search service\n    searchActors: searchActorsImpl,\n\n    // @TODO post search endpoint still falls back to search service\n    searchPosts: searchPostsImpl,\n\n    searchStarterPacks: searchStarterPacksImpl,\n\n    // V2 endpoints reuse the V1 SQL for dev env and reshape the response.\n    async searchActorsV2(req) {\n      const { dids, cursor } = await searchActorsImpl({\n        term: req.params?.query ?? '',\n        limit: req.params?.limit ?? 25,\n        cursor: req.params?.cursor,\n      })\n      return {\n        actors: dids.map((did) => ({ did, score: 0 })),\n        pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },\n      }\n    },\n\n    async searchActorsTypeahead(req) {\n      const { dids } = await searchActorsImpl({\n        term: req.params?.query ?? '',\n        limit: req.params?.limit || 10,\n      })\n      return {\n        actors: dids.map((did) => ({ did, score: 0 })),\n      }\n    },\n\n    async searchPostsV2(req) {\n      const author = req.filters?.authors?.[0]\n      const baseQuery = req.params?.query ?? ''\n      const term = author ? `${baseQuery} from:${author}` : baseQuery\n      const { uris, cursor } = await searchPostsImpl({\n        term,\n        limit: req.params?.limit ?? 25,\n        cursor: req.params?.cursor,\n      })\n      return {\n        posts: uris.map((uri) => ({ uri, score: 0 })),\n        pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },\n        detectedQueryLanguages: [],\n      }\n    },\n\n    async searchStarterPacksV2(req) {\n      const { uris, cursor } = await searchStarterPacksImpl({\n        term: req.params?.query ?? '',\n        limit: req.params?.limit ?? 25,\n        cursor: req.params?.cursor,\n      })\n      return {\n        starterPacks: uris.map((uri) => ({ uri, score: 0 })),\n        pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },\n      }\n    },\n  }\n}\n\n// Remove leading @ in case a handle is input that way\nconst cleanQuery = (query: string) => query.trim().replace(/^@/g, '')\n"]}
+{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/search.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport {\n  IndexedAtDidKeyset,\n  TimeCidKeyset,\n  paginate,\n} from '../db/pagination.js'\nimport { parsePostSearchQuery } from '../util.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => {\n  const searchActorsImpl = async (req: {\n    term: string\n    limit: number\n    cursor?: string\n  }) => {\n    const { term, limit, cursor } = req\n    const { ref } = db.db.dynamic\n    let builder = db.db\n      .selectFrom('actor')\n      .where('actor.handle', 'like', `%${cleanQuery(term)}%`)\n      .selectAll()\n\n    const keyset = new IndexedAtDidKeyset(\n      ref('actor.indexedAt'),\n      ref('actor.did'),\n    )\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n    })\n\n    const page = keyset.page(await builder.execute(), limit)\n\n    return {\n      dids: page.items.map((row) => row.did),\n      cursor: page.cursor,\n    }\n  }\n\n  const searchPostsImpl = async (req: {\n    term: string\n    limit: number\n    cursor?: string\n  }) => {\n    const { term, limit, cursor } = req\n    const { q, author } = parsePostSearchQuery(term)\n\n    let authorDid = author\n    if (author && !author?.startsWith('did:')) {\n      const res = await db.db\n        .selectFrom('actor')\n        .where('handle', '=', author)\n        .selectAll()\n        .executeTakeFirst()\n      authorDid = res?.did\n    }\n\n    const { ref } = db.db.dynamic\n    let builder = db.db\n      .selectFrom('post')\n      .where('post.text', 'like', `%${q}%`)\n      .selectAll()\n\n    if (authorDid) {\n      builder = builder.where('post.creator', '=', authorDid)\n    }\n\n    const keyset = new TimeCidKeyset(ref('post.sortAt'), ref('post.cid'))\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n    })\n\n    const page = keyset.page(await builder.execute(), limit)\n    return {\n      uris: page.items.map((row) => row.uri),\n      cursor: page.cursor,\n    }\n  }\n\n  const searchStarterPacksImpl = async (req: {\n    term: string\n    limit: number\n    cursor?: string\n  }) => {\n    const { term, limit, cursor } = req\n    const { ref } = db.db.dynamic\n    let builder = db.db\n      .selectFrom('starter_pack')\n      .where('starter_pack.name', 'ilike', `%${term}%`)\n      .selectAll()\n\n    const keyset = new TimeCidKeyset(\n      ref('starter_pack.sortAt'),\n      ref('starter_pack.cid'),\n    )\n\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n    })\n\n    const page = keyset.page(await builder.execute(), limit)\n\n    return {\n      uris: page.items.map((row) => row.uri),\n      cursor: page.cursor,\n    }\n  }\n\n  return {\n    // @TODO actor search endpoints still fall back to search service\n    searchActors: searchActorsImpl,\n\n    // @TODO post search endpoint still falls back to search service\n    searchPosts: searchPostsImpl,\n\n    searchStarterPacks: searchStarterPacksImpl,\n\n    // V2 endpoints reuse the V1 SQL for dev env and reshape the response.\n    async searchActorsV2(req) {\n      const { dids, cursor } = await searchActorsImpl({\n        term: req.params?.query ?? '',\n        limit: req.params?.limit ?? 25,\n        cursor: req.params?.cursor,\n      })\n      return {\n        actors: dids.map((did) => ({ did, score: 0 })),\n        pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },\n      }\n    },\n\n    async searchActorsTypeahead(req) {\n      const { dids } = await searchActorsImpl({\n        term: req.params?.query ?? '',\n        limit: req.params?.limit || 10,\n      })\n      return {\n        actors: dids.map((did) => ({ did, score: 0 })),\n      }\n    },\n\n    async searchPostsV2(req) {\n      const author = req.filters?.authors?.[0]\n      const baseQuery = req.params?.query ?? ''\n      const term = author ? `${baseQuery} from:${author}` : baseQuery\n      const { uris, cursor } = await searchPostsImpl({\n        term,\n        limit: req.params?.limit ?? 25,\n        cursor: req.params?.cursor,\n      })\n      return {\n        posts: uris.map((uri) => ({ uri, score: 0 })),\n        pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },\n        detectedQueryLanguages: [],\n      }\n    },\n\n    async searchStarterPacksV2(req) {\n      const { uris, cursor } = await searchStarterPacksImpl({\n        term: req.params?.query ?? '',\n        limit: req.params?.limit ?? 25,\n        cursor: req.params?.cursor,\n      })\n      return {\n        starterPacks: uris.map((uri) => ({ uri, score: 0 })),\n        pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },\n      }\n    },\n  }\n}\n\n// Remove leading @ in case a handle is input that way\nconst cleanQuery = (query: string) => query.trim().replace(/^@/g, '')\n"]}

package/dist/data-plane/server/routes/starter-packs.js

@@ -13,10 +13,10 @@ export default (db) => ({
             cursor,
             keyset,
         });
-        const starterPacks = await builder.execute();
+        const page = keyset.page(await builder.execute(), limit);
         return {
-            uris: starterPacks.map((sp) => sp.uri),
-            cursor: keyset.packFromResult(starterPacks),
+            uris: page.items.map((sp) => sp.uri),
+            cursor: page.cursor,
         };
     },
 });

package/dist/data-plane/server/routes/starter-packs.js.map

@@ -1 +1 @@
-{"version":3,"file":"starter-packs.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/starter-packs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE7D,eAAe,CAAC,EAAY,EAAwC,EAAE,CAAC,CAAC;IACtE,KAAK,CAAC,oBAAoB,CAAC,GAAG;QAC5B,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,CAAA;QAEvC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,CAAA;QAC7B,IAAI,OAAO,GAAG,EAAE,CAAC,EAAE;aAChB,UAAU,CAAC,cAAc,CAAC;aAC1B,SAAS,EAAE;aACX,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA;QAElC,MAAM,MAAM,GAAG,IAAI,aAAa,CAC9B,GAAG,CAAC,qBAAqB,CAAC,EAC1B,GAAG,CAAC,kBAAkB,CAAC,CACxB,CAAA;QACD,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE;YAC1B,KAAK;YACL,MAAM;YACN,MAAM;SACP,CAAC,CAAA;QACF,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;QAE5C,OAAO;YACL,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC;YACtC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC;SAC5C,CAAA;IACH,CAAC;CACF,CAAC,CAAA","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport { TimeCidKeyset, paginate } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getActorStarterPacks(req) {\n    const { actorDid, limit, cursor } = req\n\n    const { ref } = db.db.dynamic\n    let builder = db.db\n      .selectFrom('starter_pack')\n      .selectAll()\n      .where('creator', '=', actorDid)\n\n    const keyset = new TimeCidKeyset(\n      ref('starter_pack.sortAt'),\n      ref('starter_pack.cid'),\n    )\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n    const starterPacks = await builder.execute()\n\n    return {\n      uris: starterPacks.map((sp) => sp.uri),\n      cursor: keyset.packFromResult(starterPacks),\n    }\n  },\n})\n"]}
+{"version":3,"file":"starter-packs.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/starter-packs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE7D,eAAe,CAAC,EAAY,EAAwC,EAAE,CAAC,CAAC;IACtE,KAAK,CAAC,oBAAoB,CAAC,GAAG;QAC5B,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,CAAA;QAEvC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,CAAA;QAC7B,IAAI,OAAO,GAAG,EAAE,CAAC,EAAE;aAChB,UAAU,CAAC,cAAc,CAAC;aAC1B,SAAS,EAAE;aACX,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA;QAElC,MAAM,MAAM,GAAG,IAAI,aAAa,CAC9B,GAAG,CAAC,qBAAqB,CAAC,EAC1B,GAAG,CAAC,kBAAkB,CAAC,CACxB,CAAA;QACD,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE;YAC1B,KAAK;YACL,MAAM;YACN,MAAM;SACP,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAA;QAExD,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC;YACpC,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAA;IACH,CAAC;CACF,CAAC,CAAA","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport { TimeCidKeyset, paginate } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getActorStarterPacks(req) {\n    const { actorDid, limit, cursor } = req\n\n    const { ref } = db.db.dynamic\n    let builder = db.db\n      .selectFrom('starter_pack')\n      .selectAll()\n      .where('creator', '=', actorDid)\n\n    const keyset = new TimeCidKeyset(\n      ref('starter_pack.sortAt'),\n      ref('starter_pack.cid'),\n    )\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n    const page = keyset.page(await builder.execute(), limit)\n\n    return {\n      uris: page.items.map((sp) => sp.uri),\n      cursor: page.cursor,\n    }\n  },\n})\n"]}

package/dist/data-plane/server/routes/threads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"threads.d.ts","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/threads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;;0BAG9B,EAAE,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,OAAO,CAAC,CAAC"}
+{"version":3,"file":"threads.d.ts","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/threads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;;0BAI9B,EAAE,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,OAAO,CAAC,CAAC"}

package/dist/data-plane/server/routes/threads.js

@@ -1,5 +1,4 @@
-import { TID } from '@atproto/common';
-import { AtUri } from '@atproto/syntax';
+import { resolveCanonicalOpThread } from '../op-thread.js';
 import { getAncestorsAndSelfQb, getDescendentsQb } from '../util.js';
 export default (db) => ({
     async getThread(req) {
@@ -37,81 +36,11 @@ export default (db) => ({
             .select(['uri', 'parentUri', 'deletedAt'])
             .where('rootUri', '=', rootUri)
             .execute();
-        const repliesByParent = new Map();
-        const deletedAtByUri = new Map();
-        for (const reply of opReplies) {
-            const siblings = repliesByParent.get(reply.parentUri) ?? [];
-            siblings.push(reply.uri);
-            repliesByParent.set(reply.parentUri, siblings);
-            if (reply.deletedAt !== null) {
-                deletedAtByUri.set(reply.uri, new Date(reply.deletedAt).getTime());
-            }
-        }
-        // Sort replies (TID enables this) for each parent so we can
-        // deterministically pick the oldest reply.
-        for (const replies of repliesByParent.values()) {
-            replies.sort();
-        }
-        // Walk the oldest contiguous line of OP replies, mirroring the production
-        // dataplane. A deleted reply keeps its place while replies below it
-        // survive, so numbering stays stable. Once nothing survives below it the
-        // slot is up for grabs, but only a reply the OP wrote after that deletion
-        // may claim it: replies that already existed alongside the deleted one
-        // were never part of this chain and must not be promoted into it
-        // retroactively. The full chain is returned untrimmed by the above/below
-        // limits; the appview derives index/count from it.
-        //
-        // visited tracks the current path, so revisiting a URI means the
-        // denormalized rows describe a cycle rather than a tree.
-        const visited = new Set([rootUri]);
-        let validOpThread = true;
-        const resolve = (parentUri) => {
-            let vacatedAt = 0;
-            // sorted already, so siblings are oldest first
-            for (const reply of repliesByParent.get(parentUri) ?? []) {
-                if (visited.has(reply)) {
-                    validOpThread = false;
-                    return [];
-                }
-                if (vacatedAt !== 0 && !isOpReplyNewerThanTimestamp(reply, vacatedAt)) {
-                    continue;
-                }
-                visited.add(reply);
-                const below = resolve(reply);
-                if (!validOpThread) {
-                    return [];
-                }
-                const deletedAt = deletedAtByUri.get(reply);
-                if (deletedAt === undefined || below.length > 0) {
-                    return [reply, ...below];
-                }
-                visited.delete(reply);
-                if (deletedAt > vacatedAt) {
-                    vacatedAt = deletedAt;
-                }
-            }
-            return [];
-        };
-        const opThreadUris = [rootUri, ...resolve(rootUri)];
+        const opThread = resolveCanonicalOpThread(rootUri, opReplies);
         return {
             uris,
-            // A chain of one is just the root; only threads with OP replies count.
-            opThread: validOpThread && opThreadUris.length > 1 ? opThreadUris : undefined,
+            opThread,
         };
     },
 });
-// isOpReplyNewerThanTimestamp reports whether the post's rkey places its creation after ts.
-// The rkey is a TID, so this is the post's own claimed creation time rather
-// than when we observed it. An unparseable rkey is treated as not newer, which
-// keeps a malformed reply from claiming a vacated slot.
-const isOpReplyNewerThanTimestamp = (uri, ts) => {
-    try {
-        const tid = TID.fromStr(new AtUri(uri).rkey);
-        // TID timestamps are in microseconds.
-        return tid.timestamp() / 1000 > ts;
-    }
-    catch {
-        return false;
-    }
-};
 //# sourceMappingURL=threads.js.map

package/dist/data-plane/server/routes/threads.js.map

@@ -1 +1 @@
-{"version":3,"file":"threads.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/threads.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport { TID } from '@atproto/common'\nimport { AtUri } from '@atproto/syntax'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport { getAncestorsAndSelfQb, getDescendentsQb } from '../util.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getThread(req) {\n    const { postUri, above, below } = req\n    const [anchor, ancestors, descendents] = await Promise.all([\n      db.db\n        .selectFrom('post')\n        .select('replyRoot')\n        .where('uri', '=', postUri)\n        .executeTakeFirst(),\n      getAncestorsAndSelfQb(db.db, {\n        uri: postUri,\n        parentHeight: above,\n      })\n        .selectFrom('ancestor')\n        .selectAll()\n        .execute(),\n      getDescendentsQb(db.db, {\n        uri: postUri,\n        depth: below,\n      })\n        .selectFrom('descendent')\n        .innerJoin('post', 'post.uri', 'descendent.uri')\n        .orderBy('post.sortAt', 'desc')\n        .selectAll()\n        .execute(),\n    ])\n    const uris = [\n      ...ancestors.map((p) => p.uri),\n      ...descendents.map((p) => p.uri),\n    ]\n    const rootUri = anchor?.replyRoot ?? postUri\n    const opReplies = await db.db\n      .selectFrom('op_thread_reply')\n      .select(['uri', 'parentUri', 'deletedAt'])\n      .where('rootUri', '=', rootUri)\n      .execute()\n\n    const repliesByParent = new Map<string, string[]>()\n    const deletedAtByUri = new Map<string, number>()\n    for (const reply of opReplies) {\n      const siblings = repliesByParent.get(reply.parentUri) ?? []\n      siblings.push(reply.uri)\n      repliesByParent.set(reply.parentUri, siblings)\n      if (reply.deletedAt !== null) {\n        deletedAtByUri.set(reply.uri, new Date(reply.deletedAt).getTime())\n      }\n    }\n    // Sort replies (TID enables this) for each parent so we can\n    // deterministically pick the oldest reply.\n    for (const replies of repliesByParent.values()) {\n      replies.sort()\n    }\n\n    // Walk the oldest contiguous line of OP replies, mirroring the production\n    // dataplane. A deleted reply keeps its place while replies below it\n    // survive, so numbering stays stable. Once nothing survives below it the\n    // slot is up for grabs, but only a reply the OP wrote after that deletion\n    // may claim it: replies that already existed alongside the deleted one\n    // were never part of this chain and must not be promoted into it\n    // retroactively. The full chain is returned untrimmed by the above/below\n    // limits; the appview derives index/count from it.\n    //\n    // visited tracks the current path, so revisiting a URI means the\n    // denormalized rows describe a cycle rather than a tree.\n    const visited = new Set([rootUri])\n    let validOpThread = true\n    const resolve = (parentUri: string): string[] => {\n      let vacatedAt = 0\n      // sorted already, so siblings are oldest first\n      for (const reply of repliesByParent.get(parentUri) ?? []) {\n        if (visited.has(reply)) {\n          validOpThread = false\n          return []\n        }\n\n        if (vacatedAt !== 0 && !isOpReplyNewerThanTimestamp(reply, vacatedAt)) {\n          continue\n        }\n\n        visited.add(reply)\n\n        const below = resolve(reply)\n        if (!validOpThread) {\n          return []\n        }\n        const deletedAt = deletedAtByUri.get(reply)\n        if (deletedAt === undefined || below.length > 0) {\n          return [reply, ...below]\n        }\n\n        visited.delete(reply)\n        if (deletedAt > vacatedAt) {\n          vacatedAt = deletedAt\n        }\n      }\n      return []\n    }\n    const opThreadUris = [rootUri, ...resolve(rootUri)]\n\n    return {\n      uris,\n      // A chain of one is just the root; only threads with OP replies count.\n      opThread:\n        validOpThread && opThreadUris.length > 1 ? opThreadUris : undefined,\n    }\n  },\n})\n\n// isOpReplyNewerThanTimestamp reports whether the post's rkey places its creation after ts.\n// The rkey is a TID, so this is the post's own claimed creation time rather\n// than when we observed it. An unparseable rkey is treated as not newer, which\n// keeps a malformed reply from claiming a vacated slot.\nconst isOpReplyNewerThanTimestamp = (uri: string, ts: number): boolean => {\n  try {\n    const tid = TID.fromStr(new AtUri(uri).rkey)\n    // TID timestamps are in microseconds.\n    return tid.timestamp() / 1000 > ts\n  } catch {\n    return false\n  }\n}\n"]}
+{"version":3,"file":"threads.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/threads.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAEpE,eAAe,CAAC,EAAY,EAAwC,EAAE,CAAC,CAAC;IACtE,KAAK,CAAC,SAAS,CAAC,GAAG;QACjB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,GAAG,CAAA;QACrC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACzD,EAAE,CAAC,EAAE;iBACF,UAAU,CAAC,MAAM,CAAC;iBAClB,MAAM,CAAC,WAAW,CAAC;iBACnB,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC;iBAC1B,gBAAgB,EAAE;YACrB,qBAAqB,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC3B,GAAG,EAAE,OAAO;gBACZ,YAAY,EAAE,KAAK;aACpB,CAAC;iBACC,UAAU,CAAC,UAAU,CAAC;iBACtB,SAAS,EAAE;iBACX,OAAO,EAAE;YACZ,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE;gBACtB,GAAG,EAAE,OAAO;gBACZ,KAAK,EAAE,KAAK;aACb,CAAC;iBACC,UAAU,CAAC,YAAY,CAAC;iBACxB,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,gBAAgB,CAAC;iBAC/C,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC;iBAC9B,SAAS,EAAE;iBACX,OAAO,EAAE;SACb,CAAC,CAAA;QACF,MAAM,IAAI,GAAG;YACX,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;YAC9B,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;SACjC,CAAA;QACD,MAAM,OAAO,GAAG,MAAM,EAAE,SAAS,IAAI,OAAO,CAAA;QAC5C,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,EAAE;aAC1B,UAAU,CAAC,iBAAiB,CAAC;aAC7B,MAAM,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;aACzC,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC;aAC9B,OAAO,EAAE,CAAA;QACZ,MAAM,QAAQ,GAAG,wBAAwB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QAE7D,OAAO;YACL,IAAI;YACJ,QAAQ;SACT,CAAA;IACH,CAAC;CACF,CAAC,CAAA","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport { resolveCanonicalOpThread } from '../op-thread.js'\nimport { getAncestorsAndSelfQb, getDescendentsQb } from '../util.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getThread(req) {\n    const { postUri, above, below } = req\n    const [anchor, ancestors, descendents] = await Promise.all([\n      db.db\n        .selectFrom('post')\n        .select('replyRoot')\n        .where('uri', '=', postUri)\n        .executeTakeFirst(),\n      getAncestorsAndSelfQb(db.db, {\n        uri: postUri,\n        parentHeight: above,\n      })\n        .selectFrom('ancestor')\n        .selectAll()\n        .execute(),\n      getDescendentsQb(db.db, {\n        uri: postUri,\n        depth: below,\n      })\n        .selectFrom('descendent')\n        .innerJoin('post', 'post.uri', 'descendent.uri')\n        .orderBy('post.sortAt', 'desc')\n        .selectAll()\n        .execute(),\n    ])\n    const uris = [\n      ...ancestors.map((p) => p.uri),\n      ...descendents.map((p) => p.uri),\n    ]\n    const rootUri = anchor?.replyRoot ?? postUri\n    const opReplies = await db.db\n      .selectFrom('op_thread_reply')\n      .select(['uri', 'parentUri', 'deletedAt'])\n      .where('rootUri', '=', rootUri)\n      .execute()\n    const opThread = resolveCanonicalOpThread(rootUri, opReplies)\n\n    return {\n      uris,\n      opThread,\n    }\n  },\n})\n"]}

package/dist/feature-gates/gates.d.ts

@@ -12,7 +12,8 @@ export declare enum Gate {
     SuggestedUsersForDiscoverEnable = "suggested_users:for_discover:enable",
     SuggestedUsersForSeeMoreEnable = "suggested_users:for_see_more:enable",
     SearchV2Enable = "search:v2:enable",
-    TrendingTopicsV2 = "trending_topics_v2",
+    IrisFeed = "iris:feed:enable",
+    OpThreadMetadataEnable = "op_thread_metadata:enable",
     AATest = "aa-test-appview"
 }
 /**

package/dist/feature-gates/gates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gates.d.ts","sourceRoot":"","sources":["../../src/feature-gates/gates.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,oBAAY,IAAI;IACd,4BAA4B,0CAA0C;IACtE,+BAA+B,wCAAwC;IACvE,oCAAoC,6CAA6C;IACjF,gCAAgC,wCAAwC;IACxE,8BAA8B,uCAAuC;IACrE,+BAA+B,wCAAwC;IACvE,8BAA8B,wCAAwC;IACtE,cAAc,qBAAqB;IACnC,gBAAgB,uBAAuB;IAGvC,MAAM,oBAAoB;CAC3B;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,IAAI,CAAe,CAAA"}
+{"version":3,"file":"gates.d.ts","sourceRoot":"","sources":["../../src/feature-gates/gates.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,oBAAY,IAAI;IACd,4BAA4B,0CAA0C;IACtE,+BAA+B,wCAAwC;IACvE,oCAAoC,6CAA6C;IACjF,gCAAgC,wCAAwC;IACxE,8BAA8B,uCAAuC;IACrE,+BAA+B,wCAAwC;IACvE,8BAA8B,wCAAwC;IACtE,cAAc,qBAAqB;IACnC,QAAQ,qBAAqB;IAC7B,sBAAsB,8BAA8B;IAGpD,MAAM,oBAAoB;CAC3B;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,IAAI,CAAe,CAAA"}