perms are fixed

dorasto · Jul 23, 2024 · b914126 · b914126
1 parent 3bfebaa
commit b914126
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 41 deletions.
diff --git a/commands/add.ts b/commands/add.ts
@@ -37,8 +37,8 @@ export default {
                 .setName("keep_vod")
                 .setDescription("Show the vod from that live")
                 .setRequired(false)
-        ),
-    permissions: [PermissionsBitField.Flags.Administrator],
+        )
+        .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator),
     async execute(inter: ChatInputCommandInteraction) {
         try {
             await inter.deferReply({

diff --git a/commands/list.ts b/commands/list.ts
@@ -1,11 +1,16 @@
-import { ChatInputCommandInteraction, SlashCommandBuilder } from "discord.js";
+import {
+    ChatInputCommandInteraction,
+    PermissionsBitField,
+    SlashCommandBuilder,
+} from "discord.js";
 import { db } from "../db";
 import * as schema from "../db/schema";
 import { eq } from "drizzle-orm";
 export default {
     data: new SlashCommandBuilder()
         .setName("list")
-        .setDescription("List all twitch users"),
+        .setDescription("List all twitch users")
+        .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator),
     async execute(inter: ChatInputCommandInteraction) {
         try {
             await inter.deferReply({

diff --git a/commands/remove.ts b/commands/remove.ts
@@ -31,8 +31,8 @@ export default {
                 .setName("channel")
                 .setDescription("Channel to remove it from")
                 .setRequired(true)
-        ),
-    permissions: [PermissionsBitField.Flags.Administrator],
+        )
+        .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator),
     async execute(inter: ChatInputCommandInteraction) {
         try {
             await inter.deferReply({

diff --git a/commands/uptime.ts b/commands/uptime.ts
@@ -9,9 +9,11 @@ import { discord } from "..";
 export default {
     data: new SlashCommandBuilder()
         .setName("uptime")
-        .setDescription("Check the uptime"),
+        .setDescription("Check the uptime")
+        .setDefaultMemberPermissions(
+            PermissionsBitField.Flags.UseApplicationCommands
+        ),
     cooldown: 3,
-    permissions: [PermissionsBitField.Flags.UseApplicationCommands],
     async execute(inter: ChatInputCommandInteraction) {
         try {
             await inter.deferReply();

diff --git a/events/interactionCreate.ts b/events/interactionCreate.ts
@@ -3,7 +3,6 @@ import { AddButtonDataTwitch, commands, discord } from "..";
 import { db } from "../db";
 import * as schema from "../db/schema";
 import { randomUUID } from "crypto";
-import { checkPermissions, PermissionResult } from "../lib/checkPermissions";
 discord.on(
     Events.InteractionCreate,
     async (interaction: Interaction): Promise<any> => {
@@ -88,16 +87,7 @@ discord.on(
 
         if (!command) return;
         try {
-            const permissionsCheck: PermissionResult = await checkPermissions(
-                command,
-                interaction
-            );
-
-            if (permissionsCheck.result) {
-                command.execute(interaction as ChatInputCommandInteraction);
-            } else {
-                throw new Error(permissionsCheck.missing.join(", "));
-            }
+            command.execute(interaction as ChatInputCommandInteraction);
         } catch (error: any) {
             console.error(error);
             if (error.message.includes("permissions")) {

diff --git a/lib/checkPermissions.ts b/lib/checkPermissions.ts