@atproto/api 0.6.7 → 0.6.9

package/src/client/lexicons.ts

@@ -1026,44 +1026,6 @@ export const schemaDict = {
       },
     },
   },
-  ComAtprotoAdminRebaseRepo: {
-    lexicon: 1,
-    id: 'com.atproto.admin.rebaseRepo',
-    defs: {
-      main: {
-        type: 'procedure',
-        description: "Administrative action to rebase an account's repo",
-        input: {
-          encoding: 'application/json',
-          schema: {
-            type: 'object',
-            required: ['repo'],
-            properties: {
-              repo: {
-                type: 'string',
-                format: 'at-identifier',
-                description: 'The handle or DID of the repo.',
-              },
-              swapCommit: {
-                type: 'string',
-                format: 'cid',
-                description:
-                  'Compare and swap with the previous commit by cid.',
-              },
-            },
-          },
-        },
-        errors: [
-          {
-            name: 'InvalidSwap',
-          },
-          {
-            name: 'ConcurrentWrites',
-          },
-        ],
-      },
-    },
-  },
   ComAtprotoAdminResolveModerationReports: {
     lexicon: 1,
     id: 'com.atproto.admin.resolveModerationReports',
@@ -2229,44 +2191,6 @@ export const schemaDict = {
       },
     },
   },
-  ComAtprotoRepoRebaseRepo: {
-    lexicon: 1,
-    id: 'com.atproto.repo.rebaseRepo',
-    defs: {
-      main: {
-        type: 'procedure',
-        description: 'Simple rebase of repo that deletes history',
-        input: {
-          encoding: 'application/json',
-          schema: {
-            type: 'object',
-            required: ['repo'],
-            properties: {
-              repo: {
-                type: 'string',
-                format: 'at-identifier',
-                description: 'The handle or DID of the repo.',
-              },
-              swapCommit: {
-                type: 'string',
-                format: 'cid',
-                description:
-                  'Compare and swap with the previous commit by cid.',
-              },
-            },
-          },
-        },
-        errors: [
-          {
-            name: 'InvalidSwap',
-          },
-          {
-            name: 'ConcurrentWrites',
-          },
-        ],
-      },
-    },
-  },
   ComAtprotoRepoStrongRef: {
     lexicon: 1,
     id: 'com.atproto.repo.strongRef',
@@ -3069,7 +2993,7 @@ export const schemaDict = {
     defs: {
       main: {
         type: 'query',
-        description: 'Gets the repo state.',
+        description: 'DEPRECATED - please use com.atproto.sync.getRepo instead',
         parameters: {
           type: 'params',
           required: ['did'],
@@ -3079,12 +3003,6 @@ export const schemaDict = {
               format: 'did',
               description: 'The DID of the repo.',
             },
-            commit: {
-              type: 'string',
-              format: 'cid',
-              description:
-                'The commit to get the checkout from. Defaults to current HEAD.',
-            },
           },
         },
         output: {
@@ -3093,13 +3011,14 @@ export const schemaDict = {
       },
     },
   },
-  ComAtprotoSyncGetCommitPath: {
+  ComAtprotoSyncGetHead: {
     lexicon: 1,
-    id: 'com.atproto.sync.getCommitPath',
+    id: 'com.atproto.sync.getHead',
     defs: {
       main: {
         type: 'query',
-        description: 'Gets the path of repo commits',
+        description:
+          'DEPRECATED - please use com.atproto.sync.getLatestCommit instead',
         parameters: {
           type: 'params',
           required: ['did'],
@@ -3109,44 +3028,36 @@ export const schemaDict = {
               format: 'did',
               description: 'The DID of the repo.',
             },
-            latest: {
-              type: 'string',
-              format: 'cid',
-              description: 'The most recent commit',
-            },
-            earliest: {
-              type: 'string',
-              format: 'cid',
-              description: 'The earliest commit to start from',
-            },
           },
         },
         output: {
           encoding: 'application/json',
           schema: {
             type: 'object',
-            required: ['commits'],
+            required: ['root'],
             properties: {
-              commits: {
-                type: 'array',
-                items: {
-                  type: 'string',
-                  format: 'cid',
-                },
+              root: {
+                type: 'string',
+                format: 'cid',
               },
             },
           },
         },
+        errors: [
+          {
+            name: 'HeadNotFound',
+          },
+        ],
       },
     },
   },
-  ComAtprotoSyncGetHead: {
+  ComAtprotoSyncGetLatestCommit: {
     lexicon: 1,
-    id: 'com.atproto.sync.getHead',
+    id: 'com.atproto.sync.getLatestCommit',
     defs: {
       main: {
         type: 'query',
-        description: 'Gets the current HEAD CID of a repo.',
+        description: 'Gets the current commit CID & revision of the repo.',
         parameters: {
           type: 'params',
           required: ['did'],
@@ -3162,18 +3073,21 @@ export const schemaDict = {
           encoding: 'application/json',
           schema: {
             type: 'object',
-            required: ['root'],
+            required: ['cid', 'rev'],
             properties: {
-              root: {
+              cid: {
                 type: 'string',
                 format: 'cid',
               },
+              rev: {
+                type: 'string',
+              },
             },
           },
         },
         errors: [
           {
-            name: 'HeadNotFound',
+            name: 'RepoNotFound',
           },
         ],
       },
@@ -3222,7 +3136,8 @@ export const schemaDict = {
     defs: {
       main: {
         type: 'query',
-        description: 'Gets the repo state.',
+        description:
+          "Gets the did's repo, optionally catching up from a specific revision.",
         parameters: {
           type: 'params',
           required: ['did'],
@@ -3232,16 +3147,10 @@ export const schemaDict = {
               format: 'did',
               description: 'The DID of the repo.',
             },
-            earliest: {
+            since: {
               type: 'string',
               format: 'cid',
-              description:
-                'The earliest commit in the commit range (not inclusive)',
-            },
-            latest: {
-              type: 'string',
-              format: 'cid',
-              description: 'The latest commit in the commit range (inclusive)',
+              description: 'The revision of the repo to catch up from.',
             },
           },
         },
@@ -3257,7 +3166,7 @@ export const schemaDict = {
     defs: {
       main: {
         type: 'query',
-        description: 'List blob cids for some range of commits',
+        description: 'List blob cids since some revision',
         parameters: {
           type: 'params',
           required: ['did'],
@@ -3267,15 +3176,19 @@ export const schemaDict = {
               format: 'did',
               description: 'The DID of the repo.',
             },
-            latest: {
+            since: {
               type: 'string',
               format: 'cid',
-              description: 'The most recent commit',
+              description: 'Optional revision of the repo to list blobs since',
             },
-            earliest: {
+            limit: {
+              type: 'integer',
+              minimum: 1,
+              maximum: 1000,
+              default: 500,
+            },
+            cursor: {
               type: 'string',
-              format: 'cid',
-              description: 'The earliest commit to start from',
             },
           },
         },
@@ -3285,6 +3198,9 @@ export const schemaDict = {
             type: 'object',
             required: ['cids'],
             properties: {
+              cursor: {
+                type: 'string',
+              },
               cids: {
                 type: 'array',
                 items: {
@@ -3449,13 +3365,14 @@ export const schemaDict = {
           'tooBig',
           'repo',
           'commit',
-          'prev',
+          'rev',
+          'since',
           'blocks',
           'ops',
           'blobs',
           'time',
         ],
-        nullable: ['prev'],
+        nullable: ['prev', 'since'],
         properties: {
           seq: {
             type: 'integer',
@@ -3476,6 +3393,14 @@ export const schemaDict = {
           prev: {
             type: 'cid-link',
           },
+          rev: {
+            type: 'string',
+            description: 'The rev of the emitted commit',
+          },
+          since: {
+            type: 'string',
+            description: 'The rev of the last emitted commit from this repo',
+          },
           blocks: {
             type: 'bytes',
             description: 'CAR file containing relevant blocks',
@@ -3594,6 +3519,32 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoTempUpgradeRepoVersion: {
+    lexicon: 1,
+    id: 'com.atproto.temp.upgradeRepoVersion',
+    defs: {
+      main: {
+        type: 'procedure',
+        description: 'Upgrade a repo to v3',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['did'],
+            properties: {
+              did: {
+                type: 'string',
+                format: 'did',
+              },
+              force: {
+                type: 'boolean',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   AppBskyActorDefs: {
     lexicon: 1,
     id: 'app.bsky.actor.defs',
@@ -5354,6 +5305,49 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyFeedGetSuggestedFeeds: {
+    lexicon: 1,
+    id: 'app.bsky.feed.getSuggestedFeeds',
+    defs: {
+      main: {
+        type: 'query',
+        description: 'Get a list of suggested feeds for the viewer.',
+        parameters: {
+          type: 'params',
+          properties: {
+            limit: {
+              type: 'integer',
+              minimum: 1,
+              maximum: 100,
+              default: 50,
+            },
+            cursor: {
+              type: 'string',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['feeds'],
+            properties: {
+              cursor: {
+                type: 'string',
+              },
+              feeds: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:app.bsky.feed.defs#generatorView',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   AppBskyFeedGetTimeline: {
     lexicon: 1,
     id: 'app.bsky.feed.getTimeline',
@@ -6672,7 +6666,6 @@ export const ids = {
   ComAtprotoAdminGetModerationReports: 'com.atproto.admin.getModerationReports',
   ComAtprotoAdminGetRecord: 'com.atproto.admin.getRecord',
   ComAtprotoAdminGetRepo: 'com.atproto.admin.getRepo',
-  ComAtprotoAdminRebaseRepo: 'com.atproto.admin.rebaseRepo',
   ComAtprotoAdminResolveModerationReports:
     'com.atproto.admin.resolveModerationReports',
   ComAtprotoAdminReverseModerationAction:
@@ -6696,7 +6689,6 @@ export const ids = {
   ComAtprotoRepoGetRecord: 'com.atproto.repo.getRecord',
   ComAtprotoRepoListRecords: 'com.atproto.repo.listRecords',
   ComAtprotoRepoPutRecord: 'com.atproto.repo.putRecord',
-  ComAtprotoRepoRebaseRepo: 'com.atproto.repo.rebaseRepo',
   ComAtprotoRepoStrongRef: 'com.atproto.repo.strongRef',
   ComAtprotoRepoUploadBlob: 'com.atproto.repo.uploadBlob',
   ComAtprotoServerCreateAccount: 'com.atproto.server.createAccount',
@@ -6722,8 +6714,8 @@ export const ids = {
   ComAtprotoSyncGetBlob: 'com.atproto.sync.getBlob',
   ComAtprotoSyncGetBlocks: 'com.atproto.sync.getBlocks',
   ComAtprotoSyncGetCheckout: 'com.atproto.sync.getCheckout',
-  ComAtprotoSyncGetCommitPath: 'com.atproto.sync.getCommitPath',
   ComAtprotoSyncGetHead: 'com.atproto.sync.getHead',
+  ComAtprotoSyncGetLatestCommit: 'com.atproto.sync.getLatestCommit',
   ComAtprotoSyncGetRecord: 'com.atproto.sync.getRecord',
   ComAtprotoSyncGetRepo: 'com.atproto.sync.getRepo',
   ComAtprotoSyncListBlobs: 'com.atproto.sync.listBlobs',
@@ -6731,6 +6723,7 @@ export const ids = {
   ComAtprotoSyncNotifyOfUpdate: 'com.atproto.sync.notifyOfUpdate',
   ComAtprotoSyncRequestCrawl: 'com.atproto.sync.requestCrawl',
   ComAtprotoSyncSubscribeRepos: 'com.atproto.sync.subscribeRepos',
+  ComAtprotoTempUpgradeRepoVersion: 'com.atproto.temp.upgradeRepoVersion',
   AppBskyActorDefs: 'app.bsky.actor.defs',
   AppBskyActorGetPreferences: 'app.bsky.actor.getPreferences',
   AppBskyActorGetProfile: 'app.bsky.actor.getProfile',
@@ -6758,6 +6751,7 @@ export const ids = {
   AppBskyFeedGetPostThread: 'app.bsky.feed.getPostThread',
   AppBskyFeedGetPosts: 'app.bsky.feed.getPosts',
   AppBskyFeedGetRepostedBy: 'app.bsky.feed.getRepostedBy',
+  AppBskyFeedGetSuggestedFeeds: 'app.bsky.feed.getSuggestedFeeds',
   AppBskyFeedGetTimeline: 'app.bsky.feed.getTimeline',
   AppBskyFeedLike: 'app.bsky.feed.like',
   AppBskyFeedPost: 'app.bsky.feed.post',

package/src/client/types/{com/atproto/sync/getCommitPath.ts → app/bsky/feed/getSuggestedFeeds.ts}

@@ -6,20 +6,18 @@ import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { isObj, hasProp } from '../../../../util'
 import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import * as AppBskyFeedDefs from './defs'
 
 export interface QueryParams {
-  /** The DID of the repo. */
-  did: string
-  /** The most recent commit */
-  latest?: string
-  /** The earliest commit to start from */
-  earliest?: string
+  limit?: number
+  cursor?: string
 }
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
-  commits: string[]
+  cursor?: string
+  feeds: AppBskyFeedDefs.GeneratorView[]
   [k: string]: unknown
 }
 

package/src/client/types/com/atproto/sync/getCheckout.ts

@@ -10,8 +10,6 @@ import { CID } from 'multiformats/cid'
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
-  /** The commit to get the checkout from. Defaults to current HEAD. */
-  commit?: string
 }
 
 export type InputSchema = undefined

package/src/client/types/com/atproto/{admin/rebaseRepo.ts → sync/getLatestCommit.ts}

@@ -7,34 +7,30 @@ import { isObj, hasProp } from '../../../../util'
 import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
 
-export interface QueryParams {}
+export interface QueryParams {
+  /** The DID of the repo. */
+  did: string
+}
+
+export type InputSchema = undefined
 
-export interface InputSchema {
-  /** The handle or DID of the repo. */
-  repo: string
-  /** Compare and swap with the previous commit by cid. */
-  swapCommit?: string
+export interface OutputSchema {
+  cid: string
+  rev: string
   [k: string]: unknown
 }
 
 export interface CallOptions {
   headers?: Headers
-  qp?: QueryParams
-  encoding: 'application/json'
 }
 
 export interface Response {
   success: boolean
   headers: Headers
+  data: OutputSchema
 }
 
-export class InvalidSwapError extends XRPCError {
-  constructor(src: XRPCError) {
-    super(src.status, src.error, src.message, src.headers)
-  }
-}
-
-export class ConcurrentWritesError extends XRPCError {
+export class RepoNotFoundError extends XRPCError {
   constructor(src: XRPCError) {
     super(src.status, src.error, src.message, src.headers)
   }
@@ -42,8 +38,7 @@ export class ConcurrentWritesError extends XRPCError {
 
 export function toKnownErr(e: any) {
   if (e instanceof XRPCError) {
-    if (e.error === 'InvalidSwap') return new InvalidSwapError(e)
-    if (e.error === 'ConcurrentWrites') return new ConcurrentWritesError(e)
+    if (e.error === 'RepoNotFound') return new RepoNotFoundError(e)
   }
   return e
 }

package/src/client/types/com/atproto/sync/getRepo.ts

@@ -10,10 +10,8 @@ import { CID } from 'multiformats/cid'
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
-  /** The earliest commit in the commit range (not inclusive) */
-  earliest?: string
-  /** The latest commit in the commit range (inclusive) */
-  latest?: string
+  /** The revision of the repo to catch up from. */
+  since?: string
 }
 
 export type InputSchema = undefined

package/src/client/types/com/atproto/sync/listBlobs.ts

@@ -10,15 +10,16 @@ import { CID } from 'multiformats/cid'
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
-  /** The most recent commit */
-  latest?: string
-  /** The earliest commit to start from */
-  earliest?: string
+  /** Optional revision of the repo to list blobs since */
+  since?: string
+  limit?: number
+  cursor?: string
 }
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
+  cursor?: string
   cids: string[]
   [k: string]: unknown
 }

package/src/client/types/com/atproto/sync/subscribeRepos.ts

@@ -13,7 +13,11 @@ export interface Commit {
   tooBig: boolean
   repo: string
   commit: CID
-  prev: CID | null
+  prev?: CID | null
+  /** The rev of the emitted commit */
+  rev: string
+  /** The rev of the last emitted commit from this repo */
+  since: string | null
   /** CAR file containing relevant blocks */
   blocks: Uint8Array
   ops: RepoOp[]

package/src/client/types/com/atproto/{repo/rebaseRepo.ts → temp/upgradeRepoVersion.ts}

@@ -10,10 +10,8 @@ import { CID } from 'multiformats/cid'
 export interface QueryParams {}
 
 export interface InputSchema {
-  /** The handle or DID of the repo. */
-  repo: string
-  /** Compare and swap with the previous commit by cid. */
-  swapCommit?: string
+  did: string
+  force?: boolean
   [k: string]: unknown
 }
 
@@ -28,22 +26,8 @@ export interface Response {
   headers: Headers
 }
 
-export class InvalidSwapError extends XRPCError {
-  constructor(src: XRPCError) {
-    super(src.status, src.error, src.message, src.headers)
-  }
-}
-
-export class ConcurrentWritesError extends XRPCError {
-  constructor(src: XRPCError) {
-    super(src.status, src.error, src.message, src.headers)
-  }
-}
-
 export function toKnownErr(e: any) {
   if (e instanceof XRPCError) {
-    if (e.error === 'InvalidSwap') return new InvalidSwapError(e)
-    if (e.error === 'ConcurrentWrites') return new ConcurrentWritesError(e)
   }
   return e
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-export { AtUri } from '@atproto/uri'
+export { AtUri } from '@atproto/syntax'
 export {
   BlobRef,
   lexToJson,

package/src/types.ts

@@ -1,3 +1,5 @@
+import { LabelPreference } from './moderation/types'
+
 /**
  * Used by the PersistSessionHandler to indicate what change occurred
  */
@@ -70,3 +72,21 @@ export type AtpAgentFetchHandler = (
 export interface AtpAgentGlobalOpts {
   fetch: AtpAgentFetchHandler
 }
+
+/**
+ * Content-label preference
+ */
+export type BskyLabelPreference = LabelPreference | 'show'
+// TEMP we need to permanently convert 'show' to 'ignore', for now we manually convert -prf
+
+/**
+ * Bluesky preferences object
+ */
+export interface BskyPreferences {
+  feeds: {
+    saved?: string[]
+    pinned?: string[]
+  }
+  adultContentEnabled: boolean
+  contentLabels: Record<string, BskyLabelPreference>
+}