Skip to content

Commit

Permalink
feat(Webhook): add channel property (#8812)
Browse files Browse the repository at this point in the history
* feat(Webhook): add `channel` property

* fix: allow ForumChannel type

* fix: disallow thread channel type

* fix: formatting

* Apply suggestions from code review

Co-authored-by: Aura Román <kyradiscord@gmail.com>

Co-authored-by: Aura Román <kyradiscord@gmail.com>
  • Loading branch information
MrMythicalYT and kyranet committed Nov 26, 2022
1 parent 9922151 commit decbce4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 4 deletions.
29 changes: 25 additions & 4 deletions packages/discord.js/src/structures/Webhook.js
Expand Up @@ -39,7 +39,11 @@ class Webhook {
* @name Webhook#token
* @type {?string}
*/
Object.defineProperty(this, 'token', { value: data.token ?? null, writable: true, configurable: true });
Object.defineProperty(this, 'token', {
value: data.token ?? null,
writable: true,
configurable: true,
});

if ('avatar' in data) {
/**
Expand Down Expand Up @@ -73,7 +77,7 @@ class Webhook {

if ('channel_id' in data) {
/**
* The channel the webhook belongs to
* The id of the channel the webhook belongs to
* @type {Snowflake}
*/
this.channelId = data.channel_id;
Expand Down Expand Up @@ -141,6 +145,15 @@ class Webhook {
* <info>For interaction webhooks, this property is ignored</info>
*/

/**
* The channel the webhook belongs to
* @type {?(TextChannel|VoiceChannel|NewsChannel|ForumChannel)}
* @readonly
*/
get channel() {
return this.client.channels.resolve(this.channelId);
}

/**
* Sends a message with this webhook.
* @param {string|MessagePayload|WebhookCreateMessageOptions} options The options to provide
Expand Down Expand Up @@ -206,7 +219,12 @@ class Webhook {
});

const { body, files } = await messagePayload.resolveFiles();
const d = await this.client.rest.post(Routes.webhook(this.id, this.token), { body, files, query, auth: false });
const d = await this.client.rest.post(Routes.webhook(this.id, this.token), {
body,
files,
query,
auth: false,
});

if (!this.client.channels) return d;
return this.client.channels.cache.get(d.channel_id)?.messages._add(d, false) ?? new (getMessage())(this.client, d);
Expand Down Expand Up @@ -349,7 +367,10 @@ class Webhook {
* @returns {Promise<void>}
*/
async delete(reason) {
await this.client.rest.delete(Routes.webhook(this.id, this.token), { reason, auth: !this.token });
await this.client.rest.delete(Routes.webhook(this.id, this.token), {
reason,
auth: !this.token,
});
}

/**
Expand Down
1 change: 1 addition & 0 deletions packages/discord.js/typings/index.d.ts
Expand Up @@ -3179,6 +3179,7 @@ export class Webhook extends WebhookMixin() {
public token: string | null;
public type: WebhookType;
public applicationId: Snowflake | null;
public get channel(): TextChannel | VoiceChannel | NewsChannel | ForumChannel | null;
public isUserCreated(): this is this & {
type: WebhookType.Incoming;
applicationId: null;
Expand Down

0 comments on commit decbce4

Please sign in to comment.