@atproto/ozone 0.1.174 → 0.1.175

package/dist/mod-service/util.js

@@ -1,15 +1,9 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dateFromDbDatetime = exports.dateFromDatetime = exports.getPdsAgentForRepo = exports.isSafeUrl = exports.signLabel = exports.formatLabelRow = exports.formatLabel = void 0;
-const node_net_1 = __importDefault(require("node:net"));
-const kysely_1 = require("kysely");
-const api_1 = __importDefault(require("@atproto/api"));
-const common_1 = require("@atproto/common");
-const formatLabel = (row) => {
-    return (0, common_1.noUndefinedVals)({
+import net from 'node:net';
+import { sql } from 'kysely';
+import AtpAgent from '@atproto/api';
+import { cborEncode, noUndefinedVals } from '@atproto/common';
+export const formatLabel = (row) => {
+    return noUndefinedVals({
         ver: 1,
         src: row.src,
         uri: row.uri,
@@ -21,8 +15,7 @@ const formatLabel = (row) => {
         sig: row.sig ? new Uint8Array(row.sig) : undefined,
     });
 };
-exports.formatLabel = formatLabel;
-const formatLabelRow = (label, signingKeyId) => {
+export const formatLabelRow = (label, signingKeyId) => {
     return {
         src: label.src,
         uri: label.uri,
@@ -35,13 +28,12 @@ const formatLabelRow = (label, signingKeyId) => {
         signingKeyId: signingKeyId ?? null,
     };
 };
-exports.formatLabelRow = formatLabelRow;
-const signLabel = async (label, signingKey) => {
+export const signLabel = async (label, signingKey) => {
     const { ver, src, uri, cid, val, neg, cts, exp } = label;
     // @TODO cborEncode now ignores undefined properties, so we might not need to
     // reformat the label here. We might want to consider this if we ever re-visit
     // the logic below:
-    const reformatted = (0, common_1.noUndefinedVals)({
+    const reformatted = noUndefinedVals({
         ver: ver ?? 1,
         src,
         uri,
@@ -51,40 +43,35 @@ const signLabel = async (label, signingKey) => {
         cts,
         exp,
     });
-    const bytes = (0, common_1.cborEncode)(reformatted);
+    const bytes = cborEncode(reformatted);
     const sig = await signingKey.sign(bytes);
     return {
         ...reformatted,
         sig,
     };
 };
-exports.signLabel = signLabel;
-const isSafeUrl = (url) => {
+export const isSafeUrl = (url) => {
     if (url.protocol !== 'https:')
         return false;
     if (!url.hostname || url.hostname === 'localhost')
         return false;
-    if (node_net_1.default.isIP(url.hostname) !== 0)
+    if (net.isIP(url.hostname) !== 0)
         return false;
     return true;
 };
-exports.isSafeUrl = isSafeUrl;
-const getPdsAgentForRepo = async (idResolver, did, devMode) => {
+export const getPdsAgentForRepo = async (idResolver, did, devMode) => {
     const { pds } = await idResolver.did.resolveAtprotoData(did);
     const url = new URL(pds);
-    if (!devMode && !(0, exports.isSafeUrl)(url)) {
+    if (!devMode && !isSafeUrl(url)) {
         return { url, agent: null };
     }
-    return { url, agent: new api_1.default({ service: url }) };
+    return { url, agent: new AtpAgent({ service: url }) };
 };
-exports.getPdsAgentForRepo = getPdsAgentForRepo;
-const dateFromDatetime = (datetime) => {
+export const dateFromDatetime = (datetime) => {
     const [date] = datetime.toISOString().split('T');
     return date;
 };
-exports.dateFromDatetime = dateFromDatetime;
-const dateFromDbDatetime = (dateRef) => {
-    return (0, kysely_1.sql) `SPLIT_PART(${dateRef}, 'T', 1)`;
+export const dateFromDbDatetime = (dateRef) => {
+    return sql `SPLIT_PART(${dateRef}, 'T', 1)`;
 };
-exports.dateFromDbDatetime = dateFromDbDatetime;
 //# sourceMappingURL=util.js.map

package/dist/mod-service/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/mod-service/util.ts"],"names":[],"mappings":"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","sourcesContent":["import net from 'node:net'\nimport { sql } from 'kysely'\nimport AtpAgent from '@atproto/api'\nimport { cborEncode, noUndefinedVals } from '@atproto/common'\nimport { Keypair } from '@atproto/crypto'\nimport { IdResolver } from '@atproto/identity'\nimport { LabelRow } from '../db/schema/label'\nimport { DbRef } from '../db/types'\nimport { Label } from '../lexicon/types/com/atproto/label/defs'\n\nexport type SignedLabel = Label & { sig: Uint8Array }\n\nexport const formatLabel = (row: LabelRow): Label => {\n  return noUndefinedVals({\n    ver: 1,\n    src: row.src,\n    uri: row.uri,\n    cid: row.cid === '' ? undefined : row.cid,\n    val: row.val,\n    neg: row.neg === true ? true : undefined,\n    cts: row.cts,\n    exp: row.exp ?? undefined,\n    sig: row.sig ? new Uint8Array(row.sig) : undefined,\n  } satisfies Label) as unknown as Label\n}\n\nexport const formatLabelRow = (\n  label: Label,\n  signingKeyId?: number,\n): Omit<LabelRow, 'id'> => {\n  return {\n    src: label.src,\n    uri: label.uri,\n    cid: label.cid ?? '',\n    val: label.val,\n    neg: !!label.neg,\n    cts: label.cts,\n    exp: label.exp ?? null,\n    sig: label.sig ? Buffer.from(label.sig) : null,\n    signingKeyId: signingKeyId ?? null,\n  }\n}\n\nexport const signLabel = async (\n  label: Label,\n  signingKey: Keypair,\n): Promise<SignedLabel> => {\n  const { ver, src, uri, cid, val, neg, cts, exp } = label\n  // @TODO cborEncode now ignores undefined properties, so we might not need to\n  // reformat the label here. We might want to consider this if we ever re-visit\n  // the logic below:\n  const reformatted = noUndefinedVals({\n    ver: ver ?? 1,\n    src,\n    uri,\n    cid,\n    val,\n    neg: neg === true ? true : undefined,\n    cts,\n    exp,\n  } satisfies Label) as unknown as Label\n\n  const bytes = cborEncode(reformatted)\n  const sig = await signingKey.sign(bytes)\n  return {\n    ...reformatted,\n    sig,\n  }\n}\n\nexport const isSafeUrl = (url: URL) => {\n  if (url.protocol !== 'https:') return false\n  if (!url.hostname || url.hostname === 'localhost') return false\n  if (net.isIP(url.hostname) !== 0) return false\n  return true\n}\n\nexport const getPdsAgentForRepo = async (\n  idResolver: IdResolver,\n  did: string,\n  devMode?: boolean,\n) => {\n  const { pds } = await idResolver.did.resolveAtprotoData(did)\n  const url = new URL(pds)\n  if (!devMode && !isSafeUrl(url)) {\n    return { url, agent: null }\n  }\n\n  return { url, agent: new AtpAgent({ service: url }) }\n}\n\nexport const dateFromDatetime = (datetime: Date) => {\n  const [date] = datetime.toISOString().split('T')\n  return date\n}\n\nexport const dateFromDbDatetime = (dateRef: DbRef) => {\n  return sql<string>`SPLIT_PART(${dateRef}, 'T', 1)`\n}\n"]}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/mod-service/util.ts"],"names":[],"mappings":"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","sourcesContent":["import net from 'node:net'\nimport { sql } from 'kysely'\nimport AtpAgent from '@atproto/api'\nimport { cborEncode, noUndefinedVals } from '@atproto/common'\nimport { Keypair } from '@atproto/crypto'\nimport { IdResolver } from '@atproto/identity'\nimport { LabelRow } from '../db/schema/label.js'\nimport { DbRef } from '../db/types.js'\nimport { Label } from '../lexicon/types/com/atproto/label/defs.js'\n\nexport type SignedLabel = Label & { sig: Uint8Array }\n\nexport const formatLabel = (row: LabelRow): Label => {\n  return noUndefinedVals({\n    ver: 1,\n    src: row.src,\n    uri: row.uri,\n    cid: row.cid === '' ? undefined : row.cid,\n    val: row.val,\n    neg: row.neg === true ? true : undefined,\n    cts: row.cts,\n    exp: row.exp ?? undefined,\n    sig: row.sig ? new Uint8Array(row.sig) : undefined,\n  } satisfies Label) as unknown as Label\n}\n\nexport const formatLabelRow = (\n  label: Label,\n  signingKeyId?: number,\n): Omit<LabelRow, 'id'> => {\n  return {\n    src: label.src,\n    uri: label.uri,\n    cid: label.cid ?? '',\n    val: label.val,\n    neg: !!label.neg,\n    cts: label.cts,\n    exp: label.exp ?? null,\n    sig: label.sig ? Buffer.from(label.sig) : null,\n    signingKeyId: signingKeyId ?? null,\n  }\n}\n\nexport const signLabel = async (\n  label: Label,\n  signingKey: Keypair,\n): Promise<SignedLabel> => {\n  const { ver, src, uri, cid, val, neg, cts, exp } = label\n  // @TODO cborEncode now ignores undefined properties, so we might not need to\n  // reformat the label here. We might want to consider this if we ever re-visit\n  // the logic below:\n  const reformatted = noUndefinedVals({\n    ver: ver ?? 1,\n    src,\n    uri,\n    cid,\n    val,\n    neg: neg === true ? true : undefined,\n    cts,\n    exp,\n  } satisfies Label) as unknown as Label\n\n  const bytes = cborEncode(reformatted)\n  const sig = await signingKey.sign(bytes)\n  return {\n    ...reformatted,\n    sig,\n  }\n}\n\nexport const isSafeUrl = (url: URL) => {\n  if (url.protocol !== 'https:') return false\n  if (!url.hostname || url.hostname === 'localhost') return false\n  if (net.isIP(url.hostname) !== 0) return false\n  return true\n}\n\nexport const getPdsAgentForRepo = async (\n  idResolver: IdResolver,\n  did: string,\n  devMode?: boolean,\n) => {\n  const { pds } = await idResolver.did.resolveAtprotoData(did)\n  const url = new URL(pds)\n  if (!devMode && !isSafeUrl(url)) {\n    return { url, agent: null }\n  }\n\n  return { url, agent: new AtpAgent({ service: url }) }\n}\n\nexport const dateFromDatetime = (datetime: Date) => {\n  const [date] = datetime.toISOString().split('T')\n  return date\n}\n\nexport const dateFromDbDatetime = (dateRef: DbRef) => {\n  return sql<string>`SPLIT_PART(${dateRef}, 'T', 1)`\n}\n"]}

package/dist/mod-service/views.d.ts

@@ -2,16 +2,16 @@ import { AppBskyActorDefs, AtpAgent, ComAtprotoRepoGetRecord } from '@atproto/ap
 import { Keypair } from '@atproto/crypto';
 import { IdResolver } from '@atproto/identity';
 import { BlobRef } from '@atproto/lexicon';
-import { Database } from '../db';
-import { LabelRow } from '../db/schema/label';
-import { FeedViewPost } from '../lexicon/types/app/bsky/feed/defs';
-import { AccountView } from '../lexicon/types/com/atproto/admin/defs';
-import { Label } from '../lexicon/types/com/atproto/label/defs';
-import { OutputSchema as ReportOutput } from '../lexicon/types/com/atproto/moderation/createReport';
-import { BlobView, ModEventView, ModEventViewDetail, RecordView, RecordViewDetail, RepoView, SubjectStatusView } from '../lexicon/types/tools/ozone/moderation/defs';
-import { Un$Typed } from '../lexicon/util';
-import { ParsedLabelers } from '../util';
-import { ModerationEventRowWithHandle, ModerationSubjectStatusRowWithHandle } from './types';
+import { Database } from '../db/index.js';
+import { LabelRow } from '../db/schema/label.js';
+import { FeedViewPost } from '../lexicon/types/app/bsky/feed/defs.js';
+import { AccountView } from '../lexicon/types/com/atproto/admin/defs.js';
+import { Label } from '../lexicon/types/com/atproto/label/defs.js';
+import { OutputSchema as ReportOutput } from '../lexicon/types/com/atproto/moderation/createReport.js';
+import { BlobView, ModEventView, ModEventViewDetail, RecordView, RecordViewDetail, RepoView, SubjectStatusView } from '../lexicon/types/tools/ozone/moderation/defs.js';
+import { Un$Typed } from '../lexicon/util.js';
+import { ParsedLabelers } from '../util.js';
+import { ModerationEventRowWithHandle, ModerationSubjectStatusRowWithHandle } from './types.js';
 export type AuthHeaders = {
     headers: {
         authorization: string;

package/dist/mod-service/views.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"views.d.ts","sourceRoot":"","sources":["../../src/mod-service/views.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,QAAQ,EACR,uBAAuB,EACxB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAA;AACrE,OAAO,EACL,KAAK,EAEN,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAAE,YAAY,IAAI,YAAY,EAAE,MAAM,sDAAsD,CAAA;AAEnG,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,kBAAkB,EAClB,UAAU,EACV,gBAAgB,EAChB,QAAQ,EACR,iBAAiB,EAmBlB,MAAM,8CAA8C,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAe,MAAM,iBAAiB,CAAA;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAGxC,OAAO,EACL,4BAA4B,EAC5B,oCAAoC,EACrC,MAAM,SAAS,CAAA;AAYhB,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE;QACP,aAAa,EAAE,MAAM,CAAA;QACrB,yBAAyB,CAAC,EAAE,MAAM,CAAA;KACnC,CAAA;CACF,CAAA;AAED,qBAAa,eAAe;IAExB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,WAAW;IACZ,UAAU,EAAE,UAAU;IACtB,OAAO,CAAC,EAAE,OAAO;gBANhB,EAAE,EAAE,QAAQ,EACZ,UAAU,EAAE,OAAO,EACnB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,QAAQ,EACtB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,EACtD,UAAU,EAAE,UAAU,EACtB,OAAO,CAAC,EAAE,OAAO,YAAA;IAGpB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAuBtE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAwB3D,WAAW,CAAC,GAAG,EAAE,4BAA4B,GAAG,QAAQ,CAAC,YAAY,CAAC;IAkKhE,WAAW,CACf,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,kBAAkB,CAAC;IAuBxB,WAAW,CACf,IAAI,EAAE,MAAM,EAAE,EACd,QAAQ,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IA8B3B,WAAW,CACf,MAAM,EAAE,uBAAuB,CAAC,WAAW,EAC3C,WAAW,EAAE,WAAW;IAgCpB,YAAY,CAChB,QAAQ,EAAE,aAAa,EAAE,GACxB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAwB7B,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE;gBAiBzB,SAAS;oBACL;YAAE,KAAK,CAAC,EAAE,SAAS,CAAC;YAAC,aAAa,CAAC,EAAE,iBAAiB,CAAA;SAAE;;IA6BpE,aAAa,CACjB,QAAQ,EAAE,aAAa,EAAE,EACzB,QAAQ,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IA+CnC,iBAAiB,CACrB,QAAQ,EAAE,MAAM,EAAE,EAClB,QAAQ,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IA2BhC,YAAY,CAAC,MAAM,EAAE,4BAA4B,GAAG,YAAY;IAgB1D,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAkC9C,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAsC3C,MAAM,CACV,QAAQ,EAAE,MAAM,EAAE,EAClB,UAAU,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAyB1B,uBAAuB,CAAC,GAAG,EAAE,QAAQ;IAkBrC,gBAAgB,CACpB,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,oCAAoC,CAAC,CAAC;IAoC7D,mBAAmB,CACjB,MAAM,EAAE,oCAAoC,GAC3C,iBAAiB;IAwFd,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAUvD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE;CAgBjC;AAED,KAAK,aAAa,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAElD,KAAK,WAAW,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAA;AAIhD,KAAK,UAAU,GAAG;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAyBD,wBAAgB,aAAa,CAAC,OAAO,EAAE;IACrC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAClB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CACvC,GAAG,KAAK,EAAE,CAYV"}
+{"version":3,"file":"views.d.ts","sourceRoot":"","sources":["../../src/mod-service/views.ts"],"names":[],"mappings":"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"}

package/dist/mod-service/views.js

@@ -1,86 +1,47 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModerationViews = void 0;
-exports.getSelfLabels = getSelfLabels;
-const kysely_1 = require("kysely");
-const api_1 = require("@atproto/api");
-const common_1 = require("@atproto/common");
-const lexicon_1 = require("@atproto/lexicon");
-const syntax_1 = require("@atproto/syntax");
-const lexicons_1 = require("../lexicon/lexicons");
-const defs_1 = require("../lexicon/types/com/atproto/label/defs");
-const defs_2 = require("../lexicon/types/com/atproto/moderation/defs");
-const defs_3 = require("../lexicon/types/tools/ozone/moderation/defs");
-const util_1 = require("../lexicon/util");
-const logger_1 = require("../logger");
-const status_1 = require("./status");
-const subject_1 = require("./subject");
-const util_2 = require("./util");
-const isValidSelfLabels = (0, util_1.asPredicate)(defs_1.validateSelfLabels);
+import { sql } from 'kysely';
+import { ComAtprotoRepoGetRecord, } from '@atproto/api';
+import { chunkArray, dedupeStrs } from '@atproto/common';
+import { BlobRef } from '@atproto/lexicon';
+import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax';
+import { ids } from '../lexicon/lexicons.js';
+import { validateSelfLabels, } from '../lexicon/types/com/atproto/label/defs.js';
+import { REASONOTHER } from '../lexicon/types/com/atproto/moderation/defs.js';
+import { isAccountEvent, isAgeAssuranceEvent, isAgeAssuranceOverrideEvent, isIdentityEvent, isModEventAcknowledge, isModEventComment, isModEventEmail, isModEventEscalate, isModEventLabel, isModEventMute, isModEventMuteReporter, isModEventPriorityScore, isModEventReport, isModEventReverseTakedown, isModEventTag, isModEventTakedown, isRecordEvent, isScheduleTakedownEvent, } from '../lexicon/types/tools/ozone/moderation/defs.js';
+import { asPredicate } from '../lexicon/util.js';
+import { dbLogger, httpLogger } from '../logger.js';
+import { moderationSubjectStatusQueryBuilder } from './status.js';
+import { subjectFromEventRow, subjectFromStatusRow } from './subject.js';
+import { formatLabel, getPdsAgentForRepo, signLabel } from './util.js';
+const isValidSelfLabels = asPredicate(validateSelfLabels);
 const ifString = (val) => typeof val === 'string' ? val : undefined;
 const ifBoolean = (val) => typeof val === 'boolean' ? val : undefined;
 const ifNumber = (val) => typeof val === 'number' ? val : undefined;
-class ModerationViews {
+export class ModerationViews {
     constructor(db, signingKey, signingKeyId, appviewAgent, appviewAuth, idResolver, devMode) {
-        Object.defineProperty(this, "db", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: db
-        });
-        Object.defineProperty(this, "signingKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: signingKey
-        });
-        Object.defineProperty(this, "signingKeyId", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: signingKeyId
-        });
-        Object.defineProperty(this, "appviewAgent", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: appviewAgent
-        });
-        Object.defineProperty(this, "appviewAuth", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: appviewAuth
-        });
-        Object.defineProperty(this, "idResolver", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: idResolver
-        });
-        Object.defineProperty(this, "devMode", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: devMode
-        });
+        this.db = db;
+        this.signingKey = signingKey;
+        this.signingKeyId = signingKeyId;
+        this.appviewAgent = appviewAgent;
+        this.appviewAuth = appviewAuth;
+        this.idResolver = idResolver;
+        this.devMode = devMode;
     }
     async getAccoutInfosByDid(dids) {
         if (dids.length === 0)
             return new Map();
-        const auth = await this.appviewAuth(lexicons_1.ids.ComAtprotoAdminGetAccountInfos);
+        const auth = await this.appviewAuth(ids.ComAtprotoAdminGetAccountInfos);
         if (!auth)
             return new Map();
         try {
             const res = await this.appviewAgent.com.atproto.admin.getAccountInfos({
-                dids: (0, common_1.dedupeStrs)(dids),
+                dids: dedupeStrs(dids),
             }, auth);
             return res.data.infos.reduce((acc, cur) => {
                 return acc.set(cur.did, cur);
             }, new Map());
         }
         catch (err) {
-            logger_1.httpLogger.error({ err, dids }, 'failed to resolve account infos from appview');
+            httpLogger.error({ err, dids }, 'failed to resolve account infos from appview');
             return new Map();
         }
     }
@@ -115,7 +76,7 @@ class ModerationViews {
                 $type: row.action,
                 comment: row.comment ?? undefined,
             },
-            subject: (0, subject_1.subjectFromEventRow)(row).lex(),
+            subject: subjectFromEventRow(row).lex(),
             subjectBlobCids: row.subjectBlobCids ?? [],
             createdBy: row.createdBy,
             createdAt: row.createdAt,
@@ -130,38 +91,38 @@ class ModerationViews {
         };
         const { event } = eventView;
         const meta = row.meta || {};
-        if ((0, defs_3.isModEventMuteReporter)(event) ||
-            (0, defs_3.isModEventTakedown)(event) ||
-            (0, defs_3.isModEventLabel)(event) ||
-            (0, defs_3.isModEventMute)(event)) {
+        if (isModEventMuteReporter(event) ||
+            isModEventTakedown(event) ||
+            isModEventLabel(event) ||
+            isModEventMute(event)) {
             event.durationInHours = row.durationInHours ?? undefined;
         }
-        if (((0, defs_3.isModEventTakedown)(event) || (0, defs_3.isModEventAcknowledge)(event)) &&
+        if ((isModEventTakedown(event) || isModEventAcknowledge(event)) &&
             meta.acknowledgeAccountSubjects) {
             event.acknowledgeAccountSubjects = ifBoolean(meta.acknowledgeAccountSubjects);
         }
-        if ((0, defs_3.isModEventPriorityScore)(event)) {
+        if (isModEventPriorityScore(event)) {
             event.score = ifNumber(meta?.priorityScore) ?? 0;
         }
-        if ((0, defs_3.isModEventTakedown)(event) ||
-            (0, defs_3.isModEventEmail)(event) ||
-            (0, defs_3.isModEventReverseTakedown)(event)) {
+        if (isModEventTakedown(event) ||
+            isModEventEmail(event) ||
+            isModEventReverseTakedown(event)) {
             if (typeof meta.policies === 'string' && meta.policies.length > 0) {
                 event.policies = meta.policies.split(',');
             }
             event.strikeCount = ifNumber(row.strikeCount);
             event.severityLevel = ifString(row.severityLevel);
-            if ((0, defs_3.isModEventTakedown)(event) || (0, defs_3.isModEventEmail)(event)) {
+            if (isModEventTakedown(event) || isModEventEmail(event)) {
                 event.strikeExpiresAt = ifString(row.strikeExpiresAt);
             }
         }
-        if ((0, defs_3.isModEventTakedown)(event)) {
+        if (isModEventTakedown(event)) {
             if (typeof meta.targetServices === 'string' &&
                 meta.targetServices.length > 0) {
                 event.targetServices = meta.targetServices.split(',');
             }
         }
-        if ((0, defs_3.isModEventLabel)(event)) {
+        if (isModEventLabel(event)) {
             event.createLabelVals = row.createLabelVals?.length
                 ? row.createLabelVals.split(' ')
                 : [];
@@ -169,9 +130,9 @@ class ModerationViews {
                 ? row.negateLabelVals.split(' ')
                 : [];
         }
-        else if ((0, defs_3.isModEventAcknowledge)(event) ||
-            (0, defs_3.isModEventTakedown)(event) ||
-            (0, defs_3.isModEventEscalate)(event)) {
+        else if (isModEventAcknowledge(event) ||
+            isModEventTakedown(event) ||
+            isModEventEscalate(event)) {
             // This is for legacy data only, for new events, these types of events
             // won't have labels attached:
             if (row.createLabelVals?.length) {
@@ -183,39 +144,39 @@ class ModerationViews {
                 event.negateLabelVals = row.negateLabelVals.split(' ');
             }
         }
-        if ((0, defs_3.isModEventReport)(event)) {
+        if (isModEventReport(event)) {
             event.isReporterMuted = !!meta.isReporterMuted;
             event.reportType = ifString(meta.reportType);
         }
-        if ((0, defs_3.isModEventEmail)(event)) {
+        if (isModEventEmail(event)) {
             event.content = ifString(meta.content);
             event.subjectLine = ifString(meta.subjectLine);
             event.isDelivered = ifBoolean(meta.isDelivered);
         }
-        if ((0, defs_3.isModEventComment)(event) && meta.sticky) {
+        if (isModEventComment(event) && meta.sticky) {
             event.sticky = true;
         }
-        if ((0, defs_3.isModEventTag)(event)) {
+        if (isModEventTag(event)) {
             event.add = row.addedTags || [];
             event.remove = row.removedTags || [];
         }
-        if ((0, defs_3.isAccountEvent)(event)) {
+        if (isAccountEvent(event)) {
             event.active = !!meta.active;
             event.timestamp = ifString(meta.timestamp);
             event.status = ifString(meta.status);
         }
-        if ((0, defs_3.isIdentityEvent)(event)) {
+        if (isIdentityEvent(event)) {
             event.timestamp = ifString(meta.timestamp);
             event.handle = ifString(meta.handle);
             event.pdsHost = ifString(meta.pdsHost);
             event.tombstone = !!meta.tombstone;
         }
-        if ((0, defs_3.isRecordEvent)(event)) {
+        if (isRecordEvent(event)) {
             event.op = ifString(meta.op);
             event.cid = ifString(meta.cid);
             event.timestamp = ifString(meta.timestamp);
         }
-        if ((0, defs_3.isAgeAssuranceEvent)(event)) {
+        if (isAgeAssuranceEvent(event)) {
             event.status = ifString(meta.status);
             event.access = ifString(meta.access);
             event.createdAt = ifString(meta.createdAt);
@@ -225,11 +186,11 @@ class ModerationViews {
             event.completeIp = ifString(meta.completeIp);
             event.completeUa = ifString(meta.completeUa);
         }
-        if ((0, defs_3.isAgeAssuranceOverrideEvent)(event)) {
+        if (isAgeAssuranceOverrideEvent(event)) {
             event.status = ifString(meta.status);
             event.access = ifString(meta.access);
         }
-        if ((0, defs_3.isScheduleTakedownEvent)(event)) {
+        if (isScheduleTakedownEvent(event)) {
             event.executeAt = ifString(meta.executeAt);
             event.executeAfter = ifString(meta.executeAfter);
             event.executeUntil = ifString(meta.executeUntil);
@@ -285,10 +246,10 @@ class ModerationViews {
             return record;
         }
         catch (err) {
-            if (err instanceof api_1.ComAtprotoRepoGetRecord.RecordNotFoundError) {
+            if (err instanceof ComAtprotoRepoGetRecord.RecordNotFoundError) {
                 // If pds fetch fails, just return null regardless of the error
                 try {
-                    const { agent: pdsAgent } = await (0, util_2.getPdsAgentForRepo)(this.idResolver, params.repo, this.devMode);
+                    const { agent: pdsAgent } = await getPdsAgentForRepo(this.idResolver, params.repo, this.devMode);
                     if (!pdsAgent) {
                         return null;
                     }
@@ -303,11 +264,11 @@ class ModerationViews {
         }
     }
     async fetchRecords(subjects) {
-        const appviewAuth = await this.appviewAuth(lexicons_1.ids.ComAtprotoRepoGetRecord);
+        const appviewAuth = await this.appviewAuth(ids.ComAtprotoRepoGetRecord);
         if (!appviewAuth)
             return new Map();
         const fetched = await Promise.all(subjects.map(async (subject) => {
-            const uri = new syntax_1.AtUri(subject.uri);
+            const uri = new AtUri(subject.uri);
             const params = {
                 repo: uri.hostname,
                 collection: uri.collection,
@@ -325,7 +286,7 @@ class ModerationViews {
         }, new Map());
     }
     async records(subjects) {
-        const uris = subjects.map((record) => new syntax_1.AtUri(record.uri));
+        const uris = subjects.map((record) => new AtUri(record.uri));
         const dids = uris.map((u) => u.hostname);
         const [repos, subjectStatuses, records] = await Promise.all([
             this.repos(dids),
@@ -414,7 +375,7 @@ class ModerationViews {
             return results;
         }
         catch (err) {
-            logger_1.httpLogger.error({ err, subjects, labelers }, 'failed to resolve labels from appview');
+            httpLogger.error({ err, subjects, labelers }, 'failed to resolve labels from appview');
             return results;
         }
     }
@@ -426,10 +387,10 @@ class ModerationViews {
             // we are not guarantying that so in whatever case, if we end up with such entries, default to 'other'
             reasonType: report.meta?.reportType
                 ? report.meta?.reportType
-                : defs_2.REASONOTHER,
+                : REASONOTHER,
             reason: report.comment ?? undefined,
             reportedBy: report.createdBy,
-            subject: (0, subject_1.subjectFromEventRow)(report).lex(),
+            subject: subjectFromEventRow(report).lex(),
         };
     }
     // Partial view for subjects
@@ -472,8 +433,8 @@ class ModerationViews {
         if (!blobs.length)
             return [];
         const { ref } = this.db.db.dynamic;
-        const modStatusResults = await (0, status_1.moderationSubjectStatusQueryBuilder)(this.db.db)
-            .where((0, kysely_1.sql) `${ref('moderation_subject_status.blobCids')} @> ${JSON.stringify(blobs.map((blob) => blob.ref.toString()))}`)
+        const modStatusResults = await moderationSubjectStatusQueryBuilder(this.db.db)
+            .where(sql `${ref('moderation_subject_status.blobCids')} @> ${JSON.stringify(blobs.map((blob) => blob.ref.toString()))}`)
             .executeTakeFirst();
         const statusByCid = (modStatusResults?.blobCids || [])?.reduce((acc, cur) => Object.assign(acc, { [cur]: modStatusResults }), {});
         // Intentionally missing details field, since we don't have any on appview.
@@ -516,11 +477,11 @@ class ModerationViews {
         return labels;
     }
     async formatLabelAndEnsureSig(row) {
-        const formatted = (0, util_2.formatLabel)(row);
+        const formatted = formatLabel(row);
         if (!!row.sig && row.signingKeyId === this.signingKeyId) {
             return formatted;
         }
-        const signed = await (0, util_2.signLabel)(formatted, this.signingKey);
+        const signed = await signLabel(formatted, this.signingKey);
         try {
             await this.db.db
                 .updateTable('label')
@@ -529,7 +490,7 @@ class ModerationViews {
                 .execute();
         }
         catch (err) {
-            logger_1.dbLogger.error({ err, label: row }, 'failed to update resigned label');
+            dbLogger.error({ err, label: row }, 'failed to update resigned label');
         }
         return signed;
     }
@@ -537,7 +498,7 @@ class ModerationViews {
         if (!subjects.length)
             return new Map();
         const parsedSubjects = subjects.map(parseSubjectId);
-        const builder = (0, status_1.moderationSubjectStatusQueryBuilder)(this.db.db)
+        const builder = moderationSubjectStatusQueryBuilder(this.db.db)
             //
             .where((qb) => {
             for (const sub of parsedSubjects) {
@@ -553,7 +514,7 @@ class ModerationViews {
         ]);
         return new Map(statusRes.map((row) => {
             const subjectId = formatSubjectId(row.did, row.recordPath);
-            const handle = accountsByDid.get(row.did)?.handle ?? syntax_1.INVALID_HANDLE;
+            const handle = accountsByDid.get(row.did)?.handle ?? INVALID_HANDLE;
             return [subjectId, { ...row, handle }];
         }));
     }
@@ -579,7 +540,7 @@ class ModerationViews {
             priorityScore: status.priorityScore,
             ageAssuranceState: status.ageAssuranceState ?? undefined,
             ageAssuranceUpdatedBy: status.ageAssuranceUpdatedBy ?? undefined,
-            subject: (0, subject_1.subjectFromStatusRow)(status).lex(),
+            subject: subjectFromStatusRow(status).lex(),
             accountStats: {
                 // Explicitly typing to allow for easy manipulation (e.g. to strip from tests snapshots)
                 $type: 'tools.ozone.moderation.defs#accountStats',
@@ -635,7 +596,7 @@ class ModerationViews {
         return statusView;
     }
     async fetchAuthorFeed(actor) {
-        const auth = await this.appviewAuth(lexicons_1.ids.AppBskyFeedGetAuthorFeed);
+        const auth = await this.appviewAuth(ids.AppBskyFeedGetAuthorFeed);
         if (!auth)
             return [];
         const { data: { feed }, } = await this.appviewAgent.app.bsky.feed.getAuthorFeed({ actor }, auth);
@@ -643,10 +604,10 @@ class ModerationViews {
     }
     async getProfiles(dids) {
         const profiles = new Map();
-        const auth = await this.appviewAuth(lexicons_1.ids.AppBskyActorGetProfiles);
+        const auth = await this.appviewAuth(ids.AppBskyActorGetProfiles);
         if (!auth)
             return profiles;
-        for (const actors of (0, common_1.chunkArray)(dids, 25)) {
+        for (const actors of chunkArray(dids, 25)) {
             const { data } = await this.appviewAgent.getProfiles({ actors }, auth);
             data.profiles.forEach((profile) => {
                 profiles.set(profile.did, profile);
@@ -655,19 +616,18 @@ class ModerationViews {
         return profiles;
     }
 }
-exports.ModerationViews = ModerationViews;
 function parseSubjectId(subject) {
     if (subject.startsWith('did:')) {
         return { did: subject };
     }
-    const uri = new syntax_1.AtUri(subject);
+    const uri = new AtUri(subject);
     return { did: uri.hostname, recordPath: `${uri.collection}/${uri.rkey}` };
 }
 function formatSubjectId(did, recordPath) {
     return recordPath ? `at://${did}/${recordPath}` : did;
 }
 function findBlobRefs(value, refs = []) {
-    if (value instanceof lexicon_1.BlobRef) {
+    if (value instanceof BlobRef) {
         refs.push(value);
     }
     else if (Array.isArray(value)) {
@@ -678,15 +638,15 @@ function findBlobRefs(value, refs = []) {
     }
     return refs;
 }
-function getSelfLabels(details) {
+export function getSelfLabels(details) {
     const { uri, cid, record } = details;
     if (!uri || !cid || !record)
         return [];
     if (!isValidSelfLabels(record.labels))
         return [];
-    const src = new syntax_1.AtUri(uri).host; // record creator
+    const src = new AtUri(uri).host; // record creator
     const cts = typeof record.createdAt === 'string'
-        ? (0, syntax_1.normalizeDatetimeAlways)(record.createdAt)
+        ? normalizeDatetimeAlways(record.createdAt)
         : new Date(0).toISOString();
     return record.labels.values.map(({ val }) => {
         return { src, uri, cid, val, cts };