use keyset for ordering

bluesky-social · Sep 13, 2023 · ace87e1 · ace87e1
1 parent 58016e1
commit ace87e1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/bsky/src/api/app/bsky/feed/getActorLikes.ts b/packages/bsky/src/api/app/bsky/feed/getActorLikes.ts
@@ -1,3 +1,4 @@
+import { sql } from 'kysely'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getActorLikes'
@@ -70,10 +71,12 @@ const skeleton = async (
   let feedItemsQb = feedService
     .selectFeedItemQb()
     .innerJoin('like', 'like.subject', 'feed_item.uri')
+    .select(
+      sql`coalesce("like"."indexedAt", "feed_item"."sortAt")`.as('sortAt'),
+    )
     .where('like.creator', '=', actorDid)
-    .orderBy('like.indexedAt', 'desc')
 
-  const keyset = new FeedKeyset(ref('feed_item.sortAt'), ref('feed_item.cid'))
+  const keyset = new FeedKeyset(ref('like.sortAt'), ref('feed_item.cid'))
 
   feedItemsQb = paginate(feedItemsQb, {
     limit,

diff --git a/packages/pds/src/app-view/api/app/bsky/feed/getActorLikes.ts b/packages/pds/src/app-view/api/app/bsky/feed/getActorLikes.ts
@@ -1,3 +1,4 @@
+import { sql } from 'kysely'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../../lexicon'
 import { FeedKeyset } from '../util/feed'
@@ -54,8 +55,10 @@ export default function (server: Server, ctx: AppContext) {
       let feedItemsQb = feedService
         .selectFeedItemQb()
         .innerJoin('like', 'like.subject', 'feed_item.uri')
+        .select(
+          sql`coalesce("like"."indexedAt", "feed_item"."sortAt")`.as('sortAt'),
+        )
         .where('like.creator', '=', actorDid)
-        .orderBy('like.indexedAt', 'desc')
 
       // for access-based auth, enforce blocks
       if (requester) {
@@ -64,10 +67,7 @@ export default function (server: Server, ctx: AppContext) {
         )
       }
 
-      const keyset = new FeedKeyset(
-        ref('feed_item.sortAt'),
-        ref('feed_item.cid'),
-      )
+      const keyset = new FeedKeyset(ref('like.sortAt'), ref('feed_item.cid'))
 
       feedItemsQb = paginate(feedItemsQb, {
         limit,