Allow announcement channels to be configured for notifications (wise-…

…old-man#265)
rorro · Oct 18, 2024 · d12a2b6 · d12a2b6
1 parent bb778ce
commit d12a2b6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/src/commands/instances/config/ConfigNotificationsCommand.ts b/src/commands/instances/config/ConfigNotificationsCommand.ts
@@ -4,7 +4,8 @@ import {
   ChannelType,
   ChatInputCommandInteraction,
   EmbedBuilder,
-  PermissionFlagsBits
+  PermissionFlagsBits,
+  PermissionsBitField
 } from 'discord.js';
 import config from '../../../config';
 import { updateBotDefaultChannel, updateNotificationPreferences } from '../../../services/prisma';
@@ -39,7 +40,7 @@ const CONFIG: CommandConfig = {
       required: true,
       name: 'notification_channel',
       description: 'The channel to which notifications are sent.',
-      channelType: ChannelType.GuildText
+      channelTypes: [ChannelType.GuildText, ChannelType.GuildAnnouncement]
     },
     {
       type: ApplicationCommandOptionType.String,
@@ -80,14 +81,25 @@ class ConfigNotificationsCommand extends Command {
       const channelPermissions =
         channel.client.user !== null ? channel.permissionsFor(channel.client.user) : null;
 
-      if (channelPermissions !== null && !channelPermissions.has(PermissionFlagsBits.ViewChannel)) {
-        throw new CommandError(`Error: The bot does not have access to <#${channel.id}>.`);
+      if (channelPermissions !== null) {
+        if (!channelPermissions.has(PermissionFlagsBits.ViewChannel)) {
+          throw new CommandError(
+            `Error: The bot does not have \`View Channel\` permissions for <#${channel.id}>.`
+          );
+        } else if (!channelPermissions.has(PermissionFlagsBits.SendMessages)) {
+          throw new CommandError(
+            `Error: The bot does not have \`Send Messages\` permissions for <#${channel.id}>.`
+          );
+        }
       }
 
       const missingPermissions = getMissingPermissions(channel);
 
       if (missingPermissions.length > 0) {
-        const missingPermissionsList = missingPermissions.map(p => `\`${p}\``).join(', ');
+        const missingPermissionsList = new PermissionsBitField(missingPermissions)
+          .toArray()
+          .map(p => `\`${p}\``)
+          .join(', ');
 
         throw new CommandError(
           `Error: The bot is missing the following permissions on <#${channel.id}>: \n\n${missingPermissionsList}`

diff --git a/src/utils/commands.ts b/src/utils/commands.ts
@@ -116,7 +116,7 @@ interface StringOption extends BaseOption {
 
 interface ChannelOption extends BaseOption {
   type: ApplicationCommandOptionType.Channel;
-  channelType?: ApplicationCommandOptionAllowedChannelTypes;
+  channelTypes?: Array<ApplicationCommandOptionAllowedChannelTypes>;
 }
 
 interface UserOption extends BaseOption {
@@ -168,7 +168,7 @@ function attachOptions(
         opt.setName(option.name).setDescription(option.description);
 
         if (option.required) opt.setRequired(true);
-        if (option.channelType) opt.addChannelTypes(option.channelType);
+        if (option.channelTypes) opt.addChannelTypes(...option.channelTypes);
 
         return opt;
       });

diff --git a/src/utils/discord.ts b/src/utils/discord.ts
@@ -1,11 +1,9 @@
 import { GroupRole, Metric } from '@wise-old-man/utils';
 import {
   Channel,
-  DMChannel,
   Guild,
   GuildMember,
   EmbedBuilder,
-  NewsChannel,
   PermissionResolvable,
   TextChannel,
   User,
@@ -418,21 +416,11 @@ export function getMissingPermissions(channel: TextChannel) {
   });
 }
 
-export function isChannelSendable(channel: Channel | undefined | null): channel is TextChannel {
-  if (!channel) return false;
-  if (channel.type !== ChannelType.GuildText) return false;
-  if (!('guild' in channel)) return true;
+export function isChannelSendable(channel: Channel): channel is TextChannel {
+  if (!channel || channel.isDMBased()) return false;
 
-  const canView = clientUserPermissions(channel as TextChannel)?.has(PermissionFlagsBits.ViewChannel);
-
-  if (
-    !(channel instanceof DMChannel) &&
-    !(channel instanceof NewsChannel) &&
-    !(channel instanceof TextChannel) &&
-    canView
-  ) {
+  if (channel.type !== ChannelType.GuildAnnouncement && channel.type !== ChannelType.GuildText)
     return false;
-  }
 
   return true;
 }

diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
@@ -1,4 +1,4 @@
-import { ChannelType, Client, EmbedBuilder, TextChannel } from 'discord.js';
+import { ChannelType, Client, EmbedBuilder } from 'discord.js';
 import { getServers, getNotificationPreferences } from '../services/prisma';
 
 export const NotificationType = {
@@ -53,7 +53,7 @@ export async function propagateMessage(
       const channel = await client.channels.fetch(targetChannelId);
 
       if (!channel) return;
-      if (!((channel): channel is TextChannel => channel.type === ChannelType.GuildText)(channel))
+      if (channel.type !== ChannelType.GuildText && channel.type !== ChannelType.GuildAnnouncement)
         return;
 
       try {