@atproto/ozone 0.1.161 → 0.1.163

package/src/lexicon/types/app/bsky/draft/createDraft.ts

@@ -0,0 +1,46 @@
+/**
+ * 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'
+import type * as AppBskyDraftDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.draft.createDraft'
+
+export type QueryParams = {}
+
+export interface InputSchema {
+  draft: AppBskyDraftDefs.Draft
+}
+
+export interface OutputSchema {
+  /** The ID of the created draft. */
+  id: string
+}
+
+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
+  error?: 'DraftLimitReached'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess

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

@@ -0,0 +1,212 @@
+/**
+ * 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'
+import type * as AppBskyFeedPostgate from '../feed/postgate.js'
+import type * as AppBskyFeedThreadgate from '../feed/threadgate.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.draft.defs'
+
+/** A draft with an identifier, used to store drafts in private storage (stash). */
+export interface DraftWithId {
+  $type?: 'app.bsky.draft.defs#draftWithId'
+  /** A TID to be used as a draft identifier. */
+  id: string
+  draft: Draft
+}
+
+const hashDraftWithId = 'draftWithId'
+
+export function isDraftWithId<V>(v: V) {
+  return is$typed(v, id, hashDraftWithId)
+}
+
+export function validateDraftWithId<V>(v: V) {
+  return validate<DraftWithId & V>(v, id, hashDraftWithId)
+}
+
+/** A draft containing an array of draft posts. */
+export interface Draft {
+  $type?: 'app.bsky.draft.defs#draft'
+  /** UUIDv4 identifier of the device that created this draft. */
+  deviceId?: string
+  /** The device and/or platform on which the draft was created. */
+  deviceName?: string
+  /** Array of draft posts that compose this draft. */
+  posts: DraftPost[]
+  /** Indicates human language of posts primary text content. */
+  langs?: string[]
+  /** Embedding rules for the postgates to be created when this draft is published. */
+  postgateEmbeddingRules?: (
+    | $Typed<AppBskyFeedPostgate.DisableRule>
+    | { $type: string }
+  )[]
+  /** Allow-rules for the threadgate to be created when this draft is published. */
+  threadgateAllow?: (
+    | $Typed<AppBskyFeedThreadgate.MentionRule>
+    | $Typed<AppBskyFeedThreadgate.FollowerRule>
+    | $Typed<AppBskyFeedThreadgate.FollowingRule>
+    | $Typed<AppBskyFeedThreadgate.ListRule>
+    | { $type: string }
+  )[]
+}
+
+const hashDraft = 'draft'
+
+export function isDraft<V>(v: V) {
+  return is$typed(v, id, hashDraft)
+}
+
+export function validateDraft<V>(v: V) {
+  return validate<Draft & V>(v, id, hashDraft)
+}
+
+/** One of the posts that compose a draft. */
+export interface DraftPost {
+  $type?: 'app.bsky.draft.defs#draftPost'
+  /** The primary post content. */
+  text: string
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
+  embedImages?: DraftEmbedImage[]
+  embedVideos?: DraftEmbedVideo[]
+  embedExternals?: DraftEmbedExternal[]
+  embedRecords?: DraftEmbedRecord[]
+}
+
+const hashDraftPost = 'draftPost'
+
+export function isDraftPost<V>(v: V) {
+  return is$typed(v, id, hashDraftPost)
+}
+
+export function validateDraftPost<V>(v: V) {
+  return validate<DraftPost & V>(v, id, hashDraftPost)
+}
+
+/** View to present drafts data to users. */
+export interface DraftView {
+  $type?: 'app.bsky.draft.defs#draftView'
+  /** A TID to be used as a draft identifier. */
+  id: string
+  draft: Draft
+  /** The time the draft was created. */
+  createdAt: string
+  /** The time the draft was last updated. */
+  updatedAt: string
+}
+
+const hashDraftView = 'draftView'
+
+export function isDraftView<V>(v: V) {
+  return is$typed(v, id, hashDraftView)
+}
+
+export function validateDraftView<V>(v: V) {
+  return validate<DraftView & V>(v, id, hashDraftView)
+}
+
+export interface DraftEmbedLocalRef {
+  $type?: 'app.bsky.draft.defs#draftEmbedLocalRef'
+  /** Local, on-device ref to file to be embedded. Embeds are currently device-bound for drafts. */
+  path: string
+}
+
+const hashDraftEmbedLocalRef = 'draftEmbedLocalRef'
+
+export function isDraftEmbedLocalRef<V>(v: V) {
+  return is$typed(v, id, hashDraftEmbedLocalRef)
+}
+
+export function validateDraftEmbedLocalRef<V>(v: V) {
+  return validate<DraftEmbedLocalRef & V>(v, id, hashDraftEmbedLocalRef)
+}
+
+export interface DraftEmbedCaption {
+  $type?: 'app.bsky.draft.defs#draftEmbedCaption'
+  lang: string
+  content: string
+}
+
+const hashDraftEmbedCaption = 'draftEmbedCaption'
+
+export function isDraftEmbedCaption<V>(v: V) {
+  return is$typed(v, id, hashDraftEmbedCaption)
+}
+
+export function validateDraftEmbedCaption<V>(v: V) {
+  return validate<DraftEmbedCaption & V>(v, id, hashDraftEmbedCaption)
+}
+
+export interface DraftEmbedImage {
+  $type?: 'app.bsky.draft.defs#draftEmbedImage'
+  localRef: DraftEmbedLocalRef
+  alt?: string
+}
+
+const hashDraftEmbedImage = 'draftEmbedImage'
+
+export function isDraftEmbedImage<V>(v: V) {
+  return is$typed(v, id, hashDraftEmbedImage)
+}
+
+export function validateDraftEmbedImage<V>(v: V) {
+  return validate<DraftEmbedImage & V>(v, id, hashDraftEmbedImage)
+}
+
+export interface DraftEmbedVideo {
+  $type?: 'app.bsky.draft.defs#draftEmbedVideo'
+  localRef: DraftEmbedLocalRef
+  alt?: string
+  captions?: DraftEmbedCaption[]
+}
+
+const hashDraftEmbedVideo = 'draftEmbedVideo'
+
+export function isDraftEmbedVideo<V>(v: V) {
+  return is$typed(v, id, hashDraftEmbedVideo)
+}
+
+export function validateDraftEmbedVideo<V>(v: V) {
+  return validate<DraftEmbedVideo & V>(v, id, hashDraftEmbedVideo)
+}
+
+export interface DraftEmbedExternal {
+  $type?: 'app.bsky.draft.defs#draftEmbedExternal'
+  uri: string
+}
+
+const hashDraftEmbedExternal = 'draftEmbedExternal'
+
+export function isDraftEmbedExternal<V>(v: V) {
+  return is$typed(v, id, hashDraftEmbedExternal)
+}
+
+export function validateDraftEmbedExternal<V>(v: V) {
+  return validate<DraftEmbedExternal & V>(v, id, hashDraftEmbedExternal)
+}
+
+export interface DraftEmbedRecord {
+  $type?: 'app.bsky.draft.defs#draftEmbedRecord'
+  record: ComAtprotoRepoStrongRef.Main
+}
+
+const hashDraftEmbedRecord = 'draftEmbedRecord'
+
+export function isDraftEmbedRecord<V>(v: V) {
+  return is$typed(v, id, hashDraftEmbedRecord)
+}
+
+export function validateDraftEmbedRecord<V>(v: V) {
+  return validate<DraftEmbedRecord & V>(v, id, hashDraftEmbedRecord)
+}

package/src/lexicon/types/app/bsky/draft/deleteDraft.ts

@@ -0,0 +1,33 @@
+/**
+ * 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.draft.deleteDraft'
+
+export type QueryParams = {}
+
+export interface InputSchema {
+  id: string
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | void

package/src/lexicon/types/app/bsky/draft/getDrafts.ts

@@ -0,0 +1,42 @@
+/**
+ * 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'
+import type * as AppBskyDraftDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.draft.getDrafts'
+
+export type QueryParams = {
+  limit: number
+  cursor?: string
+}
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  cursor?: string
+  drafts: AppBskyDraftDefs.DraftView[]
+}
+
+export type HandlerInput = void
+
+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/draft/updateDraft.ts

@@ -0,0 +1,34 @@
+/**
+ * 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'
+import type * as AppBskyDraftDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.draft.updateDraft'
+
+export type QueryParams = {}
+
+export interface InputSchema {
+  draft: AppBskyDraftDefs.DraftWithId
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | void

package/src/lexicon/types/app/bsky/embed/video.ts

@@ -23,6 +23,8 @@ export interface Main {
   /** Alt text description of the video, for accessibility. */
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
+  /** A hint to the client about how to present the video. */
+  presentation?: 'default' | 'gif' | (string & {})
 }
 
 const hashMain = 'main'
@@ -58,6 +60,8 @@ export interface View {
   thumbnail?: string
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
+  /** A hint to the client about how to present the video. */
+  presentation?: 'default' | 'gif' | (string & {})
 }
 
 const hashView = 'view'

package/src/lexicon/types/app/bsky/unspecced/getSuggestedUsers.ts

@@ -24,6 +24,8 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileView[]
+  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  recId?: string
 }
 
 export type HandlerInput = void

package/src/lexicon/types/app/bsky/unspecced/getSuggestedUsersSkeleton.ts

@@ -25,6 +25,8 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   dids: string[]
+  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  recId?: string
 }
 
 export type HandlerInput = void

package/src/lexicon/types/com/atproto/server/deleteSession.ts

@@ -21,6 +21,7 @@ export type HandlerInput = void
 export interface HandlerError {
   status: number
   message?: string
+  error?: 'InvalidToken' | 'ExpiredToken'
 }
 
 export type HandlerOutput = HandlerError | void

package/src/lexicon/types/com/atproto/server/getSession.ts

@@ -20,10 +20,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   handle: string
   did: string
+  didDoc?: { [_ in string]: unknown }
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
-  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})

package/src/lexicon/types/com/atproto/server/refreshSession.ts

@@ -23,6 +23,9 @@ export interface OutputSchema {
   handle: string
   did: string
   didDoc?: { [_ in string]: unknown }
+  email?: string
+  emailConfirmed?: boolean
+  emailAuthFactor?: boolean
   active?: boolean
   /** Hosting status of the account. If not specified, then assume 'active'. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
@@ -39,7 +42,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
-  error?: 'AccountTakedown'
+  error?: 'AccountTakedown' | 'InvalidToken' | 'ExpiredToken'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess

package/src/mod-service/util.ts

@@ -1,5 +1,3 @@
-/* eslint-disable import/no-deprecated */
-
 import net from 'node:net'
 import { sql } from 'kysely'
 import AtpAgent from '@atproto/api'
@@ -48,6 +46,9 @@ export const signLabel = async (
   signingKey: Keypair,
 ): Promise<SignedLabel> => {
   const { ver, src, uri, cid, val, neg, cts, exp } = label
+  // @TODO cborEncode now ignores undefined properties, so we might not need to
+  // reformat the label here. We might want to consider this if we ever re-visit
+  // the logic below:
   const reformatted = noUndefinedVals({
     ver: ver ?? 1,
     src,

package/src/verification/issuer.ts

@@ -14,6 +14,8 @@ export type VerificationIssuerCreator = (
   verifierConfig: VerifierConfig,
 ) => VerificationIssuer
 
+const HANDLE_INVALID = 'handle.invalid'
+
 export class VerificationIssuer {
   private session = new CredentialSession(new URL(this.verifierConfig.url))
   private agent = new Agent(this.session)
@@ -58,6 +60,15 @@ export class VerificationIssuer {
     const agent = await this.getAgent()
     await Promise.allSettled(
       verifications.map(async ({ displayName, handle, subject, createdAt }) => {
+        if (handle.toLowerCase() === HANDLE_INVALID) {
+          failedVerifications.push({
+            $type: 'tools.ozone.verification.grantVerifications#grantError',
+            error: 'Cannot verify with invalid handle',
+            subject,
+          })
+          return
+        }
+
         try {
           const verificationRecord = {
             createdAt: createdAt || now,

package/tests/query-labels.test.ts

@@ -1,5 +1,3 @@
-/* eslint-disable import/no-deprecated */
-
 import { AtpAgent } from '@atproto/api'
 import { cborEncode } from '@atproto/common'
 import { Secp256k1Keypair, verifySignature } from '@atproto/crypto'

package/tests/verification.test.ts

@@ -132,6 +132,26 @@ describe('verification', () => {
         'Must be an admin or verifier to grant verifications',
       )
     })
+
+    it('fails if the handle is invalid', async () => {
+      const {
+        data: { verifications, failedVerifications },
+      } = await adminAgent.tools.ozone.verification.grantVerifications({
+        verifications: [
+          {
+            subject: sc.dids.dan,
+            handle: 'handle.invalid',
+            displayName: 'Bob',
+          },
+        ],
+      })
+
+      expect(verifications.length).toEqual(0)
+      expect(failedVerifications.length).toEqual(1)
+      const failed = failedVerifications.at(0)
+      expect(failed!.error).toEqual('Cannot verify with invalid handle')
+      expect(failed!.subject).toEqual(sc.dids.dan)
+    })
   })
 
   it('does not publish record if a valid one already exists', async () => {