@atproto/bsky 0.0.242 → 0.0.244

package/src/data-plane/server/db/migrations/20230627T212437895Z-optional-handle.ts

@@ -3,15 +3,13 @@ import { Kysely } from 'kysely'
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema
     .alterTable('actor')
-    .alterColumn('handle')
-    .dropNotNull()
+    .alterColumn('handle', (col) => col.dropNotNull())
     .execute()
 }
 
 export async function down(db: Kysely<unknown>): Promise<void> {
   await db.schema
     .alterTable('actor')
-    .alterColumn('handle')
-    .setNotNull()
+    .alterColumn('handle', (col) => col.setNotNull())
     .execute()
 }

package/src/data-plane/server/db/migrations/provider.ts

@@ -1,4 +1,5 @@
-import { Kysely, Migration, MigrationProvider } from 'kysely'
+import { Kysely } from 'kysely'
+import { Migration, MigrationProvider } from 'kysely/migration'
 
 // Passes a context argument to migrations. We use this to thread the dialect into migrations
 

package/src/data-plane/server/db/pagination.ts

@@ -1,4 +1,4 @@
-import { sql } from 'kysely'
+import { SqlBool, sql } from 'kysely'
 import { ensureValidRecordKey } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AnyQb, DbRef } from './util.js'
@@ -67,16 +67,16 @@ export abstract class GenericKeyset<R, LR extends KeysetLabeledResult> {
     if (tryIndex) {
       // The tryIndex param will likely disappear and become the default implementation: here for now for gradual rollout query-by-query.
       if (direction === 'asc') {
-        return sql`((${this.primary}, ${this.secondary}) > (${labeled.primary}, ${labeled.secondary}))`
+        return sql<SqlBool>`((${this.primary}, ${this.secondary}) > (${labeled.primary}, ${labeled.secondary}))`
       } else {
-        return sql`((${this.primary}, ${this.secondary}) < (${labeled.primary}, ${labeled.secondary}))`
+        return sql<SqlBool>`((${this.primary}, ${this.secondary}) < (${labeled.primary}, ${labeled.secondary}))`
       }
     } else {
       // @NOTE this implementation can struggle to use an index on (primary, secondary) for pagination due to the "or" usage.
       if (direction === 'asc') {
-        return sql`((${this.primary} > ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} > ${labeled.secondary}))`
+        return sql<SqlBool>`((${this.primary} > ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} > ${labeled.secondary}))`
       } else {
-        return sql`((${this.primary} < ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} < ${labeled.secondary}))`
+        return sql<SqlBool>`((${this.primary} < ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} < ${labeled.secondary}))`
       }
     }
   }
@@ -94,11 +94,11 @@ export abstract class GenericKeyset<R, LR extends KeysetLabeledResult> {
     const { limit, cursor, direction = 'desc', tryIndex, nullsLast } = opts
     const keysetSql = this.getSql(this.unpack(cursor), direction, tryIndex)
     return qb
-      .if(!!limit, (q) => q.limit(limit as number))
-      .if(!nullsLast, (q) =>
+      .$if(!!limit, (q) => q.limit(limit as number))
+      .$if(!nullsLast, (q) =>
         q.orderBy(this.primary, direction).orderBy(this.secondary, direction),
       )
-      .if(!!nullsLast, (q) =>
+      .$if(!!nullsLast, (q) =>
         q
           .orderBy(
             direction === 'asc'
@@ -111,7 +111,7 @@ export abstract class GenericKeyset<R, LR extends KeysetLabeledResult> {
               : sql`${this.secondary} desc nulls last`,
           ),
       )
-      .if(!!keysetSql, (qb) => (keysetSql ? qb.where(keysetSql) : qb)) as QB
+      .$if(!!keysetSql, (qb) => (keysetSql ? qb.where(keysetSql) : qb)) as QB
   }
 }
 
@@ -231,9 +231,9 @@ export abstract class GenericSingleKey<R, LR extends SingleKeyLabeledResult> {
   getSql(labeled?: LR, direction?: 'asc' | 'desc') {
     if (labeled === undefined) return
     if (direction === 'asc') {
-      return sql`${this.primary} > ${labeled.primary}`
+      return sql<SqlBool>`${this.primary} > ${labeled.primary}`
     }
-    return sql`${this.primary} < ${labeled.primary}`
+    return sql<SqlBool>`${this.primary} < ${labeled.primary}`
   }
   paginate<QB extends AnyQb>(
     qb: QB,
@@ -248,16 +248,16 @@ export abstract class GenericSingleKey<R, LR extends SingleKeyLabeledResult> {
     const { limit, cursor, direction = 'desc', nullsLast } = opts
     const keySql = this.getSql(this.unpack(cursor), direction)
     return qb
-      .if(!!limit, (q) => q.limit(limit as number))
-      .if(!nullsLast, (q) => q.orderBy(this.primary, direction))
-      .if(!!nullsLast, (q) =>
+      .$if(!!limit, (q) => q.limit(limit as number))
+      .$if(!nullsLast, (q) => q.orderBy(this.primary, direction))
+      .$if(!!nullsLast, (q) =>
         q.orderBy(
           direction === 'asc'
             ? sql`${this.primary} asc nulls last`
             : sql`${this.primary} desc nulls last`,
         ),
       )
-      .if(!!keySql, (qb) => (keySql ? qb.where(keySql) : qb)) as QB
+      .$if(!!keySql, (qb) => (keySql ? qb.where(keySql) : qb)) as QB
   }
 }
 

package/src/data-plane/server/db/util.ts

@@ -4,6 +4,7 @@ import {
   ExpressionBuilder,
   RawBuilder,
   SelectQueryBuilder,
+  SqlBool,
   SqliteAdapter,
   SqliteIntrospector,
   SqliteQueryCompiler,
@@ -21,7 +22,7 @@ export const actorWhereClause = (actor: string) => {
 
 // Applies to actor or record table
 export const notSoftDeletedClause = (alias: DbRef) => {
-  return sql`${alias}."takedownRef" is null`
+  return sql<SqlBool>`${alias}."takedownRef" is null`
 }
 
 export const softDeleted = (actorOrRecord: { takedownRef: string | null }) => {
@@ -35,11 +36,11 @@ export const excluded = <T>(db: DatabaseSchema, col) => {
   return sql<T>`${db.dynamic.ref(`excluded.${col}`)}`
 }
 
-export const noMatch = sql`1 = 0`
+export const noMatch = sql<SqlBool>`1 = 0`
 
 // Can be useful for large where-in clauses, to get the db to use a hash lookup on the list
-export const valuesList = (vals: unknown[]) => {
-  return sql`(values (${sql.join(vals, sql`), (`)}))`
+export const valuesList = <T = unknown>(vals: unknown[]) => {
+  return sql<T>`(values (${sql.join(vals, sql`), (`)}))`
 }
 
 export const dummyDialect = {
@@ -57,7 +58,9 @@ export const dummyDialect = {
   },
 }
 
-export type DbRef = RawBuilder | ReturnType<DynamicModule['ref']>
+export type DbRef =
+  | RawBuilder<unknown>
+  | ReturnType<DynamicModule<unknown>['ref']>
 
 export type Subquery = ExpressionBuilder<DatabaseSchemaType, any>
 

package/src/data-plane/server/index.ts

@@ -2,6 +2,8 @@ import events from 'node:events'
 import http from 'node:http'
 import { expressConnectMiddleware } from '@connectrpc/connect-express'
 import express from 'express'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
 import { IdResolver, MemoryCache } from '@atproto/identity'
 import { Database, DatabaseSchema } from './db/index.js'
 import createRoutes from './routes/index.js'
@@ -11,10 +13,14 @@ export type { DatabaseSchema }
 export { RepoSubscription } from './subscription.js'
 
 export class DataPlaneServer {
+  private terminator: httpTerminator.HttpTerminator
+
   constructor(
     public server: http.Server,
     public idResolver: IdResolver,
-  ) {}
+  ) {
+    this.terminator = httpTerminator.createHttpTerminator({ server })
+  }
 
   static async create(db: Database, port: number, plcUrl?: string) {
     const app = express()
@@ -28,14 +34,10 @@ export class DataPlaneServer {
   }
 
   async destroy() {
-    return new Promise<void>((resolve, reject) => {
-      this.server.close((err) => {
-        if (err) {
-          reject(err)
-        } else {
-          resolve()
-        }
-      })
-    })
+    await this.terminator.terminate()
+  }
+
+  async [Symbol.asyncDispose]() {
+    await this.destroy()
   }
 }

package/src/data-plane/server/indexing/index.ts

@@ -62,7 +62,7 @@ export class IndexingService {
   constructor(
     public db: Database,
     public idResolver: IdResolver,
-    public background: BackgroundQueue,
+    public background: BackgroundQueue<Database>,
   ) {
     this.records = {
       post: Post.makePlugin(this.db, this.background),

package/src/data-plane/server/indexing/plugins/block.ts

@@ -67,7 +67,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.graph.block.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/chat-declaration.ts

@@ -40,7 +40,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   const processor = new RecordProcessor(db, background, {
     schema: chat.bsky.actor.declaration.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/feed-generator.ts

@@ -63,7 +63,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.feed.generator.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/follow.ts

@@ -114,7 +114,10 @@ const updateAggregates = async (db: DatabaseSchema, follow: IndexedFollow) => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.graph.follow.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/germ-declaration.ts

@@ -40,7 +40,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: com.germnetwork.declaration.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/labeler.ts

@@ -57,7 +57,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.labeler.service.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/like.ts

@@ -133,7 +133,10 @@ const updateAggregates = async (db: DatabaseSchema, like: IndexedLike) => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.feed.like.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/list-block.ts

@@ -67,7 +67,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.graph.listblock.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/list-item.ts

@@ -75,7 +75,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.graph.listitem.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/list.ts

@@ -63,7 +63,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.graph.list.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/notif-declaration.ts

@@ -40,7 +40,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.notification.declaration.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/post-gate.ts

@@ -84,7 +84,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.feed.postgate.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/post.ts

@@ -505,10 +505,11 @@ const updateAggregates = async (db: DatabaseSchema, postIdx: IndexedPost) => {
           replyCount: db
             .selectFrom('post')
             .where('post.replyParent', '=', postIdx.post.replyParent)
-            .where((qb) =>
-              qb
-                .where('post.violatesThreadGate', 'is', null)
-                .orWhere('post.violatesThreadGate', '=', false),
+            .where((eb) =>
+              eb.or([
+                eb('post.violatesThreadGate', 'is', null),
+                eb('post.violatesThreadGate', '=', false),
+              ]),
             )
             .select(countAll.as('count')),
         })
@@ -534,7 +535,10 @@ const updateAggregates = async (db: DatabaseSchema, postIdx: IndexedPost) => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.feed.post.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/profile.ts

@@ -73,7 +73,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.actor.profile.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/repost.ts

@@ -158,7 +158,10 @@ const updateAggregates = async (db: DatabaseSchema, repost: IndexedRepost) => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.feed.repost.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/starter-pack.ts

@@ -57,7 +57,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.graph.starterpack.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/status.ts

@@ -40,7 +40,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.actor.status.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/thread-gate.ts

@@ -84,7 +84,10 @@ const notifsForDelete = () => {
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.feed.threadgate.main,
     insertFn,

package/src/data-plane/server/indexing/plugins/verification.ts

@@ -96,7 +96,10 @@ const notifsForDelete = (
 }
 
 export type PluginType = ReturnType<typeof makePlugin>
-export const makePlugin = (db: Database, background: BackgroundQueue) => {
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue<Database>,
+) => {
   return new RecordProcessor(db, background, {
     schema: app.bsky.graph.verification.main,
     insertFn,

package/src/data-plane/server/indexing/processor.ts

@@ -37,7 +37,7 @@ type Notif = Insertable<Notification>
 export class RecordProcessor<TSchema extends l.RecordSchema, TRow> {
   constructor(
     private appDb: Database,
-    private background: BackgroundQueue,
+    private background: BackgroundQueue<Database>,
     private options: RecordProcessorOptions<TSchema, TRow>,
   ) {}
 

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

@@ -8,15 +8,17 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const { actorDid, targetDid } = req
     const res = await db.db
       .selectFrom('actor_block')
-      .where((qb) =>
-        qb
-          .where('actor_block.creator', '=', actorDid)
-          .where('actor_block.subjectDid', '=', targetDid),
-      )
-      .orWhere((qb) =>
-        qb
-          .where('actor_block.creator', '=', targetDid)
-          .where('actor_block.subjectDid', '=', actorDid),
+      .where((eb) =>
+        eb.or([
+          eb.and([
+            eb('actor_block.creator', '=', actorDid),
+            eb('actor_block.subjectDid', '=', targetDid),
+          ]),
+          eb.and([
+            eb('actor_block.creator', '=', targetDid),
+            eb('actor_block.subjectDid', '=', actorDid),
+          ]),
+        ]),
       )
       .limit(1)
       .selectAll()
@@ -58,15 +60,17 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const res = await db.db
       .selectFrom('list_block')
       .innerJoin('list_item', 'list_item.listUri', 'list_block.subjectUri')
-      .where((qb) =>
-        qb
-          .where('list_block.creator', '=', actorDid)
-          .where('list_item.subjectDid', '=', targetDid),
-      )
-      .orWhere((qb) =>
-        qb
-          .where('list_block.creator', '=', targetDid)
-          .where('list_item.subjectDid', '=', actorDid),
+      .where((eb) =>
+        eb.or([
+          eb.and([
+            eb('list_block.creator', '=', actorDid),
+            eb('list_item.subjectDid', '=', targetDid),
+          ]),
+          eb.and([
+            eb('list_block.creator', '=', targetDid),
+            eb('list_item.subjectDid', '=', actorDid),
+          ]),
+        ]),
       )
       .limit(1)
       .selectAll('list_block')
@@ -96,12 +100,14 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const { ref } = db.db.dynamic
     let builder = db.db
       .selectFrom('list')
-      .whereExists(
-        db.db
-          .selectFrom('list_block')
-          .where('list_block.creator', '=', actorDid)
-          .whereRef('list_block.subjectUri', '=', ref('list.uri'))
-          .selectAll(),
+      .where(({ exists }) =>
+        exists(
+          db.db
+            .selectFrom('list_block')
+            .where('list_block.creator', '=', actorDid)
+            .whereRef('list_block.subjectUri', '=', ref('list.uri'))
+            .selectAll(),
+        ),
       )
       .selectAll('list')
 

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

@@ -34,7 +34,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const feeds = await db.db
       .selectFrom('suggested_feed')
       .orderBy('suggested_feed.order', 'asc')
-      .if(!!req.cursor, (q) => q.where('order', '>', parseInt(req.cursor, 10)))
+      .$if(!!req.cursor, (q) => q.where('order', '>', parseInt(req.cursor, 10)))
       .limit(req.limit || 50)
       .selectAll()
       .execute()
@@ -74,7 +74,7 @@ const searchFeedGeneratorsImpl = async (
   const trimmed = query.trim()
   let builder = db.db
     .selectFrom('feed_generator')
-    .if(!!trimmed, (q) => q.where('displayName', 'ilike', `%${trimmed}%`))
+    .$if(!!trimmed, (q) => q.where('displayName', 'ilike', `%${trimmed}%`))
     .selectAll()
   const keyset = new TimeCidKeyset(
     ref('feed_generator.createdAt'),

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

@@ -21,16 +21,16 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
         // only your own posts
         .where('type', '=', 'post')
         // only posts with media
-        .where((qb) =>
-          qb
-            .whereExists((iqb) =>
-              iqb
+        .where((eb) =>
+          eb.or([
+            eb.exists(
+              eb
                 .selectFrom('post_embed_image')
                 .select('post_embed_image.postUri')
                 .whereRef('post_embed_image.postUri', '=', 'feed_item.postUri'),
-            )
-            .orWhereExists((iqb) =>
-              iqb
+            ),
+            eb.exists(
+              eb
                 .selectFrom('post_embed_gallery_image')
                 .select('post_embed_gallery_image.postUri')
                 .whereRef(
@@ -39,28 +39,32 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
                   'feed_item.postUri',
                 ),
             ),
+          ]),
         )
     } else if (feedType === FeedType.POSTS_WITH_VIDEO) {
       builder = builder
         // only your own posts
         .where('type', '=', 'post')
         // only posts with video
-        .whereExists((qb) =>
-          qb
-            .selectFrom('post_embed_video')
-            .select('post_embed_video.postUri')
-            .whereRef('post_embed_video.postUri', '=', 'feed_item.postUri'),
+        .where(({ eb, exists }) =>
+          exists(
+            eb
+              .selectFrom('post_embed_video')
+              .select('post_embed_video.postUri')
+              .whereRef('post_embed_video.postUri', '=', 'feed_item.postUri'),
+          ),
         )
     } else if (feedType === FeedType.POSTS_NO_REPLIES) {
-      builder = builder.where((qb) =>
-        qb.where('post.replyParent', 'is', null).orWhere('type', '=', 'repost'),
+      builder = builder.where((eb) =>
+        eb.or([eb('post.replyParent', 'is', null), eb('type', '=', 'repost')]),
       )
     } else if (feedType === FeedType.POSTS_AND_AUTHOR_THREADS) {
-      builder = builder.where((qb) =>
-        qb
-          .where('type', '=', 'repost')
-          .orWhere('post.replyParent', 'is', null)
-          .orWhere('post.replyRoot', 'like', `at://${actorDid}/%`),
+      builder = builder.where((eb) =>
+        eb.or([
+          eb('type', '=', 'repost'),
+          eb('post.replyParent', 'is', null),
+          eb('post.replyRoot', 'like', `at://${actorDid}/%`),
+        ]),
       )
     }