diff --git a/assets/openapi.json b/assets/openapi.json index 9bcb54a5..5cf31327 100644 --- a/assets/openapi.json +++ b/assets/openapi.json @@ -2582,6 +2582,9 @@ "source_guild": { "$ref": "#/components/schemas/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -2589,10 +2592,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -8778,7 +8780,7 @@ "bearer": [] } ], - "description": "Returns a webhook object for the given id.", + "description": "Returns a webhook object for the given id and token.", "responses": { "200": { "description": "", diff --git a/assets/schemas.json b/assets/schemas.json index bfc7550c..cd3a018f 100644 --- a/assets/schemas.json +++ b/assets/schemas.json @@ -2697,6 +2697,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -2705,10 +2708,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -7269,6 +7271,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -7277,10 +7282,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -11786,6 +11790,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -11794,10 +11801,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -16281,6 +16287,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -16289,10 +16298,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -20798,6 +20806,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -20806,10 +20817,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -25307,6 +25317,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -25315,10 +25328,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -29846,6 +29858,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -29854,10 +29869,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -34349,6 +34363,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -34357,10 +34374,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -38855,6 +38871,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -38863,10 +38882,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -43373,6 +43391,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -43381,10 +43402,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -47894,6 +47914,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -47902,10 +47925,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -52397,6 +52419,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -52405,10 +52430,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -57002,6 +57026,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -57010,10 +57037,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -61517,6 +61543,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -61525,10 +61554,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -66032,6 +66060,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -66040,10 +66071,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -70542,6 +70572,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -70550,10 +70583,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -75088,6 +75120,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -75096,10 +75131,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -79603,6 +79637,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -79611,10 +79648,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -84109,6 +84145,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -84117,10 +84156,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -88618,6 +88656,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -88626,10 +88667,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -93136,6 +93176,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -93144,10 +93187,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -97642,6 +97684,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -97650,10 +97695,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -102148,6 +102192,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -102156,10 +102203,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -106673,6 +106719,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -106681,10 +106730,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -111182,6 +111230,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -111190,10 +111241,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -115751,6 +115801,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -115759,10 +115812,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -120279,6 +120331,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -120287,10 +120342,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -124948,6 +125002,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -124956,10 +125013,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -129475,6 +129531,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -129483,10 +129542,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -134012,6 +134070,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -134020,10 +134081,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -138531,6 +138591,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -138539,10 +138602,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -143056,6 +143118,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -143064,10 +143129,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -147571,6 +147635,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -147579,10 +147646,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -152074,6 +152140,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -152082,10 +152151,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -156714,6 +156782,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -156722,10 +156793,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -161208,6 +161278,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -161216,10 +161289,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -165845,6 +165917,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -165853,10 +165928,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -170351,6 +170425,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -170359,10 +170436,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -174865,6 +174941,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -174873,10 +174952,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -179372,6 +179450,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -179380,10 +179461,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -183879,6 +183959,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -183887,10 +183970,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -188421,6 +188503,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -188429,10 +188514,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -192928,6 +193012,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -192936,10 +193023,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -197434,6 +197520,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -197442,10 +197531,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -201955,6 +202043,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -201963,10 +202054,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -206465,6 +206555,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -206473,10 +206566,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -211049,6 +211141,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -211057,10 +211152,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -215555,6 +215649,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -215563,10 +215660,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -220061,6 +220157,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -220069,10 +220168,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -224564,6 +224662,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -224572,10 +224673,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -229073,6 +229173,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -229081,10 +229184,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -233592,6 +233694,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -233600,10 +233705,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -238095,6 +238199,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -238103,10 +238210,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -242647,6 +242753,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -242655,10 +242764,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -247185,6 +247293,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -247193,10 +247304,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -251688,6 +251798,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -251696,10 +251809,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -256216,6 +256328,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -256224,10 +256339,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -260839,6 +260953,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -260847,10 +260964,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -265341,6 +265457,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -265349,10 +265468,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -269882,6 +270000,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -269890,10 +270011,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -274411,6 +274531,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -274419,10 +274542,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -278992,6 +279114,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -279000,10 +279125,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -283495,6 +283619,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -283503,10 +283630,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -288006,6 +288132,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -288014,10 +288143,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -292507,6 +292635,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -292515,10 +292646,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -297014,6 +297144,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -297022,10 +297155,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -301521,6 +301653,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -301529,10 +301664,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -306114,6 +306248,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -306122,10 +306259,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -310621,6 +310757,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -310629,10 +310768,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -315160,6 +315298,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -315168,10 +315309,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -319671,6 +319811,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -319679,10 +319822,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -324172,6 +324314,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -324180,10 +324325,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -328679,6 +328823,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -328687,10 +328834,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -333197,6 +333343,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -333205,10 +333354,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -337729,6 +337877,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -337737,10 +337888,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -342232,6 +342382,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -342240,10 +342393,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -346738,6 +346890,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -346746,10 +346901,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -351273,6 +351427,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -351281,10 +351438,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -355776,6 +355932,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -355784,10 +355943,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -360358,6 +360516,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -360366,10 +360527,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -364868,6 +365028,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -364876,10 +365039,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -369371,6 +369533,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -369379,10 +369544,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -373874,6 +374038,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -373882,10 +374049,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -378384,6 +378550,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -378392,10 +378561,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -382891,6 +383059,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -382899,10 +383070,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -387394,6 +387564,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -387402,10 +387575,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -391972,6 +392144,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -391980,10 +392155,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -396486,6 +396660,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -396494,10 +396671,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -401001,6 +401177,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -401009,10 +401188,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -405566,6 +405744,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -405574,10 +405755,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -410090,6 +410270,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -410098,10 +410281,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -414620,6 +414802,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -414628,10 +414813,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -419144,6 +419328,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -419152,10 +419339,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -423647,6 +423833,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -423655,10 +423844,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -428178,6 +428366,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -428186,10 +428377,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -432721,6 +432911,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -432729,10 +432922,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -437218,6 +437410,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -437226,10 +437421,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -441725,6 +441919,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -441733,10 +441930,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -446228,6 +446424,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -446236,10 +446435,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -450738,6 +450936,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -450746,10 +450947,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -455452,6 +455652,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -455460,10 +455663,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -459946,6 +460148,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -459954,10 +460159,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -464540,6 +464744,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -464548,10 +464755,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -469037,6 +469243,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -469045,10 +469254,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -473534,6 +473742,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -473542,10 +473753,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -478031,6 +478241,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -478039,10 +478252,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -482628,6 +482840,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -482636,10 +482851,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -487123,6 +487337,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -487131,10 +487348,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -491618,6 +491834,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -491626,10 +491845,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -496113,6 +496331,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -496121,10 +496342,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -500610,6 +500830,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -500618,10 +500841,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -505107,6 +505329,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -505115,10 +505340,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -509604,6 +509828,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -509612,10 +509839,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -514101,6 +514327,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -514109,10 +514338,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -518598,6 +518826,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -518606,10 +518837,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -523159,6 +523389,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -523167,10 +523400,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -527656,6 +527888,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -527664,10 +527899,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -532153,6 +532387,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -532161,10 +532398,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -536650,6 +536886,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -536658,10 +536897,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -541194,6 +541432,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -541202,10 +541443,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -545927,6 +546167,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -545935,10 +546178,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -550424,6 +550666,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -550432,10 +550677,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -554921,6 +555165,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -554929,10 +555176,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -559418,6 +559664,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -559426,10 +559675,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -563915,6 +564163,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -563923,10 +564174,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -568438,6 +568688,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -568446,10 +568699,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -572935,6 +573187,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -572943,10 +573198,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -577430,6 +577684,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -577438,10 +577695,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -581948,6 +582204,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -581956,10 +582215,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -586459,6 +586717,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -586467,10 +586728,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -591089,6 +591349,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -591097,10 +591360,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -595610,6 +595872,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -595618,10 +595883,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -600125,6 +600389,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -600133,10 +600400,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -604632,6 +604898,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -604640,10 +604909,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -609139,6 +609407,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -609147,10 +609418,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -613633,6 +613903,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -613641,10 +613914,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -618142,6 +618414,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -618150,10 +618425,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -622648,6 +622922,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -622656,10 +622933,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -627169,6 +627445,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -627177,10 +627456,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -631694,6 +631972,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -631702,10 +631983,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -636198,6 +636478,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -636206,10 +636489,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -640701,6 +640983,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -640709,10 +640994,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -645204,6 +645488,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -645212,10 +645499,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", @@ -649713,6 +649999,9 @@ "source_guild": { "$ref": "#/definitions/Guild" }, + "url": { + "type": "string" + }, "id": { "type": "string" } @@ -649721,10 +650010,9 @@ "required": [ "application", "application_id", + "avatar", "channel", "channel_id", - "guild", - "guild_id", "id", "name", "source_guild", diff --git a/src/api/routes/webhooks/#webhook_id/#token/index.ts b/src/api/routes/webhooks/#webhook_id/#token/index.ts index 49c47cca..6d1449eb 100644 --- a/src/api/routes/webhooks/#webhook_id/#token/index.ts +++ b/src/api/routes/webhooks/#webhook_id/#token/index.ts @@ -20,7 +20,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 and token.", responses: { 200: { body: "APIWebhook", @@ -45,7 +45,12 @@ router.get( throw DiscordApiErrors.INVALID_WEBHOOK_TOKEN_PROVIDED; } - return res.json(webhook); + const instanceUrl = + Config.get().api.endpointPublic || "http://localhost:3001"; + return res.json({ + ...webhook, + url: instanceUrl + "/webhooks/" + webhook.id + "/" + webhook.token, + }); }, ); diff --git a/src/api/routes/webhooks/#webhook_id/index.ts b/src/api/routes/webhooks/#webhook_id/index.ts index 7d528dbf..98faaac1 100644 --- a/src/api/routes/webhooks/#webhook_id/index.ts +++ b/src/api/routes/webhooks/#webhook_id/index.ts @@ -1,5 +1,10 @@ import { route } from "@spacebar/api"; -import { Webhook } from "@spacebar/util"; +import { + Config, + DiscordApiErrors, + getPermission, + Webhook, +} from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); @@ -15,18 +20,29 @@ router.get( }, }), async (req: Request, res: Response) => { - // TODO: Permission check const { webhook_id } = req.params; const webhook = await Webhook.findOneOrFail({ where: { id: webhook_id }, - relations: [ - "user", - "guild", - "source_guild", - "application" /*"source_channel"*/, - ], + relations: ["channel", "guild", "application", "user"], + }); + + if (webhook.guild_id) { + const permission = await getPermission( + req.user_id, + webhook.guild_id, + ); + + if (!permission.has("MANAGE_WEBHOOKS")) + throw DiscordApiErrors.UNKNOWN_WEBHOOK; + } else if (webhook.user_id != req.user_id) + throw DiscordApiErrors.UNKNOWN_WEBHOOK; + + const instanceUrl = + Config.get().api.endpointPublic || "http://localhost:3001"; + return res.json({ + ...webhook, + url: instanceUrl + "/webhooks/" + webhook.id + "/" + webhook.token, }); - return res.json(webhook); }, ); diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts index 461cddb4..f037417a 100644 --- a/src/api/util/handlers/Message.ts +++ b/src/api/util/handlers/Message.ts @@ -149,7 +149,6 @@ export async function handleMessage(opts: MessageOptions): Promise { `/avatars/${opts.webhook_id}`, dataUri as string, ); - console.log(message.avatar); message.author.avatar = message.avatar; } } else { diff --git a/src/util/entities/Webhook.ts b/src/util/entities/Webhook.ts index b7fba53a..8b1585ad 100644 --- a/src/util/entities/Webhook.ts +++ b/src/util/entities/Webhook.ts @@ -38,20 +38,20 @@ export class Webhook extends BaseClass { name: string; @Column({ nullable: true }) - avatar?: string; + avatar: string; @Column({ nullable: true }) token?: string; @Column({ nullable: true }) @RelationId((webhook: Webhook) => webhook.guild) - guild_id: string; + guild_id?: string; @JoinColumn({ name: "guild_id" }) @ManyToOne(() => Guild, { onDelete: "CASCADE", }) - guild: Guild; + guild?: Guild; @Column({ nullable: true }) @RelationId((webhook: Webhook) => webhook.channel) @@ -92,4 +92,6 @@ export class Webhook extends BaseClass { onDelete: "CASCADE", }) source_guild: Guild; + + url?: string; }