@atproto/ozone 0.1.74 → 0.1.76

package/src/db/index.ts

@@ -1,23 +1,23 @@
-import assert from 'assert'
+import assert from 'node:assert'
+import { EventEmitter } from 'node:stream'
 import {
   Kysely,
-  PostgresDialect,
-  Migrator,
   KyselyPlugin,
+  Migrator,
   PluginTransformQueryArgs,
   PluginTransformResultArgs,
-  RootOperationNode,
+  PostgresDialect,
   QueryResult,
+  RootOperationNode,
   UnknownRow,
 } from 'kysely'
-import TypedEmitter from 'typed-emitter'
 import { Pool as PgPool, types as pgTypes } from 'pg'
-import DatabaseSchema, { DatabaseSchemaType } from './schema'
-import { PgOptions } from './types'
+import TypedEmitter from 'typed-emitter'
 import { dbLogger } from '../logger'
-import { EventEmitter } from 'stream'
 import * as migrations from './migrations'
 import { CtxMigrationProvider } from './migrations/provider'
+import { DatabaseSchema, DatabaseSchemaType } from './schema'
+import { PgOptions } from './types'
 
 export class Database {
   pool: PgPool

package/src/db/migrations/20241220T144630860Z-stats-materialized-views.ts

@@ -1,12 +1,10 @@
 import { Kysely, sql } from 'kysely'
-
 import { REASONAPPEAL } from '../../lexicon/types/com/atproto/moderation/defs'
-import { DatabaseSchemaType } from '../schema'
-
 import {
   REVIEWESCALATED,
   REVIEWOPEN,
 } from '../../lexicon/types/tools/ozone/moderation/defs'
+import { DatabaseSchemaType } from '../schema'
 import * as modEvent from '../schema/moderation_event'
 import * as modStatus from '../schema/moderation_subject_status'
 import * as recordEventsStats from '../schema/record_events_stats'

package/src/db/pagination.ts

@@ -1,4 +1,4 @@
-import { sql, DynamicModule } from 'kysely'
+import { DynamicModule, sql } from 'kysely'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AnyQb, DbRef } from './types'
 

package/src/db/schema/index.ts

@@ -1,20 +1,19 @@
 import { Kysely } from 'kysely'
-import * as modEvent from './moderation_event'
-import * as modSubjectStatus from './moderation_subject_status'
-import * as repoPushEvent from './repo_push_event'
-import * as recordPushEvent from './record_push_event'
+import * as accountEventsStats from './account_events_stats'
+import * as accountRecordEventsStats from './account_record_events_stats'
+import * as accountRecordStatusStats from './account_record_status_stats'
 import * as blobPushEvent from './blob_push_event'
-import * as label from './label'
-import * as signingKey from './signing_key'
 import * as communicationTemplate from './communication_template'
-import * as set from './ozone_set'
+import * as label from './label'
 import * as member from './member'
-import * as setting from './setting'
-
+import * as modEvent from './moderation_event'
+import * as modSubjectStatus from './moderation_subject_status'
+import * as set from './ozone_set'
 import * as recordEventsStats from './record_events_stats'
-import * as accountEventsStats from './account_events_stats'
-import * as accountRecordEventsStats from './account_record_events_stats'
-import * as accountRecordStatusStats from './account_record_status_stats'
+import * as recordPushEvent from './record_push_event'
+import * as repoPushEvent from './repo_push_event'
+import * as setting from './setting'
+import * as signingKey from './signing_key'
 
 export type DatabaseSchemaType = modEvent.PartialDB &
   modSubjectStatus.PartialDB &

package/src/db/schema/moderation_subject_status.ts

@@ -1,9 +1,9 @@
 import { Generated } from 'kysely'
 import {
   REVIEWCLOSED,
-  REVIEWOPEN,
   REVIEWESCALATED,
   REVIEWNONE,
+  REVIEWOPEN,
 } from '../../lexicon/types/tools/ozone/moderation/defs'
 
 export const subjectStatusTableName = 'moderation_subject_status'

package/src/db/types.ts

@@ -1,5 +1,5 @@
-import { Pool as PgPool } from 'pg'
 import { DynamicModule, RawBuilder, SelectQueryBuilder, sql } from 'kysely'
+import { Pool as PgPool } from 'pg'
 
 export type DbRef = RawBuilder | ReturnType<DynamicModule['ref']>
 

package/src/error.ts

@@ -1,5 +1,5 @@
-import { XRPCError } from '@atproto/xrpc-server'
 import { ErrorRequestHandler } from 'express'
+import { XRPCError } from '@atproto/xrpc-server'
 import { httpLogger as log } from './logger'
 
 export const handler: ErrorRequestHandler = (err, _req, res, next) => {

package/src/index.ts

@@ -1,23 +1,23 @@
-import express from 'express'
-import http from 'http'
-import { AddressInfo } from 'net'
-import events from 'events'
-import { createHttpTerminator, HttpTerminator } from 'http-terminator'
-import cors from 'cors'
+import events from 'node:events'
+import http from 'node:http'
+import { AddressInfo } from 'node:net'
 import compression from 'compression'
+import cors from 'cors'
+import express from 'express'
+import { HttpTerminator, createHttpTerminator } from 'http-terminator'
 import { DAY, SECOND } from '@atproto/common'
 import API, { health, wellKnown } from './api'
-import * as error from './error'
-import { dbLogger, loggerMiddleware } from './logger'
 import { OzoneConfig, OzoneSecrets } from './config'
-import { createServer } from './lexicon'
-import AppContext, { AppContextOptions } from './context'
+import { AppContext, AppContextOptions } from './context'
 import { Member } from './db/schema/member'
+import * as error from './error'
+import { createServer } from './lexicon'
+import { dbLogger, loggerMiddleware } from './logger'
 
 export * from './config'
 export { type ImageInvalidator } from './image-invalidator'
 export { Database } from './db'
-export { OzoneDaemon, EventPusher, EventReverser } from './daemon'
+export { EventPusher, EventReverser, OzoneDaemon } from './daemon'
 export { AppContext } from './context'
 export { httpLogger } from './logger'
 

package/src/lexicon/lexicons.ts

@@ -4381,6 +4381,7 @@ export const schemaDict = {
             'lex:app.bsky.actor.defs#hiddenPostsPref',
             'lex:app.bsky.actor.defs#bskyAppStatePref',
             'lex:app.bsky.actor.defs#labelersPref',
+            'lex:app.bsky.actor.defs#postInteractionSettingsPref',
           ],
         },
       },
@@ -4714,6 +4715,39 @@ export const schemaDict = {
           },
         },
       },
+      postInteractionSettingsPref: {
+        type: 'object',
+        description:
+          'Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly.',
+        required: [],
+        properties: {
+          threadgateAllowRules: {
+            description:
+              'Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: [
+                'lex:app.bsky.feed.threadgate#mentionRule',
+                'lex:app.bsky.feed.threadgate#followerRule',
+                'lex:app.bsky.feed.threadgate#followingRule',
+                'lex:app.bsky.feed.threadgate#listRule',
+              ],
+            },
+          },
+          postgateEmbeddingRules: {
+            description:
+              'Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: ['lex:app.bsky.feed.postgate#disableRule'],
+            },
+          },
+        },
+      },
     },
   },
   AppBskyActorGetPreferences: {
@@ -7120,6 +7154,8 @@ export const schemaDict = {
                 'List of AT-URIs embedding this post that the author has detached from.',
             },
             embeddingRules: {
+              description:
+                'List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
               type: 'array',
               maxLength: 5,
               items: {
@@ -7333,12 +7369,15 @@ export const schemaDict = {
               description: 'Reference (AT-URI) to the post record.',
             },
             allow: {
+              description:
+                'List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
               type: 'array',
               maxLength: 5,
               items: {
                 type: 'union',
                 refs: [
                   'lex:app.bsky.feed.threadgate#mentionRule',
+                  'lex:app.bsky.feed.threadgate#followerRule',
                   'lex:app.bsky.feed.threadgate#followingRule',
                   'lex:app.bsky.feed.threadgate#listRule',
                 ],
@@ -7365,6 +7404,11 @@ export const schemaDict = {
         description: 'Allow replies from actors mentioned in your post.',
         properties: {},
       },
+      followerRule: {
+        type: 'object',
+        description: 'Allow replies from actors who follow you.',
+        properties: {},
+      },
       followingRule: {
         type: 'object',
         description: 'Allow replies from actors you follow.',

package/src/lexicon/types/app/bsky/actor/defs.ts

@@ -8,6 +8,8 @@ import { CID } from 'multiformats/cid'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import * as AppBskyFeedThreadgate from '../feed/threadgate'
+import * as AppBskyFeedPostgate from '../feed/postgate'
 
 export interface ProfileViewBasic {
   did: string
@@ -188,6 +190,7 @@ export type Preferences = (
   | HiddenPostsPref
   | BskyAppStatePref
   | LabelersPref
+  | PostInteractionSettingsPref
   | { $type: string; [k: string]: unknown }
 )[]
 
@@ -532,3 +535,37 @@ export function isNux(v: unknown): v is Nux {
 export function validateNux(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.actor.defs#nux', v)
 }
+
+/** Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. */
+export interface PostInteractionSettingsPref {
+  /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
+  threadgateAllowRules?: (
+    | AppBskyFeedThreadgate.MentionRule
+    | AppBskyFeedThreadgate.FollowerRule
+    | AppBskyFeedThreadgate.FollowingRule
+    | AppBskyFeedThreadgate.ListRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  /** Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
+  postgateEmbeddingRules?: (
+    | AppBskyFeedPostgate.DisableRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  [k: string]: unknown
+}
+
+export function isPostInteractionSettingsPref(
+  v: unknown,
+): v is PostInteractionSettingsPref {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.actor.defs#postInteractionSettingsPref'
+  )
+}
+
+export function validatePostInteractionSettingsPref(
+  v: unknown,
+): ValidationResult {
+  return lexicons.validate('app.bsky.actor.defs#postInteractionSettingsPref', v)
+}

package/src/lexicon/types/app/bsky/feed/postgate.ts

@@ -12,6 +12,7 @@ export interface Record {
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
+  /** List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
   embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
   [k: string]: unknown
 }

package/src/lexicon/types/app/bsky/feed/threadgate.ts

@@ -9,8 +9,10 @@ import { CID } from 'multiformats/cid'
 export interface Record {
   /** Reference (AT-URI) to the post record. */
   post: string
+  /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
     | MentionRule
+    | FollowerRule
     | FollowingRule
     | ListRule
     | { $type: string; [k: string]: unknown }
@@ -51,6 +53,23 @@ export function validateMentionRule(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
 }
 
+/** Allow replies from actors who follow you. */
+export interface FollowerRule {
+  [k: string]: unknown
+}
+
+export function isFollowerRule(v: unknown): v is FollowerRule {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.feed.threadgate#followerRule'
+  )
+}
+
+export function validateFollowerRule(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.threadgate#followerRule', v)
+}
+
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
   [k: string]: unknown

package/src/logger.ts

@@ -1,5 +1,5 @@
 import { type IncomingMessage } from 'node:http'
-import pinoHttp, { stdSerializers } from 'pino-http'
+import { pinoHttp, stdSerializers } from 'pino-http'
 import { obfuscateHeaders, subsystemLogger } from '@atproto/common'
 
 export const dbLogger: ReturnType<typeof subsystemLogger> =

package/src/mod-service/index.ts

@@ -1,36 +1,56 @@
 import net from 'node:net'
 import { Insertable, sql } from 'kysely'
 import { CID } from 'multiformats/cid'
-import { AtUri, INVALID_HANDLE } from '@atproto/syntax'
-import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AtpAgent } from '@atproto/api'
 import { addHoursToDate, chunkArray } from '@atproto/common'
 import { Keypair } from '@atproto/crypto'
 import { IdResolver } from '@atproto/identity'
-import { AtpAgent } from '@atproto/api'
+import { AtUri, INVALID_HANDLE } from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { getReviewState } from '../api/util'
+import { BackgroundQueue } from '../background'
+import { OzoneConfig } from '../config'
+import { EventPusher } from '../daemon'
 import { Database } from '../db'
-import { AuthHeaders, ModerationViews } from './views'
+import { StatusKeyset, TimeIdKeyset, paginate } from '../db/pagination'
+import { BlobPushEvent } from '../db/schema/blob_push_event'
+import { LabelChannel } from '../db/schema/label'
+import { ModerationEvent } from '../db/schema/moderation_event'
+import { jsonb } from '../db/types'
+import { ImageInvalidator } from '../image-invalidator'
+import { ids } from '../lexicon/lexicons'
+import { RepoBlobRef, RepoRef } from '../lexicon/types/com/atproto/admin/defs'
+import { Label } from '../lexicon/types/com/atproto/label/defs'
 import { Main as StrongRef } from '../lexicon/types/com/atproto/repo/strongRef'
 import {
+  REVIEWESCALATED,
+  REVIEWOPEN,
+  isAccountEvent,
+  isIdentityEvent,
+  isModEventAcknowledge,
   isModEventComment,
+  isModEventEmail,
   isModEventLabel,
   isModEventMute,
   isModEventReport,
-  isModEventTakedown,
-  isModEventEmail,
   isModEventTag,
-  isAccountEvent,
-  isIdentityEvent,
+  isModEventTakedown,
   isRecordEvent,
-  REVIEWESCALATED,
-  REVIEWOPEN,
-  isModEventAcknowledge,
 } from '../lexicon/types/tools/ozone/moderation/defs'
-import { RepoRef, RepoBlobRef } from '../lexicon/types/com/atproto/admin/defs'
+import { QueryParams as QueryStatusParams } from '../lexicon/types/tools/ozone/moderation/queryStatuses'
+import { httpLogger as log } from '../logger'
+import { LABELER_HEADER_NAME, ParsedLabelers } from '../util'
 import {
   adjustModerationSubjectStatus,
   getStatusIdentifierFromSubject,
   moderationSubjectStatusQueryBuilder,
 } from './status'
+import {
+  ModSubject,
+  RecordSubject,
+  RepoSubject,
+  subjectFromStatusRow,
+} from './subject'
 import {
   ModEventType,
   ModerationEventRow,
@@ -38,28 +58,8 @@ import {
   ModerationSubjectStatusRowWithHandle,
   ReversibleModerationEvent,
 } from './types'
-import { ModerationEvent } from '../db/schema/moderation_event'
-import { StatusKeyset, TimeIdKeyset, paginate } from '../db/pagination'
-import { Label } from '../lexicon/types/com/atproto/label/defs'
-import { QueryParams as QueryStatusParams } from '../lexicon/types/tools/ozone/moderation/queryStatuses'
-import {
-  ModSubject,
-  RecordSubject,
-  RepoSubject,
-  subjectFromStatusRow,
-} from './subject'
-import { jsonb } from '../db/types'
-import { LabelChannel } from '../db/schema/label'
-import { BlobPushEvent } from '../db/schema/blob_push_event'
-import { BackgroundQueue } from '../background'
-import { EventPusher } from '../daemon'
 import { formatLabel, formatLabelRow, signLabel } from './util'
-import { ImageInvalidator } from '../image-invalidator'
-import { httpLogger as log } from '../logger'
-import { OzoneConfig } from '../config'
-import { LABELER_HEADER_NAME, ParsedLabelers } from '../util'
-import { ids } from '../lexicon/lexicons'
-import { getReviewState } from '../api/util'
+import { AuthHeaders, ModerationViews } from './views'
 
 export type ModerationServiceCreator = (db: Database) => ModerationService
 

package/src/mod-service/status.ts

@@ -3,7 +3,7 @@
 import { HOUR } from '@atproto/common'
 import { AtUri } from '@atproto/syntax'
 import { Database } from '../db'
-import DatabaseSchema from '../db/schema'
+import { DatabaseSchema } from '../db/schema'
 import { jsonb } from '../db/types'
 import { REASONAPPEAL } from '../lexicon/types/com/atproto/moderation/defs'
 import {

package/src/mod-service/subject.ts

@@ -1,11 +1,11 @@
 import { AtUri } from '@atproto/syntax'
-import { InputSchema as ReportInput } from '../lexicon/types/com/atproto/moderation/createReport'
-import { InputSchema as ActionInput } from '../lexicon/types/tools/ozone/moderation/emitEvent'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { ModerationEventRow, ModerationSubjectStatusRow } from './types'
+import { MessageRef } from '../lexicon/types/chat/bsky/convo/defs'
 import { RepoRef } from '../lexicon/types/com/atproto/admin/defs'
+import { InputSchema as ReportInput } from '../lexicon/types/com/atproto/moderation/createReport'
 import { Main as StrongRef } from '../lexicon/types/com/atproto/repo/strongRef'
-import { MessageRef } from '../lexicon/types/chat/bsky/convo/defs'
+import { InputSchema as ActionInput } from '../lexicon/types/tools/ozone/moderation/emitEvent'
+import { ModerationEventRow, ModerationSubjectStatusRow } from './types'
 
 type SubjectInput = ReportInput['subject'] | ActionInput['subject']
 

package/src/mod-service/types.ts

@@ -1,7 +1,7 @@
-import { Selectable } from 'kysely'
+import { type Selectable } from 'kysely'
+import { ToolsOzoneModerationDefs } from '@atproto/api'
 import { ModerationEvent } from '../db/schema/moderation_event'
 import { ModerationSubjectStatus } from '../db/schema/moderation_subject_status'
-import { ToolsOzoneModerationDefs } from '@atproto/api'
 import { ModSubject } from './subject'
 
 export type ModerationEventRow = Selectable<ModerationEvent>

package/src/mod-service/views.ts

@@ -1,35 +1,34 @@
 import { sql } from 'kysely'
-import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
-import { AtpAgent, AppBskyFeedDefs } from '@atproto/api'
+import { AppBskyFeedDefs, AtpAgent } from '@atproto/api'
 import { dedupeStrs } from '@atproto/common'
-import { BlobRef } from '@atproto/lexicon'
 import { Keypair } from '@atproto/crypto'
+import { BlobRef } from '@atproto/lexicon'
+import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
 import { Database } from '../db'
+import { LabelRow } from '../db/schema/label'
+import { ids } from '../lexicon/lexicons'
+import { AccountView } from '../lexicon/types/com/atproto/admin/defs'
+import { Label, isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
+import { OutputSchema as ReportOutput } from '../lexicon/types/com/atproto/moderation/createReport'
+import { REASONOTHER } from '../lexicon/types/com/atproto/moderation/defs'
 import {
+  BlobView,
   ModEventView,
-  RepoView,
+  ModEventViewDetail,
   RecordView,
   RecordViewDetail,
-  BlobView,
+  RepoView,
   SubjectStatusView,
-  ModEventViewDetail,
 } from '../lexicon/types/tools/ozone/moderation/defs'
-import { AccountView } from '../lexicon/types/com/atproto/admin/defs'
-import { OutputSchema as ReportOutput } from '../lexicon/types/com/atproto/moderation/createReport'
-import { Label, isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
+import { dbLogger, httpLogger } from '../logger'
+import { ParsedLabelers } from '../util'
+import { moderationSubjectStatusQueryBuilder } from './status'
+import { subjectFromEventRow, subjectFromStatusRow } from './subject'
 import {
   ModerationEventRowWithHandle,
   ModerationSubjectStatusRowWithHandle,
 } from './types'
-import { REASONOTHER } from '../lexicon/types/com/atproto/moderation/defs'
-import { subjectFromEventRow, subjectFromStatusRow } from './subject'
 import { formatLabel, signLabel } from './util'
-import { LabelRow } from '../db/schema/label'
-import { dbLogger } from '../logger'
-import { httpLogger } from '../logger'
-import { ParsedLabelers } from '../util'
-import { ids } from '../lexicon/lexicons'
-import { moderationSubjectStatusQueryBuilder } from './status'
 
 export type AuthHeaders = {
   headers: {

package/src/sequencer/outbox.ts

@@ -1,6 +1,6 @@
 import { AsyncBuffer, AsyncBufferFullError } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Sequencer, LabelsEvt } from './sequencer'
+import { LabelsEvt, Sequencer } from './sequencer'
 
 export type OutboxOpts = {
   maxBufferSize: number
@@ -121,5 +121,3 @@ export class Outbox {
     }
   }
 }
-
-export default Outbox

package/src/sequencer/sequencer.ts

@@ -1,11 +1,11 @@
-import EventEmitter from 'events'
-import TypedEmitter from 'typed-emitter'
+import EventEmitter from 'node:events'
 import { Selectable } from 'kysely'
 import { PoolClient } from 'pg'
-import { seqLogger as log } from '../logger'
-import Database from '../db'
+import TypedEmitter from 'typed-emitter'
+import { Database } from '../db'
+import { Label as LabelTable, LabelChannel } from '../db/schema/label'
 import { Labels as LabelsEvt } from '../lexicon/types/com/atproto/label/subscribeLabels'
-import { LabelChannel, Label as LabelTable } from '../db/schema/label'
+import { seqLogger as log } from '../logger'
 import { ModerationService } from '../mod-service'
 
 export type { Labels as LabelsEvt } from '../lexicon/types/com/atproto/label/subscribeLabels'
@@ -143,5 +143,3 @@ type SequencerEvents = {
 }
 
 export type SequencerEmitter = TypedEmitter<SequencerEvents>
-
-export default Sequencer

package/src/set/service.ts

@@ -1,8 +1,8 @@
-import Database from '../db'
 import { Selectable } from 'kysely'
+import { Database } from '../db'
+import { TimeIdKeyset, paginate } from '../db/pagination'
 import { SetDetail } from '../db/schema/ozone_set'
 import { SetView } from '../lexicon/types/tools/ozone/set/defs'
-import { paginate, TimeIdKeyset } from '../db/pagination'
 
 export type SetServiceCreator = (db: Database) => SetService
 

package/src/setting/service.ts

@@ -1,10 +1,10 @@
-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'
 import assert from 'node:assert'
+import { Selectable } from 'kysely'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { Database } from '../db'
+import { Member } from '../db/schema/member'
+import { Setting, SettingScope } from '../db/schema/setting'
+import { Option } from '../lexicon/types/tools/ozone/setting/defs'
 
 export type SettingServiceCreator = (db: Database) => SettingService
 

package/src/setting/validators.ts

@@ -1,7 +1,7 @@
 import { Selectable } from 'kysely'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Setting } from '../db/schema/setting'
 import { PolicyListSettingKey, ProtectedTagSettingKey } from './constants'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 
 export const settingValidators = new Map<
   string,

package/src/tag-service/embed-tagger.ts

@@ -1,13 +1,13 @@
 import {
+  AppBskyEmbedExternal,
   AppBskyEmbedImages,
   AppBskyEmbedRecordWithMedia,
-  AppBskyFeedPost,
   AppBskyEmbedVideo,
-  AppBskyEmbedExternal,
+  AppBskyFeedPost,
 } from '@atproto/api'
+import { ids } from '../lexicon/lexicons'
 import { langLogger as log } from '../logger'
 import { ContentTagger } from './content-tagger'
-import { ids } from '../lexicon/lexicons'
 
 export class EmbedTagger extends ContentTagger {
   tagPrefix = 'embed:'

package/src/tag-service/index.ts

@@ -1,10 +1,10 @@
+import { langLogger as log } from '../logger'
 import { ModerationService } from '../mod-service'
 import { ModSubject } from '../mod-service/subject'
-import { langLogger as log } from '../logger'
+import { ModerationSubjectStatusRow } from '../mod-service/types'
 import { ContentTagger } from './content-tagger'
-import { LanguageTagger } from './language-tagger'
 import { EmbedTagger } from './embed-tagger'
-import { ModerationSubjectStatusRow } from '../mod-service/types'
+import { LanguageTagger } from './language-tagger'
 
 export class TagService {
   private taggers: ContentTagger[]