@atproto/bsky 0.0.241 → 0.0.243

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

@@ -14,7 +14,7 @@ import {
   createPipeline,
 } from '../../../../pipeline.js'
 import { Views } from '../../../../views/index.js'
-import { resHeaders } from '../../../util.js'
+import { resHeaders, resolveSearchV2Override } from '../../../util.js'
 
 export default function (server: Server, ctx: AppContext) {
   const searchActors = createPipeline(
@@ -41,7 +41,14 @@ export default function (server: Server, ctx: AppContext) {
           }),
         ),
       })
-      const results = await searchActors({ ...params, hydrateCtx }, ctx)
+      const results = await searchActors(
+        {
+          ...params,
+          hydrateCtx,
+          isV2Override: resolveSearchV2Override(req, ctx.cfg),
+        },
+        ctx,
+      )
       return {
         encoding: 'application/json',
         body: results,
@@ -109,9 +116,10 @@ const skeletonV2 = async (
 }
 
 const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
-  const useV2 = input.params.hydrateCtx.features.checkGate(
-    input.params.hydrateCtx.features.Gate.SearchV2Enable,
-  )
+  const useV2 =
+    input.params.hydrateCtx.features.checkGate(
+      input.params.hydrateCtx.features.Gate.SearchV2Enable,
+    ) || input.params.isV2Override
   const skeletonFn = useV2 ? skeletonV2 : skeletonV1
   return skeletonFn(input)
 }
@@ -151,7 +159,10 @@ type Context = {
   searchClient?: Client
 }
 
-type Params = app.bsky.actor.searchActors.$Params & { hydrateCtx: HydrateCtx }
+type Params = app.bsky.actor.searchActors.$Params & {
+  hydrateCtx: HydrateCtx
+  isV2Override: boolean
+}
 
 type Skeleton = {
   dids: DidString[]

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

@@ -13,7 +13,7 @@ import {
   createPipeline,
 } from '../../../../pipeline.js'
 import { Views } from '../../../../views/index.js'
-import { resHeaders } from '../../../util.js'
+import { resHeaders, resolveSearchV2Override } from '../../../util.js'
 
 export default function (server: Server, ctx: AppContext) {
   const searchActorsTypeahead = createPipeline(
@@ -38,7 +38,11 @@ export default function (server: Server, ctx: AppContext) {
         ),
       })
       const results = await searchActorsTypeahead(
-        { ...params, hydrateCtx },
+        {
+          ...params,
+          hydrateCtx,
+          isV2Override: resolveSearchV2Override(req, ctx.cfg),
+        },
         ctx,
       )
       return {
@@ -101,9 +105,10 @@ const skeletonV2 = async (
 }
 
 const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
-  const useV2 = input.params.hydrateCtx.features.checkGate(
-    input.params.hydrateCtx.features.Gate.SearchV2Enable,
-  )
+  const useV2 =
+    input.params.hydrateCtx.features.checkGate(
+      input.params.hydrateCtx.features.Gate.SearchV2Enable,
+    ) || input.params.isV2Override
   const skeletonFn = useV2 ? skeletonV2 : skeletonV1
   return skeletonFn(input)
 }
@@ -149,6 +154,7 @@ type Context = {
 
 type Params = app.bsky.actor.searchActorsTypeahead.$Params & {
   hydrateCtx: HydrateCtx
+  isV2Override: boolean
 }
 
 type Skeleton = {

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

@@ -22,7 +22,7 @@ import {
 import { SearchSortOrder } from '../../../../proto/bsky_pb.js'
 import { uriToDid as creatorFromUri } from '../../../../util/uris.js'
 import { Views } from '../../../../views/index.js'
-import { resHeaders } from '../../../util.js'
+import { resHeaders, resolveSearchV2Override } from '../../../util.js'
 
 export default function (server: Server, ctx: AppContext) {
   const searchPosts = createPipeline(
@@ -50,7 +50,12 @@ export default function (server: Server, ctx: AppContext) {
         ),
       })
       const results = await searchPosts(
-        { ...params, hydrateCtx, isModService },
+        {
+          ...params,
+          hydrateCtx,
+          isModService,
+          isV2Override: resolveSearchV2Override(req, ctx.cfg),
+        },
         ctx,
       )
       return {
@@ -146,9 +151,10 @@ const skeletonV2 = async (
 }
 
 const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
-  const useV2 = input.params.hydrateCtx.features.checkGate(
-    input.params.hydrateCtx.features.Gate.SearchV2Enable,
-  )
+  const useV2 =
+    input.params.hydrateCtx.features.checkGate(
+      input.params.hydrateCtx.features.Gate.SearchV2Enable,
+    ) || input.params.isV2Override
   const skeletonFn = useV2 ? skeletonV2 : skeletonV1
   return skeletonFn(input)
 }
@@ -237,6 +243,7 @@ type Context = {
 type Params = app.bsky.feed.searchPosts.$Params & {
   hydrateCtx: HydrateCtx
   isModService: boolean
+  isV2Override: boolean
 }
 
 type Skeleton = {

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

@@ -15,7 +15,7 @@ import {
 } from '../../../../pipeline.js'
 import { uriToDid as creatorFromUri } from '../../../../util/uris.js'
 import { Views } from '../../../../views/index.js'
-import { resHeaders } from '../../../util.js'
+import { resHeaders, resolveSearchV2Override } from '../../../util.js'
 
 export default function (server: Server, ctx: AppContext) {
   const searchStarterPacks = createPipeline(
@@ -42,7 +42,14 @@ export default function (server: Server, ctx: AppContext) {
           }),
         ),
       })
-      const results = await searchStarterPacks({ ...params, hydrateCtx }, ctx)
+      const results = await searchStarterPacks(
+        {
+          ...params,
+          hydrateCtx,
+          isV2Override: resolveSearchV2Override(req, ctx.cfg),
+        },
+        ctx,
+      )
       return {
         encoding: 'application/json',
         body: results,
@@ -107,9 +114,10 @@ const skeletonV2 = async (
 }
 
 const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
-  const useV2 = input.params.hydrateCtx.features.checkGate(
-    input.params.hydrateCtx.features.Gate.SearchV2Enable,
-  )
+  const useV2 =
+    input.params.hydrateCtx.features.checkGate(
+      input.params.hydrateCtx.features.Gate.SearchV2Enable,
+    ) || input.params.isV2Override
   const skeletonFn = useV2 ? skeletonV2 : skeletonV1
   return skeletonFn(input)
 }
@@ -152,6 +160,7 @@ type Context = {
 
 type Params = app.bsky.graph.searchStarterPacks.$Params & {
   hydrateCtx: HydrateCtx
+  isV2Override: boolean
 }
 
 type Skeleton = {

package/src/api/app/bsky/unspecced/getPopularFeedGenerators.ts

@@ -4,7 +4,11 @@ import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context.js'
 import { parseString } from '../../../../hydration/util.js'
 import { app } from '../../../../lexicons/index.js'
-import { clearlyBadCursor, resHeaders } from '../../../util.js'
+import {
+  clearlyBadCursor,
+  resHeaders,
+  resolveSearchV2Override,
+} from '../../../util.js'
 
 // THIS IS A TEMPORARY UNSPECCED ROUTE
 // @TODO currently mirrors getSuggestedFeeds and ignores the "query" param.
@@ -37,9 +41,12 @@ export default function (server: Server, ctx: AppContext) {
       let uris: AtUriString[]
       let cursor: string | undefined
 
+      const isV2Override = resolveSearchV2Override(req, ctx.cfg)
+
       const query = params.query?.trim() ?? ''
       if (query) {
-        const useV2 = features.checkGate(features.Gate.SearchV2Enable)
+        const useV2 =
+          features.checkGate(features.Gate.SearchV2Enable) || isV2Override
         if (useV2) {
           const res = await ctx.dataplane.searchFeedGeneratorsV2({
             params: {

package/src/api/util.ts

@@ -1,3 +1,5 @@
+import { IncomingHttpHeaders } from 'node:http'
+import { ServerConfig } from '../config.js'
 import { ParsedLabelers, formatLabelerHeader } from '../util.js'
 
 export const BSKY_USER_AGENT = 'BskyAppView'
@@ -26,3 +28,18 @@ export const clearlyBadCursor = (cursor?: string) => {
   // hallmark of v1 cursor, highly unlikely in v2 cursors based on time or rkeys
   return !!cursor?.includes('::')
 }
+
+// @TEMPORARY backdoor to force search v2 via a request header, gated by the
+// BSKY_SEARCH_V2_OVERRIDE_HEADER env var. Remove once search v2 is fully rolled out.
+const SEARCH_V2_OVERRIDE_HEADER = 'x-bsky-search-v2-override'
+
+export const resolveSearchV2Override = (
+  req: { headers: IncomingHttpHeaders },
+  cfg: ServerConfig,
+): boolean => {
+  const expected = cfg.searchV2OverrideHeader
+  if (!expected) return false
+  const value = req.headers[SEARCH_V2_OVERRIDE_HEADER]
+  const header = Array.isArray(value) ? value.join(',') : value
+  return header === expected
+}

package/src/config.ts

@@ -110,6 +110,7 @@ export interface ServerConfigValues {
   kws?: KwsConfig
   debugFieldAllowedDids: Set<string>
   draftsLimit: number
+  searchV2OverrideHeader?: string
 }
 
 export class ServerConfig {
@@ -331,6 +332,9 @@ export class ServerConfig {
       ? parseInt(process.env.BSKY_DRAFTS_LIMIT || '', 10)
       : 500
 
+    const searchV2OverrideHeader =
+      process.env.BSKY_SEARCH_V2_OVERRIDE_HEADER || undefined
+
     return new ServerConfig({
       version,
       debugMode,
@@ -399,6 +403,7 @@ export class ServerConfig {
       kws,
       debugFieldAllowedDids,
       draftsLimit,
+      searchV2OverrideHeader,
       ...noUndefinedVals(overrides ?? {}),
     })
   }
@@ -675,6 +680,10 @@ export class ServerConfig {
   get draftsLimit() {
     return this.cfg.draftsLimit
   }
+
+  get searchV2OverrideHeader() {
+    return this.cfg.searchV2OverrideHeader
+  }
 }
 
 function envList(str: string | undefined): string[] {

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

@@ -3,7 +3,6 @@ import EventEmitter from 'node:events'
 import {
   Kysely,
   KyselyPlugin,
-  Migrator,
   PluginTransformQueryArgs,
   PluginTransformResultArgs,
   PostgresDialect,
@@ -11,6 +10,7 @@ import {
   RootOperationNode,
   UnknownRow,
 } from 'kysely'
+import { Migrator } from 'kysely/migration'
 // eslint-disable-next-line import/default
 import pg from 'pg'
 // eslint-disable-next-line import/no-named-as-default-member

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/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')),
         })

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}/%`),
+        ]),
       )
     }
 

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

@@ -19,8 +19,8 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectFrom('label')
       .where('uri', 'in', subjects)
       .where('src', 'in', issuers)
-      .where((qb) =>
-        qb.where('exp', 'is', null).orWhere(sql`exp::timestamp > now()`),
+      .where((eb) =>
+        eb.or([eb('exp', 'is', null), sql<boolean>`exp::timestamp > now()`]),
       )
       .selectAll()
       .execute()

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

@@ -88,12 +88,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_mute')
-          .where('list_mute.mutedByDid', '=', actorDid)
-          .whereRef('list_mute.listUri', '=', ref('list.uri'))
-          .selectAll(),
+      .where(({ exists }) =>
+        exists(
+          db.db
+            .selectFrom('list_mute')
+            .where('list_mute.mutedByDid', '=', actorDid)
+            .whereRef('list_mute.listUri', '=', ref('list.uri'))
+            .selectAll(),
+        ),
       )
       .selectAll('list')