@atproto/api 0.6.6 → 0.6.8

package/dist/types.d.ts

@@ -1,3 +1,4 @@
+import { LabelPreference } from './moderation/types';
 export declare type AtpSessionEvent = 'create' | 'create-failed' | 'update' | 'expired';
 export interface AtpSessionData {
     refreshJwt: string;
@@ -31,4 +32,13 @@ export declare type AtpAgentFetchHandler = (httpUri: string, httpMethod: string,
 export interface AtpAgentGlobalOpts {
     fetch: AtpAgentFetchHandler;
 }
+export declare type BskyLabelPreference = LabelPreference | 'show';
+export interface BskyPreferences {
+    feeds: {
+        saved?: string[];
+        pinned?: string[];
+    };
+    adultContentEnabled: boolean;
+    contentLabels: Record<string, BskyLabelPreference>;
+}
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "main": "dist/index.js",
   "scripts": {
     "codegen": "yarn docgen && node ./scripts/generate-code.mjs && lex gen-api ./src/client ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/*",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@atproto/common-web": "*",
-    "@atproto/uri": "*",
+    "@atproto/syntax": "*",
     "@atproto/xrpc": "*",
     "tlds": "^1.234.0",
     "typed-emitter": "^2.1.0"

package/src/bsky-agent.ts

@@ -1,10 +1,12 @@
-import { AtUri } from '@atproto/uri'
+import { AtUri } from '@atproto/syntax'
 import { AtpAgent } from './agent'
 import {
   AppBskyFeedPost,
   AppBskyActorProfile,
+  AppBskyActorDefs,
   ComAtprotoRepoPutRecord,
 } from './client'
+import { BskyPreferences, BskyLabelPreference } from './types'
 
 export class BskyAgent extends AtpAgent {
   get app() {
@@ -236,4 +238,182 @@ export class BskyAgent extends AtpAgent {
       seenAt,
     })
   }
+
+  async getPreferences(): Promise<BskyPreferences> {
+    const prefs: BskyPreferences = {
+      feeds: {
+        saved: undefined,
+        pinned: undefined,
+      },
+      adultContentEnabled: false,
+      contentLabels: {},
+    }
+    const res = await this.app.bsky.actor.getPreferences({})
+    for (const pref of res.data.preferences) {
+      if (
+        AppBskyActorDefs.isAdultContentPref(pref) &&
+        AppBskyActorDefs.validateAdultContentPref(pref).success
+      ) {
+        prefs.adultContentEnabled = pref.enabled
+      } else if (
+        AppBskyActorDefs.isContentLabelPref(pref) &&
+        AppBskyActorDefs.validateAdultContentPref(pref).success
+      ) {
+        let value = pref.visibility
+        if (value === 'show') {
+          value = 'ignore'
+        }
+        if (value === 'ignore' || value === 'warn' || value === 'hide') {
+          prefs.contentLabels[pref.label] = value as BskyLabelPreference
+        }
+      } else if (
+        AppBskyActorDefs.isSavedFeedsPref(pref) &&
+        AppBskyActorDefs.validateSavedFeedsPref(pref).success
+      ) {
+        prefs.feeds.saved = pref.saved
+        prefs.feeds.pinned = pref.pinned
+      }
+    }
+    return prefs
+  }
+
+  async setSavedFeeds(saved: string[], pinned: string[]) {
+    return updateFeedPreferences(this, () => ({
+      saved,
+      pinned,
+    }))
+  }
+
+  async addSavedFeed(v: string) {
+    return updateFeedPreferences(this, (saved: string[], pinned: string[]) => ({
+      saved: [...saved.filter((uri) => uri !== v), v],
+      pinned,
+    }))
+  }
+
+  async removeSavedFeed(v: string) {
+    return updateFeedPreferences(this, (saved: string[], pinned: string[]) => ({
+      saved: saved.filter((uri) => uri !== v),
+      pinned: pinned.filter((uri) => uri !== v),
+    }))
+  }
+
+  async addPinnedFeed(v: string) {
+    return updateFeedPreferences(this, (saved: string[], pinned: string[]) => ({
+      saved: [...saved.filter((uri) => uri !== v), v],
+      pinned: [...pinned.filter((uri) => uri !== v), v],
+    }))
+  }
+
+  async removePinnedFeed(v: string) {
+    return updateFeedPreferences(this, (saved: string[], pinned: string[]) => ({
+      saved,
+      pinned: pinned.filter((uri) => uri !== v),
+    }))
+  }
+
+  async setAdultContentEnabled(v: boolean) {
+    await updatePreferences(this, (prefs: AppBskyActorDefs.Preferences) => {
+      const existing = prefs.find(
+        (pref) =>
+          AppBskyActorDefs.isAdultContentPref(pref) &&
+          AppBskyActorDefs.validateAdultContentPref(pref).success,
+      )
+      if (existing) {
+        existing.enabled = v
+      } else {
+        prefs.push({
+          $type: 'app.bsky.actor.defs#adultContentPref',
+          enabled: v,
+        })
+      }
+      return prefs
+    })
+  }
+
+  async setContentLabelPref(key: string, value: BskyLabelPreference) {
+    // TEMP update old value
+    if (value === 'show') {
+      value = 'ignore'
+    }
+
+    await updatePreferences(this, (prefs: AppBskyActorDefs.Preferences) => {
+      const existing = prefs.find(
+        (pref) =>
+          AppBskyActorDefs.isContentLabelPref(pref) &&
+          AppBskyActorDefs.validateAdultContentPref(pref).success &&
+          pref.label === key,
+      )
+      if (existing) {
+        existing.visibility = value
+      } else {
+        prefs.push({
+          $type: 'app.bsky.actor.defs#contentLabelPref',
+          label: key,
+          visibility: value,
+        })
+      }
+      return prefs
+    })
+  }
+}
+
+/**
+ * This function updates the preferences of a user and allows for a callback function to be executed
+ * before the update.
+ * @param cb - cb is a callback function that takes in a single parameter of type
+ * AppBskyActorDefs.Preferences and returns either a boolean or void. This callback function is used to
+ * update the preferences of the user. The function is called with the current preferences as an
+ * argument and if the callback returns false, the preferences are not updated.
+ */
+async function updatePreferences(
+  agent: BskyAgent,
+  cb: (
+    prefs: AppBskyActorDefs.Preferences,
+  ) => AppBskyActorDefs.Preferences | false,
+) {
+  const res = await agent.app.bsky.actor.getPreferences({})
+  const newPrefs = cb(res.data.preferences)
+  if (newPrefs === false) {
+    return
+  }
+  await agent.app.bsky.actor.putPreferences({
+    preferences: newPrefs,
+  })
+}
+
+/**
+ * A helper specifically for updating feed preferences
+ */
+async function updateFeedPreferences(
+  agent: BskyAgent,
+  cb: (
+    saved: string[],
+    pinned: string[],
+  ) => { saved: string[]; pinned: string[] },
+): Promise<{ saved: string[]; pinned: string[] }> {
+  let res
+  await updatePreferences(agent, (prefs: AppBskyActorDefs.Preferences) => {
+    let feedsPref = prefs.find(
+      (pref) =>
+        AppBskyActorDefs.isSavedFeedsPref(pref) &&
+        AppBskyActorDefs.validateSavedFeedsPref(pref).success,
+    ) as AppBskyActorDefs.SavedFeedsPref | undefined
+    if (feedsPref) {
+      res = cb(feedsPref.saved, feedsPref.pinned)
+      feedsPref.saved = res.saved
+      feedsPref.pinned = res.pinned
+    } else {
+      res = cb([], [])
+      feedsPref = {
+        $type: 'app.bsky.actor.defs#savedFeedsPref',
+        saved: res.saved,
+        pinned: res.pinned,
+      }
+    }
+    return prefs
+      .filter((pref) => !AppBskyActorDefs.isSavedFeedsPref(pref))
+      .concat([feedsPref])
+  })
+  return res
 }

package/src/client/index.ts

@@ -18,7 +18,6 @@ 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 ComAtprotoAdminRebaseRepo from './types/com/atproto/admin/rebaseRepo'
 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'
@@ -40,7 +39,6 @@ import * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRe
 import * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord'
 import * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords'
 import * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord'
-import * as ComAtprotoRepoRebaseRepo from './types/com/atproto/repo/rebaseRepo'
 import * as ComAtprotoRepoStrongRef from './types/com/atproto/repo/strongRef'
 import * as ComAtprotoRepoUploadBlob from './types/com/atproto/repo/uploadBlob'
 import * as ComAtprotoServerCreateAccount from './types/com/atproto/server/createAccount'
@@ -63,8 +61,8 @@ import * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/r
 import * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob'
 import * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks'
 import * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout'
-import * as ComAtprotoSyncGetCommitPath from './types/com/atproto/sync/getCommitPath'
 import * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead'
+import * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit'
 import * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord'
 import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo'
 import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs'
@@ -72,6 +70,7 @@ import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos'
 import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate'
 import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl'
 import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos'
+import * as ComAtprotoTempUpgradeRepoVersion from './types/com/atproto/temp/upgradeRepoVersion'
 import * as AppBskyActorDefs from './types/app/bsky/actor/defs'
 import * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences'
 import * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile'
@@ -140,7 +139,6 @@ 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 ComAtprotoAdminRebaseRepo from './types/com/atproto/admin/rebaseRepo'
 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'
@@ -162,7 +160,6 @@ export * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRe
 export * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord'
 export * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords'
 export * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord'
-export * as ComAtprotoRepoRebaseRepo from './types/com/atproto/repo/rebaseRepo'
 export * as ComAtprotoRepoStrongRef from './types/com/atproto/repo/strongRef'
 export * as ComAtprotoRepoUploadBlob from './types/com/atproto/repo/uploadBlob'
 export * as ComAtprotoServerCreateAccount from './types/com/atproto/server/createAccount'
@@ -185,8 +182,8 @@ export * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/r
 export * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob'
 export * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks'
 export * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout'
-export * as ComAtprotoSyncGetCommitPath from './types/com/atproto/sync/getCommitPath'
 export * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead'
+export * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit'
 export * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord'
 export * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo'
 export * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs'
@@ -194,6 +191,7 @@ export * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos'
 export * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate'
 export * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl'
 export * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos'
+export * as ComAtprotoTempUpgradeRepoVersion from './types/com/atproto/temp/upgradeRepoVersion'
 export * as AppBskyActorDefs from './types/app/bsky/actor/defs'
 export * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences'
 export * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile'
@@ -318,6 +316,7 @@ export class AtprotoNS {
   repo: RepoNS
   server: ServerNS
   sync: SyncNS
+  temp: TempNS
 
   constructor(service: AtpServiceClient) {
     this._service = service
@@ -328,6 +327,7 @@ export class AtprotoNS {
     this.repo = new RepoNS(service)
     this.server = new ServerNS(service)
     this.sync = new SyncNS(service)
+    this.temp = new TempNS(service)
   }
 }
 
@@ -448,17 +448,6 @@ export class AdminNS {
       })
   }
 
-  rebaseRepo(
-    data?: ComAtprotoAdminRebaseRepo.InputSchema,
-    opts?: ComAtprotoAdminRebaseRepo.CallOptions,
-  ): Promise<ComAtprotoAdminRebaseRepo.Response> {
-    return this._service.xrpc
-      .call('com.atproto.admin.rebaseRepo', opts?.qp, data, opts)
-      .catch((e) => {
-        throw ComAtprotoAdminRebaseRepo.toKnownErr(e)
-      })
-  }
-
   resolveModerationReports(
     data?: ComAtprotoAdminResolveModerationReports.InputSchema,
     opts?: ComAtprotoAdminResolveModerationReports.CallOptions,
@@ -689,17 +678,6 @@ export class RepoNS {
       })
   }
 
-  rebaseRepo(
-    data?: ComAtprotoRepoRebaseRepo.InputSchema,
-    opts?: ComAtprotoRepoRebaseRepo.CallOptions,
-  ): Promise<ComAtprotoRepoRebaseRepo.Response> {
-    return this._service.xrpc
-      .call('com.atproto.repo.rebaseRepo', opts?.qp, data, opts)
-      .catch((e) => {
-        throw ComAtprotoRepoRebaseRepo.toKnownErr(e)
-      })
-  }
-
   uploadBlob(
     data?: ComAtprotoRepoUploadBlob.InputSchema,
     opts?: ComAtprotoRepoUploadBlob.CallOptions,
@@ -936,17 +914,6 @@ export class SyncNS {
       })
   }
 
-  getCommitPath(
-    params?: ComAtprotoSyncGetCommitPath.QueryParams,
-    opts?: ComAtprotoSyncGetCommitPath.CallOptions,
-  ): Promise<ComAtprotoSyncGetCommitPath.Response> {
-    return this._service.xrpc
-      .call('com.atproto.sync.getCommitPath', params, undefined, opts)
-      .catch((e) => {
-        throw ComAtprotoSyncGetCommitPath.toKnownErr(e)
-      })
-  }
-
   getHead(
     params?: ComAtprotoSyncGetHead.QueryParams,
     opts?: ComAtprotoSyncGetHead.CallOptions,
@@ -958,6 +925,17 @@ export class SyncNS {
       })
   }
 
+  getLatestCommit(
+    params?: ComAtprotoSyncGetLatestCommit.QueryParams,
+    opts?: ComAtprotoSyncGetLatestCommit.CallOptions,
+  ): Promise<ComAtprotoSyncGetLatestCommit.Response> {
+    return this._service.xrpc
+      .call('com.atproto.sync.getLatestCommit', params, undefined, opts)
+      .catch((e) => {
+        throw ComAtprotoSyncGetLatestCommit.toKnownErr(e)
+      })
+  }
+
   getRecord(
     params?: ComAtprotoSyncGetRecord.QueryParams,
     opts?: ComAtprotoSyncGetRecord.CallOptions,
@@ -1025,6 +1003,25 @@ export class SyncNS {
   }
 }
 
+export class TempNS {
+  _service: AtpServiceClient
+
+  constructor(service: AtpServiceClient) {
+    this._service = service
+  }
+
+  upgradeRepoVersion(
+    data?: ComAtprotoTempUpgradeRepoVersion.InputSchema,
+    opts?: ComAtprotoTempUpgradeRepoVersion.CallOptions,
+  ): Promise<ComAtprotoTempUpgradeRepoVersion.Response> {
+    return this._service.xrpc
+      .call('com.atproto.temp.upgradeRepoVersion', opts?.qp, data, opts)
+      .catch((e) => {
+        throw ComAtprotoTempUpgradeRepoVersion.toKnownErr(e)
+      })
+  }
+}
+
 export class AppNS {
   _service: AtpServiceClient
   bsky: BskyNS