@atproto/ozone 0.1.126 → 0.1.128

package/src/context.ts

@@ -17,6 +17,10 @@ import { BlobDiverter } from './daemon/blob-diverter'
 import { Database } from './db'
 import { ImageInvalidator } from './image-invalidator'
 import { ModerationService, ModerationServiceCreator } from './mod-service'
+import {
+  SafelinkRuleService,
+  SafelinkRuleServiceCreator,
+} from './safelink/service'
 import { Sequencer } from './sequencer/sequencer'
 import { SetService, SetServiceCreator } from './set/service'
 import { SettingService, SettingServiceCreator } from './setting/service'
@@ -42,6 +46,7 @@ export type AppContextOptions = {
   cfg: OzoneConfig
   modService: ModerationServiceCreator
   communicationTemplateService: CommunicationTemplateServiceCreator
+  safelinkRuleService: SafelinkRuleServiceCreator
   setService: SetServiceCreator
   settingService: SettingServiceCreator
   teamService: TeamServiceCreator
@@ -130,6 +135,7 @@ export class AppContext {
     )
 
     const communicationTemplateService = CommunicationTemplateService.creator()
+    const safelinkRuleService = SafelinkRuleService.creator()
     const teamService = TeamService.creator(
       appviewAgent,
       cfg.appview.did,
@@ -154,6 +160,7 @@ export class AppContext {
         cfg,
         modService,
         communicationTemplateService,
+        safelinkRuleService,
         teamService,
         setService,
         settingService,
@@ -204,6 +211,10 @@ export class AppContext {
     return this.opts.communicationTemplateService
   }
 
+  get safelinkRuleService(): SafelinkRuleServiceCreator {
+    return this.opts.safelinkRuleService
+  }
+
   get teamService(): TeamServiceCreator {
     return this.opts.teamService
   }

package/src/db/migrations/20250609T110704000Z-safelink.ts

@@ -0,0 +1,53 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .createTable('safelink_event')
+    .addColumn('id', 'bigserial', (col) => col.primaryKey())
+    .addColumn('eventType', 'varchar', (col) => col.notNull())
+    .addColumn('url', 'varchar', (col) => col.notNull())
+    .addColumn('pattern', 'varchar', (col) => col.notNull())
+    .addColumn('action', 'varchar', (col) => col.notNull())
+    .addColumn('reason', 'varchar', (col) => col.notNull())
+    .addColumn('createdBy', 'varchar', (col) => col.notNull())
+    .addColumn('createdAt', 'varchar', (col) => col.notNull())
+    .addColumn('comment', 'text')
+    .execute()
+
+  await db.schema
+    .createTable('safelink_rule')
+    .addColumn('id', 'bigserial', (col) => col.primaryKey())
+    .addColumn('url', 'varchar', (col) => col.notNull())
+    .addColumn('pattern', 'varchar', (col) => col.notNull())
+    .addColumn('action', 'varchar', (col) => col.notNull())
+    .addColumn('reason', 'varchar', (col) => col.notNull())
+    .addColumn('createdBy', 'varchar', (col) => col.notNull())
+    .addColumn('createdAt', 'varchar', (col) => col.notNull())
+    .addColumn('updatedAt', 'varchar', (col) => col.notNull())
+    .addColumn('comment', 'text')
+    .addUniqueConstraint('safelink_rule_url_pattern_key', ['url', 'pattern'])
+    .execute()
+
+  await db.schema
+    .createIndex('safelink_event_url_pattern_idx')
+    .on('safelink_event')
+    .columns(['url', 'pattern'])
+    .execute()
+
+  await db.schema
+    .createIndex('safelink_rule_action_idx')
+    .on('safelink_rule')
+    .column('action')
+    .execute()
+
+  await db.schema
+    .createIndex('safelink_rule_reason_idx')
+    .on('safelink_rule')
+    .column('reason')
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.dropTable('safelink_rule').execute()
+  await db.schema.dropTable('safelink_event').execute()
+}

package/src/db/migrations/20250618T180246000Z-add-mod-tool-to-moderation-event.ts

@@ -0,0 +1,18 @@
+import { Kysely, sql } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .alterTable('moderation_event')
+    .addColumn('modTool', 'jsonb')
+    .execute()
+
+  await db.schema
+    .createIndex('moderation_event_mod_tool_name_idx')
+    .on('moderation_event')
+    .expression(sql`("modTool" ->> 'name')`)
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.alterTable('moderation_event').dropColumn('modTool').execute()
+}

package/src/db/migrations/index.ts

@@ -25,3 +25,5 @@ export * as _20250221T132135150Z from './20250221T132135150Z-member-details'
 export * as _20250404T201720309Z from './20250404T201720309Z-subject-status-sort-idxs'
 export * as _20250415T201720309Z from './20250415T201720309Z-verification'
 export * as _20250417T201720309Z from './20250417T201720309Z-firehose-cursor'
+export * as _20250609T110704000Z from './20250609T110704000Z-safelink'
+export * as _20250618T180246000Z from './20250618T180246000Z-add-mod-tool-to-moderation-event'

package/src/db/schema/index.ts

@@ -13,6 +13,7 @@ import * as set from './ozone_set'
 import * as recordEventsStats from './record_events_stats'
 import * as recordPushEvent from './record_push_event'
 import * as repoPushEvent from './repo_push_event'
+import * as safelink from './safelink'
 import * as setting from './setting'
 import * as signingKey from './signing_key'
 import * as verification from './verification'
@@ -33,7 +34,8 @@ export type DatabaseSchemaType = modEvent.PartialDB &
   accountRecordEventsStats.PartialDB &
   accountRecordStatusStats.PartialDB &
   verification.PartialDB &
-  firehoseCursor.PartialDB
+  firehoseCursor.PartialDB &
+  safelink.PartialDB
 
 export type DatabaseSchema = Kysely<DatabaseSchemaType>
 

package/src/db/schema/moderation_event.ts

@@ -43,6 +43,7 @@ export interface ModerationEvent {
   addedTags: string[] | null
   removedTags: string[] | null
   legacyRefId: number | null
+  modTool: { name: string; meta?: { [_ in string]: unknown } } | null
 }
 
 export type PartialDB = {

package/src/db/schema/safelink.ts

@@ -0,0 +1,39 @@
+import { GeneratedAlways } from 'kysely'
+import {
+  SafelinkActionType,
+  SafelinkEventType,
+  SafelinkPatternType,
+  SafelinkReasonType,
+} from '../../api/util'
+
+export const safelinkRuleTableName = 'safelink_rule'
+export const safelinkEventTableName = 'safelink_event'
+
+export interface SafelinkRule {
+  id: GeneratedAlways<number>
+  url: string
+  pattern: SafelinkPatternType
+  action: SafelinkActionType
+  reason: SafelinkReasonType
+  createdBy: string
+  createdAt: string
+  updatedAt: string
+  comment: string | null
+}
+
+export interface SafelinkEvent {
+  id: GeneratedAlways<number>
+  eventType: SafelinkEventType
+  url: string
+  pattern: SafelinkPatternType
+  action: SafelinkActionType
+  reason: SafelinkReasonType
+  createdBy: string
+  createdAt: string
+  comment: string | null
+}
+
+export type PartialDB = {
+  [safelinkRuleTableName]: SafelinkRule
+  [safelinkEventTableName]: SafelinkEvent
+}

package/src/lexicon/index.ts

@@ -206,6 +206,11 @@ import * as ToolsOzoneModerationGetSubjects from './types/tools/ozone/moderation
 import * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents.js'
 import * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses.js'
 import * as ToolsOzoneModerationSearchRepos from './types/tools/ozone/moderation/searchRepos.js'
+import * as ToolsOzoneSafelinkAddRule from './types/tools/ozone/safelink/addRule.js'
+import * as ToolsOzoneSafelinkQueryEvents from './types/tools/ozone/safelink/queryEvents.js'
+import * as ToolsOzoneSafelinkQueryRules from './types/tools/ozone/safelink/queryRules.js'
+import * as ToolsOzoneSafelinkRemoveRule from './types/tools/ozone/safelink/removeRule.js'
+import * as ToolsOzoneSafelinkUpdateRule from './types/tools/ozone/safelink/updateRule.js'
 import * as ToolsOzoneServerGetConfig from './types/tools/ozone/server/getConfig.js'
 import * as ToolsOzoneSetAddValues from './types/tools/ozone/set/addValues.js'
 import * as ToolsOzoneSetDeleteSet from './types/tools/ozone/set/deleteSet.js'
@@ -2571,6 +2576,7 @@ export class ToolsOzoneNS {
   communication: ToolsOzoneCommunicationNS
   hosting: ToolsOzoneHostingNS
   moderation: ToolsOzoneModerationNS
+  safelink: ToolsOzoneSafelinkNS
   server: ToolsOzoneServerNS
   set: ToolsOzoneSetNS
   setting: ToolsOzoneSettingNS
@@ -2583,6 +2589,7 @@ export class ToolsOzoneNS {
     this.communication = new ToolsOzoneCommunicationNS(server)
     this.hosting = new ToolsOzoneHostingNS(server)
     this.moderation = new ToolsOzoneModerationNS(server)
+    this.safelink = new ToolsOzoneSafelinkNS(server)
     this.server = new ToolsOzoneServerNS(server)
     this.set = new ToolsOzoneSetNS(server)
     this.setting = new ToolsOzoneSettingNS(server)
@@ -2792,6 +2799,69 @@ export class ToolsOzoneModerationNS {
   }
 }
 
+export class ToolsOzoneSafelinkNS {
+  _server: Server
+
+  constructor(server: Server) {
+    this._server = server
+  }
+
+  addRule<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ToolsOzoneSafelinkAddRule.Handler<ExtractAuth<AV>>,
+      ToolsOzoneSafelinkAddRule.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'tools.ozone.safelink.addRule' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  queryEvents<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ToolsOzoneSafelinkQueryEvents.Handler<ExtractAuth<AV>>,
+      ToolsOzoneSafelinkQueryEvents.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'tools.ozone.safelink.queryEvents' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  queryRules<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ToolsOzoneSafelinkQueryRules.Handler<ExtractAuth<AV>>,
+      ToolsOzoneSafelinkQueryRules.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'tools.ozone.safelink.queryRules' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  removeRule<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ToolsOzoneSafelinkRemoveRule.Handler<ExtractAuth<AV>>,
+      ToolsOzoneSafelinkRemoveRule.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'tools.ozone.safelink.removeRule' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  updateRule<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ToolsOzoneSafelinkUpdateRule.Handler<ExtractAuth<AV>>,
+      ToolsOzoneSafelinkUpdateRule.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'tools.ozone.safelink.updateRule' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+}
+
 export class ToolsOzoneServerNS {
   _server: Server