Merge pull request #1125 from givepraise/fix/praise-in-pvt-threads

fix(temp): block praise in pvt threads
givepraise · Aug 4, 2023 · cf2e2d1 · cf2e2d1
2 parents a3878aa + f9d42b5
commit cf2e2d1
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/packages/discord-bot/src/utils/assertPraiseAllowedInChannel.ts b/packages/discord-bot/src/utils/assertPraiseAllowedInChannel.ts
@@ -22,15 +22,16 @@ export const assertPraiseAllowedInChannel = async (
     getSetting('PRAISE_ALLOWED_CHANNEL_IDS', host) as Promise<string[]>,
   ]);
 
-  if (allowedInAllChannels) return true;
-
-  if (!channel) {
+  if (!channel || channel.type === ChannelType.PrivateThread) {
     await interaction.editReply({
       content:
         '**❌ Missing Permissions**\nPraise bot can not work in private threads yet.',
     });
     return false;
   }
+
+  if (allowedInAllChannels) return true;
+
   if (!Array.isArray(allowedChannelsList) || allowedChannelsList.length === 0) {
     await interaction.editReply({
       content: '**❌ Praise Restricted**\nPraise not allowed in any channel.',
@@ -39,7 +40,10 @@ export const assertPraiseAllowedInChannel = async (
     return false;
   }
 
-  if (!allowedChannelsList.includes(getChannelId(channel))) {
+  if (
+    !allowedChannelsList.includes(getChannelId(channel)) &&
+    !allowedChannelsList.includes(channel.id)
+  ) {
     await interaction.editReply({
       content: `**❌ Praise Restricted**\nPraise not allowed in this channel.\nTo praise, use the following channels - ${allowedChannelsList
         .filter((el) => el !== '0')