Merge pull request #60 from Chiissu/dev

no more blocklist

Author: MrSerge01

src/bot.ts

@@ -5,7 +5,6 @@ import { ActivityType, Client, Partials } from "discord.js";
 import { registerGuildCommands } from "handlers/commands";
 import { loadAuditEvents, loadEasterEggs, loadEvents } from "handlers/events";
 import ms from "ms";
-import { leavePlease } from "utils/leavePlease";
 import { rescheduleUnbans } from "utils/unbanScheduler";
 
 export const client = new Client({
@@ -30,10 +29,6 @@ export const subscribedUsers = new Set(
 );
 
 client.once("ready", async () => {
-  const guilds = client.guilds.cache;
-  for (const id of guilds.keys())
-    await leavePlease(guilds.get(id)!, await guilds.get(id)!.fetchOwner()!, "Not like that.");
-
   if (process.env.TOPGG_TOKEN) {
     const topgg = new Api(process.env.TOPGG_TOKEN!);
     try {

src/events/guildCreate.ts

@@ -1,17 +1,12 @@
-import { check } from "database/blocklist";
 import { EmbedBuilder } from "discord.js";
 import { errorEmbed } from "embeds/errorEmbed";
 import { commands } from "handlers/commands";
 import { genColor } from "utils/colorGen";
 import { dotCheck } from "utils/dotCheck";
-import { leavePlease } from "utils/leavePlease";
 import { replace } from "utils/replace";
 import type { Event } from "utils/types";
 
 export default (async function run(guild) {
-  const owner = await guild.fetchOwner();
-  if (!check(owner.id)) return await leavePlease(guild, owner, "No.");
-
   const client = guild.client;
   const avatar = client.user.displayAvatarURL();
   const embed = new EmbedBuilder()

src/events/interactionCreate.ts

@@ -1,7 +1,5 @@
-import { check } from "database/blocklist";
 import { getUserSetting } from "database/userSettings";
 import { SlashCommandSubcommandBuilder } from "discord.js";
-import { errorEmbed } from "embeds/errorEmbed";
 import { commands, subCommands } from "handlers/commands";
 import { subscribedUsers } from "src/bot";
 import { noErrorsPlease } from "utils/noErrorsPlease";
@@ -25,13 +23,6 @@ export default (async function run(interaction) {
 
   if (!command) return;
   if (interaction.isChatInputCommand()) {
-    if (!interaction.member || !check(interaction.member.user.id!))
-      return await errorEmbed({
-        interaction,
-        title: "The bot has experienced an internal error.",
-        reason: "Please try again later.",
-      });
-
     await noErrorsPlease(interaction);
     command.run(interaction);
   }

src/events/messageCreate.ts

@@ -1,4 +1,3 @@
-import { add, check, remove } from "database/blocklist";
 import { getLevel, setLevel } from "database/leveling";
 import { getSetting } from "database/settings";
 import { EmbedBuilder, type TextChannel } from "discord.js";
@@ -8,56 +7,14 @@ import { channelCheck } from "utils/channelCheck";
 import { genColor } from "utils/colorGen";
 import { dotCheck } from "utils/dotCheck";
 import { kominator } from "utils/kominator";
-import { leavePlease } from "utils/leavePlease";
 import { mention } from "utils/mention";
 import { Event } from "utils/types";
 
 const cooldowns = new Map<string, number>();
 export default (async function run(message) {
   const client = message.client;
-  if (message.content.startsWith("!SYSTEM")) {
-    if (message.author.id != process.env.OWNER) return;
-    const args = message.content.split(" ");
-    if (!args[2]) return message.reply("ERROR: Expected three arguments.");
-    const username = (await client.users.fetch(args[2])).username;
-
-    switch (args[1]) {
-      case "add": {
-        add(args[2]);
-        await message.reply(`${username} has been blocklisted from Sokora.`);
-
-        const guilds = client.guilds.cache;
-        for (const id of guilds.keys()) {
-          const guild = guilds.get(id);
-          if (!guild) {
-            await errorEmbed({
-              client,
-              title: "Failed to blocklist guild.",
-              reason: `Guild ${id} not found`,
-            });
-            continue;
-          }
-          await leavePlease(guild, await guild.fetchOwner(), "No.");
-        }
-        break;
-      }
-      case "remove":
-        remove(args[2]);
-        await message.reply(`${username} has been removed from the Sokora blocklist.`);
-        break;
-      case "check":
-        await message.reply(`${!check(args[2])}`);
-        break;
-      default:
-        await message.reply(
-          "Hello, this is the system interface to control top level Sokora moderation utilities.",
-        );
-    }
-  }
-
   const author = message.author;
   if (author.bot) return;
-  if (!check(author.id)) return;
   const guild = message.guild!;
   const avatar = author.displayAvatarURL();