@atproto/bsky 0.0.10 → 0.0.12

package/dist/lexicon/types/com/atproto/admin/getSubjectStatus.d.ts

@@ -0,0 +1,39 @@
+import express from 'express';
+import { HandlerAuth } from '@atproto/xrpc-server';
+import * as ComAtprotoAdminDefs from './defs';
+import * as ComAtprotoRepoStrongRef from '../repo/strongRef';
+export interface QueryParams {
+    did?: string;
+    uri?: string;
+    blob?: string;
+}
+export declare type InputSchema = undefined;
+export interface OutputSchema {
+    subject: ComAtprotoAdminDefs.RepoRef | ComAtprotoRepoStrongRef.Main | ComAtprotoAdminDefs.RepoBlobRef | {
+        $type: string;
+        [k: string]: unknown;
+    };
+    takedown?: ComAtprotoAdminDefs.StatusAttr;
+    [k: string]: unknown;
+}
+export declare type HandlerInput = undefined;
+export interface HandlerSuccess {
+    encoding: 'application/json';
+    body: OutputSchema;
+    headers?: {
+        [key: string]: string;
+    };
+}
+export interface HandlerError {
+    status: number;
+    message?: string;
+}
+export declare type HandlerOutput = HandlerError | HandlerSuccess;
+export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
+    auth: HA;
+    params: QueryParams;
+    input: HandlerInput;
+    req: express.Request;
+    res: express.Response;
+};
+export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/dist/lexicon/types/com/atproto/admin/searchRepos.d.ts

@@ -4,7 +4,6 @@ import * as ComAtprotoAdminDefs from './defs';
 export interface QueryParams {
     term?: string;
     q?: string;
-    invitedBy?: string;
     limit: number;
     cursor?: string;
 }

package/dist/lexicon/types/com/atproto/admin/updateSubjectStatus.d.ts

@@ -0,0 +1,46 @@
+import express from 'express';
+import { HandlerAuth } from '@atproto/xrpc-server';
+import * as ComAtprotoAdminDefs from './defs';
+import * as ComAtprotoRepoStrongRef from '../repo/strongRef';
+export interface QueryParams {
+}
+export interface InputSchema {
+    subject: ComAtprotoAdminDefs.RepoRef | ComAtprotoRepoStrongRef.Main | ComAtprotoAdminDefs.RepoBlobRef | {
+        $type: string;
+        [k: string]: unknown;
+    };
+    takedown?: ComAtprotoAdminDefs.StatusAttr;
+    [k: string]: unknown;
+}
+export interface OutputSchema {
+    subject: ComAtprotoAdminDefs.RepoRef | ComAtprotoRepoStrongRef.Main | ComAtprotoAdminDefs.RepoBlobRef | {
+        $type: string;
+        [k: string]: unknown;
+    };
+    takedown?: ComAtprotoAdminDefs.StatusAttr;
+    [k: string]: unknown;
+}
+export interface HandlerInput {
+    encoding: 'application/json';
+    body: InputSchema;
+}
+export interface HandlerSuccess {
+    encoding: 'application/json';
+    body: OutputSchema;
+    headers?: {
+        [key: string]: string;
+    };
+}
+export interface HandlerError {
+    status: number;
+    message?: string;
+}
+export declare type HandlerOutput = HandlerError | HandlerSuccess;
+export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
+    auth: HA;
+    params: QueryParams;
+    input: HandlerInput;
+    req: express.Request;
+    res: express.Response;
+};
+export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/dist/lexicon/types/com/atproto/server/confirmEmail.d.ts

@@ -0,0 +1,27 @@
+import express from 'express';
+import { HandlerAuth } from '@atproto/xrpc-server';
+export interface QueryParams {
+}
+export interface InputSchema {
+    email: string;
+    token: string;
+    [k: string]: unknown;
+}
+export interface HandlerInput {
+    encoding: 'application/json';
+    body: InputSchema;
+}
+export interface HandlerError {
+    status: number;
+    message?: string;
+    error?: 'AccountNotFound' | 'ExpiredToken' | 'InvalidToken' | 'InvalidEmail';
+}
+export declare type HandlerOutput = HandlerError | void;
+export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
+    auth: HA;
+    params: QueryParams;
+    input: HandlerInput;
+    req: express.Request;
+    res: express.Response;
+};
+export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/dist/lexicon/types/com/atproto/server/createAccount.d.ts

@@ -9,6 +9,7 @@ export interface InputSchema {
     inviteCode?: string;
     password: string;
     recoveryKey?: string;
+    plcOp?: Uint8Array;
     [k: string]: unknown;
 }
 export interface OutputSchema {
@@ -16,6 +17,7 @@ export interface OutputSchema {
     refreshJwt: string;
     handle: string;
     did: string;
+    didDoc?: {};
     [k: string]: unknown;
 }
 export interface HandlerInput {

package/dist/lexicon/types/com/atproto/server/createSession.d.ts

@@ -12,7 +12,9 @@ export interface OutputSchema {
     refreshJwt: string;
     handle: string;
     did: string;
+    didDoc?: {};
     email?: string;
+    emailConfirmed?: boolean;
     [k: string]: unknown;
 }
 export interface HandlerInput {

package/dist/lexicon/types/com/atproto/server/getSession.d.ts

@@ -7,6 +7,7 @@ export interface OutputSchema {
     handle: string;
     did: string;
     email?: string;
+    emailConfirmed?: boolean;
     [k: string]: unknown;
 }
 export declare type HandlerInput = undefined;

package/dist/lexicon/types/com/atproto/server/refreshSession.d.ts

@@ -8,6 +8,7 @@ export interface OutputSchema {
     refreshJwt: string;
     handle: string;
     did: string;
+    didDoc?: {};
     [k: string]: unknown;
 }
 export declare type HandlerInput = undefined;

package/dist/lexicon/types/com/atproto/server/requestEmailConfirmation.d.ts

@@ -0,0 +1,19 @@
+import express from 'express';
+import { HandlerAuth } from '@atproto/xrpc-server';
+export interface QueryParams {
+}
+export declare type InputSchema = undefined;
+export declare type HandlerInput = undefined;
+export interface HandlerError {
+    status: number;
+    message?: string;
+}
+export declare type HandlerOutput = HandlerError | void;
+export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
+    auth: HA;
+    params: QueryParams;
+    input: HandlerInput;
+    req: express.Request;
+    res: express.Response;
+};
+export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/dist/lexicon/types/com/atproto/server/requestEmailUpdate.d.ts

@@ -0,0 +1,30 @@
+import express from 'express';
+import { HandlerAuth } from '@atproto/xrpc-server';
+export interface QueryParams {
+}
+export declare type InputSchema = undefined;
+export interface OutputSchema {
+    tokenRequired: boolean;
+    [k: string]: unknown;
+}
+export declare type HandlerInput = undefined;
+export interface HandlerSuccess {
+    encoding: 'application/json';
+    body: OutputSchema;
+    headers?: {
+        [key: string]: string;
+    };
+}
+export interface HandlerError {
+    status: number;
+    message?: string;
+}
+export declare type HandlerOutput = HandlerError | HandlerSuccess;
+export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
+    auth: HA;
+    params: QueryParams;
+    input: HandlerInput;
+    req: express.Request;
+    res: express.Response;
+};
+export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/dist/lexicon/types/com/atproto/server/reserveSigningKey.d.ts

@@ -0,0 +1,30 @@
+import express from 'express';
+import { HandlerAuth } from '@atproto/xrpc-server';
+export interface QueryParams {
+}
+export declare type InputSchema = undefined;
+export interface OutputSchema {
+    signingKey: string;
+    [k: string]: unknown;
+}
+export declare type HandlerInput = undefined;
+export interface HandlerSuccess {
+    encoding: 'application/json';
+    body: OutputSchema;
+    headers?: {
+        [key: string]: string;
+    };
+}
+export interface HandlerError {
+    status: number;
+    message?: string;
+}
+export declare type HandlerOutput = HandlerError | HandlerSuccess;
+export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
+    auth: HA;
+    params: QueryParams;
+    input: HandlerInput;
+    req: express.Request;
+    res: express.Response;
+};
+export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/dist/lexicon/types/com/atproto/server/updateEmail.d.ts

@@ -0,0 +1,27 @@
+import express from 'express';
+import { HandlerAuth } from '@atproto/xrpc-server';
+export interface QueryParams {
+}
+export interface InputSchema {
+    email: string;
+    token?: string;
+    [k: string]: unknown;
+}
+export interface HandlerInput {
+    encoding: 'application/json';
+    body: InputSchema;
+}
+export interface HandlerError {
+    status: number;
+    message?: string;
+    error?: 'ExpiredToken' | 'InvalidToken' | 'TokenRequired';
+}
+export declare type HandlerOutput = HandlerError | void;
+export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
+    auth: HA;
+    params: QueryParams;
+    input: HandlerInput;
+    req: express.Request;
+    res: express.Response;
+};
+export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/dist/lexicon/types/com/atproto/sync/listRepos.d.ts

@@ -35,6 +35,7 @@ export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCt
 export interface Repo {
     did: string;
     head: string;
+    rev: string;
     [k: string]: unknown;
 }
 export declare function isRepo(v: unknown): v is Repo;

package/dist/services/actor/index.d.ts

@@ -15,10 +15,10 @@ export declare class ActorService {
     getActorDid(handleOrDid: string): Promise<string | null>;
     getActor(handleOrDid: string, includeSoftDeleted?: boolean): Promise<ActorResult | null>;
     getActors(handleOrDids: string[], includeSoftDeleted?: boolean): Promise<ActorResult[]>;
-    getSearchResults({ cursor, limit, term, includeSoftDeleted, }: {
+    getSearchResults({ cursor, limit, query, includeSoftDeleted, }: {
         cursor?: string;
         limit?: number;
-        term?: string;
+        query?: string;
         includeSoftDeleted?: boolean;
     }): Promise<{
         results: Actor[];

package/dist/services/actor/types.d.ts

@@ -15,6 +15,7 @@ export declare type ActorInfo = {
         mutedByList?: ListViewBasic;
         blockedBy?: boolean;
         blocking?: string;
+        blockingByList?: ListViewBasic;
         following?: string;
         followedBy?: string;
     };

package/dist/services/graph/index.d.ts

@@ -85,6 +85,7 @@ export declare type RelationshipPair = [didA: string, didB: string];
 export declare class BlockAndMuteState {
     hasIdx: Map<string, Set<string>>;
     blockIdx: Map<string, Map<string, string>>;
+    blockListIdx: Map<string, Map<string, string>>;
     muteIdx: Map<string, Set<string>>;
     muteListIdx: Map<string, Map<string, string>>;
     constructor(items?: BlockAndMuteInfo[]);
@@ -93,6 +94,7 @@ export declare class BlockAndMuteState {
     blocking(pair: RelationshipPair): string | null;
     blockedBy(pair: RelationshipPair): string | null;
     mute(pair: RelationshipPair): boolean;
+    blockList(pair: RelationshipPair): string | null;
     muteList(pair: RelationshipPair): string | null;
     has(pair: RelationshipPair): boolean;
 }

package/dist/services/moderation/index.d.ts

@@ -6,6 +6,8 @@ import { ModerationAction, ModerationReport } from '../../db/tables/moderation';
 import { ModerationViews } from './views';
 import { ImageUriBuilder } from '../../image/uri';
 import { ImageInvalidator } from '../../image/invalidator';
+import { RepoRef, RepoBlobRef } from '../../lexicon/types/com/atproto/admin/defs';
+import { Main as StrongRef } from '../../lexicon/types/com/atproto/repo/strongRef';
 export declare class ModerationService {
     db: PrimaryDatabase;
     imgUriBuilder: ImageUriBuilder;
@@ -74,20 +76,24 @@ export declare class ModerationService {
         durationInHours?: number;
     }): Promise<ModerationActionRow>;
     getActionsDueForReversal(): Promise<ModerationActionRow[]>;
-    revertAction({ id, createdBy, createdAt, reason, }: ReversibleModerationAction): Promise<ModerationActionRow>;
+    revertAction({ id, createdBy, createdAt, reason, }: ReversibleModerationAction): Promise<{
+        result: ModerationActionRow;
+        restored?: TakedownSubjects;
+    }>;
     logReverseAction(info: ReversibleModerationAction): Promise<ModerationActionRow>;
     takedownRepo(info: {
         takedownId: number;
         did: string;
-    }): Promise<void>;
+    }): Promise<TakedownSubjects>;
     reverseTakedownRepo(info: {
         did: string;
     }): Promise<void>;
     takedownRecord(info: {
         takedownId: number;
         uri: AtUri;
+        cid: CID;
         blobCids?: CID[];
-    }): Promise<void>;
+    }): Promise<TakedownSubjects>;
     reverseTakedownRecord(info: {
         uri: AtUri;
     }): Promise<void>;
@@ -110,6 +116,10 @@ export declare class ModerationService {
         createdAt?: Date;
     }): Promise<ModerationReportRow>;
 }
+export declare type TakedownSubjects = {
+    did: string;
+    subjects: (RepoRef | RepoBlobRef | StrongRef)[];
+};
 export declare type ModerationActionRow = Selectable<ModerationAction>;
 export declare type ReversibleModerationAction = Pick<ModerationActionRow, 'id' | 'createdBy' | 'reason'> & {
     createdAt?: Date;

package/dist/services/util/search.d.ts

@@ -1,7 +1,7 @@
 import { Database } from '../../db';
 import { GenericKeyset } from '../../db/pagination';
 export declare const getUserSearchQuery: (db: Database, opts: {
-    term: string;
+    query: string;
     limit: number;
     cursor?: string;
     includeSoftDeleted?: boolean;
@@ -10,13 +10,13 @@ export declare const getUserSearchQuery: (db: Database, opts: {
     distance: number;
 }, "results">>, "actor" | "results", {}>;
 export declare const getUserSearchQuerySimple: (db: Database, opts: {
-    term: string;
+    query: string;
     limit: number;
 }) => import("kysely").SelectQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../../db/database-schema").DatabaseSchemaType, import("kysely").AliasedQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../../db/database-schema").DatabaseSchemaType, import("kysely").AliasedQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../../db/database-schema").DatabaseSchemaType, "actor">, "actor", import("kysely").Selection<import("kysely/dist/cjs/parser/table-parser").From<import("../../db/database-schema").DatabaseSchemaType, "actor">, "actor", import("kysely").AliasedRawBuilder<number, "distance"> | import("kysely").AliasedRawBuilder<unknown, "did">>, "accounts_and_profiles">>, "accounts_and_profiles", {
     did: unknown;
     distance: number;
 }, "results">>, "actor" | "results", {}>;
-export declare const cleanTerm: (term: string) => string;
+export declare const cleanQuery: (query: string) => string;
 declare type Result = {
     distance: number;
     did: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -20,7 +20,6 @@
     "@isaacs/ttlcache": "^1.4.1",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
-    "dotenv": "^16.0.0",
     "express": "^4.17.2",
     "express-async-errors": "^3.1.1",
     "form-data": "^4.0.0",
@@ -36,14 +35,14 @@
     "sharp": "^0.31.2",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.6.19",
-    "@atproto/common": "^0.3.0",
+    "@atproto/api": "^0.6.21",
+    "@atproto/common": "^0.3.2",
     "@atproto/crypto": "^0.2.2",
-    "@atproto/syntax": "^0.1.1",
-    "@atproto/identity": "^0.2.0",
-    "@atproto/lexicon": "^0.2.1",
-    "@atproto/repo": "^0.3.1",
-    "@atproto/xrpc-server": "^0.3.1"
+    "@atproto/syntax": "^0.1.3",
+    "@atproto/identity": "^0.3.0",
+    "@atproto/lexicon": "^0.2.3",
+    "@atproto/repo": "^0.3.3",
+    "@atproto/xrpc-server": "^0.3.3"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -54,11 +53,11 @@
     "@types/qs": "^6.9.7",
     "@types/sharp": "^0.31.0",
     "axios": "^0.27.2",
-    "@atproto/api": "^0.6.19",
-    "@atproto/dev-env": "^0.2.10",
-    "@atproto/lex-cli": "^0.2.1",
-    "@atproto/pds": "^0.1.19",
-    "@atproto/xrpc": "^0.3.1"
+    "@atproto/api": "^0.6.21",
+    "@atproto/dev-env": "^0.2.12",
+    "@atproto/lex-cli": "^0.2.3",
+    "@atproto/pds": "^0.3.0",
+    "@atproto/xrpc": "^0.3.3"
   },
   "scripts": {
     "codegen": "lex gen-server ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/*",

package/src/api/app/bsky/actor/searchActors.ts

@@ -2,7 +2,7 @@ import { sql } from 'kysely'
 import AppContext from '../../../../context'
 import { Server } from '../../../../lexicon'
 import {
-  cleanTerm,
+  cleanQuery,
   getUserSearchQuery,
   SearchKeyset,
 } from '../../../../services/util/search'
@@ -11,37 +11,51 @@ export default function (server: Server, ctx: AppContext) {
   server.app.bsky.actor.searchActors({
     auth: ctx.authOptionalVerifier,
     handler: async ({ auth, params }) => {
-      let { cursor, limit, term: rawTerm, q: rawQ } = params
+      const { cursor, limit } = params
       const requester = auth.credentials.did
-
-      // prefer new 'q' query param over deprecated 'term'
-      if (rawQ) {
-        rawTerm = rawQ
-      }
-
-      const term = cleanTerm(rawTerm || '')
-
+      const rawQuery = params.q ?? params.term
+      const query = cleanQuery(rawQuery || '')
       const db = ctx.db.getReplica('search')
 
-      const results = term
-        ? await getUserSearchQuery(db, { term, limit, cursor })
-            .select('distance')
-            .selectAll('actor')
-            .execute()
-        : []
-      const keyset = new SearchKeyset(sql``, sql``)
+      let results: string[]
+      let resCursor: string | undefined
+      if (ctx.searchAgent) {
+        const res =
+          await ctx.searchAgent.api.app.bsky.unspecced.searchActorsSkeleton({
+            q: query,
+            cursor,
+            limit,
+          })
+        results = res.data.actors.map((a) => a.did)
+        resCursor = res.data.cursor
+      } else {
+        const res = query
+          ? await getUserSearchQuery(db, { query, limit, cursor })
+              .select('distance')
+              .selectAll('actor')
+              .execute()
+          : []
+        results = res.map((a) => a.did)
+        const keyset = new SearchKeyset(sql``, sql``)
+        resCursor = keyset.packFromResult(res)
+      }
 
       const actors = await ctx.services
         .actor(db)
-        .views.profilesList(results, requester)
-      const filtered = actors.filter(
-        (actor) => !actor.viewer?.blocking && !actor.viewer?.blockedBy,
-      )
+        .views.profiles(results, requester)
+
+      const SKIP = []
+      const filtered = results.flatMap((did) => {
+        const actor = actors[did]
+        if (!actor) return SKIP
+        if (actor.viewer?.blocking || actor.viewer?.blockedBy) return SKIP
+        return actor
+      })
 
       return {
         encoding: 'application/json',
         body: {
-          cursor: keyset.packFromResult(results),
+          cursor: resCursor,
           actors: filtered,
         },
       }

package/src/api/app/bsky/actor/searchActorsTypeahead.ts

@@ -1,7 +1,7 @@
 import AppContext from '../../../../context'
 import { Server } from '../../../../lexicon'
 import {
-  cleanTerm,
+  cleanQuery,
   getUserSearchQuerySimple,
 } from '../../../../services/util/search'
 
@@ -9,31 +9,38 @@ export default function (server: Server, ctx: AppContext) {
   server.app.bsky.actor.searchActorsTypeahead({
     auth: ctx.authOptionalVerifier,
     handler: async ({ params, auth }) => {
-      let { limit, term: rawTerm, q: rawQ } = params
+      const { limit } = params
       const requester = auth.credentials.did
-
-      // prefer new 'q' query param over deprecated 'term'
-      if (rawQ) {
-        rawTerm = rawQ
-      }
-
-      const term = cleanTerm(rawTerm || '')
-
+      const rawQuery = params.q ?? params.term
+      const query = cleanQuery(rawQuery || '')
       const db = ctx.db.getReplica('search')
 
-      const results = term
-        ? await getUserSearchQuerySimple(db, { term, limit })
-            .selectAll('actor')
-            .execute()
-        : []
+      let results: string[]
+      if (ctx.searchAgent) {
+        const res =
+          await ctx.searchAgent.api.app.bsky.unspecced.searchActorsSkeleton({
+            q: query,
+            typeahead: true,
+            limit,
+          })
+        results = res.data.actors.map((a) => a.did)
+      } else {
+        const res = query
+          ? await getUserSearchQuerySimple(db, { query, limit })
+              .selectAll('actor')
+              .execute()
+          : []
+        results = res.map((a) => a.did)
+      }
 
       const actors = await ctx.services
         .actor(db)
         .views.profilesBasic(results, requester, { omitLabels: true })
 
       const SKIP = []
-      const filtered = results.flatMap((res) => {
-        const actor = actors[res.did]
+      const filtered = results.flatMap((did) => {
+        const actor = actors[did]
+        if (!actor) return SKIP
         if (actor.viewer?.blocking || actor.viewer?.blockedBy) return SKIP
         return actor
       })

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

@@ -89,8 +89,8 @@ export const skeleton = async (
 
   if (filter === 'posts_with_media') {
     feedItemsQb = feedItemsQb
-      // and only your own posts/reposts
-      .where('post.creator', '=', actorDid)
+      // only your own posts
+      .where('type', '=', 'post')
       // only posts with media
       .whereExists((qb) =>
         qb

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

@@ -37,9 +37,9 @@ export default function (server: Server, ctx: AppContext) {
     presentation,
   )
   server.app.bsky.feed.getPostThread({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authOptionalAccessOrRoleVerifier,
     handler: async ({ params, auth, res }) => {
-      const viewer = auth.credentials.did
+      const viewer = 'did' in auth.credentials ? auth.credentials.did : null
       const db = ctx.db.getReplica('thread')
       const feedService = ctx.services.feed(db)
       const actorService = ctx.services.actor(db)

package/src/api/app/bsky/graph/getSuggestedFollowsByActor.ts

@@ -78,6 +78,7 @@ async function getSkeleton(
         .selectFrom('like')
         .where('creator', '=', params.actor)
         .select(sql`split_part(subject, '/', 3)`.as('subjectDid'))
+        .orderBy('sortAt', 'desc')
         .limit(1000) // limit to 1000
         .as('likes'),
     )