fix: check if user is allowed to use /reopen and /close

phorcys420 · phorcys420 · commit 2e4d68f90663 · 2024-11-06T14:02:41.000Z
diff --git a/src/commands/util/close.ts b/src/commands/util/close.ts
@@ -1,7 +1,7 @@
 import { config } from "@lib/config.js";
 
 import {
-  canUserInteractWithThread,
+  canMemberInteractWithThread,
   getChannelFromInteraction,
   isHelpPost,
 } from "@lib/channels.js";
@@ -15,7 +15,7 @@ import {
 
 // TODO: find a better way to do this
 const getStateWord = (close) => (close ? "closed" : "reopened");
-const getStateVerb = (close) => (close ? "close" : "reopene");
+const getStateVerb = (close) => (close ? "close" : "reopen");
 
 export async function handleIssueState(
   interaction: ChatInputCommandInteraction,
@@ -85,11 +85,10 @@ export async function handleIssueStateCommand(
 
   // Check if thread is a help post and if user can interact
   if (await isHelpPost(interactionChannel)) {
+    const member = await interaction.guild.members.fetch(interaction.user.id);
+
     if (
-      canUserInteractWithThread(
-        interaction.channel as ThreadChannel,
-        interaction.user,
-      )
+      await canMemberInteractWithThread(interaction.channel as ThreadChannel, member)
     ) {
       return handleIssueState(interaction, close, lock);
     } else {
diff --git a/src/lib/channels.ts b/src/lib/channels.ts
@@ -4,8 +4,9 @@ import {
   type ChatInputCommandInteraction,
   ChannelType,
   type ThreadChannel,
-  type User,
   type GuildTextBasedChannel,
+  PermissionsBitField,
+  type GuildMember,
 } from "discord.js";
 
 export async function getChannelFromInteraction(
@@ -36,14 +37,18 @@ export async function isHelpPost(channel: GuildTextBasedChannel) {
   );
 }
 
-export async function canUserInteractWithThread(
+export async function canMemberInteractWithThread(
   channel: ThreadChannel,
-  user: User,
+  member: GuildMember,
 ) {
-  /*const threadChannel: ThreadChannel<true> = await interaction.client.channels.fetch(interaction.channelId) as ThreadChannel;
-
-    const firstMessage = await threadChannel.fetchStarterMessage();*/
-
-  // TODO: actually check
-  return true;
+  if (member.permissions.has(PermissionsBitField.Flags.ManageChannels)) {
+    return true;
+  } else {
+    // Sometimes fetchOwner() will fail, so this is just a failsafe
+    const owner =
+      (await channel.fetchOwner())?.guildMember ??
+      (await channel.fetchStarterMessage()).member;
+
+    return member.id === owner.id;
+  }
 }
