@atproto/ozone 0.2.4 → 0.2.5

package/dist/set/service.d.ts

@@ -7,7 +7,16 @@ export declare class SetService {
     db: Database;
     constructor(db: Database);
     static creator(): (db: Database) => SetService;
-    buildQueryForSetWithSize(): import("kysely").QueryBuilderWithSelection<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/schema/index.js").DatabaseSchemaType, "set_detail as s">, "s", {}, "s.createdAt" | "s.description" | "s.id" | "s.name" | "s.updatedAt" | ((eb: import("kysely").ExpressionBuilder<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/schema/index.js").DatabaseSchemaType, "set_detail as s">, "s">) => import("kysely").AliasedQueryBuilder<import("kysely/dist/esm/parser/table-parser.js").From<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/schema/index.js").DatabaseSchemaType, "set_detail as s">, "set_value">, import("kysely/dist/esm/parser/table-parser.js").FromTables<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/schema/index.js").DatabaseSchemaType, "set_detail as s">, "s", "set_value">, import("kysely").Selection<import("kysely/dist/esm/parser/table-parser.js").From<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/schema/index.js").DatabaseSchemaType, "set_detail as s">, "set_value">, import("kysely/dist/esm/parser/table-parser.js").FromTables<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/schema/index.js").DatabaseSchemaType, "set_detail as s">, "s", "set_value">, (e: import("kysely").ExpressionBuilder<import("kysely/dist/esm/parser/table-parser.js").From<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/schema/index.js").DatabaseSchemaType, "set_detail as s">, "set_value">, import("kysely/dist/esm/parser/table-parser.js").FromTables<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/schema/index.js").DatabaseSchemaType, "set_detail as s">, "s", "set_value">>) => import("kysely").AliasedAggregateFunctionBuilder<import("kysely/dist/esm/parser/table-parser.js").From<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/schema/index.js").DatabaseSchemaType, "set_detail as s">, "set_value">, import("kysely/dist/esm/parser/table-parser.js").FromTables<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/schema/index.js").DatabaseSchemaType, "set_detail as s">, "s", "set_value">, number, "count">>, "setSize">)>;
+    buildQueryForSetWithSize(): import("kysely").SelectQueryBuilder<import("../db/schema/moderation_event.js").PartialDB & import("../db/schema/moderation_subject_status.js").PartialDB & import("../db/schema/report.js").PartialDB & import("../db/schema/report_activity.js").PartialDB & import("../db/schema/report_queue.js").PartialDB & import("../db/schema/label.js").PartialDB & import("../db/schema/signing_key.js").PartialDB & import("../db/schema/repo_push_event.js").PartialDB & import("../db/schema/record_push_event.js").PartialDB & import("../db/schema/blob_push_event.js").PartialDB & import("../db/schema/communication_template.js").PartialDB & import("../db/schema/ozone_set.js").PartialDB & import("../db/schema/member.js").PartialDB & import("../db/schema/setting.js").PartialDB & import("../db/schema/account_events_stats.js").PartialDB & import("../db/schema/record_events_stats.js").PartialDB & import("../db/schema/account_record_events_stats.js").PartialDB & import("../db/schema/account_record_status_stats.js").PartialDB & import("../db/schema/account_strike.js").PartialDB & import("../db/schema/verification.js").PartialDB & import("../db/schema/firehose_cursor.js").PartialDB & import("../db/schema/job_cursor.js").PartialDB & import("../db/schema/safelink.js").PartialDB & import("../db/schema/scheduled-action.js").PartialDB & import("../db/schema/moderator_assignment.js").PartialDB & import("../db/schema/report_stat.js").PartialDB & import("../db/schema/expiring_tag.js").PartialDB & {
+        s: SetDetail;
+    }, "s", {
+        createdAt: Date;
+        description: string | null;
+        id: number;
+        name: string;
+        setSize: number;
+        updatedAt: Date;
+    }>;
     query({ limit, cursor, namePrefix, sortBy, sortDirection, }: {
         limit: number;
         cursor?: string;

package/dist/set/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/set/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,0CAA0C,CAAA;AAElE,MAAM,MAAM,iBAAiB,GAAG,CAAC,EAAE,EAAE,QAAQ,KAAK,UAAU,CAAA;AAE5D,qBAAa,UAAU;IACF,EAAE,EAAE,QAAQ;IAA/B,YAAmB,EAAE,EAAE,QAAQ,EAAI;IAEnC,MAAM,CAAC,OAAO,SACA,QAAQ,gBACrB;IAED,wBAAwB,oqEAcvB;IAEK,KAAK,CAAC,EACV,KAAK,EACL,MAAM,EACN,UAAU,EACV,MAAM,EACN,aAAa,GACd,EAAE;QACD,KAAK,EAAE,MAAM,CAAA;QACb,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,WAAW,CAAA;QAC1C,aAAa,EAAE,KAAK,GAAG,MAAM,CAAA;KAC9B,GAAG,OAAO,CAAC;QACV,IAAI,EAAE,UAAU,CAAC,SAAS,GAAG;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC,EAAE,CAAA;QACnD,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,CAAC,CAgCD;IAEK,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,CAOxE;IAEK,iBAAiB,CACrB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,UAAU,CAAC,SAAS,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,SAAS,CAAC,CAIlE;IAEK,gBAAgB,CAAC,EACrB,IAAI,EACJ,KAAK,EACL,MAAM,GACP,EAAE;QACD,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;QACb,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GAAG,OAAO,CACP;QACE,GAAG,EAAE,UAAU,CAAC,SAAS,GAAG;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QAChD,MAAM,EAAE,MAAM,EAAE,CAAA;QAChB,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GACD,SAAS,CACZ,CAyBA;IACK,MAAM,CAAC,EACX,IAAI,EACJ,WAAW,GACZ,EAAE,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBzD;IAEK,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB9D;IAEK,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBjE;IAEK,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK5C;IAED,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,SAAS,CAAC,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAQ9D;CACF"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/set/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,UAAU,EAAE,MAAM,QAAQ,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,0CAA0C,CAAA;AAElE,MAAM,MAAM,iBAAiB,GAAG,CAAC,EAAE,EAAE,QAAQ,KAAK,UAAU,CAAA;AAE5D,qBAAa,UAAU;IACF,EAAE,EAAE,QAAQ;IAA/B,YAAmB,EAAE,EAAE,QAAQ,EAAI;IAEnC,MAAM,CAAC,OAAO,SACA,QAAQ,gBACrB;IAED,wBAAwB;;;;;;;;;OAiBvB;IAEK,KAAK,CAAC,EACV,KAAK,EACL,MAAM,EACN,UAAU,EACV,MAAM,EACN,aAAa,GACd,EAAE;QACD,KAAK,EAAE,MAAM,CAAA;QACb,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,WAAW,CAAA;QAC1C,aAAa,EAAE,KAAK,GAAG,MAAM,CAAA;KAC9B,GAAG,OAAO,CAAC;QACV,IAAI,EAAE,UAAU,CAAC,SAAS,GAAG;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC,EAAE,CAAA;QACnD,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,CAAC,CAgCD;IAEK,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,CAOxE;IAEK,iBAAiB,CACrB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,UAAU,CAAC,SAAS,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,SAAS,CAAC,CAIlE;IAEK,gBAAgB,CAAC,EACrB,IAAI,EACJ,KAAK,EACL,MAAM,GACP,EAAE;QACD,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;QACb,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GAAG,OAAO,CACP;QACE,GAAG,EAAE,UAAU,CAAC,SAAS,GAAG;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QAChD,MAAM,EAAE,MAAM,EAAE,CAAA;QAChB,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GACD,SAAS,CACZ,CAyBA;IACK,MAAM,CAAC,EACX,IAAI,EACJ,WAAW,GACZ,EAAE,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBzD;IAEK,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB9D;IAEK,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBjE;IAEK,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK5C;IAED,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,SAAS,CAAC,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAQ9D;CACF"}

package/dist/set/service.js

@@ -7,7 +7,9 @@ export class SetService {
         return (db) => new SetService(db);
     }
     buildQueryForSetWithSize() {
-        return this.db.db.selectFrom('set_detail as s').select([
+        return this.db.db
+            .selectFrom('set_detail as s')
+            .select([
             's.id',
             's.name',
             's.description',
@@ -18,7 +20,8 @@ export class SetService {
                 .select((e) => e.fn.count('setId').as('count'))
                 .whereRef('setId', '=', 's.id')
                 .as('setSize'),
-        ]);
+        ])
+            .$narrowType();
     }
     async query({ limit, cursor, namePrefix, sortBy, sortDirection, }) {
         let qb = this.buildQueryForSetWithSize().limit(limit);

package/dist/set/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/set/service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Selectable } from 'kysely'\nimport { Database } from '../db/index.js'\nimport { TimeIdKeyset, paginate } from '../db/pagination.js'\nimport { SetDetail } from '../db/schema/ozone_set.js'\nimport { SetView } from '../lexicon/types/tools/ozone/set/defs.js'\n\nexport type SetServiceCreator = (db: Database) => SetService\n\nexport class SetService {\n  constructor(public db: Database) {}\n\n  static creator() {\n    return (db: Database) => new SetService(db)\n  }\n\n  buildQueryForSetWithSize() {\n    return this.db.db.selectFrom('set_detail as s').select([\n      's.id',\n      's.name',\n      's.description',\n      's.createdAt',\n      's.updatedAt',\n      (eb) =>\n        eb\n          .selectFrom('set_value')\n          .select((e) => e.fn.count<number>('setId').as('count'))\n          .whereRef('setId', '=', 's.id')\n          .as('setSize'),\n    ])\n  }\n\n  async query({\n    limit,\n    cursor,\n    namePrefix,\n    sortBy,\n    sortDirection,\n  }: {\n    limit: number\n    cursor?: string\n    namePrefix?: string\n    sortBy: 'name' | 'createdAt' | 'updatedAt'\n    sortDirection: 'asc' | 'desc'\n  }): Promise<{\n    sets: Selectable<SetDetail & { setSize: number }>[]\n    cursor?: string\n  }> {\n    let qb = this.buildQueryForSetWithSize().limit(limit)\n\n    if (namePrefix) {\n      qb = qb.where('s.name', 'like', `${namePrefix}%`)\n    }\n\n    if (cursor) {\n      if (sortBy === 'name') {\n        qb = qb.where('s.name', sortDirection === 'asc' ? '>' : '<', cursor)\n      } else {\n        qb = qb.where(\n          `s.${sortBy}`,\n          sortDirection === 'asc' ? '>' : '<',\n          new Date(cursor),\n        )\n      }\n    }\n\n    qb = qb.orderBy(`s.${sortBy}`, sortDirection)\n\n    const sets = await qb.execute()\n    const lastItem = sets.at(-1)\n\n    return {\n      sets,\n      cursor: lastItem\n        ? sortBy === 'name'\n          ? lastItem?.name\n          : lastItem?.[sortBy].toISOString()\n        : undefined,\n    }\n  }\n\n  async getByName(name: string): Promise<Selectable<SetDetail> | undefined> {\n    const query = this.db.db\n      .selectFrom('set_detail')\n      .selectAll()\n      .where('name', '=', name)\n\n    return await query.executeTakeFirst()\n  }\n\n  async getByNameWithSize(\n    name: string,\n  ): Promise<Selectable<SetDetail & { setSize: number }> | undefined> {\n    return await this.buildQueryForSetWithSize()\n      .where('s.name', '=', name)\n      .executeTakeFirst()\n  }\n\n  async getSetWithValues({\n    name,\n    limit,\n    cursor,\n  }: {\n    name: string\n    limit: number\n    cursor?: string\n  }): Promise<\n    | {\n        set: Selectable<SetDetail & { setSize: number }>\n        values: string[]\n        cursor?: string\n      }\n    | undefined\n  > {\n    const set = await this.getByNameWithSize(name)\n    if (!set) return undefined\n\n    const { ref } = this.db.db.dynamic\n    const qb = this.db.db\n      .selectFrom('set_value')\n      .selectAll()\n      .where('setId', '=', set.id)\n\n    const keyset = new TimeIdKeyset(ref(`createdAt`), ref('id'))\n    const paginatedBuilder = paginate(qb, {\n      limit,\n      cursor,\n      keyset,\n      direction: 'asc',\n    })\n\n    const result = await paginatedBuilder.execute()\n\n    return {\n      set,\n      values: result.map((v) => v.value),\n      cursor: keyset.packFromResult(result),\n    }\n  }\n  async upsert({\n    name,\n    description,\n  }: Pick<SetDetail, 'name' | 'description'>): Promise<void> {\n    await this.db.db\n      .insertInto('set_detail')\n      .values({\n        name,\n        description,\n        updatedAt: new Date(),\n      })\n      .onConflict((oc) => {\n        // if description is provided as a string, even an empty one, update it\n        // otherwise, just update the updatedAt timestamp\n        return oc.column('name').doUpdateSet(\n          typeof description === 'string'\n            ? {\n                description,\n                updatedAt: new Date(),\n              }\n            : { updatedAt: new Date() },\n        )\n      })\n      .execute()\n  }\n\n  async addValues(setId: number, values: string[]): Promise<void> {\n    await this.db.transaction(async (txn) => {\n      const now = new Date()\n      const query = txn.db\n        .insertInto('set_value')\n        .values(\n          values.map((value) => ({\n            setId,\n            value,\n            createdAt: now,\n          })),\n        )\n        .onConflict((oc) => oc.columns(['setId', 'value']).doNothing())\n\n      await query.execute()\n\n      // Update the set's updatedAt timestamp\n      await txn.db\n        .updateTable('set_detail')\n        .set({ updatedAt: now })\n        .where('id', '=', setId)\n        .execute()\n    })\n  }\n\n  async removeValues(setId: number, values: string[]): Promise<void> {\n    if (values.length < 1) {\n      return\n    }\n    await this.db.transaction(async (txn) => {\n      const query = txn.db\n        .deleteFrom('set_value')\n        .where('setId', '=', setId)\n        .where('value', 'in', values)\n\n      await query.execute()\n\n      // Update the set's updatedAt timestamp\n      await txn.db\n        .updateTable('set_detail')\n        .set({ updatedAt: new Date() })\n        .where('id', '=', setId)\n        .execute()\n    })\n  }\n\n  async removeSet(setId: number): Promise<void> {\n    await this.db.transaction(async (txn) => {\n      await txn.db.deleteFrom('set_value').where('setId', '=', setId).execute()\n      await txn.db.deleteFrom('set_detail').where('id', '=', setId).execute()\n    })\n  }\n\n  view(set: Selectable<SetDetail> & { setSize: number }): SetView {\n    return {\n      name: set.name,\n      description: set.description || undefined,\n      setSize: set.setSize,\n      createdAt: set.createdAt.toISOString(),\n      updatedAt: set.updatedAt.toISOString(),\n    }\n  }\n}\n"]}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/set/service.ts"],"names":[],"mappings":"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","sourcesContent":["import { NotNull, Selectable } from 'kysely'\nimport { Database } from '../db/index.js'\nimport { TimeIdKeyset, paginate } from '../db/pagination.js'\nimport { SetDetail } from '../db/schema/ozone_set.js'\nimport { SetView } from '../lexicon/types/tools/ozone/set/defs.js'\n\nexport type SetServiceCreator = (db: Database) => SetService\n\nexport class SetService {\n  constructor(public db: Database) {}\n\n  static creator() {\n    return (db: Database) => new SetService(db)\n  }\n\n  buildQueryForSetWithSize() {\n    return this.db.db\n      .selectFrom('set_detail as s')\n      .select([\n        's.id',\n        's.name',\n        's.description',\n        's.createdAt',\n        's.updatedAt',\n        (eb) =>\n          eb\n            .selectFrom('set_value')\n            .select((e) => e.fn.count<number>('setId').as('count'))\n            .whereRef('setId', '=', 's.id')\n            .as('setSize'),\n      ])\n      .$narrowType<{ setSize: NotNull }>()\n  }\n\n  async query({\n    limit,\n    cursor,\n    namePrefix,\n    sortBy,\n    sortDirection,\n  }: {\n    limit: number\n    cursor?: string\n    namePrefix?: string\n    sortBy: 'name' | 'createdAt' | 'updatedAt'\n    sortDirection: 'asc' | 'desc'\n  }): Promise<{\n    sets: Selectable<SetDetail & { setSize: number }>[]\n    cursor?: string\n  }> {\n    let qb = this.buildQueryForSetWithSize().limit(limit)\n\n    if (namePrefix) {\n      qb = qb.where('s.name', 'like', `${namePrefix}%`)\n    }\n\n    if (cursor) {\n      if (sortBy === 'name') {\n        qb = qb.where('s.name', sortDirection === 'asc' ? '>' : '<', cursor)\n      } else {\n        qb = qb.where(\n          `s.${sortBy}`,\n          sortDirection === 'asc' ? '>' : '<',\n          new Date(cursor),\n        )\n      }\n    }\n\n    qb = qb.orderBy(`s.${sortBy}`, sortDirection)\n\n    const sets = await qb.execute()\n    const lastItem = sets.at(-1)\n\n    return {\n      sets,\n      cursor: lastItem\n        ? sortBy === 'name'\n          ? lastItem?.name\n          : lastItem?.[sortBy].toISOString()\n        : undefined,\n    }\n  }\n\n  async getByName(name: string): Promise<Selectable<SetDetail> | undefined> {\n    const query = this.db.db\n      .selectFrom('set_detail')\n      .selectAll()\n      .where('name', '=', name)\n\n    return await query.executeTakeFirst()\n  }\n\n  async getByNameWithSize(\n    name: string,\n  ): Promise<Selectable<SetDetail & { setSize: number }> | undefined> {\n    return await this.buildQueryForSetWithSize()\n      .where('s.name', '=', name)\n      .executeTakeFirst()\n  }\n\n  async getSetWithValues({\n    name,\n    limit,\n    cursor,\n  }: {\n    name: string\n    limit: number\n    cursor?: string\n  }): Promise<\n    | {\n        set: Selectable<SetDetail & { setSize: number }>\n        values: string[]\n        cursor?: string\n      }\n    | undefined\n  > {\n    const set = await this.getByNameWithSize(name)\n    if (!set) return undefined\n\n    const { ref } = this.db.db.dynamic\n    const qb = this.db.db\n      .selectFrom('set_value')\n      .selectAll()\n      .where('setId', '=', set.id)\n\n    const keyset = new TimeIdKeyset(ref(`createdAt`), ref('id'))\n    const paginatedBuilder = paginate(qb, {\n      limit,\n      cursor,\n      keyset,\n      direction: 'asc',\n    })\n\n    const result = await paginatedBuilder.execute()\n\n    return {\n      set,\n      values: result.map((v) => v.value),\n      cursor: keyset.packFromResult(result),\n    }\n  }\n  async upsert({\n    name,\n    description,\n  }: Pick<SetDetail, 'name' | 'description'>): Promise<void> {\n    await this.db.db\n      .insertInto('set_detail')\n      .values({\n        name,\n        description,\n        updatedAt: new Date(),\n      })\n      .onConflict((oc) => {\n        // if description is provided as a string, even an empty one, update it\n        // otherwise, just update the updatedAt timestamp\n        return oc.column('name').doUpdateSet(\n          typeof description === 'string'\n            ? {\n                description,\n                updatedAt: new Date(),\n              }\n            : { updatedAt: new Date() },\n        )\n      })\n      .execute()\n  }\n\n  async addValues(setId: number, values: string[]): Promise<void> {\n    await this.db.transaction(async (txn) => {\n      const now = new Date()\n      const query = txn.db\n        .insertInto('set_value')\n        .values(\n          values.map((value) => ({\n            setId,\n            value,\n            createdAt: now,\n          })),\n        )\n        .onConflict((oc) => oc.columns(['setId', 'value']).doNothing())\n\n      await query.execute()\n\n      // Update the set's updatedAt timestamp\n      await txn.db\n        .updateTable('set_detail')\n        .set({ updatedAt: now })\n        .where('id', '=', setId)\n        .execute()\n    })\n  }\n\n  async removeValues(setId: number, values: string[]): Promise<void> {\n    if (values.length < 1) {\n      return\n    }\n    await this.db.transaction(async (txn) => {\n      const query = txn.db\n        .deleteFrom('set_value')\n        .where('setId', '=', setId)\n        .where('value', 'in', values)\n\n      await query.execute()\n\n      // Update the set's updatedAt timestamp\n      await txn.db\n        .updateTable('set_detail')\n        .set({ updatedAt: new Date() })\n        .where('id', '=', setId)\n        .execute()\n    })\n  }\n\n  async removeSet(setId: number): Promise<void> {\n    await this.db.transaction(async (txn) => {\n      await txn.db.deleteFrom('set_value').where('setId', '=', setId).execute()\n      await txn.db.deleteFrom('set_detail').where('id', '=', setId).execute()\n    })\n  }\n\n  view(set: Selectable<SetDetail> & { setSize: number }): SetView {\n    return {\n      name: set.name,\n      description: set.description || undefined,\n      setSize: set.setSize,\n      createdAt: set.createdAt.toISOString(),\n      updatedAt: set.updatedAt.toISOString(),\n    }\n  }\n}\n"]}

package/dist/team/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/team/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/team/index.ts"],"names":[],"mappings":"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"}

package/dist/team/index.js

@@ -31,9 +31,10 @@ 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}%`),
+            ]));
         }
         const members = await builder
             .limit(limit)
@@ -150,7 +151,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();
             const dids = members.map((member) => member.did);

package/dist/team/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/team/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { Selectable } from 'kysely'\nimport AtpAgent from '@atproto/api'\nimport { chunkArray } from '@atproto/common'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { Database } from '../db/index.js'\nimport { Member } from '../db/schema/member.js'\nimport { ids } from '../lexicon/lexicons.js'\nimport { ProfileViewDetailed } from '../lexicon/types/app/bsky/actor/defs.js'\nimport { Member as TeamMember } from '../lexicon/types/tools/ozone/team/defs.js'\nimport { httpLogger } from '../logger.js'\nimport { AuthHeaders } from '../mod-service/views.js'\n\nexport type TeamServiceCreator = (db: Database) => TeamService\n\nexport class TeamService {\n  constructor(\n    public db: Database,\n    private appviewAgent: AtpAgent,\n    private appviewDid: string,\n    private createAuthHeaders: (\n      aud: string,\n      method: string,\n    ) => Promise<AuthHeaders>,\n  ) {}\n\n  static creator(\n    appviewAgent: AtpAgent,\n    appviewDid: string,\n    createAuthHeaders: (aud: string, method: string) => Promise<AuthHeaders>,\n  ) {\n    return (db: Database) =>\n      new TeamService(db, appviewAgent, appviewDid, createAuthHeaders)\n  }\n\n  async list({\n    cursor,\n    limit = 25,\n    roles,\n    disabled,\n    q,\n  }: {\n    q?: string\n    cursor?: string\n    limit?: number\n    disabled?: boolean\n    roles?: string[]\n  }): Promise<{ members: Selectable<Member>[]; cursor?: string }> {\n    let builder = this.db.db.selectFrom('member').selectAll()\n    if (cursor) {\n      builder = builder.where('createdAt', '>', new Date(cursor))\n    }\n    if (roles !== undefined) {\n      const knownRoles = roles.filter(\n        (r) =>\n          r === 'tools.ozone.team.defs#roleAdmin' ||\n          r === 'tools.ozone.team.defs#roleModerator' ||\n          r === 'tools.ozone.team.defs#roleVerifier' ||\n          r === 'tools.ozone.team.defs#roleTriage',\n      )\n\n      // Optimization: no need to query to know that no values will be returned\n      if (!knownRoles.length) return { members: [] }\n\n      builder = builder.where('role', 'in', knownRoles)\n    }\n    if (disabled !== undefined) {\n      builder = builder.where('disabled', disabled ? 'is' : 'is not', true)\n    }\n    if (q) {\n      builder = builder.where((qb) =>\n        qb\n          .orWhere('handle', 'ilike', `%${q}%`)\n          .orWhere('displayName', 'ilike', `%${q}%`),\n      )\n    }\n\n    const members = await builder\n      .limit(limit)\n      .orderBy('createdAt', 'asc')\n      .orderBy('handle', 'asc')\n      .execute()\n\n    return { members, cursor: members.at(-1)?.createdAt.toISOString() }\n  }\n\n  async create({\n    role,\n    did,\n    disabled,\n    updatedAt,\n    createdAt,\n    lastUpdatedBy,\n  }: Omit<Selectable<Member>, 'createdAt' | 'updatedAt'> & {\n    createdAt?: Date\n    updatedAt?: Date\n  }): Promise<Selectable<Member>> {\n    const now = new Date()\n    const newMember = await this.db.db\n      .insertInto('member')\n      .values({\n        role,\n        did,\n        disabled,\n        lastUpdatedBy,\n        updatedAt: updatedAt || now,\n        createdAt: createdAt || now,\n      })\n      .returningAll()\n      .executeTakeFirstOrThrow()\n\n    return newMember\n  }\n\n  async upsert({\n    role,\n    did,\n    lastUpdatedBy,\n  }: Pick<\n    Selectable<Member>,\n    'role' | 'did' | 'lastUpdatedBy'\n  >): Promise<void> {\n    const now = new Date()\n    await this.db.db\n      .insertInto('member')\n      .values({\n        role,\n        did,\n        lastUpdatedBy,\n        disabled: false,\n        updatedAt: now,\n        createdAt: now,\n      })\n      .onConflict((oc) =>\n        oc.column('did').doUpdateSet({ role, updatedAt: now, lastUpdatedBy }),\n      )\n      .execute()\n  }\n\n  async update(\n    did: string,\n    updates: Partial<\n      Pick<\n        Selectable<Member>,\n        'role' | 'disabled' | 'lastUpdatedBy' | 'updatedAt'\n      >\n    >,\n  ): Promise<Selectable<Member>> {\n    const { role, disabled, lastUpdatedBy, updatedAt = new Date() } = updates\n    const updatedMember = await this.db.db\n      .updateTable('member')\n      .where('did', '=', did)\n      .set({\n        role,\n        disabled,\n        lastUpdatedBy,\n        updatedAt,\n      })\n      .returningAll()\n      .executeTakeFirstOrThrow()\n\n    return updatedMember\n  }\n\n  async delete(did: string): Promise<void> {\n    await this.db.db.deleteFrom('member').where('did', '=', did).execute()\n  }\n\n  async assertCanDelete(did: string): Promise<void> {\n    const memberExists = await this.doesMemberExist(did)\n\n    if (!memberExists) {\n      throw new InvalidRequestError('member not found', 'MemberNotFound')\n    }\n  }\n\n  async doesMemberExist(did: string): Promise<boolean> {\n    const member = await this.db.db\n      .selectFrom('member')\n      .select('did')\n      .where('did', '=', did)\n      .executeTakeFirst()\n\n    return !!member\n  }\n\n  async getMember(did: string): Promise<Selectable<Member> | undefined> {\n    const member = await this.db.db\n      .selectFrom('member')\n      .selectAll()\n      .where('did', '=', did)\n      .executeTakeFirst()\n\n    return member\n  }\n\n  getMemberRole(member?: Selectable<Member>) {\n    const isAdmin = member?.role === 'tools.ozone.team.defs#roleAdmin'\n    const isModerator =\n      isAdmin || member?.role === 'tools.ozone.team.defs#roleModerator'\n    const isTriage =\n      isModerator || member?.role === 'tools.ozone.team.defs#roleTriage'\n    const isVerifier =\n      isAdmin || member?.role === 'tools.ozone.team.defs#roleVerifier'\n\n    return {\n      isModerator,\n      isAdmin,\n      isTriage,\n      isVerifier,\n    }\n  }\n\n  // getProfiles() only allows 25 DIDs at a time so we need to query in chunks\n  async getProfiles(dids: string[]): Promise<Map<string, ProfileViewDetailed>> {\n    const profiles = new Map<string, ProfileViewDetailed>()\n\n    try {\n      const headers = await this.createAuthHeaders(\n        this.appviewDid,\n        ids.AppBskyActorGetProfiles,\n      )\n\n      for (const actors of chunkArray(dids, 25)) {\n        const { data } = await this.appviewAgent.getProfiles(\n          { actors },\n          headers,\n        )\n\n        data.profiles.forEach((profile) => {\n          profiles.set(profile.did, profile)\n        })\n      }\n    } catch (err) {\n      httpLogger.error({ err, dids }, 'Failed to get profiles for team members')\n    }\n\n    return profiles\n  }\n\n  async syncMemberProfiles(): Promise<void> {\n    let lastDid = ''\n    // Max 25 profiles can be fetched at a time so let's pull 25 members at a time from the db and update their profile details\n    do {\n      const members = await this.db.db\n        .selectFrom('member')\n        .select(['did'])\n        .limit(25)\n        .if(!!lastDid, (q) => q.where('did', '>', lastDid))\n        .orderBy('did', 'asc')\n        .execute()\n\n      const dids = members.map((member) => member.did)\n      const profiles = await this.getProfiles(dids)\n\n      for (const profile of profiles.values()) {\n        await this.db.db\n          .updateTable('member')\n          .where('did', '=', profile.did)\n          .set({\n            handle: profile.handle,\n            displayName: profile.displayName || null,\n          })\n          .execute()\n      }\n\n      lastDid = dids.at(-1) || ''\n    } while (lastDid)\n  }\n\n  async viewByDids(dids: string[]): Promise<Map<string, TeamMember>> {\n    if (!dids.length) return new Map()\n    const members = await this.db.db\n      .selectFrom('member')\n      .selectAll()\n      .where('did', 'in', dids)\n      .execute()\n    const memberViews = await this.view(members)\n    return new Map(memberViews.map((m) => [m.did, m]))\n  }\n\n  async view(members: Selectable<Member>[]): Promise<TeamMember[]> {\n    const profiles = await this.getProfiles(members.map(({ did }) => did))\n    return members.map((member) => {\n      return {\n        did: member.did,\n        role: member.role,\n        disabled: member.disabled,\n        profile: profiles.get(member.did),\n        createdAt: member.createdAt.toISOString(),\n        updatedAt: member.updatedAt.toISOString(),\n        lastUpdatedBy: member.lastUpdatedBy,\n      }\n    })\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/team/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { Selectable } from 'kysely'\nimport AtpAgent from '@atproto/api'\nimport { chunkArray } from '@atproto/common'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { Database } from '../db/index.js'\nimport { Member } from '../db/schema/member.js'\nimport { ids } from '../lexicon/lexicons.js'\nimport { ProfileViewDetailed } from '../lexicon/types/app/bsky/actor/defs.js'\nimport { Member as TeamMember } from '../lexicon/types/tools/ozone/team/defs.js'\nimport { httpLogger } from '../logger.js'\nimport { AuthHeaders } from '../mod-service/views.js'\n\nexport type TeamServiceCreator = (db: Database) => TeamService\n\nexport class TeamService {\n  constructor(\n    public db: Database,\n    private appviewAgent: AtpAgent,\n    private appviewDid: string,\n    private createAuthHeaders: (\n      aud: string,\n      method: string,\n    ) => Promise<AuthHeaders>,\n  ) {}\n\n  static creator(\n    appviewAgent: AtpAgent,\n    appviewDid: string,\n    createAuthHeaders: (aud: string, method: string) => Promise<AuthHeaders>,\n  ) {\n    return (db: Database) =>\n      new TeamService(db, appviewAgent, appviewDid, createAuthHeaders)\n  }\n\n  async list({\n    cursor,\n    limit = 25,\n    roles,\n    disabled,\n    q,\n  }: {\n    q?: string\n    cursor?: string\n    limit?: number\n    disabled?: boolean\n    roles?: string[]\n  }): Promise<{ members: Selectable<Member>[]; cursor?: string }> {\n    let builder = this.db.db.selectFrom('member').selectAll()\n    if (cursor) {\n      builder = builder.where('createdAt', '>', new Date(cursor))\n    }\n    if (roles !== undefined) {\n      const knownRoles = roles.filter(\n        (r) =>\n          r === 'tools.ozone.team.defs#roleAdmin' ||\n          r === 'tools.ozone.team.defs#roleModerator' ||\n          r === 'tools.ozone.team.defs#roleVerifier' ||\n          r === 'tools.ozone.team.defs#roleTriage',\n      )\n\n      // Optimization: no need to query to know that no values will be returned\n      if (!knownRoles.length) return { members: [] }\n\n      builder = builder.where('role', 'in', knownRoles)\n    }\n    if (disabled !== undefined) {\n      builder = builder.where('disabled', disabled ? 'is' : 'is not', true)\n    }\n    if (q) {\n      builder = builder.where((eb) =>\n        eb.or([\n          eb('handle', 'ilike', `%${q}%`),\n          eb('displayName', 'ilike', `%${q}%`),\n        ]),\n      )\n    }\n\n    const members = await builder\n      .limit(limit)\n      .orderBy('createdAt', 'asc')\n      .orderBy('handle', 'asc')\n      .execute()\n\n    return { members, cursor: members.at(-1)?.createdAt.toISOString() }\n  }\n\n  async create({\n    role,\n    did,\n    disabled,\n    updatedAt,\n    createdAt,\n    lastUpdatedBy,\n  }: Omit<Selectable<Member>, 'createdAt' | 'updatedAt'> & {\n    createdAt?: Date\n    updatedAt?: Date\n  }): Promise<Selectable<Member>> {\n    const now = new Date()\n    const newMember = await this.db.db\n      .insertInto('member')\n      .values({\n        role,\n        did,\n        disabled,\n        lastUpdatedBy,\n        updatedAt: updatedAt || now,\n        createdAt: createdAt || now,\n      })\n      .returningAll()\n      .executeTakeFirstOrThrow()\n\n    return newMember\n  }\n\n  async upsert({\n    role,\n    did,\n    lastUpdatedBy,\n  }: Pick<\n    Selectable<Member>,\n    'role' | 'did' | 'lastUpdatedBy'\n  >): Promise<void> {\n    const now = new Date()\n    await this.db.db\n      .insertInto('member')\n      .values({\n        role,\n        did,\n        lastUpdatedBy,\n        disabled: false,\n        updatedAt: now,\n        createdAt: now,\n      })\n      .onConflict((oc) =>\n        oc.column('did').doUpdateSet({ role, updatedAt: now, lastUpdatedBy }),\n      )\n      .execute()\n  }\n\n  async update(\n    did: string,\n    updates: Partial<\n      Pick<\n        Selectable<Member>,\n        'role' | 'disabled' | 'lastUpdatedBy' | 'updatedAt'\n      >\n    >,\n  ): Promise<Selectable<Member>> {\n    const { role, disabled, lastUpdatedBy, updatedAt = new Date() } = updates\n    const updatedMember = await this.db.db\n      .updateTable('member')\n      .where('did', '=', did)\n      .set({\n        role,\n        disabled,\n        lastUpdatedBy,\n        updatedAt,\n      })\n      .returningAll()\n      .executeTakeFirstOrThrow()\n\n    return updatedMember\n  }\n\n  async delete(did: string): Promise<void> {\n    await this.db.db.deleteFrom('member').where('did', '=', did).execute()\n  }\n\n  async assertCanDelete(did: string): Promise<void> {\n    const memberExists = await this.doesMemberExist(did)\n\n    if (!memberExists) {\n      throw new InvalidRequestError('member not found', 'MemberNotFound')\n    }\n  }\n\n  async doesMemberExist(did: string): Promise<boolean> {\n    const member = await this.db.db\n      .selectFrom('member')\n      .select('did')\n      .where('did', '=', did)\n      .executeTakeFirst()\n\n    return !!member\n  }\n\n  async getMember(did: string): Promise<Selectable<Member> | undefined> {\n    const member = await this.db.db\n      .selectFrom('member')\n      .selectAll()\n      .where('did', '=', did)\n      .executeTakeFirst()\n\n    return member\n  }\n\n  getMemberRole(member?: Selectable<Member>) {\n    const isAdmin = member?.role === 'tools.ozone.team.defs#roleAdmin'\n    const isModerator =\n      isAdmin || member?.role === 'tools.ozone.team.defs#roleModerator'\n    const isTriage =\n      isModerator || member?.role === 'tools.ozone.team.defs#roleTriage'\n    const isVerifier =\n      isAdmin || member?.role === 'tools.ozone.team.defs#roleVerifier'\n\n    return {\n      isModerator,\n      isAdmin,\n      isTriage,\n      isVerifier,\n    }\n  }\n\n  // getProfiles() only allows 25 DIDs at a time so we need to query in chunks\n  async getProfiles(dids: string[]): Promise<Map<string, ProfileViewDetailed>> {\n    const profiles = new Map<string, ProfileViewDetailed>()\n\n    try {\n      const headers = await this.createAuthHeaders(\n        this.appviewDid,\n        ids.AppBskyActorGetProfiles,\n      )\n\n      for (const actors of chunkArray(dids, 25)) {\n        const { data } = await this.appviewAgent.getProfiles(\n          { actors },\n          headers,\n        )\n\n        data.profiles.forEach((profile) => {\n          profiles.set(profile.did, profile)\n        })\n      }\n    } catch (err) {\n      httpLogger.error({ err, dids }, 'Failed to get profiles for team members')\n    }\n\n    return profiles\n  }\n\n  async syncMemberProfiles(): Promise<void> {\n    let lastDid = ''\n    // Max 25 profiles can be fetched at a time so let's pull 25 members at a time from the db and update their profile details\n    do {\n      const members = await this.db.db\n        .selectFrom('member')\n        .select(['did'])\n        .limit(25)\n        .$if(!!lastDid, (q) => q.where('did', '>', lastDid))\n        .orderBy('did', 'asc')\n        .execute()\n\n      const dids = members.map((member) => member.did)\n      const profiles = await this.getProfiles(dids)\n\n      for (const profile of profiles.values()) {\n        await this.db.db\n          .updateTable('member')\n          .where('did', '=', profile.did)\n          .set({\n            handle: profile.handle,\n            displayName: profile.displayName || null,\n          })\n          .execute()\n      }\n\n      lastDid = dids.at(-1) || ''\n    } while (lastDid)\n  }\n\n  async viewByDids(dids: string[]): Promise<Map<string, TeamMember>> {\n    if (!dids.length) return new Map()\n    const members = await this.db.db\n      .selectFrom('member')\n      .selectAll()\n      .where('did', 'in', dids)\n      .execute()\n    const memberViews = await this.view(members)\n    return new Map(memberViews.map((m) => [m.did, m]))\n  }\n\n  async view(members: Selectable<Member>[]): Promise<TeamMember[]> {\n    const profiles = await this.getProfiles(members.map(({ did }) => did))\n    return members.map((member) => {\n      return {\n        did: member.did,\n        role: member.role,\n        disabled: member.disabled,\n        profile: profiles.get(member.did),\n        createdAt: member.createdAt.toISOString(),\n        updatedAt: member.updatedAt.toISOString(),\n        lastUpdatedBy: member.lastUpdatedBy,\n      }\n    })\n  }\n}\n"]}

package/dist/verification/issuer.d.ts

@@ -1,7 +1,5 @@
-import { Selectable } from 'kysely';
 import { Agent } from '@atproto/api';
 import { VerifierConfig } from '../config/index.js';
-import { Verification } from '../db/schema/verification.js';
 export type VerificationInput = {
     displayName: string;
     handle: string;
@@ -17,7 +15,19 @@ export declare class VerificationIssuer {
     static creator(): (verifierConfig: VerifierConfig) => VerificationIssuer;
     getAgent(): Promise<Agent>;
     verify(verifications: VerificationInput[]): Promise<{
-        grantedVerifications: Selectable<Verification>[];
+        grantedVerifications: {
+            cid: string;
+            createdAt: string;
+            displayName: string;
+            handle: string;
+            issuer: string;
+            revokeReason: string | null;
+            revokedAt: string | null;
+            revokedBy: string | null;
+            subject: string;
+            updatedAt: string;
+            uri: string;
+        }[];
         failedVerifications: {
             $type: 'tools.ozone.verification.grantVerifications#grantError';
             subject: string;

package/dist/verification/issuer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"issuer.d.ts","sourceRoot":"","sources":["../../src/verification/issuer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,KAAK,EAA4B,MAAM,cAAc,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAE3D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG,CACtC,cAAc,EAAE,cAAc,KAC3B,kBAAkB,CAAA;AAIvB,qBAAa,kBAAkB;IAGjB,OAAO,CAAC,cAAc;IAFlC,OAAO,CAAC,OAAO,CAA0D;IACzE,OAAO,CAAC,KAAK,CAA0B;IACvC,YAAoB,cAAc,EAAE,cAAc,EAAI;IAEtD,MAAM,CAAC,OAAO,qBACY,cAAc,wBAEvC;IAEK,QAAQ,mBAqBb;IAEK,MAAM,CAAC,aAAa,EAAE,iBAAiB,EAAE;;;mBAGpC,wDAAwD;qBACtD,MAAM;mBACR,MAAM;;OAmDhB;IAEK,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE;;;iBAED,MAAM;mBAAS,MAAM;;OAiC5D;CACF"}
+{"version":3,"file":"issuer.d.ts","sourceRoot":"","sources":["../../src/verification/issuer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAA4B,MAAM,cAAc,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAGnD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG,CACtC,cAAc,EAAE,cAAc,KAC3B,kBAAkB,CAAA;AAIvB,qBAAa,kBAAkB;IAGjB,OAAO,CAAC,cAAc;IAFlC,OAAO,CAAC,OAAO,CAA0D;IACzE,OAAO,CAAC,KAAK,CAA0B;IACvC,YAAoB,cAAc,EAAE,cAAc,EAAI;IAEtD,MAAM,CAAC,OAAO,qBACY,cAAc,wBAEvC;IAEK,QAAQ,mBAqBb;IAEK,MAAM,CAAC,aAAa,EAAE,iBAAiB,EAAE;;;;;;;;;;;;;;;mBAGpC,wDAAwD;qBACtD,MAAM;mBACR,MAAM;;OAmDhB;IAEK,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE;;;iBAED,MAAM;mBAAS,MAAM;;OAiC5D;CACF"}

package/dist/verification/service.d.ts

@@ -7,7 +7,19 @@ export declare class VerificationService {
     db: Database;
     constructor(db: Database);
     static creator(): (db: Database) => VerificationService;
-    create(verifications: Pick<Verification, 'uri' | 'issuer' | 'subject' | 'handle' | 'displayName' | 'createdAt' | 'cid'>[]): Promise<Selectable<Verification>[]>;
+    create(verifications: Pick<Verification, 'uri' | 'issuer' | 'subject' | 'handle' | 'displayName' | 'createdAt' | 'cid'>[]): Promise<{
+        cid: string;
+        createdAt: string;
+        displayName: string;
+        handle: string;
+        issuer: string;
+        revokeReason: string | null;
+        revokedAt: string | null;
+        revokedBy: string | null;
+        subject: string;
+        updatedAt: string;
+        uri: string;
+    }[]>;
     markRevoked({ uris, revokedBy, revokedAt, revokeReason, }: {
         uris: string[];
         revokedBy?: string;

package/dist/verification/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/verification/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EACL,MAAM,EACN,gBAAgB,EAEhB,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAE3D,MAAM,MAAM,0BAA0B,GAAG,CAAC,EAAE,EAAE,QAAQ,KAAK,mBAAmB,CAAA;AAE9E,qBAAa,mBAAmB;IACX,EAAE,EAAE,QAAQ;IAA/B,YAAmB,EAAE,EAAE,QAAQ,EAAI;IAEnC,MAAM,CAAC,OAAO,SACA,QAAQ,yBACrB;IAEK,MAAM,CACV,aAAa,EAAE,IAAI,CACjB,YAAY,EACV,KAAK,GACL,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,aAAa,GACb,WAAW,GACX,KAAK,CACR,EAAE,uCAUJ;IAEK,WAAW,CAAC,EAChB,IAAI,EACJ,SAAS,EACT,SAAS,EACT,YAAY,GACb,EAAE;QACD,IAAI,EAAE,MAAM,EAAE,CAAA;QACd,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,YAAY,CAAC,EAAE,MAAM,CAAA;KACtB,wDAkBA;IAEK,IAAI,CAAC,EACT,aAAa,EACb,MAAM,EACN,YAAY,EACZ,aAAa,EACb,OAAY,EACZ,QAAa,EACb,SAAS,EACT,KAAW,GACZ,EAAE;QACD,aAAa,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;QAC9B,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;QAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;QACnB,SAAS,CAAC,EAAE,OAAO,CAAA;QACnB,KAAK,CAAC,EAAE,MAAM,CAAA;KACf;;;;;;;;;;;;;;;OAoCA;IAED,IAAI,CACF,aAAa,EAAE,UAAU,CAAC,YAAY,CAAC,EAAE,EACzC,KAAK,EAAE,GAAG,CACR,MAAM,EACJ,MAAM,CAAC,wBAAwB,CAAC,cAAc,CAAC,GAC/C,MAAM,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CACpD,EACD,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,GAC1D,MAAM,CAAC,0BAA0B,CAAC,gBAAgB,CAAC,EAAE,CAkCvD;IAEK,iBAAiB,2BAQtB;IAED,oBAAoB,6CASnB;IAEK,oBAAoB,CAAC,MAAM,EAAE,MAAM,sCAYxC;CACF"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/verification/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EACL,MAAM,EACN,gBAAgB,EAEhB,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAE3D,MAAM,MAAM,0BAA0B,GAAG,CAAC,EAAE,EAAE,QAAQ,KAAK,mBAAmB,CAAA;AAE9E,qBAAa,mBAAmB;IACX,EAAE,EAAE,QAAQ;IAA/B,YAAmB,EAAE,EAAE,QAAQ,EAAI;IAEnC,MAAM,CAAC,OAAO,SACA,QAAQ,yBACrB;IAEK,MAAM,CACV,aAAa,EAAE,IAAI,CACjB,YAAY,EACV,KAAK,GACL,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,aAAa,GACb,WAAW,GACX,KAAK,CACR,EAAE;;;;;;;;;;;;SAUJ;IAEK,WAAW,CAAC,EAChB,IAAI,EACJ,SAAS,EACT,SAAS,EACT,YAAY,GACb,EAAE;QACD,IAAI,EAAE,MAAM,EAAE,CAAA;QACd,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,YAAY,CAAC,EAAE,MAAM,CAAA;KACtB,wDAkBA;IAEK,IAAI,CAAC,EACT,aAAa,EACb,MAAM,EACN,YAAY,EACZ,aAAa,EACb,OAAY,EACZ,QAAa,EACb,SAAS,EACT,KAAW,GACZ,EAAE;QACD,aAAa,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;QAC9B,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;QAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;QACnB,SAAS,CAAC,EAAE,OAAO,CAAA;QACnB,KAAK,CAAC,EAAE,MAAM,CAAA;KACf;;;;;;;;;;;;;;;OAoCA;IAED,IAAI,CACF,aAAa,EAAE,UAAU,CAAC,YAAY,CAAC,EAAE,EACzC,KAAK,EAAE,GAAG,CACR,MAAM,EACJ,MAAM,CAAC,wBAAwB,CAAC,cAAc,CAAC,GAC/C,MAAM,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CACpD,EACD,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,GAC1D,MAAM,CAAC,0BAA0B,CAAC,gBAAgB,CAAC,EAAE,CAkCvD;IAEK,iBAAiB,2BAQtB;IAED,oBAAoB,6CASnB;IAEK,oBAAoB,CAAC,MAAM,EAAE,MAAM,sCAYxC;CACF"}

package/dist/verification/service.js

@@ -123,7 +123,7 @@ 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();
         return updated?.cursor;

package/dist/verification/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/verification/service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Selectable } from 'kysely'\nimport {\n  $Typed,\n  AppBskyActorDefs,\n  AtUri,\n  ToolsOzoneModerationDefs,\n  ToolsOzoneVerificationDefs,\n} from '@atproto/api'\nimport { Database } from '../db/index.js'\nimport { CreatedAtUriKeyset, paginate } from '../db/pagination.js'\nimport { Verification } from '../db/schema/verification.js'\n\nexport type VerificationServiceCreator = (db: Database) => VerificationService\n\nexport class VerificationService {\n  constructor(public db: Database) {}\n\n  static creator() {\n    return (db: Database) => new VerificationService(db)\n  }\n\n  async create(\n    verifications: Pick<\n      Verification,\n      | 'uri'\n      | 'issuer'\n      | 'subject'\n      | 'handle'\n      | 'displayName'\n      | 'createdAt'\n      | 'cid'\n    >[],\n  ) {\n    return this.db.transaction(async (tx) => {\n      return tx.db\n        .insertInto('verification')\n        .values(verifications)\n        .onConflict((oc) => oc.doNothing())\n        .returningAll()\n        .execute()\n    })\n  }\n\n  async markRevoked({\n    uris,\n    revokedBy,\n    revokedAt,\n    revokeReason,\n  }: {\n    uris: string[]\n    revokedBy?: string\n    revokedAt?: string\n    revokeReason?: string\n  }) {\n    const now = new Date().toISOString()\n    return this.db.transaction(async (tx) => {\n      for (const uri of uris) {\n        return tx.db\n          .updateTable('verification')\n          .set({\n            revokeReason,\n            updatedAt: now,\n            revokedAt: revokedAt || now,\n            // Allow setting revokedBy to a moderator/verifier DID and if it isn't set, default to the author of the verification record\n            revokedBy: revokedBy || new AtUri(uri).host,\n          })\n          .where('uri', '=', uri)\n          .where('revokedAt', 'is', null)\n          .execute()\n      }\n    })\n  }\n\n  async list({\n    sortDirection,\n    cursor,\n    createdAfter,\n    createdBefore,\n    issuers = [],\n    subjects = [],\n    isRevoked,\n    limit = 100,\n  }: {\n    sortDirection?: 'asc' | 'desc'\n    cursor?: string\n    createdAfter?: string\n    createdBefore?: string\n    issuers?: string[]\n    subjects?: string[]\n    isRevoked?: boolean\n    limit?: number\n  }) {\n    const { ref } = this.db.db.dynamic\n\n    let qb = this.db.db.selectFrom('verification').selectAll()\n\n    if (issuers.length) {\n      qb = qb.where('issuer', 'in', issuers)\n    }\n\n    if (isRevoked !== undefined) {\n      qb = qb.where('revokedAt', isRevoked ? 'is not' : 'is', null)\n    }\n\n    if (subjects.length) {\n      qb = qb.where('subject', 'in', subjects)\n    }\n\n    if (createdAfter) {\n      qb = qb.where('createdAt', '>=', createdAfter)\n    }\n\n    if (createdBefore) {\n      qb = qb.where('createdAt', '<=', createdBefore)\n    }\n\n    const keyset = new CreatedAtUriKeyset(ref(`createdAt`), ref('uri'))\n    const paginatedBuilder = paginate(qb, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n      direction: sortDirection === 'desc' ? 'desc' : 'asc',\n    })\n\n    const result = await paginatedBuilder.execute()\n    return { verifications: result, cursor: keyset.packFromResult(result) }\n  }\n\n  view(\n    verifications: Selectable<Verification>[],\n    repos: Map<\n      string,\n      | $Typed<ToolsOzoneModerationDefs.RepoViewDetail>\n      | $Typed<ToolsOzoneModerationDefs.RepoViewNotFound>\n    >,\n    profiles: Map<string, AppBskyActorDefs.ProfileViewDetailed>,\n  ): $Typed<ToolsOzoneVerificationDefs.VerificationView>[] {\n    return verifications.map((verification) => {\n      const issuerRepo = repos.get(verification.issuer)\n      const subjectRepo = repos.get(verification.subject)\n      const subjectProfile = profiles.get(verification.subject)\n      const issuerProfile = profiles.get(verification.issuer)\n      return {\n        $type: 'tools.ozone.verification.defs#verificationView',\n        uri: verification.uri,\n        issuer: verification.issuer,\n        subject: verification.subject,\n        createdAt: verification.createdAt,\n        displayName: verification.displayName,\n        handle: verification.handle,\n        updatedAt: verification.updatedAt || undefined,\n        revokedAt: verification.revokedAt || undefined,\n        revokedBy: verification.revokedBy || undefined,\n        revokeReason: verification.revokeReason || undefined,\n        issuerRepo,\n        subjectRepo,\n        subjectProfile: subjectProfile\n          ? {\n              $type: 'app.bsky.actor.defs#profileViewDetailed',\n              ...subjectProfile,\n            }\n          : undefined,\n        issuerProfile: issuerProfile\n          ? {\n              $type: 'app.bsky.actor.defs#profileViewDetailed',\n              ...issuerProfile,\n            }\n          : undefined,\n      }\n    })\n  }\n\n  async getFirehoseCursor() {\n    const entry = await this.db.db\n      .selectFrom('firehose_cursor')\n      .select('cursor')\n      .where('service', '=', 'verification')\n      .executeTakeFirst()\n\n    return entry?.cursor || null\n  }\n\n  createFirehoseCursor() {\n    return this.db.db\n      .insertInto('firehose_cursor')\n      .values({\n        service: 'verification',\n        cursor: null,\n      })\n      .onConflict((oc) => oc.doNothing())\n      .execute()\n  }\n\n  async updateFirehoseCursor(cursor: number) {\n    const updated = await this.db.db\n      .updateTable('firehose_cursor')\n      .set({ cursor })\n      .where('service', '=', 'verification')\n      .where((qb) =>\n        qb.where('cursor', '<', cursor).orWhere('cursor', 'is', null),\n      )\n      .returningAll()\n      .executeTakeFirst()\n\n    return updated?.cursor\n  }\n}\n"]}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/verification/service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Selectable } from 'kysely'\nimport {\n  $Typed,\n  AppBskyActorDefs,\n  AtUri,\n  ToolsOzoneModerationDefs,\n  ToolsOzoneVerificationDefs,\n} from '@atproto/api'\nimport { Database } from '../db/index.js'\nimport { CreatedAtUriKeyset, paginate } from '../db/pagination.js'\nimport { Verification } from '../db/schema/verification.js'\n\nexport type VerificationServiceCreator = (db: Database) => VerificationService\n\nexport class VerificationService {\n  constructor(public db: Database) {}\n\n  static creator() {\n    return (db: Database) => new VerificationService(db)\n  }\n\n  async create(\n    verifications: Pick<\n      Verification,\n      | 'uri'\n      | 'issuer'\n      | 'subject'\n      | 'handle'\n      | 'displayName'\n      | 'createdAt'\n      | 'cid'\n    >[],\n  ) {\n    return this.db.transaction(async (tx) => {\n      return tx.db\n        .insertInto('verification')\n        .values(verifications)\n        .onConflict((oc) => oc.doNothing())\n        .returningAll()\n        .execute()\n    })\n  }\n\n  async markRevoked({\n    uris,\n    revokedBy,\n    revokedAt,\n    revokeReason,\n  }: {\n    uris: string[]\n    revokedBy?: string\n    revokedAt?: string\n    revokeReason?: string\n  }) {\n    const now = new Date().toISOString()\n    return this.db.transaction(async (tx) => {\n      for (const uri of uris) {\n        return tx.db\n          .updateTable('verification')\n          .set({\n            revokeReason,\n            updatedAt: now,\n            revokedAt: revokedAt || now,\n            // Allow setting revokedBy to a moderator/verifier DID and if it isn't set, default to the author of the verification record\n            revokedBy: revokedBy || new AtUri(uri).host,\n          })\n          .where('uri', '=', uri)\n          .where('revokedAt', 'is', null)\n          .execute()\n      }\n    })\n  }\n\n  async list({\n    sortDirection,\n    cursor,\n    createdAfter,\n    createdBefore,\n    issuers = [],\n    subjects = [],\n    isRevoked,\n    limit = 100,\n  }: {\n    sortDirection?: 'asc' | 'desc'\n    cursor?: string\n    createdAfter?: string\n    createdBefore?: string\n    issuers?: string[]\n    subjects?: string[]\n    isRevoked?: boolean\n    limit?: number\n  }) {\n    const { ref } = this.db.db.dynamic\n\n    let qb = this.db.db.selectFrom('verification').selectAll()\n\n    if (issuers.length) {\n      qb = qb.where('issuer', 'in', issuers)\n    }\n\n    if (isRevoked !== undefined) {\n      qb = qb.where('revokedAt', isRevoked ? 'is not' : 'is', null)\n    }\n\n    if (subjects.length) {\n      qb = qb.where('subject', 'in', subjects)\n    }\n\n    if (createdAfter) {\n      qb = qb.where('createdAt', '>=', createdAfter)\n    }\n\n    if (createdBefore) {\n      qb = qb.where('createdAt', '<=', createdBefore)\n    }\n\n    const keyset = new CreatedAtUriKeyset(ref(`createdAt`), ref('uri'))\n    const paginatedBuilder = paginate(qb, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n      direction: sortDirection === 'desc' ? 'desc' : 'asc',\n    })\n\n    const result = await paginatedBuilder.execute()\n    return { verifications: result, cursor: keyset.packFromResult(result) }\n  }\n\n  view(\n    verifications: Selectable<Verification>[],\n    repos: Map<\n      string,\n      | $Typed<ToolsOzoneModerationDefs.RepoViewDetail>\n      | $Typed<ToolsOzoneModerationDefs.RepoViewNotFound>\n    >,\n    profiles: Map<string, AppBskyActorDefs.ProfileViewDetailed>,\n  ): $Typed<ToolsOzoneVerificationDefs.VerificationView>[] {\n    return verifications.map((verification) => {\n      const issuerRepo = repos.get(verification.issuer)\n      const subjectRepo = repos.get(verification.subject)\n      const subjectProfile = profiles.get(verification.subject)\n      const issuerProfile = profiles.get(verification.issuer)\n      return {\n        $type: 'tools.ozone.verification.defs#verificationView',\n        uri: verification.uri,\n        issuer: verification.issuer,\n        subject: verification.subject,\n        createdAt: verification.createdAt,\n        displayName: verification.displayName,\n        handle: verification.handle,\n        updatedAt: verification.updatedAt || undefined,\n        revokedAt: verification.revokedAt || undefined,\n        revokedBy: verification.revokedBy || undefined,\n        revokeReason: verification.revokeReason || undefined,\n        issuerRepo,\n        subjectRepo,\n        subjectProfile: subjectProfile\n          ? {\n              $type: 'app.bsky.actor.defs#profileViewDetailed',\n              ...subjectProfile,\n            }\n          : undefined,\n        issuerProfile: issuerProfile\n          ? {\n              $type: 'app.bsky.actor.defs#profileViewDetailed',\n              ...issuerProfile,\n            }\n          : undefined,\n      }\n    })\n  }\n\n  async getFirehoseCursor() {\n    const entry = await this.db.db\n      .selectFrom('firehose_cursor')\n      .select('cursor')\n      .where('service', '=', 'verification')\n      .executeTakeFirst()\n\n    return entry?.cursor || null\n  }\n\n  createFirehoseCursor() {\n    return this.db.db\n      .insertInto('firehose_cursor')\n      .values({\n        service: 'verification',\n        cursor: null,\n      })\n      .onConflict((oc) => oc.doNothing())\n      .execute()\n  }\n\n  async updateFirehoseCursor(cursor: number) {\n    const updated = await this.db.db\n      .updateTable('firehose_cursor')\n      .set({ cursor })\n      .where('service', '=', 'verification')\n      .where((eb) =>\n        eb.or([eb('cursor', '<', cursor), eb('cursor', 'is', null)]),\n      )\n      .returningAll()\n      .executeTakeFirst()\n\n    return updated?.cursor\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.2.4",
+  "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",
@@ -35,13 +35,13 @@
     "ws": "^8.12.0",
     "@atproto/api": "^0.20.16",
     "@atproto/common": "^0.6.3",
-    "@atproto/crypto": "^0.5.1",
     "@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-server": "^0.11.2",
-    "@atproto/xrpc": "^0.8.1"
+    "@atproto/xrpc": "^0.8.1",
+    "@atproto/xrpc-server": "^0.11.2"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -49,12 +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",
     "@atproto/lex-cli": "^0.10.1",
-    "@atproto/pds": "^0.5.5"
+    "@atproto/pds": "^0.5.6"
   },
   "type": "module",
   "exports": {

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