@atproto/ozone 0.1.160 → 0.1.161

package/src/api/moderation/emitEvent.ts

@@ -315,36 +315,44 @@ export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.moderation.emitEvent({
     auth: ctx.authVerifier.modOrAdminToken,
     handler: async ({ input, auth }) => {
-      const moderationEvent = await handleModerationEvent({
-        input,
-        auth,
-        ctx,
-      })
-
-      // On divert events, we need to automatically take down the blobs
-      if (isModEventDivert(input.body.event)) {
-        await handleModerationEvent({
+      try {
+        const moderationEvent = await handleModerationEvent({
+          input,
           auth,
           ctx,
-          input: {
-            ...input,
-            body: {
-              ...input.body,
-              event: {
-                ...input.body.event,
-                $type: 'tools.ozone.moderation.defs#modEventTakedown',
-                comment:
-                  '[DIVERT_SIDE_EFFECT]: Automatically taking down after divert event',
+        })
+
+        // On divert events, we need to automatically take down the blobs
+        if (isModEventDivert(input.body.event)) {
+          await handleModerationEvent({
+            auth,
+            ctx,
+            input: {
+              ...input,
+              body: {
+                ...input.body,
+                event: {
+                  ...input.body.event,
+                  $type: 'tools.ozone.moderation.defs#modEventTakedown',
+                  comment:
+                    '[DIVERT_SIDE_EFFECT]: Automatically taking down after divert event',
+                },
+                modTool: input.body.modTool,
               },
-              modTool: input.body.modTool,
             },
-          },
-        })
-      }
+          })
+        }
 
-      return {
-        encoding: 'application/json',
-        body: moderationEvent,
+        return {
+          encoding: 'application/json',
+          body: moderationEvent,
+        }
+      } catch (err) {
+        httpLogger.error(
+          { err, body: input.body },
+          'failed to emit moderation event',
+        )
+        throw err
       }
     },
   })

package/src/lexicon/index.ts

@@ -28,6 +28,7 @@ import * as AppBskyContactGetMatches from './types/app/bsky/contact/getMatches.j
 import * as AppBskyContactGetSyncStatus from './types/app/bsky/contact/getSyncStatus.js'
 import * as AppBskyContactImportContacts from './types/app/bsky/contact/importContacts.js'
 import * as AppBskyContactRemoveData from './types/app/bsky/contact/removeData.js'
+import * as AppBskyContactSendNotification from './types/app/bsky/contact/sendNotification.js'
 import * as AppBskyContactStartPhoneVerification from './types/app/bsky/contact/startPhoneVerification.js'
 import * as AppBskyContactVerifyPhone from './types/app/bsky/contact/verifyPhone.js'
 import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator.js'
@@ -678,6 +679,18 @@ export class AppBskyContactNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  sendNotification<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyContactSendNotification.QueryParams,
+      AppBskyContactSendNotification.HandlerInput,
+      AppBskyContactSendNotification.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.contact.sendNotification' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   startPhoneVerification<A extends Auth = void>(
     cfg: MethodConfigOrHandler<
       A,

package/src/lexicon/lexicons.ts

@@ -401,6 +401,7 @@ export const schemaDict = {
             'lex:app.bsky.actor.defs#savedFeedsPref',
             'lex:app.bsky.actor.defs#savedFeedsPrefV2',
             'lex:app.bsky.actor.defs#personalDetailsPref',
+            'lex:app.bsky.actor.defs#declaredAgePref',
             'lex:app.bsky.actor.defs#feedViewPref',
             'lex:app.bsky.actor.defs#threadViewPref',
             'lex:app.bsky.actor.defs#interestsPref',
@@ -507,6 +508,28 @@ export const schemaDict = {
           },
         },
       },
+      declaredAgePref: {
+        type: 'object',
+        description:
+          "Read-only preference containing value(s) inferred from the user's declared birthdate. Absence of this preference object in the response indicates that the user has not made a declaration.",
+        properties: {
+          isOverAge13: {
+            type: 'boolean',
+            description:
+              'Indicates if the user has declared that they are over 13 years of age.',
+          },
+          isOverAge16: {
+            type: 'boolean',
+            description:
+              'Indicates if the user has declared that they are over 16 years of age.',
+          },
+          isOverAge18: {
+            type: 'boolean',
+            description:
+              'Indicates if the user has declared that they are over 18 years of age.',
+          },
+        },
+      },
       feedViewPref: {
         type: 'object',
         required: ['feed'],
@@ -1776,6 +1799,24 @@ export const schemaDict = {
           },
         },
       },
+      notification: {
+        description:
+          'A stash object to be sent via bsync representing a notification to be created.',
+        type: 'object',
+        required: ['from', 'to'],
+        properties: {
+          from: {
+            description: 'The DID of who this notification comes from.',
+            type: 'string',
+            format: 'did',
+          },
+          to: {
+            description: 'The DID of who this notification should go to.',
+            type: 'string',
+            format: 'did',
+          },
+        },
+      },
     },
   },
   AppBskyContactDismissMatch: {
@@ -1785,7 +1826,7 @@ export const schemaDict = {
       main: {
         type: 'procedure',
         description:
-          "WARNING: This is unstable and under active development, don't use it while this warning is here. Removes a match that was found via contact import. It shouldn't appear again if the same contact is re-imported. Requires authentication.",
+          "Removes a match that was found via contact import. It shouldn't appear again if the same contact is re-imported. Requires authentication.",
         input: {
           encoding: 'application/json',
           schema: {
@@ -1809,8 +1850,10 @@ export const schemaDict = {
         },
         errors: [
           {
-            name: 'TODO',
-            description: 'TODO',
+            name: 'InvalidDid',
+          },
+          {
+            name: 'InternalError',
           },
         ],
       },
@@ -1823,7 +1866,7 @@ export const schemaDict = {
       main: {
         type: 'query',
         description:
-          "WARNING: This is unstable and under active development, don't use it while this warning is here. Returns the matched contacts (contacts that were mutually imported). Excludes dismissed matches. Requires authentication.",
+          'Returns the matched contacts (contacts that were mutually imported). Excludes dismissed matches. Requires authentication.',
         parameters: {
           type: 'params',
           properties: {
@@ -1859,8 +1902,16 @@ export const schemaDict = {
         },
         errors: [
           {
-            name: 'TODO',
-            description: 'TODO',
+            name: 'InvalidDid',
+          },
+          {
+            name: 'InvalidLimit',
+          },
+          {
+            name: 'InvalidCursor',
+          },
+          {
+            name: 'InternalError',
           },
         ],
       },
@@ -1873,7 +1924,7 @@ export const schemaDict = {
       main: {
         type: 'query',
         description:
-          "WARNING: This is unstable and under active development, don't use it while this warning is here. Gets the user's current contact import status. Requires authentication.",
+          "Gets the user's current contact import status. Requires authentication.",
         parameters: {
           type: 'params',
           properties: {},
@@ -1894,8 +1945,10 @@ export const schemaDict = {
         },
         errors: [
           {
-            name: 'TODO',
-            description: 'TODO',
+            name: 'InvalidDid',
+          },
+          {
+            name: 'InternalError',
           },
         ],
       },
@@ -1908,7 +1961,7 @@ export const schemaDict = {
       main: {
         type: 'procedure',
         description:
-          "WARNING: This is unstable and under active development, don't use it while this warning is here. Import contacts for securely matching with other users. This follows the protocol explained in https://docs.bsky.app/blog/contact-import-rfc. Requires authentication.",
+          'Import contacts for securely matching with other users. This follows the protocol explained in https://docs.bsky.app/blog/contact-import-rfc. Requires authentication.',
         input: {
           encoding: 'application/json',
           schema: {
@@ -1953,8 +2006,19 @@ export const schemaDict = {
         },
         errors: [
           {
-            name: 'TODO',
-            description: 'TODO',
+            name: 'InvalidDid',
+          },
+          {
+            name: 'InvalidContacts',
+          },
+          {
+            name: 'TooManyContacts',
+          },
+          {
+            name: 'InvalidToken',
+          },
+          {
+            name: 'InternalError',
           },
         ],
       },
@@ -1967,7 +2031,7 @@ export const schemaDict = {
       main: {
         type: 'procedure',
         description:
-          "WARNING: This is unstable and under active development, don't use it while this warning is here. Removes all stored hashes used for contact matching, existing matches, and sync status. Requires authentication.",
+          'Removes all stored hashes used for contact matching, existing matches, and sync status. Requires authentication.',
         input: {
           encoding: 'application/json',
           schema: {
@@ -1984,13 +2048,52 @@ export const schemaDict = {
         },
         errors: [
           {
-            name: 'TODO',
-            description: 'TODO',
+            name: 'InvalidDid',
+          },
+          {
+            name: 'InternalError',
           },
         ],
       },
     },
   },
+  AppBskyContactSendNotification: {
+    lexicon: 1,
+    id: 'app.bsky.contact.sendNotification',
+    defs: {
+      main: {
+        type: 'procedure',
+        description:
+          'System endpoint to send notifications related to contact imports. Requires role authentication.',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['from', 'to'],
+            properties: {
+              from: {
+                description: 'The DID of who this notification comes from.',
+                type: 'string',
+                format: 'did',
+              },
+              to: {
+                description: 'The DID of who this notification should go to.',
+                type: 'string',
+                format: 'did',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            properties: {},
+          },
+        },
+      },
+    },
+  },
   AppBskyContactStartPhoneVerification: {
     lexicon: 1,
     id: 'app.bsky.contact.startPhoneVerification',
@@ -1998,7 +2101,7 @@ export const schemaDict = {
       main: {
         type: 'procedure',
         description:
-          "WARNING: This is unstable and under active development, don't use it while this warning is here. Starts a phone verification flow. The phone passed will receive a code via SMS that should be passed to `app.bsky.contact.verifyPhone`. Requires authentication.",
+          'Starts a phone verification flow. The phone passed will receive a code via SMS that should be passed to `app.bsky.contact.verifyPhone`. Requires authentication.',
         input: {
           encoding: 'application/json',
           schema: {
@@ -2021,8 +2124,16 @@ export const schemaDict = {
         },
         errors: [
           {
-            name: 'TODO',
-            description: 'TODO',
+            name: 'RateLimitExceeded',
+          },
+          {
+            name: 'InvalidDid',
+          },
+          {
+            name: 'InvalidPhone',
+          },
+          {
+            name: 'InternalError',
           },
         ],
       },
@@ -2035,7 +2146,7 @@ export const schemaDict = {
       main: {
         type: 'procedure',
         description:
-          "WARNING: This is unstable and under active development, don't use it while this warning is here. Verifies control over a phone number with a code received via SMS and starts a contact import session. Requires authentication.",
+          'Verifies control over a phone number with a code received via SMS and starts a contact import session. Requires authentication.',
         input: {
           encoding: 'application/json',
           schema: {
@@ -2071,8 +2182,19 @@ export const schemaDict = {
         },
         errors: [
           {
-            name: 'TODO',
-            description: 'TODO',
+            name: 'RateLimitExceeded',
+          },
+          {
+            name: 'InvalidDid',
+          },
+          {
+            name: 'InvalidPhone',
+          },
+          {
+            name: 'InvalidCode',
+          },
+          {
+            name: 'InternalError',
           },
         ],
       },
@@ -6725,6 +6847,7 @@ export const schemaDict = {
               'like-via-repost',
               'repost-via-repost',
               'subscribed-post',
+              'contact-match',
             ],
           },
           reasonSubject: {
@@ -19949,6 +20072,7 @@ export const ids = {
   AppBskyContactGetSyncStatus: 'app.bsky.contact.getSyncStatus',
   AppBskyContactImportContacts: 'app.bsky.contact.importContacts',
   AppBskyContactRemoveData: 'app.bsky.contact.removeData',
+  AppBskyContactSendNotification: 'app.bsky.contact.sendNotification',
   AppBskyContactStartPhoneVerification:
     'app.bsky.contact.startPhoneVerification',
   AppBskyContactVerifyPhone: 'app.bsky.contact.verifyPhone',

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

@@ -259,6 +259,7 @@ export type Preferences = (
   | $Typed<SavedFeedsPref>
   | $Typed<SavedFeedsPrefV2>
   | $Typed<PersonalDetailsPref>
+  | $Typed<DeclaredAgePref>
   | $Typed<FeedViewPref>
   | $Typed<ThreadViewPref>
   | $Typed<InterestsPref>
@@ -370,6 +371,27 @@ export function validatePersonalDetailsPref<V>(v: V) {
   return validate<PersonalDetailsPref & V>(v, id, hashPersonalDetailsPref)
 }
 
+/** Read-only preference containing value(s) inferred from the user's declared birthdate. Absence of this preference object in the response indicates that the user has not made a declaration. */
+export interface DeclaredAgePref {
+  $type?: 'app.bsky.actor.defs#declaredAgePref'
+  /** Indicates if the user has declared that they are over 13 years of age. */
+  isOverAge13?: boolean
+  /** Indicates if the user has declared that they are over 16 years of age. */
+  isOverAge16?: boolean
+  /** Indicates if the user has declared that they are over 18 years of age. */
+  isOverAge18?: boolean
+}
+
+const hashDeclaredAgePref = 'declaredAgePref'
+
+export function isDeclaredAgePref<V>(v: V) {
+  return is$typed(v, id, hashDeclaredAgePref)
+}
+
+export function validateDeclaredAgePref<V>(v: V) {
+  return validate<DeclaredAgePref & V>(v, id, hashDeclaredAgePref)
+}
+
 export interface FeedViewPref {
   $type?: 'app.bsky.actor.defs#feedViewPref'
   /** The URI of the feed, or an identifier which describes the feed. */

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

@@ -50,3 +50,22 @@ export function isSyncStatus<V>(v: V) {
 export function validateSyncStatus<V>(v: V) {
   return validate<SyncStatus & V>(v, id, hashSyncStatus)
 }
+
+/** A stash object to be sent via bsync representing a notification to be created. */
+export interface Notification {
+  $type?: 'app.bsky.contact.defs#notification'
+  /** The DID of who this notification comes from. */
+  from: string
+  /** The DID of who this notification should go to. */
+  to: string
+}
+
+const hashNotification = 'notification'
+
+export function isNotification<V>(v: V) {
+  return is$typed(v, id, hashNotification)
+}
+
+export function validateNotification<V>(v: V) {
+  return validate<Notification & V>(v, id, hashNotification)
+}

package/src/lexicon/types/app/bsky/contact/dismissMatch.ts

@@ -37,7 +37,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
-  error?: 'TODO'
+  error?: 'InvalidDid' | 'InternalError'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/app/bsky/contact/getMatches.ts

@@ -37,7 +37,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
-  error?: 'TODO'
+  error?: 'InvalidDid' | 'InvalidLimit' | 'InvalidCursor' | 'InternalError'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/app/bsky/contact/getSyncStatus.ts

@@ -33,7 +33,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
-  error?: 'TODO'
+  error?: 'InvalidDid' | 'InternalError'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/app/bsky/contact/importContacts.ts

@@ -43,7 +43,12 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
-  error?: 'TODO'
+  error?:
+    | 'InvalidDid'
+    | 'InvalidContacts'
+    | 'TooManyContacts'
+    | 'InvalidToken'
+    | 'InternalError'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/app/bsky/contact/removeData.ts

@@ -34,7 +34,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
-  error?: 'TODO'
+  error?: 'InvalidDid' | 'InternalError'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/app/bsky/contact/sendNotification.ts

@@ -0,0 +1,44 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.contact.sendNotification'
+
+export type QueryParams = {}
+
+export interface InputSchema {
+  /** The DID of who this notification comes from. */
+  from: string
+  /** The DID of who this notification should go to. */
+  to: string
+}
+
+export interface OutputSchema {}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/app/bsky/contact/startPhoneVerification.ts

@@ -37,7 +37,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
-  error?: 'TODO'
+  error?: 'RateLimitExceeded' | 'InvalidDid' | 'InvalidPhone' | 'InternalError'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/app/bsky/contact/verifyPhone.ts

@@ -42,7 +42,12 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
-  error?: 'TODO'
+  error?:
+    | 'RateLimitExceeded'
+    | 'InvalidDid'
+    | 'InvalidPhone'
+    | 'InvalidCode'
+    | 'InternalError'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/app/bsky/notification/listNotifications.ts

@@ -67,6 +67,7 @@ export interface Notification {
     | 'like-via-repost'
     | 'repost-via-repost'
     | 'subscribed-post'
+    | 'contact-match'
     | (string & {})
   reasonSubject?: string
   record: { [_ in string]: unknown }

package/src/mod-service/index.ts

@@ -799,6 +799,18 @@ export class ModerationService {
         takedownRef,
       }))
 
+    // The label is consumed by appview if we opt for appview only takedown, this is needed
+    // if we opt for pds level takedown, adding the label doesn't hurt
+    const takedownLabel = isSuspend ? SUSPEND_LABEL : TAKEDOWN_LABEL
+    await this.formatAndCreateLabels(subject.did, null, {
+      create: [takedownLabel],
+    })
+
+    // If we dont have to push any events, return early
+    if (!values.length) {
+      return
+    }
+
     const repoEvts = await this.db.db
       .insertInto('repo_push_event')
       .values(values)
@@ -813,11 +825,6 @@ export class ModerationService {
       .returning('id')
       .execute()
 
-    const takedownLabel = isSuspend ? SUSPEND_LABEL : TAKEDOWN_LABEL
-    await this.formatAndCreateLabels(subject.did, null, {
-      create: [takedownLabel],
-    })
-
     this.db.onCommit(() => {
       this.backgroundQueue.add(async () => {
         await Promise.all(