@atproto/ozone 0.2.3 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -22,7 +22,7 @@
     "cors": "^2.8.5",
     "express": "^4.17.2",
     "http-terminator": "^3.2.0",
-    "kysely": "^0.22.0",
+    "kysely": "^0.29.2",
     "lande": "^1.0.10",
     "multiformats": "^13.0.0",
     "p-queue": "^8.0.0",
@@ -33,15 +33,15 @@
     "uint8arrays": "^5.0.0",
     "undici": "^6.14.1",
     "ws": "^8.12.0",
-    "@atproto/api": "^0.20.12",
-    "@atproto/common": "^0.6.1",
-    "@atproto/crypto": "^0.5.0",
-    "@atproto/identity": "^0.5.0",
-    "@atproto/lexicon": "^0.7.1",
-    "@atproto/syntax": "^0.6.1",
-    "@atproto/ws-client": "^0.1.0",
-    "@atproto/xrpc": "^0.8.0",
-    "@atproto/xrpc-server": "^0.11.1"
+    "@atproto/api": "^0.20.16",
+    "@atproto/common": "^0.6.3",
+    "@atproto/identity": "^0.5.1",
+    "@atproto/crypto": "^0.5.1",
+    "@atproto/lexicon": "^0.7.2",
+    "@atproto/syntax": "^0.6.2",
+    "@atproto/ws-client": "^0.1.1",
+    "@atproto/xrpc": "^0.8.1",
+    "@atproto/xrpc-server": "^0.11.2"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -49,13 +49,12 @@
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
     "@types/express-serve-static-core": "^4.17.36",
-    "@types/pg": "^8.6.6",
+    "@types/pg": "^8.15.5",
     "@types/qs": "^6.9.7",
     "jest": "^30.0.0",
     "ts-node": "^10.8.2",
-    "typescript": "^6.0.3",
-    "@atproto/lex-cli": "^0.10.0",
-    "@atproto/pds": "^0.5.2"
+    "@atproto/lex-cli": "^0.10.1",
+    "@atproto/pds": "^0.5.6"
   },
   "type": "module",
   "exports": {
@@ -67,7 +66,7 @@
   "scripts": {
     "codegen:lex": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",
     "prebuild": "[ -f ./src/lexicon/index.ts ] && [ -z \"$(find ../../lexicons -newer ./src/lexicon/index.ts -type f -print -quit)\" ] || pnpm run codegen:lex",
-    "build": "tsc --build tsconfig.build.json",
+    "build": "tsgo --build tsconfig.build.json",
     "start": "node --enable-source-maps dist/bin.js",
     "test": "NODE_OPTIONS=--experimental-vm-modules ../dev-infra/with-test-redis-and-db.sh jest",
     "test:log": "tail -50 test.log | pino-pretty",

package/src/api/label/queryLabels.ts

@@ -1,4 +1,3 @@
-import { sql } from 'kysely'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AppContext } from '../../context.js'
 import { Server } from '../../lexicon/index.js'
@@ -9,14 +8,13 @@ export default function (server: Server, ctx: AppContext) {
     let builder = ctx.db.db.selectFrom('label').selectAll().limit(limit)
     // if includes '*', then we don't need a where clause
     if (!uriPatterns.includes('*')) {
-      builder = builder.where((qb) => {
-        // starter where clause that is always false so that we can chain `orWhere`s
-        qb = qb.where(sql`1 = 0`)
-        for (const pattern of uriPatterns) {
-          // if no '*', then we're looking for an exact match
-          if (!pattern.includes('*')) {
-            qb = qb.orWhere('uri', '=', pattern)
-          } else {
+      builder = builder.where((eb) =>
+        eb.or(
+          uriPatterns.map((pattern) => {
+            // if no '*', then we're looking for an exact match
+            if (!pattern.includes('*')) {
+              return eb('uri', '=', pattern)
+            }
             if (pattern.indexOf('*') < pattern.length - 1) {
               throw new InvalidRequestError(`invalid pattern: ${pattern}`)
             }
@@ -24,11 +22,10 @@ export default function (server: Server, ctx: AppContext) {
               .slice(0, -1)
               .replaceAll('%', '') // sanitize search pattern
               .replaceAll('_', '\\_') // escape any underscores
-            qb = qb.orWhere('uri', 'like', `${searchPattern}%`)
-          }
-        }
-        return qb
-      })
+            return eb('uri', 'like', `${searchPattern}%`)
+          }),
+        ),
+      )
     }
     if (sources && sources.length > 0) {
       builder = builder.where('src', 'in', sources)

package/src/assignment/index.ts

@@ -129,8 +129,8 @@ export class AssignmentService {
 
     if (onlyActive) {
       const now = new Date().toISOString()
-      query = query.where((qb) =>
-        qb.where('endAt', 'is', null).orWhere('endAt', '>', now),
+      query = query.where((eb) =>
+        eb.or([eb('endAt', 'is', null), eb('endAt', '>', now)]),
       )
     }
 
@@ -198,8 +198,8 @@ export class AssignmentService {
 
     if (onlyActive) {
       const now = new Date().toISOString()
-      query = query.where((qb) =>
-        qb.where('endAt', '>', now).orWhere('endAt', 'is', null),
+      query = query.where((eb) =>
+        eb.or([eb('endAt', '>', now), eb('endAt', 'is', null)]),
       )
     }
 
@@ -266,10 +266,8 @@ export class AssignmentService {
         .where('did', '=', did)
         .where('queueId', '=', queueId)
         .where('reportId', 'is', null)
-        .where((qb) =>
-          qb
-            .where('endAt', 'is', null)
-            .orWhere('endAt', '>', now.toISOString()),
+        .where((eb) =>
+          eb.or([eb('endAt', 'is', null), eb('endAt', '>', now.toISOString())]),
         )
         .executeTakeFirst()
       if (existing) {
@@ -338,8 +336,8 @@ export class AssignmentService {
       .where('did', '=', did)
       .where('queueId', '=', queueId)
       .where('reportId', 'is', null)
-      .where((qb) =>
-        qb.where('endAt', 'is', null).orWhere('endAt', '>', now.toISOString()),
+      .where((eb) =>
+        eb.or([eb('endAt', 'is', null), eb('endAt', '>', now.toISOString())]),
       )
       .executeTakeFirst()
 
@@ -447,10 +445,8 @@ export class AssignmentService {
         .selectFrom('moderator_assignment')
         .selectAll()
         .where('reportId', '=', reportId)
-        .where((qb) =>
-          qb
-            .where('endAt', '>', now.toISOString())
-            .orWhere('endAt', 'is', null),
+        .where((eb) =>
+          eb.or([eb('endAt', '>', now.toISOString()), eb('endAt', 'is', null)]),
         )
         .executeTakeFirst()
 
@@ -533,10 +529,11 @@ export class AssignmentService {
           .selectFrom('moderator_assignment')
           .selectAll()
           .where('reportId', '=', reportId)
-          .where((qb) =>
-            qb
-              .where('endAt', '>', now.toISOString())
-              .orWhere('endAt', 'is', null),
+          .where((eb) =>
+            eb.or([
+              eb('endAt', '>', now.toISOString()),
+              eb('endAt', 'is', null),
+            ]),
           )
           .executeTakeFirst()
 

package/src/db/index.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/db/migrations/20241220T144630860Z-stats-materialized-views.ts

@@ -4,7 +4,6 @@ import {
   REVIEWESCALATED,
   REVIEWOPEN,
 } from '../../lexicon/types/tools/ozone/moderation/defs.js'
-import { DatabaseSchemaType } from '../schema/index.js'
 import * as modEvent from '../schema/moderation_event.js'
 import * as modStatus from '../schema/moderation_subject_status.js'
 import * as recordEventsStats from '../schema/record_events_stats.js'
@@ -208,7 +207,7 @@ export async function up(db: Kysely<any>): Promise<void> {
     .execute()
 }
 
-export async function down(db: Kysely<DatabaseSchemaType>): Promise<void> {
+export async function down(db: Kysely<any>): Promise<void> {
   db.schema.dropView('account_record_status_stats').materialized().execute()
   db.schema.dropView('account_record_events_stats').materialized().execute()
   db.schema.dropView('record_events_stats').materialized().execute()

package/src/db/migrations/20250718T150931000Z-update-appeal-reason-stats.ts

@@ -1,7 +1,6 @@
 import { Kysely, sql } from 'kysely'
 import { OZONE_APPEAL_REASON_TYPE } from '../../api/util.js'
 import { REASONAPPEAL } from '../../lexicon/types/com/atproto/moderation/defs.js'
-import { DatabaseSchemaType } from '../schema/index.js'
 import * as modEvent from '../schema/moderation_event.js'
 import * as recordEventsStats from '../schema/record_events_stats.js'
 
@@ -161,7 +160,7 @@ export async function up(db: Kysely<any>): Promise<void> {
     .execute()
 }
 
-export async function down(db: Kysely<DatabaseSchemaType>): Promise<void> {
+export async function down(db: Kysely<any>): Promise<void> {
   // Drop the updated materialized views
   await db.schema
     .dropView('account_record_events_stats')

package/src/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/db/pagination.ts

@@ -1,4 +1,4 @@
-import { DynamicModule, sql } from 'kysely'
+import { DynamicModule, SqlBool, sql } from 'kysely'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AnyQb, DbRef } from './types.js'
 
@@ -66,16 +66,16 @@ export abstract class GenericKeyset<R, LR extends LabeledResult> {
     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}))`
       }
     }
   }
@@ -91,7 +91,7 @@ export class StatusKeyset extends GenericKeyset<StatusKeysetParam, Cursor> {
   labelResult(result: StatusKeysetParam): Cursor
   labelResult(result: StatusKeysetParam) {
     const primaryField = (
-      this.primary as ReturnType<DynamicModule['ref']>
+      this.primary as ReturnType<DynamicModule<unknown>['ref']>
     ).dynamicReference.includes('lastReviewedAt')
       ? 'lastReviewedAt'
       : 'lastReportedAt'
@@ -134,12 +134,12 @@ export class StatusKeyset extends GenericKeyset<StatusKeysetParam, Cursor> {
     if (labeled === undefined) return
     if (direction === 'asc') {
       return !labeled.primary
-        ? sql`(${this.primary} IS NULL AND ${this.secondary} > ${labeled.secondary})`
-        : sql`((${this.primary}, ${this.secondary}) > (${labeled.primary}, ${labeled.secondary}) OR (${this.primary} is null))`
+        ? sql<SqlBool>`(${this.primary} IS NULL AND ${this.secondary} > ${labeled.secondary})`
+        : sql<SqlBool>`((${this.primary}, ${this.secondary}) > (${labeled.primary}, ${labeled.secondary}) OR (${this.primary} is null))`
     } else {
       return !labeled.primary
-        ? sql`(${this.primary} IS NULL AND ${this.secondary} < ${labeled.secondary})`
-        : sql`((${this.primary}, ${this.secondary}) < (${labeled.primary}, ${labeled.secondary}) OR (${this.primary} is null))`
+        ? sql<SqlBool>`(${this.primary} IS NULL AND ${this.secondary} < ${labeled.secondary})`
+        : sql<SqlBool>`((${this.primary}, ${this.secondary}) < (${labeled.primary}, ${labeled.secondary}) OR (${this.primary} is null))`
     }
   }
 }
@@ -244,15 +244,15 @@ export class EndAtIdKeyset extends GenericKeyset<EndAtIdKeysetParam, Cursor> {
     const primaryRef = sql`COALESCE(${this.primary}, ${PERMANENT_ENDSAT})`
     if (tryIndex) {
       if (direction === 'asc') {
-        return sql`((${primaryRef}, ${this.secondary}) > (${labeled.primary}, ${labeled.secondary}))`
+        return sql<SqlBool>`((${primaryRef}, ${this.secondary}) > (${labeled.primary}, ${labeled.secondary}))`
       } else {
-        return sql`((${primaryRef}, ${this.secondary}) < (${labeled.primary}, ${labeled.secondary}))`
+        return sql<SqlBool>`((${primaryRef}, ${this.secondary}) < (${labeled.primary}, ${labeled.secondary}))`
       }
     } else {
       if (direction === 'asc') {
-        return sql`((${primaryRef} > ${labeled.primary}) or (${primaryRef} = ${labeled.primary} and ${this.secondary} > ${labeled.secondary}))`
+        return sql<SqlBool>`((${primaryRef} > ${labeled.primary}) or (${primaryRef} = ${labeled.primary} and ${this.secondary} > ${labeled.secondary}))`
       } else {
-        return sql`((${primaryRef} < ${labeled.primary}) or (${primaryRef} = ${labeled.primary} and ${this.secondary} < ${labeled.secondary}))`
+        return sql<SqlBool>`((${primaryRef} < ${labeled.primary}) or (${primaryRef} = ${labeled.primary} and ${this.secondary} < ${labeled.secondary}))`
       }
     }
   }
@@ -314,11 +314,11 @@ export const paginate = <
   } = opts
   const keysetSql = keyset.getSql(keyset.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(keyset.primary, direction).orderBy(keyset.secondary, direction),
     )
-    .if(!!nullsLast, (q) =>
+    .$if(!!nullsLast, (q) =>
       q
         .orderBy(
           direction === 'asc'
@@ -331,5 +331,5 @@ export const paginate = <
             : sql`${keyset.secondary} desc nulls last`,
         ),
     )
-    .if(!!keysetSql, (qb) => (keysetSql ? qb.where(keysetSql) : qb)) as QB
+    .$if(!!keysetSql, (qb) => (keysetSql ? qb.where(keysetSql) : qb)) as QB
 }

package/src/db/types.ts

@@ -3,7 +3,9 @@ import { DynamicModule, RawBuilder, SelectQueryBuilder, sql } from 'kysely'
 import pg from 'pg'
 type PgPool = pg.Pool
 
-export type DbRef = RawBuilder | ReturnType<DynamicModule['ref']>
+export type DbRef =
+  | RawBuilder<unknown>
+  | ReturnType<DynamicModule<unknown>['ref']>
 
 export type AnyQb = SelectQueryBuilder<any, any, any>
 

package/src/mod-service/index.ts

@@ -1,4 +1,4 @@
-import { Insertable, RawBuilder, sql } from 'kysely'
+import { Expression, Insertable, sql } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtpAgent, ToolsOzoneModerationDefs } from '@atproto/api'
 import { addHoursToDate, chunkArray } from '@atproto/common'
@@ -267,21 +267,24 @@ export class ModerationService {
 
     // If subjectType is set to 'account' let that take priority and ignore collections filter
     if (collections.length && subjectType !== 'account') {
-      builder = builder.where('subjectUri', 'is not', null).where((qb) => {
-        collections.forEach((collection) => {
-          qb = qb.orWhere('subjectUri', 'like', `%/${collection}/%`)
-        })
-        return qb
-      })
+      builder = builder
+        .where('subjectUri', 'is not', null)
+        .where((eb) =>
+          eb.or(
+            collections.map((collection) =>
+              eb('subjectUri', 'like', `%/${collection}/%`),
+            ),
+          ),
+        )
     }
 
     if (types.length) {
-      builder = builder.where((qb) => {
+      builder = builder.where((eb) => {
         if (types.length === 1) {
-          return qb.where('action', '=', types[0])
+          return eb('action', '=', types[0])
         }
 
-        return qb.where('action', 'in', types)
+        return eb('action', 'in', types)
       })
     }
     if (createdBy) {
@@ -298,12 +301,11 @@ export class ModerationService {
       // the input may end in || in which case, there may be item in the array which is just '' and we want to ignore those
       const keywords = comment.split('||').filter((keyword) => !!keyword.trim())
       if (keywords.length > 1) {
-        builder = builder.where((qb) => {
-          keywords.forEach((keyword) => {
-            qb = qb.orWhere('comment', 'ilike', `%${keyword}%`)
-          })
-          return qb
-        })
+        builder = builder.where((eb) =>
+          eb.or(
+            keywords.map((keyword) => eb('comment', 'ilike', `%${keyword}%`)),
+          ),
+        )
       } else if (keywords.length === 1) {
         builder = builder.where('comment', 'ilike', `%${keywords[0]}%`)
       }
@@ -324,23 +326,26 @@ export class ModerationService {
       })
     }
     if (addedTags.length) {
-      builder = builder.where(sql`${ref('addedTags')} @> ${jsonb(addedTags)}`)
+      builder = builder.where(
+        sql<boolean>`${ref('addedTags')} @> ${jsonb(addedTags)}`,
+      )
     }
     if (removedTags.length) {
       builder = builder.where(
-        sql`${ref('removedTags')} @> ${jsonb(removedTags)}`,
+        sql<boolean>`${ref('removedTags')} @> ${jsonb(removedTags)}`,
       )
     }
     if (reportTypes?.length) {
       builder = builder.where(sql`meta->>'reportType'`, 'in', reportTypes)
     }
     if (policies?.length) {
-      builder = builder.where((qb) => {
-        policies.forEach((policy) => {
-          qb = qb.orWhere(sql`meta->>'policies'`, 'ilike', `%${policy}%`)
-        })
-        return qb
-      })
+      builder = builder.where((eb) =>
+        eb.or(
+          policies.map((policy) =>
+            eb(sql`meta->>'policies'`, 'ilike', `%${policy}%`),
+          ),
+        ),
+      )
     }
     if (modTool?.length) {
       builder = builder
@@ -446,8 +451,8 @@ export class ModerationService {
     const subjectsToBeResolved = await this.db.db
       .selectFrom('moderation_subject_status')
       .where('did', '=', did)
-      .where((qb) =>
-        qb.where('recordPath', '!=', '').orWhere('convoId', '!=', ''),
+      .where((eb) =>
+        eb.or([eb('recordPath', '!=', ''), eb('convoId', '!=', '')]),
       )
       .where('reviewState', 'in', [REVIEWESCALATED, REVIEWOPEN])
       .selectAll()
@@ -816,8 +821,9 @@ export class ModerationService {
     const now = new Date().toISOString()
     const subjects = await this.db.db
       .selectFrom('moderation_subject_status')
-      .where('suspendUntil', '<', now)
-      .orWhere('muteUntil', '<', now)
+      .where((eb) =>
+        eb.or([eb('suspendUntil', '<', now), eb('muteUntil', '<', now)]),
+      )
       .selectAll()
       .execute()
 
@@ -1206,16 +1212,17 @@ export class ModerationService {
     if (subjectType !== 'account' && collections?.length) {
       builder = builder
         .where('moderation_subject_status.recordPath', '!=', '')
-        .where((qb) => {
-          for (const collection of collections) {
-            qb = qb.orWhere(
-              'moderation_subject_status.recordPath',
-              'like',
-              `${collection}/%`,
-            )
-          }
-          return qb
-        })
+        .where((eb) =>
+          eb.or(
+            collections.map((collection) =>
+              eb(
+                'moderation_subject_status.recordPath',
+                'like',
+                `${collection}/%`,
+              ),
+            ),
+          ),
+        )
     }
 
     if (ignoreSubjects?.length) {
@@ -1325,30 +1332,32 @@ export class ModerationService {
     }
 
     if (!includeMuted) {
-      builder = builder.where((qb) =>
-        qb
-          .where(
+      builder = builder.where((eb) =>
+        eb.or([
+          eb(
             'moderation_subject_status.muteUntil',
             '<',
             new Date().toISOString(),
-          )
-          .orWhere('moderation_subject_status.muteUntil', 'is', null),
+          ),
+          eb('moderation_subject_status.muteUntil', 'is', null),
+        ]),
       )
     }
 
     if (onlyMuted) {
-      builder = builder.where((qb) =>
-        qb
-          .where(
+      builder = builder.where((eb) =>
+        eb.or([
+          eb(
             'moderation_subject_status.muteUntil',
             '>',
             new Date().toISOString(),
-          )
-          .orWhere(
+          ),
+          eb(
             'moderation_subject_status.muteReportingUntil',
             '>',
             new Date().toISOString(),
           ),
+        ]),
       )
     }
 
@@ -1356,30 +1365,28 @@ export class ModerationService {
     const conditions = parseTags(tags)
     if (conditions?.length) {
       // [["tag1"], ["tag2", "tag3"], ["tag4"]] => (tags ? 'tag1') OR (tags ? 'tag2' AND tags ? 'tag3') OR (tags ? 'tag4')
-      builder = builder.where((qb) => {
-        for (const subTags of conditions) {
-          // OR between every conditions items (subTags)
-          qb = qb.orWhere((qb) => {
+      builder = builder.where((eb) =>
+        // OR between every conditions items (subTags)
+        eb.or(
+          conditions.map((subTags) =>
             // AND between every subTags items (subTag)
-            for (const subTag of subTags) {
-              qb = qb.where(
-                sql`${ref('moderation_subject_status.tags')} ? ${subTag}`,
-              )
-            }
-            return qb
-          })
-        }
-        return qb
-      })
+            eb.and(
+              subTags.map(
+                (subTag) =>
+                  sql<boolean>`${ref('moderation_subject_status.tags')} ? ${subTag}`,
+              ),
+            ),
+          ),
+        ),
+      )
     }
 
     if (excludeTags?.length) {
-      builder = builder.where((qb) =>
-        qb
-          .where(
-            sql`NOT(${ref('moderation_subject_status.tags')} ?| array[${sql.join(excludeTags)}]::TEXT[])`,
-          )
-          .orWhere('tags', 'is', null),
+      builder = builder.where((eb) =>
+        eb.or([
+          sql<boolean>`NOT(${ref('moderation_subject_status.tags')} ?| array[${sql.join(excludeTags)}]::TEXT[])`,
+          eb('tags', 'is', null),
+        ]),
       )
     }
 
@@ -1620,15 +1627,15 @@ export class ModerationService {
     const countAll = () => {
       return sql<number>`COUNT(*)`
     }
-    const countAllDistinctBy = (ref: RawBuilder) => {
+    const countAllDistinctBy = (ref: Expression<unknown>) => {
       return sql<number>`COUNT(DISTINCT ${ref})`
     }
-    const countTakedownsDistinctBy = (ref: RawBuilder) => {
+    const countTakedownsDistinctBy = (ref: Expression<unknown>) => {
       return sql<number>`COUNT(DISTINCT ${ref}) FILTER (
         WHERE actions."action" = 'tools.ozone.moderation.defs#modEventTakedown'
       )`
     }
-    const countLabelsDistinctBy = (ref: RawBuilder) => {
+    const countLabelsDistinctBy = (ref: Expression<unknown>) => {
       return sql<number>`COUNT(DISTINCT ${ref}) FILTER (
         WHERE actions."action" = 'tools.ozone.moderation.defs#modEventLabel'
       )`

package/src/mod-service/report.ts

@@ -74,7 +74,9 @@ export async function queryReports(
     const collectionConditions = params.collections.map(
       (collection) => sql`r."recordPath" LIKE ${`${collection}/%`}`,
     )
-    builder = builder.where(sql`(${sql.join(collectionConditions, sql` OR `)})`)
+    builder = builder.where(
+      sql<boolean>`(${sql.join(collectionConditions, sql` OR `)})`,
+    )
   }
 
   if (params.reportTypes?.length) {
@@ -112,12 +114,12 @@ export async function queryReports(
     const [sortValue, id] = params.cursor.split('::')
     const sortCol = sortField === 'updatedAt' ? 'r.updatedAt' : 'r.createdAt'
     if (sortDirection === 'desc') {
-      builder = builder.where(sql`(
+      builder = builder.where(sql<boolean>`(
         ${sql.ref(sortCol)} < ${sortValue}
         OR (${sql.ref(sortCol)} = ${sortValue} AND r.id < ${Number(id)})
       )`)
     } else {
-      builder = builder.where(sql`(
+      builder = builder.where(sql<boolean>`(
         ${sql.ref(sortCol)} > ${sortValue}
         OR (${sql.ref(sortCol)} = ${sortValue} AND r.id > ${Number(id)})
       )`)