fix(blacklist): interchat mods can now unblacklist other hubs

Discord-InterChat · Jun 9, 2024 · 8b6689d · 8b6689d
1 parent ac7b91b
commit 8b6689d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/src/commands/context-menu/blacklist.ts b/src/commands/context-menu/blacklist.ts
@@ -47,7 +47,7 @@ export default class Blacklist extends BaseCommand {
 
     const isStaffOrHubMod = checkIfStaff(interaction.user.id) || isHubMod;
 
-    if (!messageInDb || (!isStaffOrHubMod && !checkIfStaff(interaction.user.id))) {
+    if (!messageInDb || !isStaffOrHubMod) {
       await interaction.reply({
         embeds: [
           simpleEmbed(

diff --git a/src/commands/slash/Main/blacklist/server.ts b/src/commands/slash/Main/blacklist/server.ts
@@ -1,6 +1,6 @@
 import { captureException } from '@sentry/node';
 import { ChatInputCommandInteraction, EmbedBuilder, time } from 'discord.js';
-import { simpleEmbed } from '../../../../utils/Utils.js';
+import { checkIfStaff, simpleEmbed } from '../../../../utils/Utils.js';
 import { emojis } from '../../../../utils/Constants.js';
 import db from '../../../../utils/Db.js';
 import BlacklistCommand from './index.js';
@@ -17,18 +17,14 @@ export default class UserBlacklist extends BlacklistCommand {
     await interaction.deferReply();
 
     const hub = interaction.options.getString('hub', true);
+    const hubInDb = await db.hubs.findFirst({ where: { name: hub } });
 
-    const hubInDb = await db.hubs.findFirst({
-      where: {
-        name: hub,
-        OR: [
-          { ownerId: interaction.user.id },
-          { moderators: { some: { userId: interaction.user.id } } },
-        ],
-      },
-    });
+    const isStaffOrHubMod =
+      hubInDb?.ownerId === interaction.user.id ||
+      hubInDb?.moderators.find((mod) => mod.userId === interaction.user.id) ||
+      checkIfStaff(interaction.user.id);
 
-    if (!hubInDb) {
+    if (!hubInDb || !isStaffOrHubMod) {
       await interaction.editReply({
         embeds: [
           simpleEmbed(

diff --git a/src/commands/slash/Main/blacklist/user.ts b/src/commands/slash/Main/blacklist/user.ts
@@ -4,7 +4,7 @@ import BlacklistCommand from './index.js';
 import BlacklistManager from '../../../../managers/BlacklistManager.js';
 import parse from 'parse-duration';
 import { emojis } from '../../../../utils/Constants.js';
-import { simpleEmbed } from '../../../../utils/Utils.js';
+import { checkIfStaff, simpleEmbed } from '../../../../utils/Utils.js';
 import { t } from '../../../../utils/Locale.js';
 import Logger from '../../../../utils/Logger.js';
 import { logBlacklist, logUnblacklist } from '../../../../utils/HubLogger/ModLogs.js';
@@ -14,18 +14,15 @@ export default class Server extends BlacklistCommand {
     await interaction.deferReply();
 
     const hub = interaction.options.getString('hub', true);
+    const hubInDb = await db.hubs.findFirst({ where: { name: hub } });
 
-    const hubInDb = await db.hubs.findFirst({
-      where: {
-        name: hub,
-        OR: [
-          { ownerId: interaction.user.id },
-          { moderators: { some: { userId: interaction.user.id } } },
-        ],
-      },
-    });
+    const isStaffOrHubMod =
+      hubInDb?.ownerId === interaction.user.id ||
+      hubInDb?.moderators.find((mod) => mod.userId === interaction.user.id) ||
+      checkIfStaff(interaction.user.id);
+    console.log(isStaffOrHubMod);
 
-    if (!hubInDb) {
+    if (!hubInDb || !isStaffOrHubMod) {
       await interaction.editReply({
         embeds: [
           simpleEmbed(