diff --git a/.changeset/orange-chairs-act.md b/.changeset/orange-chairs-act.md new file mode 100644 index 00000000000..33c7115c6db --- /dev/null +++ b/.changeset/orange-chairs-act.md @@ -0,0 +1,6 @@ +--- +"@atproto/api": patch +"@atproto/pds": patch +--- + +remove some deprecated fields from com.atproto Lexicons diff --git a/lexicons/com/atproto/repo/listRecords.json b/lexicons/com/atproto/repo/listRecords.json index bc91c952bb1..3d43ff40b8e 100644 --- a/lexicons/com/atproto/repo/listRecords.json +++ b/lexicons/com/atproto/repo/listRecords.json @@ -27,14 +27,6 @@ "description": "The number of records to return." }, "cursor": { "type": "string" }, - "rkeyStart": { - "type": "string", - "description": "DEPRECATED: The lowest sort-ordered rkey to start from (exclusive)" - }, - "rkeyEnd": { - "type": "string", - "description": "DEPRECATED: The highest sort-ordered rkey to stop at (exclusive)" - }, "reverse": { "type": "boolean", "description": "Flag to reverse the order of the returned records." diff --git a/lexicons/com/atproto/sync/getRecord.json b/lexicons/com/atproto/sync/getRecord.json index cd69e231954..ecfc5acc4da 100644 --- a/lexicons/com/atproto/sync/getRecord.json +++ b/lexicons/com/atproto/sync/getRecord.json @@ -19,11 +19,6 @@ "type": "string", "description": "Record Key", "format": "record-key" - }, - "commit": { - "type": "string", - "format": "cid", - "description": "DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit" } } }, diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts index 56c910fe698..31f9cc6bf1c 100644 --- a/packages/api/src/client/lexicons.ts +++ b/packages/api/src/client/lexicons.ts @@ -1860,16 +1860,6 @@ export const schemaDict = { cursor: { type: 'string', }, - rkeyStart: { - type: 'string', - description: - 'DEPRECATED: The lowest sort-ordered rkey to start from (exclusive)', - }, - rkeyEnd: { - type: 'string', - description: - 'DEPRECATED: The highest sort-ordered rkey to stop at (exclusive)', - }, reverse: { type: 'boolean', description: 'Flag to reverse the order of the returned records.', @@ -3410,12 +3400,6 @@ export const schemaDict = { description: 'Record Key', format: 'record-key', }, - commit: { - type: 'string', - format: 'cid', - description: - 'DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit', - }, }, }, output: { diff --git a/packages/api/src/client/types/com/atproto/repo/listRecords.ts b/packages/api/src/client/types/com/atproto/repo/listRecords.ts index 5efd63c11de..c956420604c 100644 --- a/packages/api/src/client/types/com/atproto/repo/listRecords.ts +++ b/packages/api/src/client/types/com/atproto/repo/listRecords.ts @@ -19,10 +19,6 @@ export interface QueryParams { /** The number of records to return. */ limit?: number cursor?: string - /** DEPRECATED: The lowest sort-ordered rkey to start from (exclusive) */ - rkeyStart?: string - /** DEPRECATED: The highest sort-ordered rkey to stop at (exclusive) */ - rkeyEnd?: string /** Flag to reverse the order of the returned records. */ reverse?: boolean } diff --git a/packages/api/src/client/types/com/atproto/sync/getRecord.ts b/packages/api/src/client/types/com/atproto/sync/getRecord.ts index 09d772cf2cc..43e325825ae 100644 --- a/packages/api/src/client/types/com/atproto/sync/getRecord.ts +++ b/packages/api/src/client/types/com/atproto/sync/getRecord.ts @@ -17,8 +17,6 @@ export interface QueryParams { collection: string /** Record Key */ rkey: string - /** DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit */ - commit?: string } export type InputSchema = undefined diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts index 56c910fe698..31f9cc6bf1c 100644 --- a/packages/ozone/src/lexicon/lexicons.ts +++ b/packages/ozone/src/lexicon/lexicons.ts @@ -1860,16 +1860,6 @@ export const schemaDict = { cursor: { type: 'string', }, - rkeyStart: { - type: 'string', - description: - 'DEPRECATED: The lowest sort-ordered rkey to start from (exclusive)', - }, - rkeyEnd: { - type: 'string', - description: - 'DEPRECATED: The highest sort-ordered rkey to stop at (exclusive)', - }, reverse: { type: 'boolean', description: 'Flag to reverse the order of the returned records.', @@ -3410,12 +3400,6 @@ export const schemaDict = { description: 'Record Key', format: 'record-key', }, - commit: { - type: 'string', - format: 'cid', - description: - 'DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit', - }, }, }, output: { diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts index 573d34d70a8..df001bdb54f 100644 --- a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts +++ b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts @@ -20,10 +20,6 @@ export interface QueryParams { /** The number of records to return. */ limit: number cursor?: string - /** DEPRECATED: The lowest sort-ordered rkey to start from (exclusive) */ - rkeyStart?: string - /** DEPRECATED: The highest sort-ordered rkey to stop at (exclusive) */ - rkeyEnd?: string /** Flag to reverse the order of the returned records. */ reverse?: boolean } diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts index 1c7a509b1b4..89051c859fa 100644 --- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts +++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts @@ -19,8 +19,6 @@ export interface QueryParams { collection: string /** Record Key */ rkey: string - /** DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit */ - commit?: string } export type InputSchema = undefined diff --git a/packages/pds/src/api/com/atproto/repo/listRecords.ts b/packages/pds/src/api/com/atproto/repo/listRecords.ts index 673049b8616..7384c8ee72f 100644 --- a/packages/pds/src/api/com/atproto/repo/listRecords.ts +++ b/packages/pds/src/api/com/atproto/repo/listRecords.ts @@ -5,15 +5,7 @@ import { Server } from '../../../../lexicon' export default function (server: Server, ctx: AppContext) { server.com.atproto.repo.listRecords(async ({ params }) => { - const { - repo, - collection, - limit = 50, - cursor, - rkeyStart, - rkeyEnd, - reverse = false, - } = params + const { repo, collection, limit = 50, cursor, reverse = false } = params const did = await ctx.accountManager.getDidForActor(repo) if (!did) { @@ -26,8 +18,6 @@ export default function (server: Server, ctx: AppContext) { limit, reverse, cursor, - rkeyStart, - rkeyEnd, }), ) diff --git a/packages/pds/src/api/com/atproto/sync/getRecord.ts b/packages/pds/src/api/com/atproto/sync/getRecord.ts index 3952ea3ff17..23c9a1ac453 100644 --- a/packages/pds/src/api/com/atproto/sync/getRecord.ts +++ b/packages/pds/src/api/com/atproto/sync/getRecord.ts @@ -25,9 +25,7 @@ export default function (server: Server, ctx: AppContext) { let carStream: stream.Readable try { const storage = new SqlRepoReader(actorDb) - const commit = params.commit - ? CID.parse(params.commit) - : await storage.getRoot() + const commit = await storage.getRoot() if (!commit) { throw new InvalidRequestError(`Could not find repo for DID: ${did}`) diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts index 56c910fe698..31f9cc6bf1c 100644 --- a/packages/pds/src/lexicon/lexicons.ts +++ b/packages/pds/src/lexicon/lexicons.ts @@ -1860,16 +1860,6 @@ export const schemaDict = { cursor: { type: 'string', }, - rkeyStart: { - type: 'string', - description: - 'DEPRECATED: The lowest sort-ordered rkey to start from (exclusive)', - }, - rkeyEnd: { - type: 'string', - description: - 'DEPRECATED: The highest sort-ordered rkey to stop at (exclusive)', - }, reverse: { type: 'boolean', description: 'Flag to reverse the order of the returned records.', @@ -3410,12 +3400,6 @@ export const schemaDict = { description: 'Record Key', format: 'record-key', }, - commit: { - type: 'string', - format: 'cid', - description: - 'DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit', - }, }, }, output: { diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts index 573d34d70a8..df001bdb54f 100644 --- a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts +++ b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts @@ -20,10 +20,6 @@ export interface QueryParams { /** The number of records to return. */ limit: number cursor?: string - /** DEPRECATED: The lowest sort-ordered rkey to start from (exclusive) */ - rkeyStart?: string - /** DEPRECATED: The highest sort-ordered rkey to stop at (exclusive) */ - rkeyEnd?: string /** Flag to reverse the order of the returned records. */ reverse?: boolean } diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts index 1c7a509b1b4..89051c859fa 100644 --- a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts +++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts @@ -19,8 +19,6 @@ export interface QueryParams { collection: string /** Record Key */ rkey: string - /** DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit */ - commit?: string } export type InputSchema = undefined