@atproto/ozone 0.2.4 → 0.2.6

package/src/report/activity.ts

@@ -1,5 +1,8 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Database } from '../db/index.js'
+import { TimeIdKeyset, paginate } from '../db/pagination.js'
+import { ReportView } from '../lexicon/types/tools/ozone/report/defs.js'
+import { QueryParams as QueryActivitiesParams } from '../lexicon/types/tools/ozone/report/queryActivities.js'
 import { Member } from '../lexicon/types/tools/ozone/team/defs.js'
 import {
   AlreadyInTargetState,
@@ -190,6 +193,48 @@ export async function listReportActivities(
   return { activities, cursor: nextCursor }
 }
 
+export async function queryReportActivities(
+  db: Database,
+  params: QueryActivitiesParams,
+) {
+  const {
+    activityTypes,
+    createdAfter,
+    createdBefore,
+    sortDirection,
+    limit,
+    cursor,
+  } = params
+  const { ref } = db.db.dynamic
+
+  let builder = db.db.selectFrom('report_activity').selectAll()
+
+  if (activityTypes && activityTypes.length > 0) {
+    builder = builder.where('activityType', 'in', activityTypes)
+  }
+  if (createdAfter) {
+    builder = builder.where('createdAt', '>=', createdAfter)
+  }
+  if (createdBefore) {
+    builder = builder.where('createdAt', '<=', createdBefore)
+  }
+
+  const keyset = new TimeIdKeyset(
+    ref('report_activity.createdAt'),
+    ref('report_activity.id'),
+  )
+  const paginatedBuilder = paginate(builder, {
+    limit,
+    cursor,
+    keyset,
+    direction: sortDirection,
+    tryIndex: true,
+  })
+
+  const activities = await paginatedBuilder.execute()
+  return { activities, cursor: keyset.packFromResult(activities) }
+}
+
 function buildActivityObject(
   activityType: string,
   previousStatus: string | null,
@@ -215,6 +260,7 @@ export function formatActivityView(
     createdAt: string
   },
   memberViews?: Map<string, Member>,
+  reportViews?: Map<number, ReportView>,
 ) {
   return {
     id: activity.id,
@@ -229,6 +275,7 @@ export function formatActivityView(
     isAutomated: activity.isAutomated,
     createdBy: activity.createdBy,
     moderator: memberViews?.get(activity.createdBy),
+    report: reportViews?.get(activity.reportId),
     createdAt: activity.createdAt,
   }
 }

package/src/report/stats.ts

@@ -672,7 +672,7 @@ export class ReportStatsService {
         del =
           r.reportTypes !== null
             ? del.where(
-                sql`"reportTypes"::jsonb = ${jsonb(r.reportTypes)}::jsonb`,
+                sql<boolean>`"reportTypes"::jsonb = ${jsonb(r.reportTypes)}::jsonb`,
               )
             : del.where('reportTypes', 'is', null)
         await del.execute()
@@ -720,7 +720,7 @@ export class ReportStatsService {
     }
     if (group.reportTypes !== null) {
       qb = qb.where(
-        sql`"reportTypes"::jsonb = ${jsonb(group.reportTypes)}::jsonb`,
+        sql<boolean>`"reportTypes"::jsonb = ${jsonb(group.reportTypes)}::jsonb`,
       )
     } else {
       qb = qb.where('reportTypes', 'is', null)
@@ -786,7 +786,9 @@ export class ReportStatsService {
       qb = qb.where('moderatorDid', 'is', null)
     }
     if (reportTypes !== null) {
-      qb = qb.where(sql`"reportTypes"::jsonb = ${jsonb(reportTypes)}::jsonb`)
+      qb = qb.where(
+        sql<boolean>`"reportTypes"::jsonb = ${jsonb(reportTypes)}::jsonb`,
+      )
     } else {
       qb = qb.where('reportTypes', 'is', null)
     }

package/src/scheduled-action/service.ts

@@ -151,24 +151,25 @@ export class ScheduledActionService {
     }
 
     if (startTime) {
-      query = query.where((qb) => {
-        return qb
-          .orWhere('executeAt', '>=', startTime.toISOString())
-          .orWhere('executeAfter', '>=', startTime.toISOString())
-      })
+      query = query.where((eb) =>
+        eb.or([
+          eb('executeAt', '>=', startTime.toISOString()),
+          eb('executeAfter', '>=', startTime.toISOString()),
+        ]),
+      )
     }
 
     if (endTime) {
-      query = query.where((qb) => {
-        return qb
-          .orWhere('executeAt', '<=', endTime.toISOString())
-          .orWhere('executeUntil', '<=', endTime.toISOString())
-          .orWhere((sqb) => {
-            return sqb
-              .where('executeUntil', 'is', null)
-              .where('executeAfter', '<=', endTime.toISOString())
-          })
-      })
+      query = query.where((eb) =>
+        eb.or([
+          eb('executeAt', '<=', endTime.toISOString()),
+          eb('executeUntil', '<=', endTime.toISOString()),
+          eb.and([
+            eb('executeUntil', 'is', null),
+            eb('executeAfter', '<=', endTime.toISOString()),
+          ]),
+        ]),
+      )
     }
 
     if (cursor) {
@@ -235,11 +236,12 @@ export class ScheduledActionService {
       .selectFrom('scheduled_action')
       .selectAll()
       .where('status', '=', 'pending')
-      .where((qb) => {
-        return qb
-          .orWhere('executeAfter', '<=', now.toISOString())
-          .orWhere('executeAt', '<=', now.toISOString())
-      })
+      .where((eb) =>
+        eb.or([
+          eb('executeAfter', '<=', now.toISOString()),
+          eb('executeAt', '<=', now.toISOString()),
+        ]),
+      )
       .execute()
   }
 

package/src/set/service.ts

@@ -1,4 +1,4 @@
-import { Selectable } from 'kysely'
+import { NotNull, Selectable } from 'kysely'
 import { Database } from '../db/index.js'
 import { TimeIdKeyset, paginate } from '../db/pagination.js'
 import { SetDetail } from '../db/schema/ozone_set.js'
@@ -14,19 +14,22 @@ export class SetService {
   }
 
   buildQueryForSetWithSize() {
-    return this.db.db.selectFrom('set_detail as s').select([
-      's.id',
-      's.name',
-      's.description',
-      's.createdAt',
-      's.updatedAt',
-      (eb) =>
-        eb
-          .selectFrom('set_value')
-          .select((e) => e.fn.count<number>('setId').as('count'))
-          .whereRef('setId', '=', 's.id')
-          .as('setSize'),
-    ])
+    return this.db.db
+      .selectFrom('set_detail as s')
+      .select([
+        's.id',
+        's.name',
+        's.description',
+        's.createdAt',
+        's.updatedAt',
+        (eb) =>
+          eb
+            .selectFrom('set_value')
+            .select((e) => e.fn.count<number>('setId').as('count'))
+            .whereRef('setId', '=', 's.id')
+            .as('setSize'),
+      ])
+      .$narrowType<{ setSize: NotNull }>()
   }
 
   async query({

package/src/team/index.ts

@@ -67,10 +67,11 @@ export class TeamService {
       builder = builder.where('disabled', disabled ? 'is' : 'is not', true)
     }
     if (q) {
-      builder = builder.where((qb) =>
-        qb
-          .orWhere('handle', 'ilike', `%${q}%`)
-          .orWhere('displayName', 'ilike', `%${q}%`),
+      builder = builder.where((eb) =>
+        eb.or([
+          eb('handle', 'ilike', `%${q}%`),
+          eb('displayName', 'ilike', `%${q}%`),
+        ]),
       )
     }
 
@@ -245,7 +246,7 @@ export class TeamService {
         .selectFrom('member')
         .select(['did'])
         .limit(25)
-        .if(!!lastDid, (q) => q.where('did', '>', lastDid))
+        .$if(!!lastDid, (q) => q.where('did', '>', lastDid))
         .orderBy('did', 'asc')
         .execute()
 

package/src/verification/service.ts

@@ -197,8 +197,8 @@ export class VerificationService {
       .updateTable('firehose_cursor')
       .set({ cursor })
       .where('service', '=', 'verification')
-      .where((qb) =>
-        qb.where('cursor', '<', cursor).orWhere('cursor', 'is', null),
+      .where((eb) =>
+        eb.or([eb('cursor', '<', cursor), eb('cursor', 'is', null)]),
       )
       .returningAll()
       .executeTakeFirst()

package/tests/3p-labeler.test.ts

@@ -53,8 +53,8 @@ describe('labels from 3p labelers', () => {
   })
 
   afterAll(async () => {
-    await network.close()
-    await thirdPartyLabeler.close()
+    await network?.close()
+    await thirdPartyLabeler?.close()
   })
 
   const getPostSubject = () => ({

package/tests/_util.ts

@@ -1,6 +1,7 @@
-import { Server } from 'node:http'
+import { RequestListener, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
-import { type Express } from 'express'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
 import { CID } from 'multiformats/cid'
 import { lexToJson } from '@atproto/lexicon'
 import { AtUri } from '@atproto/syntax'
@@ -215,19 +216,11 @@ export const stripViewerFromThread = <T extends ThreadViewPost>(
   return thread
 }
 
-export async function startServer(app: Express) {
-  return new Promise<{
-    origin: string
-    server: Server
-    stop: () => Promise<void>
-  }>((resolve, reject) => {
+export async function startServer(listener: RequestListener) {
+  return new Promise<AsyncDisposable & { port: number }>((resolve, reject) => {
     const onListen = () => {
       const port = (server.address() as AddressInfo).port
-      resolve({
-        server,
-        origin: `http://localhost:${port}`,
-        stop: () => stopServer(server),
-      })
+      resolve({ port, [Symbol.asyncDispose]: () => terminator.terminate() })
       cleanup()
     }
     const onError = (err: Error) => {
@@ -239,21 +232,11 @@ export async function startServer(app: Express) {
       server.removeListener('error', onError)
     }
 
-    const server = app
+    const server = createServer(listener)
       .listen(0)
       .once('listening', onListen)
       .once('error', onError)
-  })
-}
 
-export async function stopServer(server: Server) {
-  return new Promise<void>((resolve, reject) => {
-    server.close((err) => {
-      if (err) {
-        reject(err)
-      } else {
-        resolve()
-      }
-    })
+    const terminator = httpTerminator.createHttpTerminator({ server })
   })
 }

package/tests/account-strikes.test.ts

@@ -65,7 +65,7 @@ describe('account-strikes', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('tracks strikes and exposes them through queryStatuses and queryEvents', async () => {

package/tests/ack-all-subjects-of-account.test.ts

@@ -93,7 +93,7 @@ describe('acknowledge all subjects of account', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('acknowledges all open/escalated review subjects with takedown.', async () => {

package/tests/age-assurance.test.ts

@@ -22,7 +22,7 @@ describe('age assurance events', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('handles age assurance events from user', async () => {

package/tests/blob-divert.test.ts

@@ -30,7 +30,7 @@ describe('blob divert', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const mockReportServiceResponse = (succeeds: boolean) => {

package/tests/communication-templates.test.ts

@@ -18,7 +18,7 @@ describe('communication-templates', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const templateOne = {

package/tests/content-tagger.test.ts

@@ -23,7 +23,7 @@ describe('moderation subject content tagging', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getStatus = async (subject: string) => {

package/tests/db.test.ts

@@ -15,7 +15,7 @@ describe('db', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('handles client errors without crashing.', async () => {

package/tests/expiring-label.test.ts

@@ -25,7 +25,7 @@ describe('expiring label', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const emitExpiringLabel = async (did: string) =>

package/tests/expiring-tags.test.ts

@@ -23,7 +23,7 @@ describe('expiring tags', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const emitTagEvent = (

package/tests/get-account-timeline.test.ts

@@ -62,7 +62,7 @@ describe('account timeline', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('Returns entire timeline of events for a given account', async () => {

package/tests/get-config.test.ts

@@ -19,7 +19,7 @@ describe('get-config', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getConfig = async (role: 'moderator' | 'admin' | 'triage') => {

package/tests/get-lists.test.ts

@@ -35,8 +35,9 @@ describe('admin get lists', () => {
   })
 
   afterAll(async () => {
+    // @TODO figure out why we even need this in afterAll ?
     AtpAgent.configure({ appLabelers: [BSKY_LABELER_DID] })
-    await network.close()
+    await network?.close()
   })
 
   const getAlicesList = async () => {

package/tests/get-profiles.test.ts

@@ -26,7 +26,7 @@ describe('get profiles through ozone', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('allows getting profiles by dids for takendown accounts.', async () => {

package/tests/get-record.test.ts

@@ -38,7 +38,7 @@ describe('admin get record view', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {

package/tests/get-records.test.ts

@@ -37,7 +37,7 @@ describe('admin get records view', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {

package/tests/get-repo.test.ts

@@ -43,7 +43,7 @@ describe('admin get repo view', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {

package/tests/get-report.test.ts

@@ -29,7 +29,7 @@ describe('ozone-get-report', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('returns a single report by id', async () => {

package/tests/get-reporter-stats.test.ts

@@ -28,7 +28,7 @@ describe('reporter-stats', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getReporterStats = async (

package/tests/get-repos.test.ts

@@ -43,7 +43,7 @@ describe('admin get multiple repos', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {

package/tests/get-starter-pack.test.ts

@@ -30,7 +30,7 @@ describe('admin get starter pack view', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {

package/tests/get-subjects.test.ts

@@ -37,7 +37,7 @@ describe('admin get multiple subjects with all relevant details', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {

package/tests/mod-tool.test.ts

@@ -21,7 +21,7 @@ describe('mod-tool tracking', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('stores and returns modTool with name and meta metadata', async () => {

package/tests/moderation-appeals.test.ts

@@ -30,7 +30,7 @@ describe('moderation-appeals', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const assertSubjectStatus = async (

package/tests/moderation-events.test.ts

@@ -75,7 +75,7 @@ describe('moderation-events', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('query events', () => {

package/tests/moderation-status-tags.test.ts

@@ -24,7 +24,7 @@ describe('moderation-status-tags', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('manage tags on subject status', () => {

package/tests/moderation-statuses.test.ts

@@ -80,7 +80,7 @@ describe('moderation-statuses', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('query statuses', () => {

package/tests/moderation.test.ts

@@ -81,7 +81,7 @@ describe('moderation', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('reporting', () => {

package/tests/protected-tags.test.ts

@@ -30,7 +30,7 @@ describe('protected-tags', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('Settings management', () => {

package/tests/query-labels.test.ts

@@ -70,7 +70,7 @@ describe('ozone query labels', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('returns all labels', async () => {

package/tests/query-reports.test.ts

@@ -91,7 +91,7 @@ describe('query-reports', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('queryReports', () => {

package/tests/queue-assignment.test.ts

@@ -106,7 +106,7 @@ describe('queue', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('get active assignments', async () => {

package/tests/queue-router.test.ts

@@ -91,7 +91,7 @@ describe('queue-router', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('inserts report rows with no queue assignment when no queues are configured', async () => {

package/tests/queues.test.ts

@@ -109,7 +109,7 @@ describe('ozone-queues', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('createQueue', () => {

package/tests/record-and-account-events.test.ts

@@ -32,7 +32,7 @@ describe('record and account events on moderation subjects', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getSubjectStatus = async (