mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-17 20:13:30 +01:00
feat(Webhook): add channel property (#8812)
* 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>
This commit is contained in:
@@ -39,7 +39,11 @@ class Webhook {
|
|||||||
* @name Webhook#token
|
* @name Webhook#token
|
||||||
* @type {?string}
|
* @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) {
|
if ('avatar' in data) {
|
||||||
/**
|
/**
|
||||||
@@ -73,7 +77,7 @@ class Webhook {
|
|||||||
|
|
||||||
if ('channel_id' in data) {
|
if ('channel_id' in data) {
|
||||||
/**
|
/**
|
||||||
* The channel the webhook belongs to
|
* The id of the channel the webhook belongs to
|
||||||
* @type {Snowflake}
|
* @type {Snowflake}
|
||||||
*/
|
*/
|
||||||
this.channelId = data.channel_id;
|
this.channelId = data.channel_id;
|
||||||
@@ -141,6 +145,15 @@ class Webhook {
|
|||||||
* <info>For interaction webhooks, this property is ignored</info>
|
* <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.
|
* Sends a message with this webhook.
|
||||||
* @param {string|MessagePayload|WebhookCreateMessageOptions} options The options to provide
|
* @param {string|MessagePayload|WebhookCreateMessageOptions} options The options to provide
|
||||||
@@ -206,7 +219,12 @@ class Webhook {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const { body, files } = await messagePayload.resolveFiles();
|
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;
|
if (!this.client.channels) return d;
|
||||||
return this.client.channels.cache.get(d.channel_id)?.messages._add(d, false) ?? new (getMessage())(this.client, d);
|
return this.client.channels.cache.get(d.channel_id)?.messages._add(d, false) ?? new (getMessage())(this.client, d);
|
||||||
@@ -349,7 +367,10 @@ class Webhook {
|
|||||||
* @returns {Promise<void>}
|
* @returns {Promise<void>}
|
||||||
*/
|
*/
|
||||||
async delete(reason) {
|
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,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
1
packages/discord.js/typings/index.d.ts
vendored
1
packages/discord.js/typings/index.d.ts
vendored
@@ -3179,6 +3179,7 @@ export class Webhook extends WebhookMixin() {
|
|||||||
public token: string | null;
|
public token: string | null;
|
||||||
public type: WebhookType;
|
public type: WebhookType;
|
||||||
public applicationId: Snowflake | null;
|
public applicationId: Snowflake | null;
|
||||||
|
public get channel(): TextChannel | VoiceChannel | NewsChannel | ForumChannel | null;
|
||||||
public isUserCreated(): this is this & {
|
public isUserCreated(): this is this & {
|
||||||
type: WebhookType.Incoming;
|
type: WebhookType.Incoming;
|
||||||
applicationId: null;
|
applicationId: null;
|
||||||
|
|||||||
Reference in New Issue
Block a user