diff --git a/lexicons/follow.json b/lexicons/follow.json index 9417adb..9c4c973 100644 --- a/lexicons/follow.json +++ b/lexicons/follow.json @@ -10,21 +10,20 @@ "record": { "type": "object", "required": [ - "createdAt", - "subject" + "subject", + "createdAt" ], "properties": { - "createdAt": { - "type": "string", - "format": "datetime" - }, "subject": { "type": "string", "format": "did" + }, + "createdAt": { + "type": "string", + "format": "datetime" } } } } } } - diff --git a/lexicons/issue/comment.json b/lexicons/issue/comment.json index e0af8bd..b896687 100644 --- a/lexicons/issue/comment.json +++ b/lexicons/issue/comment.json @@ -9,26 +9,23 @@ "key": "tid", "record": { "type": "object", - "required": ["issue"], + "required": [ + "issue", + "body", + "createdAt" + ], "properties": { "issue": { - "type": "string", - "format": "at-uri" - }, - "repo": { - "type": "string", - "format": "at-uri" - }, - "commentId": { - "type": "integer" - }, - "owner": { - "type": "string", - "format": "did" + "type": "ref", + "ref": "com.atproto.repo.strongRef" }, "body": { "type": "string" }, + "reply": { + "type": "ref", + "ref": "com.atproto.repo.strongRef" + }, "createdAt": { "type": "string", "format": "datetime" diff --git a/lexicons/issue/issue.json b/lexicons/issue/issue.json index edd7dc0..9e5d6ea 100644 --- a/lexicons/issue/issue.json +++ b/lexicons/issue/issue.json @@ -9,19 +9,17 @@ "key": "tid", "record": { "type": "object", - "required": ["repo", "issueId", "owner", "title"], + "required": [ + "repo", + "title", + "body", + "createdAt" + ], "properties": { "repo": { "type": "string", "format": "at-uri" }, - "issueId": { - "type": "integer" - }, - "owner": { - "type": "string", - "format": "did" - }, "title": { "type": "string" }, diff --git a/lexicons/issue/state.json b/lexicons/issue/state.json index 9b11ced..512221e 100644 --- a/lexicons/issue/state.json +++ b/lexicons/issue/state.json @@ -9,7 +9,9 @@ "key": "tid", "record": { "type": "object", - "required": ["issue"], + "required": [ + "issue" + ], "properties": { "issue": { "type": "string", diff --git a/lexicons/member.json b/lexicons/member.json index 94b3cec..10c2d43 100644 --- a/lexicons/member.json +++ b/lexicons/member.json @@ -10,11 +10,12 @@ "record": { "type": "object", "required": [ - "member", - "domain" + "subject", + "domain", + "createdAt" ], "properties": { - "member": { + "subject": { "type": "string", "format": "did" }, @@ -22,7 +23,7 @@ "type": "string", "description": "domain that this member now belongs to" }, - "addedAt": { + "createdAt": { "type": "string", "format": "datetime" } diff --git a/lexicons/publicKey.json b/lexicons/publicKey.json index 51250b4..27bddf7 100644 --- a/lexicons/publicKey.json +++ b/lexicons/publicKey.json @@ -12,13 +12,12 @@ "required": [ "key", "name", - "created" + "createdAt" ], "properties": { "key": { "type": "string", "maxLength": 4096, - "maxGraphemes": 4096, "description": "public key contents" }, "name": { @@ -26,7 +25,7 @@ "format": "string", "description": "human-readable name for this key" }, - "created": { + "createdAt": { "type": "string", "format": "datetime", "description": "key upload timestamp" diff --git a/lexicons/pulls/comment.json b/lexicons/pulls/comment.json index f89a173..02bdd32 100644 --- a/lexicons/pulls/comment.json +++ b/lexicons/pulls/comment.json @@ -9,26 +9,23 @@ "key": "tid", "record": { "type": "object", - "required": ["pull"], + "required": [ + "pull", + "body", + "createdAt" + ], "properties": { "pull": { - "type": "string", - "format": "at-uri" - }, - "repo": { - "type": "string", - "format": "at-uri" - }, - "commentId": { - "type": "integer" - }, - "owner": { - "type": "string", - "format": "did" + "type": "ref", + "ref": "com.atproto.repo.strongRef" }, "body": { "type": "string" }, + "reply": { + "type": "ref", + "ref": "com.atproto.repo.strongRef" + }, "createdAt": { "type": "string", "format": "datetime" diff --git a/lexicons/pulls/pull.json b/lexicons/pulls/pull.json index d7e30e9..88bdc96 100644 --- a/lexicons/pulls/pull.json +++ b/lexicons/pulls/pull.json @@ -10,22 +10,14 @@ "record": { "type": "object", "required": [ - "targetRepo", - "targetBranch", - "pullId", + "target", "title", - "patch" + "createdAt" ], "properties": { - "targetRepo": { - "type": "string", - "format": "at-uri" - }, - "targetBranch": { - "type": "string" - }, - "pullId": { - "type": "integer" + "target": { + "type": "ref", + "ref": "#target" }, "title": { "type": "string" @@ -36,27 +28,23 @@ "createdAt": { "type": "string", "format": "datetime" - }, - "patch": { - "type": "string" - }, - "source": { - "type": "ref", - "ref": "#source" } } } }, - "source": { + "target": { "type": "object", - "required": ["branch"], + "required": [ + "repo", + "branch" + ], "properties": { - "branch": { - "type": "string" - }, "repo": { "type": "string", "format": "at-uri" + }, + "branch": { + "type": "string" } } } diff --git a/lexicons/pulls/round.json b/lexicons/pulls/round.json new file mode 100644 index 0000000..d82c35d --- /dev/null +++ b/lexicons/pulls/round.json @@ -0,0 +1,66 @@ +{ + "lexicon": 1, + "id": "sh.tangled.repo.pull.round", + "needsCbor": true, + "needsType": true, + "defs": { + "main": { + "type": "record", + "key": "tid", + "record": { + "type": "object", + "required": [ + "pull", + "source", + "createdAt" + ], + "properties": { + "pull": { + "type": "string", + "format": "at-uri" + }, + "source": { + "type": "union", + "refs": [ + "#patchSource", + "#pullSource" + ] + }, + "prevRound": { + "type": "ref", + "ref": "com.atproto.repo.strongRef" + }, + "createdAt": { + "type": "string", + "format": "datetime" + } + } + } + }, + "patchSource": { + "type": "string" + }, + "commitSource": { + "type": "object", + "required": [ + "repo", + "branch", + "rev" + ], + "properties": { + "repo": { + "type": "string", + "format": "uri" + }, + "branch": { + "type": "string" + }, + "rev": { + "type": "string", + "minLength": 40, + "maxLength": 40 + } + } + } + } +} diff --git a/lexicons/pulls/state.json b/lexicons/pulls/state.json index 752d164..1f7521e 100644 --- a/lexicons/pulls/state.json +++ b/lexicons/pulls/state.json @@ -9,7 +9,9 @@ "key": "tid", "record": { "type": "object", - "required": ["pull"], + "required": [ + "pull" + ], "properties": { "pull": { "type": "string", diff --git a/lexicons/repo.json b/lexicons/repo.json index 42612b9..d44da8f 100644 --- a/lexicons/repo.json +++ b/lexicons/repo.json @@ -9,34 +9,34 @@ "key": "tid", "record": { "type": "object", - "required": ["name", "knot", "owner"], + "required": [ + "name", + "knot", + "createdAt" + ], "properties": { "name": { "type": "string", "description": "name of the repo" }, - "owner": { - "type": "string", - "format": "did" - }, "knot": { "type": "string", "description": "knot where the repo was created" }, - "addedAt": { - "type": "string", - "format": "datetime" - }, "description": { "type": "string", "format": "datetime", - "minLength": 1, - "maxLength": 140 + "minGraphemes": 1, + "maxGraphemes": 140 + }, + "fork": { + "type": "string", + "format": "at-uri", + "description": "source repo this repo was forked from" }, - "source": { + "createdAt": { "type": "string", - "format": "uri", - "description": "source of the repo" + "format": "datetime" } } } diff --git a/lexicons/star.json b/lexicons/star.json index f434ce2..dd19992 100644 --- a/lexicons/star.json +++ b/lexicons/star.json @@ -10,22 +10,20 @@ "record": { "type": "object", "required": [ - "createdAt", - "subject" + "subject", + "createdAt" ], "properties": { - "createdAt": { - "type": "string", - "format": "datetime" - }, "subject": { "type": "string", "format": "at-uri" + }, + "createdAt": { + "type": "string", + "format": "datetime" } } } } } } - -