From b3e68bee38fb6fcc1bbf875971b187e44577f35b Mon Sep 17 00:00:00 2001
From: Shadow <blazeis292@gmail.com>
Date: Sat, 9 Nov 2024 04:56:16 -0500
Subject: [PATCH] Fix /say not working in in some text channels (#849)

* Fix /say not working in in some text channels
---
 src/discord/commands/guild/d.say.ts | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/discord/commands/guild/d.say.ts b/src/discord/commands/guild/d.say.ts
index f2c301f5c..b6d6c5996 100644
--- a/src/discord/commands/guild/d.say.ts
+++ b/src/discord/commands/guild/d.say.ts
@@ -27,6 +27,10 @@ export const dSay: SlashCommand = {
       return false;
     }
 
+    if (!interaction.member) return false;
+
+    const member: GuildMember = interaction.member as GuildMember;
+
     const say = interaction.options.getString('say', true);
 
     let channel = interaction.options.getChannel('channel')
@@ -38,8 +42,24 @@ export const dSay: SlashCommand = {
       return false;
     }
 
+    // Ensure only moderators can use /say in announcements
+    if (
+      channel.type === ChannelType.GuildAnnouncement
+      && !member.roles.cache.has(env.ROLE_MODERATOR)
+    ) {
+      await interaction.editReply({ content: 'Only moderators can use this command in announcement channels!' });
+      return false;
+    }
+
     // Ensure that the channel used is a text channel
-    if (channel.type !== ChannelType.GuildText) {
+    if (
+      channel.type !== ChannelType.GuildText
+      && channel.type !== ChannelType.GuildVoice
+      && channel.type !== ChannelType.PublicThread
+      && channel.type !== ChannelType.PrivateThread
+      && channel.type !== ChannelType.GuildAnnouncement
+      && channel.type !== ChannelType.GuildForum
+    ) {
       await interaction.editReply({ content: 'This command can only be used in a server!' });
       return false;
     }
@@ -57,8 +77,8 @@ export const dSay: SlashCommand = {
 
     const channelBotlog = await interaction.guild.channels.fetch(env.CHANNEL_BOTLOG) as TextChannel;
     if (channelBotlog) {
-      await channelBotlog.send(`${(interaction.member as GuildMember).displayName} made me say '${say}' \
-in ${channel.name}`);
+      await channelBotlog.send(`${member.displayName} made me say '${say}' \
+        in ${channel.name}`);
     }
 
     return true;