From 049c104cd2198f5c04acf4ee806b56d2d8fd1e76 Mon Sep 17 00:00:00 2001 From: Pascal B Date: Thu, 3 Oct 2024 19:58:23 -0400 Subject: [PATCH] fix: add missing property `category.node_id` to `discussion` and `discussion_comment` (#960) --- .../discussion/answered.payload.json | 1 + .../discussion/category_changed.payload.json | 2 ++ .../discussion/created.payload.json | 1 + .../discussion/edited.payload.json | 1 + .../edited.with-reactions.payload.json | 1 + .../discussion/labeled.payload.json | 1 + .../labeled.with-reactions.payload.json | 1 + .../discussion/locked.payload.json | 1 + .../locked.with-reactions.payload.json | 1 + .../discussion/pinned.payload.json | 1 + .../discussion/transferred.payload.json | 2 ++ .../discussion/unanswered.payload.json | 1 + .../discussion/unlabeled.payload.json | 1 + .../discussion/unlocked.payload.json | 1 + .../discussion_comment/created.payload.json | 1 + .../discussion_comment/deleted.payload.json | 1 + .../discussion_comment/edited.payload.json | 1 + payload-examples/api.github.com/index.json | 19 ++++++++++ .../common/discussion-category.schema.json | 31 ++++++++++++++++ .../common/discussion.schema.json | 27 +------------- .../discussion/category_changed.schema.json | 27 +------------- payload-types/schema.d.ts | 36 ++++++++----------- 22 files changed, 85 insertions(+), 74 deletions(-) create mode 100644 payload-schemas/api.github.com/common/discussion-category.schema.json diff --git a/payload-examples/api.github.com/discussion/answered.payload.json b/payload-examples/api.github.com/discussion/answered.payload.json index e55cdcc1c..14e9a6c2c 100644 --- a/payload-examples/api.github.com/discussion/answered.payload.json +++ b/payload-examples/api.github.com/discussion/answered.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809315, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":pray:", "name": "Q&A", diff --git a/payload-examples/api.github.com/discussion/category_changed.payload.json b/payload-examples/api.github.com/discussion/category_changed.payload.json index 85cd89f11..b2dfc6a2e 100644 --- a/payload-examples/api.github.com/discussion/category_changed.payload.json +++ b/payload-examples/api.github.com/discussion/category_changed.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809317, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":raised_hands:", "name": "Show and tell", @@ -54,6 +55,7 @@ "category": { "from": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE", "repository_id": 141753607, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion/created.payload.json b/payload-examples/api.github.com/discussion/created.payload.json index 7369f1a17..bf732a32f 100644 --- a/payload-examples/api.github.com/discussion/created.payload.json +++ b/payload-examples/api.github.com/discussion/created.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion/edited.payload.json b/payload-examples/api.github.com/discussion/edited.payload.json index 1acfba414..abc9734c6 100644 --- a/payload-examples/api.github.com/discussion/edited.payload.json +++ b/payload-examples/api.github.com/discussion/edited.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion/edited.with-reactions.payload.json b/payload-examples/api.github.com/discussion/edited.with-reactions.payload.json index 0184c61fa..791623267 100644 --- a/payload-examples/api.github.com/discussion/edited.with-reactions.payload.json +++ b/payload-examples/api.github.com/discussion/edited.with-reactions.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion/labeled.payload.json b/payload-examples/api.github.com/discussion/labeled.payload.json index bcc4e2def..91b16578e 100644 --- a/payload-examples/api.github.com/discussion/labeled.payload.json +++ b/payload-examples/api.github.com/discussion/labeled.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion/labeled.with-reactions.payload.json b/payload-examples/api.github.com/discussion/labeled.with-reactions.payload.json index 08a8c4ded..1cc80d718 100644 --- a/payload-examples/api.github.com/discussion/labeled.with-reactions.payload.json +++ b/payload-examples/api.github.com/discussion/labeled.with-reactions.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion/locked.payload.json b/payload-examples/api.github.com/discussion/locked.payload.json index f71ea8bde..d832a5543 100644 --- a/payload-examples/api.github.com/discussion/locked.payload.json +++ b/payload-examples/api.github.com/discussion/locked.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion/locked.with-reactions.payload.json b/payload-examples/api.github.com/discussion/locked.with-reactions.payload.json index 7f0544e1a..c8af2aebf 100644 --- a/payload-examples/api.github.com/discussion/locked.with-reactions.payload.json +++ b/payload-examples/api.github.com/discussion/locked.with-reactions.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion/pinned.payload.json b/payload-examples/api.github.com/discussion/pinned.payload.json index dab75f025..091dbb7ec 100644 --- a/payload-examples/api.github.com/discussion/pinned.payload.json +++ b/payload-examples/api.github.com/discussion/pinned.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion/transferred.payload.json b/payload-examples/api.github.com/discussion/transferred.payload.json index 1bb794870..c34db5ffd 100644 --- a/payload-examples/api.github.com/discussion/transferred.payload.json +++ b/payload-examples/api.github.com/discussion/transferred.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809315, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":pray:", "name": "Q&A", @@ -55,6 +56,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/friendly-octo-succotash", "category": { "id": 32809824, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5ODI", "repository_id": 353173080, "emoji": ":pray:", "name": "Q&A", diff --git a/payload-examples/api.github.com/discussion/unanswered.payload.json b/payload-examples/api.github.com/discussion/unanswered.payload.json index 208df2662..a52d61576 100644 --- a/payload-examples/api.github.com/discussion/unanswered.payload.json +++ b/payload-examples/api.github.com/discussion/unanswered.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809315, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":pray:", "name": "Q&A", diff --git a/payload-examples/api.github.com/discussion/unlabeled.payload.json b/payload-examples/api.github.com/discussion/unlabeled.payload.json index af9cdd4f5..0534daf50 100644 --- a/payload-examples/api.github.com/discussion/unlabeled.payload.json +++ b/payload-examples/api.github.com/discussion/unlabeled.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion/unlocked.payload.json b/payload-examples/api.github.com/discussion/unlocked.payload.json index 2520d6b74..4f841ef87 100644 --- a/payload-examples/api.github.com/discussion/unlocked.payload.json +++ b/payload-examples/api.github.com/discussion/unlocked.payload.json @@ -4,6 +4,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion_comment/created.payload.json b/payload-examples/api.github.com/discussion_comment/created.payload.json index 813279c74..ca3121227 100644 --- a/payload-examples/api.github.com/discussion_comment/created.payload.json +++ b/payload-examples/api.github.com/discussion_comment/created.payload.json @@ -49,6 +49,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEwOkkpc4F1c3Npg24zMjk5NjE0", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion_comment/deleted.payload.json b/payload-examples/api.github.com/discussion_comment/deleted.payload.json index 597f828c8..9c6c9335c 100644 --- a/payload-examples/api.github.com/discussion_comment/deleted.payload.json +++ b/payload-examples/api.github.com/discussion_comment/deleted.payload.json @@ -49,6 +49,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEwOkkpc4F1c3Npg24zMjk5NjE0", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/discussion_comment/edited.payload.json b/payload-examples/api.github.com/discussion_comment/edited.payload.json index 2a88cbb56..59795065e 100644 --- a/payload-examples/api.github.com/discussion_comment/edited.payload.json +++ b/payload-examples/api.github.com/discussion_comment/edited.payload.json @@ -50,6 +50,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEwOkkpc4F1c3Npg24zMjk5NjE0", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-examples/api.github.com/index.json b/payload-examples/api.github.com/index.json index 8cdc8ef0b..608a06d8a 100644 --- a/payload-examples/api.github.com/index.json +++ b/payload-examples/api.github.com/index.json @@ -12116,6 +12116,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809315, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":pray:", "name": "Q&A", @@ -12344,6 +12345,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809317, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":raised_hands:", "name": "Show and tell", @@ -12394,6 +12396,7 @@ "category": { "from": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE", "repository_id": 141753607, "emoji": ":speech_balloon:", "name": "General", @@ -12535,6 +12538,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", @@ -12711,6 +12715,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", @@ -12888,6 +12893,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", @@ -13077,6 +13083,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", @@ -13262,6 +13269,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", @@ -13459,6 +13467,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":speech_balloon:", "name": "General", @@ -13635,6 +13644,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":speech_balloon:", "name": "General", @@ -13823,6 +13833,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", @@ -13999,6 +14010,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809315, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":pray:", "name": "Q&A", @@ -14050,6 +14062,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/friendly-octo-succotash", "category": { "id": 32809824, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5ODI", "repository_id": 353173080, "emoji": ":pray:", "name": "Q&A", @@ -14326,6 +14339,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809315, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":pray:", "name": "Q&A", @@ -14535,6 +14549,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", @@ -14720,6 +14735,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEyOkRpc2N1c3Npb25DYWNoZTMyODA5MzE1", "repository_id": 141753607, "emoji": ":speech_balloon:", "name": "General", @@ -15185,6 +15201,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEwOkkpc4F1c3Npg24zMjk5NjE0", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", @@ -15406,6 +15423,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEwOkkpc4F1c3Npg24zMjk5NjE0", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", @@ -15628,6 +15646,7 @@ "repository_url": "https://api.github.com/repos/Codertocat/Hello-World", "category": { "id": 32809314, + "node_id": "MDEwOkkpc4F1c3Npg24zMjk5NjE0", "repository_id": 186853002, "emoji": ":speech_balloon:", "name": "General", diff --git a/payload-schemas/api.github.com/common/discussion-category.schema.json b/payload-schemas/api.github.com/common/discussion-category.schema.json new file mode 100644 index 000000000..3e512d6e9 --- /dev/null +++ b/payload-schemas/api.github.com/common/discussion-category.schema.json @@ -0,0 +1,31 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema", + "$id": "common/discussion-category.schema.json", + "type": "object", + "required": [ + "id", + "node_id", + "repository_id", + "emoji", + "name", + "description", + "created_at", + "updated_at", + "slug", + "is_answerable" + ], + "properties": { + "id": { "type": "integer" }, + "node_id": { "type": "string" }, + "repository_id": { "type": "integer" }, + "emoji": { "type": "string" }, + "name": { "type": "string" }, + "description": { "type": "string" }, + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, + "slug": { "type": "string" }, + "is_answerable": { "type": "boolean" } + }, + "additionalProperties": false, + "title": "Discussion Category" +} diff --git a/payload-schemas/api.github.com/common/discussion.schema.json b/payload-schemas/api.github.com/common/discussion.schema.json index 2ed34f081..cff7a567c 100644 --- a/payload-schemas/api.github.com/common/discussion.schema.json +++ b/payload-schemas/api.github.com/common/discussion.schema.json @@ -25,32 +25,7 @@ "type": "object", "properties": { "repository_url": { "type": "string" }, - "category": { - "type": "object", - "required": [ - "id", - "repository_id", - "emoji", - "name", - "description", - "created_at", - "updated_at", - "slug", - "is_answerable" - ], - "properties": { - "id": { "type": "integer" }, - "repository_id": { "type": "integer" }, - "emoji": { "type": "string" }, - "name": { "type": "string" }, - "description": { "type": "string" }, - "created_at": { "type": "string", "format": "date-time" }, - "updated_at": { "type": "string", "format": "date-time" }, - "slug": { "type": "string" }, - "is_answerable": { "type": "boolean" } - }, - "additionalProperties": false - }, + "category": { "$ref": "discussion-category.schema.json" }, "answer_html_url": { "type": ["string", "null"] }, "answer_chosen_at": { "oneOf": [{ "type": "string", "format": "date-time" }, { "type": "null" }] diff --git a/payload-schemas/api.github.com/discussion/category_changed.schema.json b/payload-schemas/api.github.com/discussion/category_changed.schema.json index b633d89d4..af4088c96 100644 --- a/payload-schemas/api.github.com/discussion/category_changed.schema.json +++ b/payload-schemas/api.github.com/discussion/category_changed.schema.json @@ -12,32 +12,7 @@ "type": "object", "required": ["from"], "properties": { - "from": { - "type": "object", - "required": [ - "id", - "repository_id", - "emoji", - "name", - "description", - "created_at", - "updated_at", - "slug", - "is_answerable" - ], - "properties": { - "id": { "type": "integer" }, - "repository_id": { "type": "integer" }, - "emoji": { "type": "string" }, - "name": { "type": "string" }, - "description": { "type": "string" }, - "created_at": { "type": "string", "format": "date-time" }, - "updated_at": { "type": "string", "format": "date-time" }, - "slug": { "type": "string" }, - "is_answerable": { "type": "boolean" } - }, - "additionalProperties": false - } + "from": { "$ref": "common/discussion-category.schema.json" } }, "additionalProperties": false } diff --git a/payload-types/schema.d.ts b/payload-types/schema.d.ts index 0f7b47337..bfee57299 100644 --- a/payload-types/schema.d.ts +++ b/payload-types/schema.d.ts @@ -3662,17 +3662,7 @@ export interface DiscussionAnsweredEvent { } export interface Discussion { repository_url: string; - category: { - id: number; - repository_id: number; - emoji: string; - name: string; - description: string; - created_at: string; - updated_at: string; - slug: string; - is_answerable: boolean; - }; + category: DiscussionCategory; answer_html_url: string | null; answer_chosen_at: string | null; answer_chosen_by: User | null; @@ -3698,6 +3688,18 @@ export interface Discussion { body: string; reactions?: Reactions; } +export interface DiscussionCategory { + id: number; + node_id: string; + repository_id: number; + emoji: string; + name: string; + description: string; + created_at: string; + updated_at: string; + slug: string; + is_answerable: boolean; +} export interface Reactions { url: string; total_count: number; @@ -3713,17 +3715,7 @@ export interface Reactions { export interface DiscussionCategoryChangedEvent { changes: { category: { - from: { - id: number; - repository_id: number; - emoji: string; - name: string; - description: string; - created_at: string; - updated_at: string; - slug: string; - is_answerable: boolean; - }; + from: DiscussionCategory; }; }; action: "category_changed";