@atproto/ozone 0.1.53 → 0.1.54

package/dist/setting/service.d.ts

@@ -0,0 +1,33 @@
+import Database from '../db';
+import { Selectable } from 'kysely';
+import { Option } from '../lexicon/types/tools/ozone/setting/defs';
+import { Setting, SettingScope } from '../db/schema/setting';
+import { Member } from '../db/schema/member';
+export type SettingServiceCreator = (db: Database) => SettingService;
+export declare class SettingService {
+    db: Database;
+    constructor(db: Database);
+    static creator(): (db: Database) => SettingService;
+    query({ limit, scope, did, cursor, prefix, keys, }: {
+        limit: number;
+        scope?: 'personal' | 'instance';
+        did?: string;
+        cursor?: string;
+        prefix?: string;
+        keys?: string[];
+    }): Promise<{
+        options: Selectable<Setting>[];
+        cursor?: string;
+    }>;
+    upsert(option: Omit<Setting, 'id' | 'createdAt' | 'updatedAt'> & {
+        createdAt: Date;
+        updatedAt: Date;
+    }): Promise<void>;
+    removeOptions(keys: string[], filters: {
+        did?: string;
+        scope: SettingScope;
+        managerRole: Member['role'][];
+    }): Promise<void>;
+    view(setting: Selectable<Setting>): Option;
+}
+//# sourceMappingURL=service.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/setting/service.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,OAAO,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAA;AAClE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAI5C,MAAM,MAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,QAAQ,KAAK,cAAc,CAAA;AAEpE,qBAAa,cAAc;IACN,EAAE,EAAE,QAAQ;gBAAZ,EAAE,EAAE,QAAQ;IAE/B,MAAM,CAAC,OAAO,SACA,QAAQ;IAGhB,KAAK,CAAC,EACV,KAAW,EACX,KAAK,EACL,GAAG,EACH,MAAM,EACN,MAAM,EACN,IAAI,GACL,EAAE;QACD,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,CAAC,EAAE,UAAU,GAAG,UAAU,CAAA;QAC/B,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;KAChB,GAAG,OAAO,CAAC;QACV,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,CAAA;QAC9B,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,CAAC;IAiCI,MAAM,CACV,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,WAAW,GAAG,WAAW,CAAC,GAAG;QACxD,SAAS,EAAE,IAAI,CAAA;QACf,SAAS,EAAE,IAAI,CAAA;KAChB,GACA,OAAO,CAAC,IAAI,CAAC;IAgBV,aAAa,CACjB,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE;QACP,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,YAAY,CAAA;QACnB,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAA;KAC9B,GACA,OAAO,CAAC,IAAI,CAAC;IAyBhB,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,MAAM;CA2B3C"}

package/dist/setting/service.js

@@ -0,0 +1,101 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SettingService = void 0;
+const node_assert_1 = __importDefault(require("node:assert"));
+const xrpc_server_1 = require("@atproto/xrpc-server");
+class SettingService {
+    constructor(db) {
+        Object.defineProperty(this, "db", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: db
+        });
+    }
+    static creator() {
+        return (db) => new SettingService(db);
+    }
+    async query({ limit = 100, scope, did, cursor, prefix, keys, }) {
+        let builder = this.db.db.selectFrom('setting').selectAll();
+        if (prefix) {
+            builder = builder.where('key', 'like', `${prefix}%`);
+        }
+        else if (keys?.length) {
+            builder = builder.where('key', 'in', keys);
+        }
+        if (scope) {
+            builder = builder.where('scope', '=', scope);
+        }
+        if (did) {
+            builder = builder.where('did', '=', did);
+        }
+        if (cursor) {
+            const cursorId = parseInt(cursor, 10);
+            if (isNaN(cursorId)) {
+                throw new xrpc_server_1.InvalidRequestError('invalid cursor');
+            }
+            builder = builder.where('id', '<', cursorId);
+        }
+        const options = await builder.orderBy('id', 'desc').limit(limit).execute();
+        return {
+            options,
+            cursor: options[options.length - 1]?.id.toString(),
+        };
+    }
+    async upsert(option) {
+        await this.db.db
+            .insertInto('setting')
+            .values(option)
+            .onConflict((oc) => {
+            return oc.columns(['key', 'scope', 'did']).doUpdateSet({
+                value: option.value,
+                updatedAt: option.updatedAt,
+                description: option.description,
+                managerRole: option.managerRole,
+                lastUpdatedBy: option.lastUpdatedBy,
+            });
+        })
+            .execute();
+    }
+    async removeOptions(keys, filters) {
+        if (!keys.length)
+            return;
+        if (filters.scope === 'personal') {
+            (0, node_assert_1.default)(filters.did, 'did is required for personal scope');
+        }
+        let qb = this.db.db
+            .deleteFrom('setting')
+            .where('key', 'in', keys)
+            .where('scope', '=', filters.scope);
+        if (filters.managerRole.length) {
+            qb = qb.where('managerRole', 'in', filters.managerRole);
+        }
+        else {
+            qb = qb.where('managerRole', 'is', null);
+        }
+        if (filters.did) {
+            qb = qb.where('did', '=', filters.did);
+        }
+        await qb.execute();
+    }
+    view(setting) {
+        const { key, value, did, description, createdAt, createdBy, updatedAt, lastUpdatedBy, managerRole, scope, } = setting;
+        return {
+            key,
+            value,
+            did,
+            scope,
+            createdBy,
+            lastUpdatedBy,
+            managerRole: managerRole || undefined,
+            description: description || undefined,
+            createdAt: createdAt.toISOString(),
+            updatedAt: updatedAt.toISOString(),
+        };
+    }
+}
+exports.SettingService = SettingService;
+//# sourceMappingURL=service.js.map

package/dist/setting/service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/setting/service.ts"],"names":[],"mappings":";;;;;;AAKA,8DAAgC;AAChC,sDAA0D;AAI1D,MAAa,cAAc;IACzB,YAAmB,EAAY;QAAnB;;;;mBAAO,EAAE;WAAU;IAAG,CAAC;IAEnC,MAAM,CAAC,OAAO;QACZ,OAAO,CAAC,EAAY,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,EAAE,CAAC,CAAA;IACjD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,EACV,KAAK,GAAG,GAAG,EACX,KAAK,EACL,GAAG,EACH,MAAM,EACN,MAAM,EACN,IAAI,GAQL;QAIC,IAAI,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAA;QAE1D,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,CAAA;QACtD,CAAC;aAAM,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;YACxB,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QAC5C,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;QAC9C,CAAC;QAED,IAAI,GAAG,EAAE,CAAC;YACR,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QAC1C,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;YACrC,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpB,MAAM,IAAI,iCAAmB,CAAC,gBAAgB,CAAC,CAAA;YACjD,CAAC;YACD,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA;QAC9C,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAA;QAE1E,OAAO;YACL,OAAO;YACP,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE;SACnD,CAAA;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CACV,MAGC;QAED,MAAM,IAAI,CAAC,EAAE,CAAC,EAAE;aACb,UAAU,CAAC,SAAS,CAAC;aACrB,MAAM,CAAC,MAAM,CAAC;aACd,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE;YACjB,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC;gBACrD,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,aAAa,EAAE,MAAM,CAAC,aAAa;aACpC,CAAC,CAAA;QACJ,CAAC,CAAC;aACD,OAAO,EAAE,CAAA;IACd,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,IAAc,EACd,OAIC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAM;QAExB,IAAI,OAAO,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YACjC,IAAA,qBAAM,EAAC,OAAO,CAAC,GAAG,EAAE,oCAAoC,CAAC,CAAA;QAC3D,CAAC;QAED,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE;aAChB,UAAU,CAAC,SAAS,CAAC;aACrB,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC;aACxB,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAErC,IAAI,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YAC/B,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;QACzD,CAAC;aAAM,CAAC;YACN,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QAC1C,CAAC;QAED,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAChB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;QACxC,CAAC;QAED,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;IACpB,CAAC;IAED,IAAI,CAAC,OAA4B;QAC/B,MAAM,EACJ,GAAG,EACH,KAAK,EACL,GAAG,EACH,WAAW,EACX,SAAS,EACT,SAAS,EACT,SAAS,EACT,aAAa,EACb,WAAW,EACX,KAAK,GACN,GAAG,OAAO,CAAA;QAEX,OAAO;YACL,GAAG;YACH,KAAK;YACL,GAAG;YACH,KAAK;YACL,SAAS;YACT,aAAa;YACb,WAAW,EAAE,WAAW,IAAI,SAAS;YACrC,WAAW,EAAE,WAAW,IAAI,SAAS;YACrC,SAAS,EAAE,SAAS,CAAC,WAAW,EAAE;YAClC,SAAS,EAAE,SAAS,CAAC,WAAW,EAAE;SACnC,CAAA;IACH,CAAC;CACF;AAzID,wCAyIC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.53",
+  "version": "0.1.54",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -32,14 +32,14 @@
     "structured-headers": "^1.0.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.13.14",
+    "@atproto/api": "^0.13.15",
     "@atproto/common": "^0.4.4",
-    "@atproto/crypto": "^0.4.1",
-    "@atproto/identity": "^0.4.2",
+    "@atproto/crypto": "^0.4.2",
+    "@atproto/identity": "^0.4.3",
     "@atproto/lexicon": "^0.4.2",
     "@atproto/syntax": "^0.3.0",
     "@atproto/xrpc": "^0.6.3",
-    "@atproto/xrpc-server": "^0.7.1"
+    "@atproto/xrpc-server": "^0.7.2"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -53,7 +53,7 @@
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
     "@atproto/lex-cli": "^0.5.1",
-    "@atproto/pds": "^0.4.69"
+    "@atproto/pds": "^0.4.70"
   },
   "scripts": {
     "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",

package/src/api/index.ts

@@ -30,6 +30,9 @@ import upsertSet from './set/upsertSet'
 import setDeleteValues from './set/deleteValues'
 import deleteSet from './set/deleteSet'
 import getRepos from './moderation/getRepos'
+import listOptions from './setting/listOptions'
+import removeOptions from './setting/removeOptions'
+import upsertOption from './setting/upsertOption'
 
 export * as health from './health'
 
@@ -66,5 +69,8 @@ export default function (server: Server, ctx: AppContext) {
   upsertSet(server, ctx)
   setDeleteValues(server, ctx)
   deleteSet(server, ctx)
+  upsertOption(server, ctx)
+  listOptions(server, ctx)
+  removeOptions(server, ctx)
   return server
 }

package/src/api/moderation/queryStatuses.ts

@@ -18,6 +18,11 @@ export default function (server: Server, ctx: AppContext) {
         reportedBefore,
         ignoreSubjects,
         lastReviewedBy,
+        hostingDeletedBefore,
+        hostingDeletedAfter,
+        hostingUpdatedBefore,
+        hostingUpdatedAfter,
+        hostingStatuses,
         sortDirection = 'desc',
         sortField = 'lastReportedAt',
         includeMuted = false,
@@ -42,6 +47,11 @@ export default function (server: Server, ctx: AppContext) {
         reportedAfter,
         reportedBefore,
         includeMuted,
+        hostingDeletedBefore,
+        hostingDeletedAfter,
+        hostingUpdatedBefore,
+        hostingUpdatedAfter,
+        hostingStatuses,
         onlyMuted,
         ignoreSubjects,
         sortDirection,

package/src/api/setting/listOptions.ts

@@ -0,0 +1,44 @@
+import { AuthRequiredError } from '@atproto/xrpc-server'
+import { Server } from '../../lexicon'
+import AppContext from '../../context'
+
+export default function (server: Server, ctx: AppContext) {
+  server.tools.ozone.setting.listOptions({
+    auth: ctx.authVerifier.modOrAdminToken,
+    handler: async ({ params, auth }) => {
+      const access = auth.credentials
+      const db = ctx.db
+      const { prefix, scope, keys, limit, cursor } = params
+      let did = ctx.cfg.service.did
+
+      if (scope === 'personal') {
+        if (access.type !== 'moderator') {
+          throw new AuthRequiredError(
+            'Must use moderator auth to get personal set details',
+          )
+        }
+
+        did = access.iss
+      }
+
+      const settingService = ctx.settingService(db)
+
+      const result = await settingService.query({
+        scope: scope === 'personal' ? 'personal' : 'instance',
+        did,
+        keys,
+        prefix,
+        limit,
+        cursor,
+      })
+
+      return {
+        encoding: 'application/json',
+        body: {
+          options: result.options.map((option) => settingService.view(option)),
+          cursor: result.cursor,
+        },
+      }
+    },
+  })
+}

package/src/api/setting/removeOptions.ts

@@ -0,0 +1,63 @@
+import { AuthRequiredError } from '@atproto/xrpc-server'
+import { Server } from '../../lexicon'
+import AppContext from '../../context'
+import { Member } from '../../db/schema/member'
+
+export default function (server: Server, ctx: AppContext) {
+  server.tools.ozone.setting.removeOptions({
+    auth: ctx.authVerifier.modOrAdminToken,
+    handler: async ({ input, auth }) => {
+      const access = auth.credentials
+      const db = ctx.db
+      const { keys, scope } = input.body
+      let did = ctx.cfg.service.did
+      let managerRole: Member['role'][] = []
+
+      if (scope === 'personal') {
+        if (access.type !== 'moderator') {
+          throw new AuthRequiredError(
+            'Must use moderator auth to delete personal setting',
+          )
+        }
+
+        did = access.iss
+      }
+
+      // When attempting to delete an instance setting using admin_token will allow removing any setting
+      // otherwise, admins can remove settings that are manageable by all roles
+      // moderators can remove settings that are manageable by moderator and triage roles
+      // triage can remove settings that are manageable by triage role
+      if (scope === 'instance') {
+        managerRole = [
+          'tools.ozone.team.defs#roleModerator',
+          'tools.ozone.team.defs#roleTriage',
+          'tools.ozone.team.defs#roleAdmin',
+        ]
+
+        if (access.type !== 'admin_token' && !access.isAdmin) {
+          if (access.isModerator) {
+            managerRole = [
+              'tools.ozone.team.defs#roleModerator',
+              'tools.ozone.team.defs#roleTriage',
+            ]
+          } else if (access.isTriage) {
+            managerRole = ['tools.ozone.team.defs#roleTriage']
+          }
+        }
+      }
+
+      const settingService = ctx.settingService(db)
+
+      await settingService.removeOptions(keys, {
+        scope: scope === 'personal' ? 'personal' : 'instance',
+        managerRole,
+        did,
+      })
+
+      return {
+        encoding: 'application/json',
+        body: {},
+      }
+    },
+  })
+}

package/src/api/setting/upsertOption.ts

@@ -0,0 +1,142 @@
+import { AuthRequiredError } from '@atproto/xrpc-server'
+import { Server } from '../../lexicon'
+import AppContext from '../../context'
+import { AdminTokenOutput, ModeratorOutput } from '../../auth-verifier'
+import { SettingService } from '../../setting/service'
+import { Member } from '../../db/schema/member'
+import { ToolsOzoneTeamDefs } from '@atproto/api'
+import assert from 'node:assert'
+
+export default function (server: Server, ctx: AppContext) {
+  server.tools.ozone.setting.upsertOption({
+    auth: ctx.authVerifier.modOrAdminToken,
+    handler: async ({ input, auth }) => {
+      const access = auth.credentials
+      const db = ctx.db
+      const { key, value, description, managerRole, scope } = input.body
+      const serviceDid = ctx.cfg.service.did
+      let ownerDid = serviceDid
+
+      if (scope === 'personal' && access.type !== 'moderator') {
+        throw new AuthRequiredError(
+          'Must use moderator auth to create or update a personal setting',
+        )
+      }
+
+      // if the caller is using moderator auth and storing personal setting
+      // use the caller's DID as the owner
+      if (scope === 'personal' && access.type === 'moderator') {
+        ownerDid = access.iss
+      }
+
+      const now = new Date()
+      const baseOption = {
+        key,
+        value,
+        did: ownerDid,
+        createdBy: ownerDid,
+        lastUpdatedBy: ownerDid,
+        description: description || '',
+        createdAt: now,
+        updatedAt: now,
+      }
+
+      const settingService = ctx.settingService(db)
+      if (scope === 'personal') {
+        await settingService.upsert({
+          ...baseOption,
+          scope: 'personal',
+          managerRole: null,
+        })
+      } else {
+        const manageableRoles = getRolesForInstanceOption(access)
+        const existingSetting = await getExistingSetting(
+          settingService,
+          ownerDid,
+          key,
+          'instance',
+        )
+
+        if (
+          existingSetting?.managerRole &&
+          !manageableRoles.includes(existingSetting.managerRole)
+        ) {
+          throw new AuthRequiredError(`Not permitted to update setting ${key}`)
+        }
+        await settingService.upsert({
+          ...baseOption,
+          scope: 'instance',
+          managerRole: getManagerRole(managerRole),
+        })
+      }
+
+      const newOption = await getExistingSetting(
+        settingService,
+        ownerDid,
+        key,
+        scope,
+      )
+      assert(newOption, 'Failed to get the updated setting')
+
+      return {
+        encoding: 'application/json',
+        body: {
+          option: settingService.view(newOption),
+        },
+      }
+    },
+  })
+}
+
+const getExistingSetting = async (
+  settingService: SettingService,
+  did: string,
+  key: string,
+  scope: string,
+) => {
+  const result = await settingService.query({
+    scope: scope === 'personal' ? 'personal' : 'instance',
+    keys: [key],
+    limit: 1,
+    did,
+  })
+
+  return result.options[0]
+}
+
+const getRolesForInstanceOption = (
+  access: AdminTokenOutput['credentials'] | ModeratorOutput['credentials'],
+) => {
+  const fullPermission = [
+    ToolsOzoneTeamDefs.ROLEADMIN,
+    ToolsOzoneTeamDefs.ROLEMODERATOR,
+    ToolsOzoneTeamDefs.ROLETRIAGE,
+  ]
+  if (access.type === 'admin_token') {
+    return fullPermission
+  }
+
+  if (access.isAdmin) {
+    return fullPermission
+  }
+
+  if (access.isModerator) {
+    return [ToolsOzoneTeamDefs.ROLEMODERATOR, ToolsOzoneTeamDefs.ROLETRIAGE]
+  }
+
+  return [ToolsOzoneTeamDefs.ROLETRIAGE]
+}
+
+const getManagerRole = (role?: string) => {
+  let managerRole: Member['role'] | null = null
+
+  if (role === ToolsOzoneTeamDefs.ROLEADMIN) {
+    managerRole = ToolsOzoneTeamDefs.ROLEADMIN
+  } else if (role === ToolsOzoneTeamDefs.ROLEMODERATOR) {
+    managerRole = ToolsOzoneTeamDefs.ROLEMODERATOR
+  } else if (role === ToolsOzoneTeamDefs.ROLETRIAGE) {
+    managerRole = ToolsOzoneTeamDefs.ROLETRIAGE
+  }
+
+  return managerRole
+}

package/src/context.ts

@@ -27,6 +27,7 @@ import {
   parseLabelerHeader,
 } from './util'
 import { SetService, SetServiceCreator } from './set/service'
+import { SettingService, SettingServiceCreator } from './setting/service'
 
 export type AppContextOptions = {
   db: Database
@@ -34,6 +35,7 @@ export type AppContextOptions = {
   modService: ModerationServiceCreator
   communicationTemplateService: CommunicationTemplateServiceCreator
   setService: SetServiceCreator
+  settingService: SettingServiceCreator
   teamService: TeamServiceCreator
   appviewAgent: AtpAgent
   pdsAgent: AtpAgent | undefined
@@ -120,6 +122,7 @@ export class AppContext {
     const communicationTemplateService = CommunicationTemplateService.creator()
     const teamService = TeamService.creator()
     const setService = SetService.creator()
+    const settingService = SettingService.creator()
 
     const sequencer = new Sequencer(modService(db))
 
@@ -137,6 +140,7 @@ export class AppContext {
         communicationTemplateService,
         teamService,
         setService,
+        settingService,
         appviewAgent,
         pdsAgent,
         chatAgent,
@@ -190,6 +194,10 @@ export class AppContext {
     return this.opts.setService
   }
 
+  get settingService(): SettingServiceCreator {
+    return this.opts.settingService
+  }
+
   get appviewAgent(): AtpAgent {
     return this.opts.appviewAgent
   }

package/src/db/migrations/20241018T205730722Z-setting.ts

@@ -0,0 +1,27 @@
+import { Kysely, sql } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .createTable('setting')
+    .addColumn('id', 'serial', (col) => col.primaryKey())
+    .addColumn('key', 'text', (col) => col.notNull())
+    .addColumn('did', 'text', (col) => col.notNull())
+    .addColumn('value', 'jsonb', (col) => col.notNull())
+    .addColumn('description', 'text')
+    .addColumn('createdAt', 'timestamptz', (col) =>
+      col.defaultTo(sql`now()`).notNull(),
+    )
+    .addColumn('updatedAt', 'timestamptz', (col) =>
+      col.defaultTo(sql`now()`).notNull(),
+    )
+    .addColumn('managerRole', 'text')
+    .addColumn('scope', 'text', (col) => col.notNull())
+    .addColumn('createdBy', 'text', (col) => col.notNull())
+    .addColumn('lastUpdatedBy', 'text', (col) => col.notNull())
+    .addUniqueConstraint('setting_did_scope_key_idx', ['did', 'scope', 'key'])
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.dropTable('setting').execute()
+}

package/src/db/migrations/20241026T205730722Z-add-hosting-status-to-subject-status.ts

@@ -0,0 +1,57 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .addColumn('hostingStatus', 'varchar', (col) =>
+      col.notNull().defaultTo('unknown'),
+    )
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .addColumn('hostingDeletedAt', 'varchar')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .addColumn('hostingUpdatedAt', 'varchar')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .addColumn('hostingCreatedAt', 'varchar')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .addColumn('hostingDeactivatedAt', 'varchar')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .addColumn('hostingReactivatedAt', 'varchar')
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropColumn('hostingStatus')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropColumn('hostingDeletedAt')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropColumn('hostingUpdatedAt')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropColumn('hostingCreatedAt')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropColumn('hostingDeactivatedAt')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropColumn('hostingReactivatedAt')
+    .execute()
+}

package/src/db/migrations/index.ts

@@ -15,3 +15,5 @@ export * as _20240903T205730722Z from './20240903T205730722Z-add-template-lang'
 export * as _20240904T205730722Z from './20240904T205730722Z-add-subject-did-index'
 export * as _20241001T205730722Z from './20241001T205730722Z-subject-status-review-state-index'
 export * as _20241008T205730722Z from './20241008T205730722Z-sets'
+export * as _20241018T205730722Z from './20241018T205730722Z-setting'
+export * as _20241026T205730722Z from './20241026T205730722Z-add-hosting-status-to-subject-status'

package/src/db/schema/index.ts

@@ -9,6 +9,7 @@ import * as signingKey from './signing_key'
 import * as communicationTemplate from './communication_template'
 import * as set from './ozone_set'
 import * as member from './member'
+import * as setting from './setting'
 
 export type DatabaseSchemaType = modEvent.PartialDB &
   modSubjectStatus.PartialDB &
@@ -19,7 +20,8 @@ export type DatabaseSchemaType = modEvent.PartialDB &
   blobPushEvent.PartialDB &
   communicationTemplate.PartialDB &
   set.PartialDB &
-  member.PartialDB
+  member.PartialDB &
+  setting.PartialDB
 
 export type DatabaseSchema = Kysely<DatabaseSchemaType>
 

package/src/db/schema/moderation_event.ts

@@ -19,6 +19,9 @@ export interface ModerationEvent {
     | 'tools.ozone.moderation.defs#modEventEmail'
     | 'tools.ozone.moderation.defs#modEventResolveAppeal'
     | 'tools.ozone.moderation.defs#modEventTag'
+    | 'tools.ozone.moderation.defs#accountEvent'
+    | 'tools.ozone.moderation.defs#identityEvent'
+    | 'tools.ozone.moderation.defs#recordEvent'
   subjectType:
     | 'com.atproto.admin.defs#repoRef'
     | 'com.atproto.repo.strongRef'

package/src/db/schema/moderation_subject_status.ts

@@ -25,6 +25,12 @@ export interface ModerationSubjectStatus {
   lastReviewedAt: string | null
   lastReportedAt: string | null
   lastAppealedAt: string | null
+  hostingUpdatedAt: string | null
+  hostingDeletedAt: string | null
+  hostingCreatedAt: string | null
+  hostingDeactivatedAt: string | null
+  hostingReactivatedAt: string | null
+  hostingStatus: string | null
   muteUntil: string | null
   muteReportingUntil: string | null
   suspendUntil: string | null