From adc3474216af90df8ff54089eb6d2ad67a95b533 Mon Sep 17 00:00:00 2001 From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com> Date: Thu, 18 Jul 2024 15:35:10 +0200 Subject: [PATCH] Consistent relations, url property, src channel --- assets/openapi.json | 13 +- assets/schemas.json | 1584 ++++++++++++++--- .../routes/channels/#channel_id/webhooks.ts | 17 +- src/api/routes/guilds/#guild_id/webhooks.ts | 19 +- .../webhooks/#webhook_id/#token/index.ts | 10 +- src/api/routes/webhooks/#webhook_id/index.ts | 11 +- src/util/entities/Webhook.ts | 16 +- 7 files changed, 1362 insertions(+), 308 deletions(-) diff --git a/assets/openapi.json b/assets/openapi.json index 5cf31327..be317720 100644 --- a/assets/openapi.json +++ b/assets/openapi.json @@ -2582,6 +2582,12 @@ "source_guild": { "$ref": "#/components/schemas/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/components/schemas/Channel" + }, "url": { "type": "string" }, @@ -2597,9 +2603,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -8741,7 +8748,7 @@ "bearer": [] } ], - "description": "Returns a webhook object for the given id.", + "description": "Returns a webhook object for the given id. Requires the MANAGE_WEBHOOKS permission or to be the owner of the webhook.", "responses": { "200": { "description": "", diff --git a/assets/schemas.json b/assets/schemas.json index cd3a018f..aecc76a2 100644 --- a/assets/schemas.json +++ b/assets/schemas.json @@ -2697,6 +2697,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -2713,9 +2719,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -7271,6 +7278,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -7287,9 +7300,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -11790,6 +11804,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -11806,9 +11826,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -16287,6 +16308,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -16303,9 +16330,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -20806,6 +20834,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -20822,9 +20856,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -25317,6 +25352,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -25333,9 +25374,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -29858,6 +29900,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -29874,9 +29922,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -34363,6 +34412,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -34379,9 +34434,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -38871,6 +38927,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -38887,9 +38949,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -43391,6 +43454,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -43407,9 +43476,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -47914,6 +47984,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -47930,9 +48006,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -52419,6 +52496,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -52435,9 +52518,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -57026,6 +57110,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -57042,9 +57132,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -61543,6 +61634,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -61559,9 +61656,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -66060,6 +66158,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -66076,9 +66180,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -70572,6 +70677,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -70588,9 +70699,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -75120,6 +75232,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -75136,9 +75254,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -79637,6 +79756,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -79653,9 +79778,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -84145,6 +84271,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -84161,9 +84293,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -88656,6 +88789,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -88672,9 +88811,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -93176,6 +93316,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -93192,9 +93338,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -97684,6 +97831,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -97700,9 +97853,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -102192,6 +102346,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -102208,9 +102368,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -106719,6 +106880,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -106735,9 +106902,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -111230,6 +111398,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -111246,9 +111420,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -115801,6 +115976,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -115817,9 +115998,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -120331,6 +120513,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -120347,9 +120535,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -125002,6 +125191,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -125018,9 +125213,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -129531,6 +129727,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -129547,9 +129749,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -134070,6 +134273,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -134086,9 +134295,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -138591,6 +138801,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -138607,9 +138823,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -143118,6 +143335,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -143134,9 +143357,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -147635,6 +147859,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -147651,9 +147881,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -152140,6 +152371,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -152156,9 +152393,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -156782,6 +157020,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -156798,9 +157042,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -161278,6 +161523,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -161294,9 +161545,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -165917,6 +166169,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -165933,9 +166191,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -170425,6 +170684,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -170441,9 +170706,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -174941,6 +175207,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -174957,9 +175229,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -179450,6 +179723,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -179466,9 +179745,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -183959,6 +184239,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -183975,9 +184261,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -188503,6 +188790,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -188519,9 +188812,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -193012,6 +193306,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -193028,9 +193328,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -197520,6 +197821,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -197536,9 +197843,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -202043,6 +202351,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -202059,9 +202373,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -206555,6 +206870,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -206571,9 +206892,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -211141,6 +211463,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -211157,9 +211485,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -215649,6 +215978,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -215665,9 +216000,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -220157,6 +220493,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -220173,9 +220515,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -224662,6 +225005,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -224678,9 +225027,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -229173,6 +229523,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -229189,9 +229545,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -233694,6 +234051,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -233710,9 +234073,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -238199,6 +238563,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -238215,9 +238585,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -242753,6 +243124,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -242769,9 +243146,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -247293,6 +247671,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -247309,9 +247693,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -251798,6 +252183,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -251814,9 +252205,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -256328,6 +256720,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -256344,9 +256742,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -260953,6 +261352,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -260969,9 +261374,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -265457,6 +265863,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -265473,9 +265885,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -270000,6 +270413,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -270016,9 +270435,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -274531,6 +274951,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -274547,9 +274973,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -279114,6 +279541,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -279130,9 +279563,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -283619,6 +284053,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -283635,9 +284075,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -288132,6 +288573,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -288148,9 +288595,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -292635,6 +293083,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -292651,9 +293105,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -297144,6 +297599,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -297160,9 +297621,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -301653,6 +302115,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -301669,9 +302137,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -306248,6 +306717,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -306264,9 +306739,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -310757,6 +311233,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -310773,9 +311255,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -315298,6 +315781,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -315314,9 +315803,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -319811,6 +320301,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -319827,9 +320323,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -324314,6 +324811,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -324330,9 +324833,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -328823,6 +329327,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -328839,9 +329349,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -333343,6 +333854,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -333359,9 +333876,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -337877,6 +338395,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -337893,9 +338417,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -342382,6 +342907,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -342398,9 +342929,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -346890,6 +347422,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -346906,9 +347444,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -351427,6 +351966,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -351443,9 +351988,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -355932,6 +356478,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -355948,9 +356500,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -360516,6 +361069,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -360532,9 +361091,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -365028,6 +365588,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -365044,9 +365610,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -369533,6 +370100,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -369549,9 +370122,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -374038,6 +374612,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -374054,9 +374634,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -378550,6 +379131,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -378566,9 +379153,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -383059,6 +383647,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -383075,9 +383669,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -387564,6 +388159,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -387580,9 +388181,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -392144,6 +392746,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -392160,9 +392768,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -396660,6 +397269,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -396676,9 +397291,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -401177,6 +401793,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -401193,9 +401815,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -405744,6 +406367,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -405760,9 +406389,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -410270,6 +410900,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -410286,9 +410922,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -414802,6 +415439,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -414818,9 +415461,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -419328,6 +419972,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -419344,9 +419994,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -423833,6 +424484,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -423849,9 +424506,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -428366,6 +429024,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -428382,9 +429046,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -432911,6 +433576,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -432927,9 +433598,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -437410,6 +438082,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -437426,9 +438104,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -441919,6 +442598,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -441935,9 +442620,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -446424,6 +447110,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -446440,9 +447132,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -450936,6 +451629,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -450952,9 +451651,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -455652,6 +456352,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -455668,9 +456374,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -460148,6 +460855,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -460164,9 +460877,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -464744,6 +465458,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -464760,9 +465480,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -469243,6 +469964,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -469259,9 +469986,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -473742,6 +474470,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -473758,9 +474492,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -478241,6 +478976,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -478257,9 +478998,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -482840,6 +483582,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -482856,9 +483604,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -487337,6 +488086,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -487353,9 +488108,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -491834,6 +492590,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -491850,9 +492612,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -496331,6 +497094,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -496347,9 +497116,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -500830,6 +501600,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -500846,9 +501622,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -505329,6 +506106,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -505345,9 +506128,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -509828,6 +510612,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -509844,9 +510634,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -514327,6 +515118,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -514343,9 +515140,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -518826,6 +519624,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -518842,9 +519646,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -523389,6 +524194,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -523405,9 +524216,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -527888,6 +528700,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -527904,9 +528722,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -532387,6 +533206,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -532403,9 +533228,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -536886,6 +537712,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -536902,9 +537734,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -541432,6 +542265,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -541448,9 +542287,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -546167,6 +547007,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -546183,9 +547029,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -550666,6 +551513,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -550682,9 +551535,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -555165,6 +556019,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -555181,9 +556041,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -559664,6 +560525,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -559680,9 +560547,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -564163,6 +565031,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -564179,9 +565053,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -568688,6 +569563,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -568704,9 +569585,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -573187,6 +574069,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -573203,9 +574091,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -577684,6 +578573,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -577700,9 +578595,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -582204,6 +583100,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -582220,9 +583122,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -586717,6 +587620,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -586733,9 +587642,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -591349,6 +592259,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -591365,9 +592281,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -595872,6 +596789,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -595888,9 +596811,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -600389,6 +601313,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -600405,9 +601335,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -604898,6 +605829,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -604914,9 +605851,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -609407,6 +610345,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -609423,9 +610367,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -613903,6 +614848,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -613919,9 +614870,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -618414,6 +619366,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -618430,9 +619388,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -622922,6 +623881,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -622938,9 +623903,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -627445,6 +628411,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -627461,9 +628433,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -631972,6 +632945,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -631988,9 +632967,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -636478,6 +637458,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -636494,9 +637480,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -640983,6 +641970,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -640999,9 +641992,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -645488,6 +646482,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -645504,9 +646504,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] @@ -649999,6 +651000,12 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "source_channel_id": { + "type": "string" + }, + "source_channel": { + "$ref": "#/definitions/Channel" + }, "url": { "type": "string" }, @@ -650015,9 +651022,10 @@ "channel_id", "id", "name", - "source_guild", - "source_guild_id", + "source_channel", + "source_channel_id", "type", + "url", "user", "user_id" ] diff --git a/src/api/routes/channels/#channel_id/webhooks.ts b/src/api/routes/channels/#channel_id/webhooks.ts index 4c1ccbdf..7533fceb 100644 --- a/src/api/routes/channels/#channel_id/webhooks.ts +++ b/src/api/routes/channels/#channel_id/webhooks.ts @@ -1,17 +1,17 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Spacebar and Spacebar Contributors - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ @@ -53,13 +53,20 @@ router.get( where: { channel_id }, relations: [ "user", + "channel", + "source_channel", "guild", "source_guild", - "application" /*"source_channel"*/, + "application", ], }); - return res.json(webhooks); + const instanceUrl = + Config.get().api.endpointPublic || "http://localhost:3001"; + return res.json(webhooks.map(webhook => ({ + ...webhook, + url: instanceUrl + "/webhooks/" + webhook.id + "/" + webhook.token, + }))); }, ); diff --git a/src/api/routes/guilds/#guild_id/webhooks.ts b/src/api/routes/guilds/#guild_id/webhooks.ts index a2ef7d69..60c9818a 100644 --- a/src/api/routes/guilds/#guild_id/webhooks.ts +++ b/src/api/routes/guilds/#guild_id/webhooks.ts @@ -1,23 +1,23 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Spacebar and Spacebar Contributors - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ import { route } from "@spacebar/api"; -import { Webhook } from "@spacebar/util"; +import { Config, Webhook } from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); @@ -39,13 +39,20 @@ router.get( where: { guild_id }, relations: [ "user", + "channel", + "source_channel", "guild", "source_guild", - "application" /*"source_channel"*/, + "application", ], }); - return res.json(webhooks); + const instanceUrl = + Config.get().api.endpointPublic || "http://localhost:3001"; + return res.json(webhooks.map(webhook => ({ + ...webhook, + url: instanceUrl + "/webhooks/" + webhook.id + "/" + webhook.token, + }))); }, ); diff --git a/src/api/routes/webhooks/#webhook_id/#token/index.ts b/src/api/routes/webhooks/#webhook_id/#token/index.ts index 6d1449eb..8e0ad0dd 100644 --- a/src/api/routes/webhooks/#webhook_id/#token/index.ts +++ b/src/api/routes/webhooks/#webhook_id/#token/index.ts @@ -34,7 +34,14 @@ router.get( where: { id: webhook_id, }, - relations: ["channel", "guild", "application"], + relations: [ + "user", + "channel", + "source_channel", + "guild", + "source_guild", + "application", + ], }); if (!webhook) { @@ -65,6 +72,7 @@ const messageUpload = multer({ }); // max upload 50 mb // https://discord.com/developers/docs/resources/webhook#execute-webhook +// TODO: GitHub/Slack compatible hooks router.post( "/", messageUpload.any(), diff --git a/src/api/routes/webhooks/#webhook_id/index.ts b/src/api/routes/webhooks/#webhook_id/index.ts index 98faaac1..c10bf224 100644 --- a/src/api/routes/webhooks/#webhook_id/index.ts +++ b/src/api/routes/webhooks/#webhook_id/index.ts @@ -11,7 +11,7 @@ const router = Router(); router.get( "/", route({ - description: "Returns a webhook object for the given id.", + description: "Returns a webhook object for the given id. Requires the MANAGE_WEBHOOKS permission or to be the owner of the webhook.", responses: { 200: { body: "APIWebhook", @@ -23,7 +23,14 @@ router.get( const { webhook_id } = req.params; const webhook = await Webhook.findOneOrFail({ where: { id: webhook_id }, - relations: ["channel", "guild", "application", "user"], + relations: [ + "user", + "channel", + "source_channel", + "guild", + "source_guild", + "application", + ], }); if (webhook.guild_id) { diff --git a/src/util/entities/Webhook.ts b/src/util/entities/Webhook.ts index 8b1585ad..9539d6e8 100644 --- a/src/util/entities/Webhook.ts +++ b/src/util/entities/Webhook.ts @@ -85,13 +85,23 @@ export class Webhook extends BaseClass { @Column({ nullable: true }) @RelationId((webhook: Webhook) => webhook.guild) - source_guild_id: string; + source_guild_id?: string; @JoinColumn({ name: "source_guild_id" }) @ManyToOne(() => Guild, { onDelete: "CASCADE", }) - source_guild: Guild; + source_guild?: Guild; - url?: string; + @Column({ nullable: true }) + @RelationId((webhook: Webhook) => webhook.channel) + source_channel_id: string; + + @JoinColumn({ name: "source_channel_id" }) + @ManyToOne(() => Channel, { + onDelete: "CASCADE", + }) + source_channel: Channel; + + url: string; }