support feed search on getPopularFeedGenerators

bluesky-social · Jan 31, 2024 · c03fcec · c03fcec
1 parent 8f613b5
commit c03fcec
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 19 deletions.
diff --git a/packages/bsky/src/api/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/bsky/src/api/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -20,12 +20,26 @@ export default function (server: Server, ctx: AppContext) {
         }
       }
 
-      const suggestedRes = await ctx.dataplane.getSuggestedFeeds({
-        actorDid: viewer ?? undefined,
-        limit: params.limit,
-        cursor: params.cursor,
-      })
-      const uris = suggestedRes.uris
+      let uris: string[]
+      let cursor: string | undefined
+
+      const query = params.query?.trim() ?? ''
+      if (query) {
+        const res = await ctx.dataplane.searchFeedGenerators({
+          query,
+          limit: params.limit,
+        })
+        uris = res.uris
+      } else {
+        const res = await ctx.dataplane.getSuggestedFeeds({
+          actorDid: viewer ?? undefined,
+          limit: params.limit,
+          cursor: params.cursor,
+        })
+        uris = res.uris
+        cursor = parseString(res.cursor)
+      }
+
       const hydration = await ctx.hydrator.hydrateFeedGens(uris, viewer)
       const feedViews = mapDefined(uris, (uri) =>
         ctx.views.feedGenerator(uri, hydration),
@@ -35,7 +49,7 @@ export default function (server: Server, ctx: AppContext) {
         encoding: 'application/json',
         body: {
           feeds: feedViews,
-          cursor: parseString(suggestedRes.cursor),
+          cursor,
         },
       }
     },

diff --git a/packages/bsky/src/data-plane/server/routes/feed-gens.ts b/packages/bsky/src/data-plane/server/routes/feed-gens.ts
@@ -30,14 +30,37 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     }
   },
 
-  async getSuggestedFeeds() {
+  async getSuggestedFeeds(req) {
     const feeds = await db.db
       .selectFrom('suggested_feed')
       .orderBy('suggested_feed.order', 'asc')
+      .if(!!req.cursor, (q) => q.where('order', '>', parseInt(req.cursor, 10)))
+      .limit(req.limit || 50)
       .selectAll()
       .execute()
     return {
       uris: feeds.map((f) => f.uri),
+      cursor: feeds.at(-1)?.order.toString(),
+    }
+  },
+
+  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'),
+    )
+    builder = paginate(builder, { limit, keyset })
+    const feeds = await builder.execute()
+    return {
+      uris: feeds.map((f) => f.uri),
+      cursor: keyset.packFromResult(feeds),
     }
   },
 

diff --git a/packages/bsky/tests/__snapshots__/feed-generation.test.ts.snap b/packages/bsky/tests/__snapshots__/feed-generation.test.ts.snap
@@ -1597,6 +1597,7 @@ Object {
 
 exports[`feed generation getSuggestedFeeds returns list of suggested feed generators 1`] = `
 Object {
+  "cursor": "4",
   "feeds": Array [
     Object {
       "cid": "cids(0)",

diff --git a/packages/bsky/tests/feed-generation.test.ts b/packages/bsky/tests/feed-generation.test.ts
@@ -348,18 +348,26 @@ describe('feed generation', () => {
     })
   })
 
-  // @TODO support from dataplane
-  describe.skip('getPopularFeedGenerators', () => {
+  describe('getPopularFeedGenerators', () => {
     it('gets popular feed generators', async () => {
-      const resEven =
-        await agent.api.app.bsky.unspecced.getPopularFeedGenerators(
-          {},
-          { headers: await network.serviceHeaders(sc.dids.bob) },
-        )
-      expect(resEven.data.feeds.map((f) => f.likeCount)).toEqual([
-        2, 0, 0, 0, 0,
+      const res = await agent.api.app.bsky.unspecced.getPopularFeedGenerators(
+        {},
+        { headers: await network.serviceHeaders(sc.dids.bob) },
+      )
+      expect(res.data.feeds.map((f) => f.uri)).not.toContain(feedUriPrime) // taken-down
+      expect(res.data.feeds.map((f) => f.uri)).toEqual([
+        feedUriAll,
+        feedUriEven,
+        feedUriBadPagination,
       ])
-      expect(resEven.data.feeds.map((f) => f.uri)).not.toContain(feedUriPrime) // taken-down
+    })
+
+    it('searches feed generators', async () => {
+      const res = await agent.api.app.bsky.unspecced.getPopularFeedGenerators(
+        { query: 'all' },
+        { headers: await network.serviceHeaders(sc.dids.bob) },
+      )
+      expect(res.data.feeds.map((f) => f.uri)).toEqual([feedUriAll])
     })
 
     it('paginates', async () => {
@@ -368,7 +376,6 @@ describe('feed generation', () => {
           {},
           { headers: await network.serviceHeaders(sc.dids.bob) },
         )
-
       const resOne =
         await agent.api.app.bsky.unspecced.getPopularFeedGenerators(
           { limit: 2 },