diff --git a/src/bot.ts b/src/bot.ts index abe2482a9..48662637c 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -586,7 +586,6 @@ export interface Helpers { upsertApplicationCommands: typeof helpers.upsertApplicationCommands; validDiscoveryTerm: typeof helpers.validDiscoveryTerm; addToThread: typeof helpers.addToThread; - deleteThread: typeof helpers.deleteThread; editThread: typeof helpers.editThread; getActiveThreads: typeof helpers.getActiveThreads; getArchivedThreads: typeof helpers.getArchivedThreads; @@ -755,7 +754,6 @@ export function createBaseHelpers(options: Partial) { upsertApplicationCommands: options.upsertApplicationCommands || helpers.upsertApplicationCommands, validDiscoveryTerm: options.validDiscoveryTerm || helpers.validDiscoveryTerm, addToThread: options.addToThread || helpers.addToThread, - deleteThread: options.deleteThread || helpers.deleteThread, editThread: options.editThread || helpers.editThread, getActiveThreads: options.getActiveThreads || helpers.getActiveThreads, getArchivedThreads: options.getArchivedThreads || helpers.getArchivedThreads, diff --git a/src/helpers/channels/deleteChannel.ts b/src/helpers/channels/deleteChannel.ts index 3766d4e80..2fa9eee12 100644 --- a/src/helpers/channels/deleteChannel.ts +++ b/src/helpers/channels/deleteChannel.ts @@ -1,8 +1,19 @@ import type { Bot } from "../../bot.ts"; +import { Channel } from "../../types/channels/channel.ts"; -/** Delete a channel in your server. Bot needs MANAGE_CHANNEL permissions in the server. */ +/** Delete a channel in your server. Bot needs MANAGE_CHANNEL permissions in the server. Bot needs MANAGE_THREADS permissions in the server if deleting thread. */ export async function deleteChannel(bot: Bot, channelId: bigint, reason?: string) { - return await bot.rest.runMethod(bot.rest, "delete", bot.constants.endpoints.CHANNEL_BASE(channelId), { - reason, + const result = await bot.rest.runMethod( + bot.rest, + "delete", + bot.constants.endpoints.CHANNEL_BASE(channelId), + { + reason, + } + ); + + return bot.transformers.channel(bot, { + channel: result, + guildId: result.guild_id ? bot.transformers.snowflake(result.guild_id) : undefined, }); } diff --git a/src/helpers/channels/threads/deleteThread.ts b/src/helpers/channels/threads/deleteThread.ts deleted file mode 100644 index d1876251f..000000000 --- a/src/helpers/channels/threads/deleteThread.ts +++ /dev/null @@ -1,8 +0,0 @@ -import type { Bot } from "../../../bot.ts"; - -/** Delete a thread in your server. Bot needs MANAGE_THREADS permissions in the server. */ -export async function deleteThread(bot: Bot, threadId: bigint, reason?: string) { - return await bot.rest.runMethod(bot.rest, "delete", bot.constants.endpoints.CHANNEL_BASE(threadId), { - reason, - }); -} diff --git a/src/helpers/channels/threads/mod.ts b/src/helpers/channels/threads/mod.ts index 741b603d6..5b957b1d1 100644 --- a/src/helpers/channels/threads/mod.ts +++ b/src/helpers/channels/threads/mod.ts @@ -1,5 +1,4 @@ export * from "./addToThread.ts"; -export * from "./deleteThread.ts"; export * from "./editThread.ts"; export * from "./getActiveThreads.ts"; export * from "./getArchivedThreads.ts"; diff --git a/src/helpers/mod.ts b/src/helpers/mod.ts index 523aa4b60..bddb7a8dc 100644 --- a/src/helpers/mod.ts +++ b/src/helpers/mod.ts @@ -159,7 +159,6 @@ export * from "./channels/getStageInstance.ts"; export * from "./channels/deleteStageInstance.ts"; export * from "./voice/connectToVoiceChannel.ts"; export * from "./channels/threads/addToThread.ts"; -export * from "./channels/threads/deleteThread.ts"; export * from "./channels/threads/editThread.ts"; export * from "./channels/threads/getActiveThreads.ts"; export * from "./channels/threads/getArchivedThreads.ts"; diff --git a/tests/channels/threads.ts b/tests/channels/threads.ts index 9173d524a..c2ff39cb5 100644 --- a/tests/channels/threads.ts +++ b/tests/channels/threads.ts @@ -54,6 +54,6 @@ Deno.test("[thread] Start a thread", async (t) => { }); await t.step("[thread] Delete a thread", async () => { - await bot.helpers.deleteThread(thread.id); + await bot.helpers.deleteChannel(thread.id); }); });