diff --git a/src/helpers/channels/threads/add_to_thread.ts b/src/helpers/channels/threads/add_to_thread.ts index 2de27e14e..3872ecbaa 100644 --- a/src/helpers/channels/threads/add_to_thread.ts +++ b/src/helpers/channels/threads/add_to_thread.ts @@ -14,7 +14,7 @@ export async function addToThread(threadId: bigint, userId: bigint) { } // If a user id is provided SEND_MESSAGES is required. - const channel = await cacheHandlers.get("channels", thread.channelId); + const channel = await cacheHandlers.get("channels", thread.parentId); // TODO: does MANAGE_THREADS override this???? if (channel) await requireBotChannelPermissions(channel, ["SEND_MESSAGES"]); } diff --git a/src/helpers/channels/threads/delete_thread.ts b/src/helpers/channels/threads/delete_thread.ts index cec0331de..53d314697 100644 --- a/src/helpers/channels/threads/delete_thread.ts +++ b/src/helpers/channels/threads/delete_thread.ts @@ -7,7 +7,7 @@ import { requireBotGuildPermissions } from "../../../util/permissions.ts"; export async function deleteThread(threadId: bigint, reason?: string) { const thread = await cacheHandlers.get("threads", threadId); if (thread) { - const channel = await cacheHandlers.get("channels", thread?.channelId); + const channel = await cacheHandlers.get("channels", thread?.parentId); if (channel?.guildId) await requireBotGuildPermissions(channel.guildId, ["MANAGE_THREADS"]); } diff --git a/src/helpers/channels/threads/get_thread_members.ts b/src/helpers/channels/threads/get_thread_members.ts index 1fc49a0be..bc3f965dc 100644 --- a/src/helpers/channels/threads/get_thread_members.ts +++ b/src/helpers/channels/threads/get_thread_members.ts @@ -15,7 +15,7 @@ export async function getThreadMembers(threadId: bigint) { const thread = await cacheHandlers.get("threads", threadId); if (thread?.isPrivate) { - const channel = await cacheHandlers.get("channels", thread.channelId); + const channel = await cacheHandlers.get("channels", thread.parentId); if (channel && !(await botHasChannelPermissions(channel, ["MANAGE_THREADS"])) && !thread.botIsMember) throw new Error(Errors.CANNOT_GET_MEMBERS_OF_AN_UNJOINED_PRIVATE_THREAD); } diff --git a/src/helpers/channels/threads/remove_thread_member.ts b/src/helpers/channels/threads/remove_thread_member.ts index c418d78ef..8951e0695 100644 --- a/src/helpers/channels/threads/remove_thread_member.ts +++ b/src/helpers/channels/threads/remove_thread_member.ts @@ -12,7 +12,7 @@ export async function removeThreadMember(threadId: bigint, userId: bigint) { if (thread.archived) throw new Error(Errors.CANNOT_REMOVE_FROM_ARCHIVED_THREAD); if (thread.ownerId !== botId) { - const channel = await cacheHandlers.get("channels", thread.channelId); + const channel = await cacheHandlers.get("channels", thread.parentId); if (channel) await requireBotChannelPermissions(channel, ["MANAGE_THREADS"]); } } diff --git a/src/util/transformers/channel_to_thread.ts b/src/util/transformers/channel_to_thread.ts index 3f952805a..0999c6ff9 100644 --- a/src/util/transformers/channel_to_thread.ts +++ b/src/util/transformers/channel_to_thread.ts @@ -29,7 +29,7 @@ const baseThread: Partial = { return { id: this.id?.toString(), type: this.type, - channelId: this.channelId?.toString(), + parentId: this.parentId?.toString(), memberCount: this.memberCount, messageCount: this.messageCount, archiveTimestamp: new Date(this.archiveTimestamp!).toISOString(), @@ -49,7 +49,7 @@ export function channelToThread(channel: Channel) { return Object.create(baseThread, { id: createNewProp(snowflakeToBigint(channel.id)), type: createNewProp(channel.type), - channelId: createNewProp(snowflakeToBigint(channel.parentId!)), + parentId: createNewProp(snowflakeToBigint(channel.parentId!)), memberCount: createNewProp(channel.memberCount), messageCount: createNewProp(channel.messageCount), archiveTimestamp: createNewProp( @@ -69,7 +69,7 @@ export interface Thread { | DiscordChannelTypes.GuildNewsThread | DiscordChannelTypes.GuildPublicThread | DiscordChannelTypes.GuildPrivateThread; - channelId: string; + parentId: string; memberCount: number; messageCount: number; archiveTimestamp: string; @@ -86,7 +86,7 @@ export interface DiscordenoThread { | DiscordChannelTypes.GuildNewsThread | DiscordChannelTypes.GuildPublicThread | DiscordChannelTypes.GuildPrivateThread; - channelId: bigint; + parentId: bigint; memberCount: number; messageCount: number; archiveTimestamp: number;