@atproto/api 0.6.20 → 0.6.22

package/dist/moderation/accumulator.d.ts

@@ -6,6 +6,7 @@ export declare class ModerationCauseAccumulator {
     constructor();
     setDid(did: string): void;
     addBlocking(blocking: string | undefined): void;
+    addBlockingByList(blockingByList: AppBskyGraphDefs.ListViewBasic | undefined): void;
     addBlockedBy(blockedBy: boolean | undefined): void;
     addBlockOther(blockOther: boolean | undefined): void;
     addLabel(label: Label, opts: ModerationOpts): void;

package/docs/moderation-behaviors/profiles.md

@@ -547,6 +547,23 @@ Key:
 </td>
 </tr>
 
+<tr>
+<td><strong>Mute/block: Blocking-by-list user</strong></td>
+<td>
+❌
+</td>
+<td>
+
+</td>
+<td>
+
+</td>
+<td>
+🚫
+
+</td>
+</tr>
+
 <tr>
 <td><strong>Mute/block: Blocked by user</strong></td>
 <td>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.6.20",
+  "version": "0.6.22",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
@@ -19,15 +19,16 @@
     "multiformats": "^9.9.0",
     "tlds": "^1.234.0",
     "typed-emitter": "^2.1.0",
-    "@atproto/common-web": "^0.2.1",
-    "@atproto/lexicon": "^0.2.2",
-    "@atproto/syntax": "^0.1.2",
-    "@atproto/xrpc": "^0.3.2"
+    "zod": "^3.21.4",
+    "@atproto/common-web": "^0.2.3",
+    "@atproto/lexicon": "^0.3.0",
+    "@atproto/syntax": "^0.1.4",
+    "@atproto/xrpc": "^0.4.0"
   },
   "devDependencies": {
     "common-tags": "^1.8.2",
-    "@atproto/lex-cli": "^0.2.2",
-    "@atproto/pds": "^0.1.20"
+    "@atproto/lex-cli": "^0.2.4",
+    "@atproto/dev-env": "^0.2.13"
   },
   "scripts": {
     "codegen": "pnpm docgen && node ./scripts/generate-code.mjs && lex gen-api ./src/client ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/*",

package/src/agent.ts

@@ -1,5 +1,6 @@
 import { ErrorResponseBody, errorResponseBody } from '@atproto/xrpc'
 import { defaultFetchHandler } from '@atproto/xrpc'
+import { isValidDidDoc, getPdsEndpoint } from '@atproto/common-web'
 import {
   AtpBaseClient,
   AtpServiceClient,
@@ -30,6 +31,11 @@ export class AtpAgent {
   api: AtpServiceClient
   session?: AtpSessionData
 
+  /**
+   * The PDS URL, driven by the did doc. May be undefined.
+   */
+  pdsUrl: URL | undefined
+
   private _baseClient: AtpBaseClient
   private _persistSession?: AtpPersistSessionHandler
   private _refreshSessionPromise: Promise<void> | undefined
@@ -97,6 +103,7 @@ export class AtpAgent {
         email: opts.email,
         emailConfirmed: false,
       }
+      this._updateApiEndpoint(res.data.didDoc)
       return res
     } catch (e) {
       this.session = undefined
@@ -129,6 +136,7 @@ export class AtpAgent {
         email: res.data.email,
         emailConfirmed: res.data.emailConfirmed,
       }
+      this._updateApiEndpoint(res.data.didDoc)
       return res
     } catch (e) {
       this.session = undefined
@@ -253,7 +261,7 @@ export class AtpAgent {
     }
 
     // send the refresh request
-    const url = new URL(this.service.origin)
+    const url = new URL((this.pdsUrl || this.service).origin)
     url.pathname = `/xrpc/${REFRESH_SESSION}`
     const res = await AtpAgent.fetch(
       url.toString(),
@@ -277,6 +285,7 @@ export class AtpAgent {
         handle: res.body.handle,
         did: res.body.did,
       }
+      this._updateApiEndpoint(res.body.didDoc)
       this._persistSession?.('update', this.session)
     }
     // else: other failures should be ignored - the issue will
@@ -311,6 +320,24 @@ export class AtpAgent {
    */
   createModerationReport: typeof this.api.com.atproto.moderation.createReport =
     (data, opts) => this.api.com.atproto.moderation.createReport(data, opts)
+
+  /**
+   * Helper to update the pds endpoint dynamically.
+   *
+   * The session methods (create, resume, refresh) may respond with the user's
+   * did document which contains the user's canonical PDS endpoint. That endpoint
+   * may differ from the endpoint used to contact the server. We capture that
+   * PDS endpoint and update the client to use that given endpoint for future
+   * requests. (This helps ensure smooth migrations between PDSes, especially
+   * when the PDSes are operated by a single org.)
+   */
+  private _updateApiEndpoint(didDoc: unknown) {
+    if (isValidDidDoc(didDoc)) {
+      const endpoint = getPdsEndpoint(didDoc)
+      this.pdsUrl = endpoint ? new URL(endpoint) : undefined
+    }
+    this.api.xrpc.uri = this.pdsUrl || this.service
+  }
 }
 
 function isErrorObject(v: unknown): v is ErrorResponseBody {

package/src/bsky-agent.ts

@@ -258,6 +258,49 @@ export class BskyAgent extends AtpAgent {
     return this.api.app.bsky.graph.unmuteActor({ actor })
   }
 
+  async muteModList(uri: string) {
+    return this.api.app.bsky.graph.muteActorList({
+      list: uri,
+    })
+  }
+
+  async unmuteModList(uri: string) {
+    return this.api.app.bsky.graph.unmuteActorList({
+      list: uri,
+    })
+  }
+
+  async blockModList(uri: string) {
+    if (!this.session) {
+      throw new Error('Not logged in')
+    }
+    return await this.api.app.bsky.graph.listblock.create(
+      { repo: this.session.did },
+      {
+        subject: uri,
+        createdAt: new Date().toISOString(),
+      },
+    )
+  }
+
+  async unblockModList(uri: string) {
+    if (!this.session) {
+      throw new Error('Not logged in')
+    }
+    const listInfo = await this.api.app.bsky.graph.getList({
+      list: uri,
+      limit: 1,
+    })
+    if (!listInfo.data.list.viewer?.blocked) {
+      return
+    }
+    const { rkey } = new AtUri(listInfo.data.list.viewer.blocked)
+    return await this.api.app.bsky.graph.listblock.delete({
+      repo: this.session.did,
+      rkey,
+    })
+  }
+
   async updateSeenNotifications(seenAt?: string) {
     seenAt = seenAt || new Date().toISOString()
     return this.api.app.bsky.notification.updateSeen({

package/src/client/index.ts

@@ -11,6 +11,7 @@ import * as ComAtprotoAdminDefs from './types/com/atproto/admin/defs'
 import * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites'
 import * as ComAtprotoAdminDisableInviteCodes from './types/com/atproto/admin/disableInviteCodes'
 import * as ComAtprotoAdminEnableAccountInvites from './types/com/atproto/admin/enableAccountInvites'
+import * as ComAtprotoAdminGetAccountInfo from './types/com/atproto/admin/getAccountInfo'
 import * as ComAtprotoAdminGetInviteCodes from './types/com/atproto/admin/getInviteCodes'
 import * as ComAtprotoAdminGetModerationAction from './types/com/atproto/admin/getModerationAction'
 import * as ComAtprotoAdminGetModerationActions from './types/com/atproto/admin/getModerationActions'
@@ -18,6 +19,7 @@ import * as ComAtprotoAdminGetModerationReport from './types/com/atproto/admin/g
 import * as ComAtprotoAdminGetModerationReports from './types/com/atproto/admin/getModerationReports'
 import * as ComAtprotoAdminGetRecord from './types/com/atproto/admin/getRecord'
 import * as ComAtprotoAdminGetRepo from './types/com/atproto/admin/getRepo'
+import * as ComAtprotoAdminGetSubjectStatus from './types/com/atproto/admin/getSubjectStatus'
 import * as ComAtprotoAdminResolveModerationReports from './types/com/atproto/admin/resolveModerationReports'
 import * as ComAtprotoAdminReverseModerationAction from './types/com/atproto/admin/reverseModerationAction'
 import * as ComAtprotoAdminSearchRepos from './types/com/atproto/admin/searchRepos'
@@ -25,6 +27,7 @@ import * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail'
 import * as ComAtprotoAdminTakeModerationAction from './types/com/atproto/admin/takeModerationAction'
 import * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail'
 import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle'
+import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus'
 import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle'
 import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle'
 import * as ComAtprotoLabelDefs from './types/com/atproto/label/defs'
@@ -59,6 +62,7 @@ import * as ComAtprotoServerRequestAccountDelete from './types/com/atproto/serve
 import * as ComAtprotoServerRequestEmailConfirmation from './types/com/atproto/server/requestEmailConfirmation'
 import * as ComAtprotoServerRequestEmailUpdate from './types/com/atproto/server/requestEmailUpdate'
 import * as ComAtprotoServerRequestPasswordReset from './types/com/atproto/server/requestPasswordReset'
+import * as ComAtprotoServerReserveSigningKey from './types/com/atproto/server/reserveSigningKey'
 import * as ComAtprotoServerResetPassword from './types/com/atproto/server/resetPassword'
 import * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/revokeAppPassword'
 import * as ComAtprotoServerUpdateEmail from './types/com/atproto/server/updateEmail'
@@ -144,6 +148,7 @@ export * as ComAtprotoAdminDefs from './types/com/atproto/admin/defs'
 export * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites'
 export * as ComAtprotoAdminDisableInviteCodes from './types/com/atproto/admin/disableInviteCodes'
 export * as ComAtprotoAdminEnableAccountInvites from './types/com/atproto/admin/enableAccountInvites'
+export * as ComAtprotoAdminGetAccountInfo from './types/com/atproto/admin/getAccountInfo'
 export * as ComAtprotoAdminGetInviteCodes from './types/com/atproto/admin/getInviteCodes'
 export * as ComAtprotoAdminGetModerationAction from './types/com/atproto/admin/getModerationAction'
 export * as ComAtprotoAdminGetModerationActions from './types/com/atproto/admin/getModerationActions'
@@ -151,6 +156,7 @@ export * as ComAtprotoAdminGetModerationReport from './types/com/atproto/admin/g
 export * as ComAtprotoAdminGetModerationReports from './types/com/atproto/admin/getModerationReports'
 export * as ComAtprotoAdminGetRecord from './types/com/atproto/admin/getRecord'
 export * as ComAtprotoAdminGetRepo from './types/com/atproto/admin/getRepo'
+export * as ComAtprotoAdminGetSubjectStatus from './types/com/atproto/admin/getSubjectStatus'
 export * as ComAtprotoAdminResolveModerationReports from './types/com/atproto/admin/resolveModerationReports'
 export * as ComAtprotoAdminReverseModerationAction from './types/com/atproto/admin/reverseModerationAction'
 export * as ComAtprotoAdminSearchRepos from './types/com/atproto/admin/searchRepos'
@@ -158,6 +164,7 @@ export * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail'
 export * as ComAtprotoAdminTakeModerationAction from './types/com/atproto/admin/takeModerationAction'
 export * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail'
 export * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle'
+export * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus'
 export * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle'
 export * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle'
 export * as ComAtprotoLabelDefs from './types/com/atproto/label/defs'
@@ -192,6 +199,7 @@ export * as ComAtprotoServerRequestAccountDelete from './types/com/atproto/serve
 export * as ComAtprotoServerRequestEmailConfirmation from './types/com/atproto/server/requestEmailConfirmation'
 export * as ComAtprotoServerRequestEmailUpdate from './types/com/atproto/server/requestEmailUpdate'
 export * as ComAtprotoServerRequestPasswordReset from './types/com/atproto/server/requestPasswordReset'
+export * as ComAtprotoServerReserveSigningKey from './types/com/atproto/server/reserveSigningKey'
 export * as ComAtprotoServerResetPassword from './types/com/atproto/server/resetPassword'
 export * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/revokeAppPassword'
 export * as ComAtprotoServerUpdateEmail from './types/com/atproto/server/updateEmail'
@@ -394,6 +402,17 @@ export class AdminNS {
       })
   }
 
+  getAccountInfo(
+    params?: ComAtprotoAdminGetAccountInfo.QueryParams,
+    opts?: ComAtprotoAdminGetAccountInfo.CallOptions,
+  ): Promise<ComAtprotoAdminGetAccountInfo.Response> {
+    return this._service.xrpc
+      .call('com.atproto.admin.getAccountInfo', params, undefined, opts)
+      .catch((e) => {
+        throw ComAtprotoAdminGetAccountInfo.toKnownErr(e)
+      })
+  }
+
   getInviteCodes(
     params?: ComAtprotoAdminGetInviteCodes.QueryParams,
     opts?: ComAtprotoAdminGetInviteCodes.CallOptions,
@@ -471,6 +490,17 @@ export class AdminNS {
       })
   }
 
+  getSubjectStatus(
+    params?: ComAtprotoAdminGetSubjectStatus.QueryParams,
+    opts?: ComAtprotoAdminGetSubjectStatus.CallOptions,
+  ): Promise<ComAtprotoAdminGetSubjectStatus.Response> {
+    return this._service.xrpc
+      .call('com.atproto.admin.getSubjectStatus', params, undefined, opts)
+      .catch((e) => {
+        throw ComAtprotoAdminGetSubjectStatus.toKnownErr(e)
+      })
+  }
+
   resolveModerationReports(
     data?: ComAtprotoAdminResolveModerationReports.InputSchema,
     opts?: ComAtprotoAdminResolveModerationReports.CallOptions,
@@ -547,6 +577,17 @@ export class AdminNS {
         throw ComAtprotoAdminUpdateAccountHandle.toKnownErr(e)
       })
   }
+
+  updateSubjectStatus(
+    data?: ComAtprotoAdminUpdateSubjectStatus.InputSchema,
+    opts?: ComAtprotoAdminUpdateSubjectStatus.CallOptions,
+  ): Promise<ComAtprotoAdminUpdateSubjectStatus.Response> {
+    return this._service.xrpc
+      .call('com.atproto.admin.updateSubjectStatus', opts?.qp, data, opts)
+      .catch((e) => {
+        throw ComAtprotoAdminUpdateSubjectStatus.toKnownErr(e)
+      })
+  }
 }
 
 export class IdentityNS {
@@ -907,6 +948,17 @@ export class ServerNS {
       })
   }
 
+  reserveSigningKey(
+    data?: ComAtprotoServerReserveSigningKey.InputSchema,
+    opts?: ComAtprotoServerReserveSigningKey.CallOptions,
+  ): Promise<ComAtprotoServerReserveSigningKey.Response> {
+    return this._service.xrpc
+      .call('com.atproto.server.reserveSigningKey', opts?.qp, data, opts)
+      .catch((e) => {
+        throw ComAtprotoServerReserveSigningKey.toKnownErr(e)
+      })
+  }
+
   resetPassword(
     data?: ComAtprotoServerResetPassword.InputSchema,
     opts?: ComAtprotoServerResetPassword.CallOptions,