@atproto/bsky 0.0.237 → 0.0.239

package/src/api/com/atproto/repo/getRecord.ts

@@ -1,4 +1,4 @@
-import { AtUri } from '@atproto/syntax'
+import { atUri } from '@atproto/lex'
 import { InvalidRequestError, Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context.js'
 import { com } from '../../../../lexicons/index.js'
@@ -21,7 +21,7 @@ export default function (server: Server, ctx: AppContext) {
         throw new InvalidRequestError(`Could not find repo: ${repo}`)
       }
 
-      const uri = AtUri.make(did, collection, rkey).toString()
+      const uri = atUri(did, collection, rkey)
       const result = await ctx.hydrator.getRecord(uri, includeTakedowns)
 
       if (!result || (cid && result.cid !== cid)) {

package/src/data-plane/server/routes/feed-gens.ts

@@ -45,22 +45,18 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   },
 
   async searchFeedGenerators(req) {
-    const { ref } = db.db.dynamic
-    const limit = req.limit
-    const query = req.query.trim()
-    let builder = db.db
-      .selectFrom('feed_generator')
-      .if(!!query, (q) => q.where('displayName', 'ilike', `%${query}%`))
-      .selectAll()
-    const keyset = new TimeCidKeyset(
-      ref('feed_generator.createdAt'),
-      ref('feed_generator.cid'),
+    return searchFeedGeneratorsImpl(db, req.query, req.limit)
+  },
+
+  async searchFeedGeneratorsV2(req) {
+    const { uris, cursor } = await searchFeedGeneratorsImpl(
+      db,
+      req.params?.query ?? '',
+      req.params?.limit ?? 25,
     )
-    builder = paginate(builder, { limit, keyset })
-    const feeds = await builder.execute()
     return {
-      uris: feeds.map((f) => f.uri),
-      cursor: keyset.packFromResult(feeds),
+      feedGenerators: uris.map((uri) => ({ uri, score: 0 })),
+      pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },
     }
   },
 
@@ -68,3 +64,26 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     throw new Error('unimplemented')
   },
 })
+
+const searchFeedGeneratorsImpl = async (
+  db: Database,
+  query: string,
+  limit: number,
+) => {
+  const { ref } = db.db.dynamic
+  const trimmed = query.trim()
+  let builder = db.db
+    .selectFrom('feed_generator')
+    .if(!!trimmed, (q) => q.where('displayName', 'ilike', `%${trimmed}%`))
+    .selectAll()
+  const keyset = new TimeCidKeyset(
+    ref('feed_generator.createdAt'),
+    ref('feed_generator.cid'),
+  )
+  builder = paginate(builder, { limit, keyset })
+  const feeds = await builder.execute()
+  return {
+    uris: feeds.map((f) => f.uri),
+    cursor: keyset.packFromResult(feeds),
+  }
+}

package/src/data-plane/server/routes/search.ts

@@ -8,9 +8,12 @@ import {
 } from '../db/pagination.js'
 import { parsePostSearchQuery } from '../util.js'
 
-export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
-  // @TODO actor search endpoints still fall back to search service
-  async searchActors(req) {
+export default (db: Database): Partial<ServiceImpl<typeof Service>> => {
+  const searchActorsImpl = async (req: {
+    term: string
+    limit: number
+    cursor?: string
+  }) => {
     const { term, limit, cursor } = req
     const { ref } = db.db.dynamic
     let builder = db.db
@@ -35,10 +38,13 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       dids: res.map((row) => row.did),
       cursor: keyset.packFromResult(res),
     }
-  },
+  }
 
-  // @TODO post search endpoint still falls back to search service
-  async searchPosts(req) {
+  const searchPostsImpl = async (req: {
+    term: string
+    limit: number
+    cursor?: string
+  }) => {
     const { term, limit, cursor } = req
     const { q, author } = parsePostSearchQuery(term)
 
@@ -75,9 +81,13 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       uris: res.map((row) => row.uri),
       cursor: keyset.packFromResult(res),
     }
-  },
+  }
 
-  async searchStarterPacks(req) {
+  const searchStarterPacksImpl = async (req: {
+    term: string
+    limit: number
+    cursor?: string
+  }) => {
     const { term, limit, cursor } = req
     const { ref } = db.db.dynamic
     let builder = db.db
@@ -99,14 +109,72 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
 
     const res = await builder.execute()
 
-    const cur = keyset.packFromResult(res)
-
     return {
       uris: res.map((row) => row.uri),
-      cursor: cur,
+      cursor: keyset.packFromResult(res),
     }
-  },
-})
+  }
+
+  return {
+    // @TODO actor search endpoints still fall back to search service
+    searchActors: searchActorsImpl,
+
+    // @TODO post search endpoint still falls back to search service
+    searchPosts: searchPostsImpl,
+
+    searchStarterPacks: searchStarterPacksImpl,
+
+    // V2 endpoints reuse the V1 SQL for dev env and reshape the response.
+    async searchActorsV2(req) {
+      const { dids, cursor } = await searchActorsImpl({
+        term: req.params?.query ?? '',
+        limit: req.params?.limit ?? 25,
+        cursor: req.params?.cursor,
+      })
+      return {
+        actors: dids.map((did) => ({ did, score: 0 })),
+        pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },
+      }
+    },
+
+    async searchActorsTypeahead(req) {
+      const { dids } = await searchActorsImpl({
+        term: req.query,
+        limit: req.limit || 10,
+      })
+      return {
+        actors: dids.map((did) => ({ did, score: 0 })),
+      }
+    },
+
+    async searchPostsV2(req) {
+      const author = req.filters?.authors?.[0]
+      const baseQuery = req.params?.query ?? ''
+      const term = author ? `${baseQuery} from:${author}` : baseQuery
+      const { uris, cursor } = await searchPostsImpl({
+        term,
+        limit: req.params?.limit ?? 25,
+        cursor: req.params?.cursor,
+      })
+      return {
+        posts: uris.map((uri) => ({ uri, score: 0 })),
+        pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },
+      }
+    },
+
+    async searchStarterPacksV2(req) {
+      const { uris, cursor } = await searchStarterPacksImpl({
+        term: req.params?.query ?? '',
+        limit: req.params?.limit ?? 25,
+        cursor: req.params?.cursor,
+      })
+      return {
+        starterPacks: uris.map((uri) => ({ uri, score: 0 })),
+        pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },
+      }
+    },
+  }
+}
 
 // Remove leading @ in case a handle is input that way
 const cleanQuery = (query: string) => query.trim().replace(/^@/g, '')

package/src/feature-gates/gates.ts

@@ -11,6 +11,7 @@ export enum Gate {
   SuggestedUsersForExploreEnable = 'suggested_users:for_explore:enable',
   SuggestedUsersForDiscoverEnable = 'suggested_users:for_discover:enable',
   SuggestedUsersForSeeMoreEnable = 'suggested_users:for_see_more:enable',
+  SearchV2Enable = 'search:v2:enable',
 
   // temp
   AATest = 'aa-test-appview',

package/src/hydration/hydrator.ts

@@ -1,5 +1,6 @@
 import assert from 'node:assert'
 import { dedupeStrs, mapDefined } from '@atproto/common'
+import { atUri } from '@atproto/lex'
 import { AtUri, AtUriString, DidString, UriString } from '@atproto/syntax'
 import { DataPlaneClient } from '../data-plane/client/index.js'
 import {
@@ -1575,12 +1576,8 @@ const isModList = (
 const labelSubjectsForDid = (dids: DidString[]) => {
   return [
     ...dids,
-    ...dids.map((did) =>
-      AtUri.make(did, app.bsky.actor.profile.$type, 'self').toString(),
-    ),
-    ...dids.map((did) =>
-      AtUri.make(did, app.bsky.actor.status.$type, 'self').toString(),
-    ),
+    ...dids.map((did) => atUri(did, app.bsky.actor.profile)),
+    ...dids.map((did) => atUri(did, app.bsky.actor.status)),
   ]
 }
 

package/src/hydration/label.ts

@@ -1,4 +1,4 @@
-import { AtUri, AtUriString, DidString, UriString } from '@atproto/syntax'
+import { AtUriString, DidString, UriString, atUri } from '@atproto/lex'
 import { DataPlaneClient } from '../data-plane/client/index.js'
 import { app, com } from '../lexicons/index.js'
 import { ParsedLabelers } from '../util.js'
@@ -198,8 +198,8 @@ export class LabelHydrator {
   }
 }
 
-const labelerDidToUri = (did: DidString): AtUriString => {
-  return AtUri.make(did, app.bsky.labeler.service.$type, 'self').toString()
+function labelerDidToUri<T extends DidString>(did: T) {
+  return atUri(did, app.bsky.labeler.service)
 }
 
 const IMPERSONATION_LABEL = 'impersonation'

package/src/views/index.ts

@@ -4,6 +4,7 @@ import {
   Un$Typed,
   Unknown$TypedObject,
   UriString,
+  atUri,
   getBlobCidString,
 } from '@atproto/lex'
 import {
@@ -66,6 +67,10 @@ import {
   ExternalEmbedView,
   FeedViewPost,
   FollowRecord,
+  GalleryEmbed,
+  GalleryEmbedView,
+  GalleryImageEmbed,
+  GalleryImageEmbedView,
   GeneratorView,
   GetPostThreadV2QueryParams,
   ImagesEmbed,
@@ -115,6 +120,8 @@ import {
   VideoEmbed,
   VideoEmbedView,
   isExternalEmbedType,
+  isGalleryEmbedType,
+  isGalleryImageEmbedType,
   isImagesEmbedType,
   isLabelerRecordType,
   isListRuleType,
@@ -135,6 +142,11 @@ const notificationDeletedRecord =
 const notificationDeletedRecordCid =
   'bafyreidad6nyekfa4a67yfb573ptxiv6s7kyxyg2ra6qbbemcruadvtuim'
 
+// Soft-limit for `app.bsky.embed.gallery#main.items`. The lexicon's
+// schema-level cap is 20, but clients are expected to enforce a soft limit
+// of 10 today. The AppView trims defensively at the view boundary.
+const GALLERY_SOFT_LIMIT = 10
+
 export class Views {
   public imgUriBuilder: ImageUriBuilder = this.opts.imgUriBuilder
   public videoUriBuilder: VideoUriBuilder = this.opts.videoUriBuilder
@@ -348,11 +360,7 @@ export class Views {
   ): Un$Typed<ProfileViewBasic> | undefined {
     const actor = state.actors?.get(did)
     if (!actor) return
-    const profileUri = AtUri.make(
-      did,
-      app.bsky.actor.profile.$nsid,
-      'self',
-    ).toString()
+    const profileUri = atUri(did, app.bsky.actor.profile)
     const labels = [
       ...(state.labels?.getBySubject(did) ?? []),
       ...(state.labels?.getBySubject(profileUri) ?? []),
@@ -603,7 +611,7 @@ export class Views {
       return undefined
     }
 
-    const uri = AtUri.make(did, app.bsky.actor.status.$nsid, 'self').toString()
+    const uri = atUri(did, app.bsky.actor.status)
     const labels = state.labels?.getBySubject(uri)
 
     const minDuration = 5 * MINUTE
@@ -838,11 +846,7 @@ export class Views {
     const viewer = state.labelerViewers?.get(did)
     const aggs = state.labelerAggs?.get(did)
 
-    const uri = AtUri.make(
-      did,
-      app.bsky.labeler.service.$type,
-      'self',
-    ).toString()
+    const uri = atUri(did, app.bsky.labeler.service)
     const labels = [
       ...(state.labels?.getBySubject(uri) ?? []),
       ...this.selfLabels({
@@ -2090,6 +2094,8 @@ export class Views {
       return this.imagesEmbed(creatorFromUri(postUri), embed)
     } else if (isVideoEmbedType(embed)) {
       return this.videoEmbed(creatorFromUri(postUri), embed)
+    } else if (isGalleryEmbedType(embed)) {
+      return this.galleryEmbed(creatorFromUri(postUri), embed)
     } else if (isExternalEmbedType(embed)) {
       return this.externalEmbed(creatorFromUri(postUri), embed, state)
     } else if (isRecordEmbedType(embed)) {
@@ -2133,6 +2139,47 @@ export class Views {
     })
   }
 
+  galleryEmbed(did: DidString, embed: GalleryEmbed): $Typed<GalleryEmbedView> {
+    // The lexicon's schema-level cap is 20, but clients are expected to
+    // enforce a soft limit of 10. Trim defensively at the view boundary so
+    // viewers see at most 10 items regardless of what was authored.
+    const items = embed.items.slice(0, GALLERY_SOFT_LIMIT).flatMap((item) => {
+      const view = this.galleryItemView(did, item)
+      return view ? [view] : []
+    })
+    return app.bsky.embed.gallery.view.$build({ items })
+  }
+
+  private galleryItemView(
+    did: DidString,
+    item: GalleryEmbed['items'][number],
+  ): $Typed<GalleryImageEmbedView> | undefined {
+    if (isGalleryImageEmbedType(item)) {
+      return this.galleryImageView(did, item)
+    }
+    return undefined
+  }
+
+  private galleryImageView(
+    did: DidString,
+    item: GalleryImageEmbed,
+  ): $Typed<GalleryImageEmbedView> {
+    return app.bsky.embed.gallery.viewImage.$build({
+      thumbnail: this.imgUriBuilder.getPresetUri(
+        'feed_thumbnail',
+        did,
+        getBlobCidString(item.image),
+      ),
+      fullsize: this.imgUriBuilder.getPresetUri(
+        'feed_fullsize',
+        did,
+        getBlobCidString(item.image),
+      ),
+      alt: item.alt,
+      aspectRatio: item.aspectRatio,
+    })
+  }
+
   externalEmbed(
     did: DidString,
     embed: ExternalEmbed,
@@ -2528,11 +2575,14 @@ export class Views {
     let mediaEmbed:
       | $Typed<ImagesEmbedView>
       | $Typed<VideoEmbedView>
+      | $Typed<GalleryEmbedView>
       | $Typed<ExternalEmbedView>
     if (isImagesEmbedType(embed.media)) {
       mediaEmbed = this.imagesEmbed(creator, embed.media)
     } else if (isVideoEmbedType(embed.media)) {
       mediaEmbed = this.videoEmbed(creator, embed.media)
+    } else if (isGalleryEmbedType(embed.media)) {
+      mediaEmbed = this.galleryEmbed(creator, embed.media)
     } else if (isExternalEmbedType(embed.media)) {
       mediaEmbed = this.externalEmbed(creator, embed.media, state)
     } else {

package/src/views/types.ts

@@ -33,6 +33,13 @@ export const isVideoEmbedType = app.bsky.embed.video.$isTypeOf
 export type VideoEmbed = app.bsky.embed.video.Main
 export type VideoEmbedView = app.bsky.embed.video.View
 
+export const isGalleryEmbedType = app.bsky.embed.gallery.$isTypeOf
+export type GalleryEmbed = app.bsky.embed.gallery.Main
+export type GalleryEmbedView = app.bsky.embed.gallery.View
+export const isGalleryImageEmbedType = app.bsky.embed.gallery.image.$isTypeOf
+export type GalleryImageEmbed = app.bsky.embed.gallery.Image
+export type GalleryImageEmbedView = app.bsky.embed.gallery.ViewImage
+
 export const isExternalEmbedType = app.bsky.embed.external.$isTypeOf
 export type ExternalEmbed = app.bsky.embed.external.Main
 export type ExternalEmbedView = app.bsky.embed.external.View
@@ -57,6 +64,7 @@ export type RecordWithMediaEmbedView = app.bsky.embed.recordWithMedia.View
 export type Embed =
   | ImagesEmbed
   | VideoEmbed
+  | GalleryEmbed
   | ExternalEmbed
   | RecordEmbed
   | RecordWithMedia
@@ -64,6 +72,7 @@ export type Embed =
 export type EmbedView =
   | ImagesEmbedView
   | VideoEmbedView
+  | GalleryEmbedView
   | ExternalEmbedView
   | RecordEmbedView
   | RecordWithMediaView

package/tests/data-plane/handle-invalidation.test.ts

@@ -116,7 +116,8 @@ describe('handle invalidation', () => {
 
   it('deals with handle contention', async () => {
     await backdateIndexedAt(bob)
-    // update alices handle so that the pds will let bob take her old handle
+    // make alice lose her handle so that the pds will let bob take her old handle
+    mockHandles['not-alice.test'] = null
     await network.pds.ctx.accountManager.updateHandle(alice, 'not-alice.test')
 
     await pdsAgent.api.com.atproto.identity.updateHandle(

package/tests/views/__snapshots__/posts.test.ts.snap

@@ -1,5 +1,256 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`pds posts views > embeds gallery with record. 1`] = `
+{
+  "author": {
+    "associated": {
+      "activitySubscription": {
+        "allowSubscriptions": "followers",
+      },
+    },
+    "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)",
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "did": "user(0)",
+    "displayName": "ali",
+    "handle": "alice.test",
+    "labels": [
+      {
+        "cid": "cids(2)",
+        "cts": "1970-01-01T00:00:00.000Z",
+        "src": "user(0)",
+        "uri": "record(1)",
+        "val": "self-label-a",
+      },
+      {
+        "cid": "cids(2)",
+        "cts": "1970-01-01T00:00:00.000Z",
+        "src": "user(0)",
+        "uri": "record(1)",
+        "val": "self-label-b",
+      },
+    ],
+  },
+  "bookmarkCount": 0,
+  "cid": "cids(0)",
+  "embed": {
+    "$type": "app.bsky.embed.recordWithMedia#view",
+    "media": {
+      "$type": "app.bsky.embed.gallery#view",
+      "items": [
+        {
+          "$type": "app.bsky.embed.gallery#viewImage",
+          "alt": "landscape",
+          "aspectRatio": {
+            "height": 3,
+            "width": 4,
+          },
+          "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(1)/cids(3)",
+          "thumbnail": "https://bsky.public.url/img/feed_thumbnail/plain/user(1)/cids(3)",
+        },
+      ],
+    },
+    "record": {
+      "record": {
+        "$type": "app.bsky.embed.record#viewRecord",
+        "author": {
+          "associated": {
+            "activitySubscription": {
+              "allowSubscriptions": "followers",
+            },
+          },
+          "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)",
+          "createdAt": "1970-01-01T00:00:00.000Z",
+          "did": "user(0)",
+          "displayName": "ali",
+          "handle": "alice.test",
+          "labels": [
+            {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-a",
+            },
+            {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-b",
+            },
+          ],
+        },
+        "cid": "cids(4)",
+        "embeds": [],
+        "indexedAt": "1970-01-01T00:00:00.000Z",
+        "labels": [],
+        "likeCount": 0,
+        "quoteCount": 1,
+        "replyCount": 0,
+        "repostCount": 0,
+        "uri": "record(2)",
+        "value": {
+          "$type": "app.bsky.feed.post",
+          "createdAt": "1970-01-01T00:00:00.000Z",
+          "text": "embedded",
+        },
+      },
+    },
+  },
+  "indexedAt": "1970-01-01T00:00:00.000Z",
+  "labels": [],
+  "likeCount": 0,
+  "quoteCount": 0,
+  "record": {
+    "$type": "app.bsky.feed.post",
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "embed": {
+      "$type": "app.bsky.embed.recordWithMedia",
+      "media": {
+        "$type": "app.bsky.embed.gallery",
+        "items": [
+          {
+            "$type": "app.bsky.embed.gallery#image",
+            "alt": "landscape",
+            "aspectRatio": {
+              "height": 3,
+              "width": 4,
+            },
+            "image": {
+              "$type": "blob",
+              "mimeType": "image/jpeg",
+              "ref": {
+                "$link": "cids(3)",
+              },
+              "size": 4114,
+            },
+          },
+        ],
+      },
+      "record": {
+        "record": {
+          "cid": "cids(4)",
+          "uri": "record(2)",
+        },
+      },
+    },
+    "text": "gallery + record",
+  },
+  "replyCount": 0,
+  "repostCount": 0,
+  "uri": "record(0)",
+}
+`;
+
+exports[`pds posts views > embeds gallery. 1`] = `
+{
+  "author": {
+    "associated": {
+      "activitySubscription": {
+        "allowSubscriptions": "followers",
+      },
+    },
+    "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)",
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "did": "user(0)",
+    "displayName": "ali",
+    "handle": "alice.test",
+    "labels": [
+      {
+        "cid": "cids(2)",
+        "cts": "1970-01-01T00:00:00.000Z",
+        "src": "user(0)",
+        "uri": "record(1)",
+        "val": "self-label-a",
+      },
+      {
+        "cid": "cids(2)",
+        "cts": "1970-01-01T00:00:00.000Z",
+        "src": "user(0)",
+        "uri": "record(1)",
+        "val": "self-label-b",
+      },
+    ],
+  },
+  "bookmarkCount": 0,
+  "cid": "cids(0)",
+  "embed": {
+    "$type": "app.bsky.embed.gallery#view",
+    "items": [
+      {
+        "$type": "app.bsky.embed.gallery#viewImage",
+        "alt": "landscape",
+        "aspectRatio": {
+          "height": 3,
+          "width": 4,
+        },
+        "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(1)/cids(3)",
+        "thumbnail": "https://bsky.public.url/img/feed_thumbnail/plain/user(1)/cids(3)",
+      },
+      {
+        "$type": "app.bsky.embed.gallery#viewImage",
+        "alt": "portrait",
+        "aspectRatio": {
+          "height": 4,
+          "width": 3,
+        },
+        "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(1)/cids(1)",
+        "thumbnail": "https://bsky.public.url/img/feed_thumbnail/plain/user(1)/cids(1)",
+      },
+    ],
+  },
+  "indexedAt": "1970-01-01T00:00:00.000Z",
+  "labels": [],
+  "likeCount": 0,
+  "quoteCount": 0,
+  "record": {
+    "$type": "app.bsky.feed.post",
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "embed": {
+      "$type": "app.bsky.embed.gallery",
+      "items": [
+        {
+          "$type": "app.bsky.embed.gallery#image",
+          "alt": "landscape",
+          "aspectRatio": {
+            "height": 3,
+            "width": 4,
+          },
+          "image": {
+            "$type": "blob",
+            "mimeType": "image/jpeg",
+            "ref": {
+              "$link": "cids(3)",
+            },
+            "size": 4114,
+          },
+        },
+        {
+          "$type": "app.bsky.embed.gallery#image",
+          "alt": "portrait",
+          "aspectRatio": {
+            "height": 4,
+            "width": 3,
+          },
+          "image": {
+            "$type": "blob",
+            "mimeType": "image/jpeg",
+            "ref": {
+              "$link": "cids(1)",
+            },
+            "size": 3976,
+          },
+        },
+      ],
+    },
+    "text": "gallery",
+  },
+  "replyCount": 0,
+  "repostCount": 0,
+  "uri": "record(0)",
+}
+`;
+
 exports[`pds posts views > embeds video with record. 1`] = `
 {
   "author": {