@atproto/ozone 0.1.73 → 0.1.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.73",
+  "version": "0.1.75",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -16,6 +16,9 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": "dist/bin.js",
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@did-plc/lib": "^0.0.1",
     "compression": "^1.7.4",
@@ -32,14 +35,14 @@
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
     "undici": "^6.14.1",
-    "@atproto/api": "^0.13.31",
-    "@atproto/common": "^0.4.6",
-    "@atproto/crypto": "^0.4.3",
-    "@atproto/identity": "^0.4.5",
-    "@atproto/lexicon": "^0.4.5",
-    "@atproto/syntax": "^0.3.1",
-    "@atproto/xrpc": "^0.6.6",
-    "@atproto/xrpc-server": "^0.7.8"
+    "@atproto/api": "^0.13.33",
+    "@atproto/common": "^0.4.8",
+    "@atproto/crypto": "^0.4.4",
+    "@atproto/identity": "^0.4.6",
+    "@atproto/lexicon": "^0.4.6",
+    "@atproto/syntax": "^0.3.2",
+    "@atproto/xrpc": "^0.6.8",
+    "@atproto/xrpc-server": "^0.7.10"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -51,8 +54,8 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/lex-cli": "^0.5.6",
-    "@atproto/pds": "^0.4.90"
+    "@atproto/lex-cli": "^0.5.7",
+    "@atproto/pds": "^0.4.92"
   },
   "scripts": {
     "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",

package/src/api/chat/getActorMetadata.ts

@@ -1,6 +1,6 @@
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
 import { ids } from '../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/chat/getMessageContext.ts

@@ -1,6 +1,6 @@
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
 import { ids } from '../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/chat/index.ts

@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import getActorMetadata from './getActorMetadata'
 import getMessageContext from './getMessageContext'
 

package/src/api/communication/createTemplate.ts

@@ -1,7 +1,7 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { isDuplicateTemplateNameError } from '../../communication-service/util'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.communication.createTemplate({

package/src/api/communication/deleteTemplate.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.communication.deleteTemplate({

package/src/api/communication/listTemplates.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.communication.listTemplates({

package/src/api/communication/updateTemplate.ts

@@ -1,7 +1,7 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { isDuplicateTemplateNameError } from '../../communication-service/util'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.communication.updateTemplate({

package/src/api/health.ts

@@ -1,9 +1,9 @@
-import express from 'express'
+import { Router } from 'express'
 import { sql } from 'kysely'
-import AppContext from '../context'
+import { AppContext } from '../context'
 
-export const createRouter = (ctx: AppContext): express.Router => {
-  const router = express.Router()
+export const createRouter = (ctx: AppContext): Router => {
+  const router = Router()
 
   router.get('/robots.txt', function (req, res) {
     res.type('text/plain')

package/src/api/index.ts

@@ -1,38 +1,38 @@
+import { AppContext } from '../context'
 import { Server } from '../lexicon'
-import AppContext from '../context'
-import createReport from './report/createReport'
+import chat from './chat'
+import createTemplate from './communication/createTemplate'
+import deleteTemplate from './communication/deleteTemplate'
+import listTemplates from './communication/listTemplates'
+import updateTemplate from './communication/updateTemplate'
+import fetchLabels from './label/fetchLabels'
+import queryLabels from './label/queryLabels'
+import subscribeLabels from './label/subscribeLabels'
 import emitEvent from './moderation/emitEvent'
-import searchRepos from './moderation/searchRepos'
+import getEvent from './moderation/getEvent'
 import adminGetRecord from './moderation/getRecord'
 import adminGetRecords from './moderation/getRecords'
 import getRepo from './moderation/getRepo'
-import queryStatuses from './moderation/queryStatuses'
+import getRepos from './moderation/getRepos'
 import queryEvents from './moderation/queryEvents'
-import getEvent from './moderation/getEvent'
-import queryLabels from './label/queryLabels'
-import subscribeLabels from './label/subscribeLabels'
-import fetchLabels from './label/fetchLabels'
-import createTemplate from './communication/createTemplate'
-import updateTemplate from './communication/updateTemplate'
-import deleteTemplate from './communication/deleteTemplate'
-import listTemplates from './communication/listTemplates'
-import addMember from './team/addMember'
-import updateMember from './team/updateMember'
-import deleteMember from './team/deleteMember'
-import listMembers from './team/listMembers'
-import getConfig from './server/getConfig'
-import chat from './chat'
+import queryStatuses from './moderation/queryStatuses'
+import searchRepos from './moderation/searchRepos'
 import proxied from './proxied'
+import createReport from './report/createReport'
+import getConfig from './server/getConfig'
 import setAddValues from './set/addValues'
+import deleteSet from './set/deleteSet'
+import setDeleteValues from './set/deleteValues'
 import setGetValues from './set/getValues'
 import querySets from './set/querySets'
 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'
+import addMember from './team/addMember'
+import deleteMember from './team/deleteMember'
+import listMembers from './team/listMembers'
+import updateMember from './team/updateMember'
 
 export * as health from './health'
 

package/src/api/label/fetchLabels.ts

@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.temp.fetchLabels({

package/src/api/label/queryLabels.ts

@@ -1,7 +1,7 @@
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { sql } from 'kysely'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.label.queryLabels(async ({ params }) => {

package/src/api/label/subscribeLabels.ts

@@ -1,7 +1,7 @@
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
-import Outbox from '../../sequencer/outbox'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
+import { Outbox } from '../../sequencer/outbox'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.label.subscribeLabels(async function* ({

package/src/api/moderation/emitEvent.ts

@@ -1,7 +1,9 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AdminTokenOutput, ModeratorOutput } from '../../auth-verifier'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import {
+  ModEventTag,
   isModEventAcknowledge,
   isModEventDivert,
   isModEventEmail,
@@ -12,17 +14,15 @@ import {
   isModEventTag,
   isModEventTakedown,
   isModEventUnmuteReporter,
-  ModEventTag,
 } from '../../lexicon/types/tools/ozone/moderation/defs'
 import { HandlerInput } from '../../lexicon/types/tools/ozone/moderation/emitEvent'
 import { subjectFromInput } from '../../mod-service/subject'
-import { TagService } from '../../tag-service'
-import { retryHttp } from '../../util'
-import { ModeratorOutput, AdminTokenOutput } from '../../auth-verifier'
-import { SettingService } from '../../setting/service'
 import { ProtectedTagSettingKey } from '../../setting/constants'
+import { SettingService } from '../../setting/service'
 import { ProtectedTagSetting } from '../../setting/types'
+import { TagService } from '../../tag-service'
 import { getTagForReport } from '../../tag-service/util'
+import { retryHttp } from '../../util'
 
 const handleModerationEvent = async ({
   ctx,
@@ -207,6 +207,7 @@ const handleModerationEvent = async ({
             ? result.event.negateLabelVals.split(' ')
             : undefined,
         },
+        result.event.durationInHours ?? undefined,
       )
     }
 

package/src/api/moderation/getEvent.ts

@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.moderation.getEvent({

package/src/api/moderation/getRecord.ts

@@ -1,8 +1,8 @@
+import { AtUri } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { addAccountInfoToRepoView, getPdsAccountInfos } from '../util'
-import { AtUri } from '@atproto/syntax'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.moderation.getRecord({

package/src/api/moderation/getRecords.ts

@@ -1,7 +1,7 @@
+import { AtUri } from '@atproto/syntax'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { addAccountInfoToRepoView, getPdsAccountInfos } from '../util'
-import { AtUri } from '@atproto/syntax'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.moderation.getRecords({

package/src/api/moderation/getRepo.ts

@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { addAccountInfoToRepoViewDetail, getPdsAccountInfos } from '../util'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/moderation/getRepos.ts

@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { addAccountInfoToRepoViewDetail, getPdsAccountInfos } from '../util'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/moderation/queryEvents.ts

@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { getEventType } from '../util'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/moderation/queryStatuses.ts

@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.moderation.queryStatuses({

package/src/api/moderation/searchRepos.ts

@@ -1,6 +1,6 @@
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
 import { ids } from '../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/proxied.ts

@@ -1,5 +1,5 @@
+import { AppContext } from '../context'
 import { Server } from '../lexicon'
-import AppContext from '../context'
 import { ids } from '../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/report/createReport.ts

@@ -1,15 +1,15 @@
+import { ForbiddenError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
-import { getReasonType } from '../util'
-import { subjectFromInput } from '../../mod-service/subject'
 import {
   REASONAPPEAL,
   ReasonType,
 } from '../../lexicon/types/com/atproto/moderation/defs'
-import { ForbiddenError } from '@atproto/xrpc-server'
-import { TagService } from '../../tag-service'
 import { ModerationService } from '../../mod-service'
+import { subjectFromInput } from '../../mod-service/subject'
+import { TagService } from '../../tag-service'
 import { getTagForReport } from '../../tag-service/util'
+import { getReasonType } from '../util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.moderation.createReport({

package/src/api/server/getConfig.ts

@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server, TOOLS_OZONE_TEAM } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.server.getConfig({

package/src/api/set/addValues.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.set.addValues({

package/src/api/set/deleteSet.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.set.deleteSet({

package/src/api/set/deleteValues.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.set.deleteValues({

package/src/api/set/getValues.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.set.getValues({

package/src/api/set/querySets.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.set.querySets({

package/src/api/set/upsertSet.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.set.upsertSet({

package/src/api/setting/listOptions.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.setting.listOptions({

package/src/api/setting/removeOptions.ts

@@ -1,7 +1,7 @@
 import { AuthRequiredError } from '@atproto/xrpc-server'
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
+import { AppContext } from '../../context'
 import { Member } from '../../db/schema/member'
+import { Server } from '../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.setting.removeOptions({

package/src/api/setting/upsertOption.ts

@@ -1,11 +1,11 @@
+import assert from 'node:assert'
+import { ToolsOzoneTeamDefs } from '@atproto/api'
 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 { AppContext } from '../../context'
 import { Member } from '../../db/schema/member'
-import { ToolsOzoneTeamDefs } from '@atproto/api'
-import assert from 'node:assert'
+import { Server } from '../../lexicon'
+import { SettingService } from '../../setting/service'
 import { settingValidators } from '../../setting/validators'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/team/addMember.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { getMemberRole } from '../util'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/team/deleteMember.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.team.deleteMember({

package/src/api/team/listMembers.ts

@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.team.listMembers({

package/src/api/team/updateMember.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { getMemberRole } from '../util'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/util.ts

@@ -1,32 +1,32 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../context'
+import { Member } from '../db/schema/member'
+import { ModerationEvent } from '../db/schema/moderation_event'
+import { ids } from '../lexicon/lexicons'
+import { AccountView } from '../lexicon/types/com/atproto/admin/defs'
 import { InputSchema as ReportInput } from '../lexicon/types/com/atproto/moderation/createReport'
 import {
-  REASONOTHER,
-  REASONSPAM,
+  REASONAPPEAL,
   REASONMISLEADING,
+  REASONOTHER,
   REASONRUDE,
   REASONSEXUAL,
+  REASONSPAM,
   REASONVIOLATION,
-  REASONAPPEAL,
 } from '../lexicon/types/com/atproto/moderation/defs'
-import { AccountView } from '../lexicon/types/com/atproto/admin/defs'
 import {
-  RepoView,
-  RepoViewDetail,
   REVIEWCLOSED,
   REVIEWESCALATED,
   REVIEWOPEN,
+  RepoView,
+  RepoViewDetail,
 } from '../lexicon/types/tools/ozone/moderation/defs'
-import { ModerationEvent } from '../db/schema/moderation_event'
-import { ModerationSubjectStatusRow } from '../mod-service/types'
-import AppContext from '../context'
-import { Member } from '../db/schema/member'
 import {
   ROLEADMIN,
   ROLEMODERATOR,
   ROLETRIAGE,
 } from '../lexicon/types/tools/ozone/team/defs'
-import { ids } from '../lexicon/lexicons'
+import { ModerationSubjectStatusRow } from '../mod-service/types'
 
 export const getPdsAccountInfos = async (
   ctx: AppContext,
@@ -154,6 +154,9 @@ const eventTypes = new Set([
   'tools.ozone.moderation.defs#modEventResolveAppeal',
   'tools.ozone.moderation.defs#modEventTag',
   'tools.ozone.moderation.defs#modEventDivert',
+  'tools.ozone.moderation.defs#accountEvent',
+  'tools.ozone.moderation.defs#identityEvent',
+  'tools.ozone.moderation.defs#recordEvent',
 ])
 
 export const getMemberRole = (role: string) => {

package/src/api/well-known.ts

@@ -1,8 +1,8 @@
-import express from 'express'
-import AppContext from '../context'
+import { Router } from 'express'
+import { AppContext } from '../context'
 
-export const createRouter = (ctx: AppContext): express.Router => {
-  const router = express.Router()
+export const createRouter = (ctx: AppContext): Router => {
+  const router = Router()
 
   router.get('/.well-known/did.json', (_req, res) => {
     const hostname =

package/src/background.ts

@@ -152,10 +152,8 @@ export class PeriodicBackgroundTask {
     // destroy it here.
 
     this.abortController.abort()
-    console.error('ABOOOORT')
 
     await this.intervalPromise
     this.intervalPromise = undefined
-    console.error('DONE -_-')
   }
 }

package/src/communication-service/template.ts

@@ -1,5 +1,5 @@
-import Database from '../db'
 import { Selectable } from 'kysely'
+import { Database } from '../db'
 import { CommunicationTemplate } from '../db/schema/communication_template'
 import { TemplateView } from '../lexicon/types/tools/ozone/communication/defs'
 

package/src/config/config.ts

@@ -1,6 +1,6 @@
 import assert from 'node:assert'
-import { OzoneEnvironment } from './env'
 import { DAY, HOUR } from '@atproto/common'
+import { OzoneEnvironment } from './env'
 
 // off-config but still from env:
 // logging: LOG_LEVEL, LOG_SYSTEMS, LOG_ENABLED, LOG_DESTINATION

package/src/config/secrets.ts

@@ -1,4 +1,4 @@
-import assert from 'assert'
+import assert from 'node:assert'
 import { OzoneEnvironment } from './env'
 
 export const envToSecrets = (env: OzoneEnvironment): OzoneSecrets => {