refactor: remove folders from Utils/

src/Commands/Apps/deleteMsg.ts

@@ -1,5 +1,5 @@
 import { ContextMenuCommandBuilder, ApplicationCommandType, MessageContextMenuCommandInteraction } from 'discord.js';
-import { getDb, checkIfStaff } from '../../Utils/misc/utils';
+import { getDb, checkIfStaff } from '../../Utils/utils';
 import logger from '../../Utils/logger';
 import { networkMessageDelete } from '../../Scripts/networkLogs/msgDelete';
 import emojis from '../../Utils/JSON/emoji.json';

src/Commands/Apps/editMsg.ts

@@ -1,9 +1,9 @@
 import { ContextMenuCommandBuilder, MessageContextMenuCommandInteraction, ApplicationCommandType, ModalBuilder, ActionRowBuilder, TextInputBuilder, TextInputStyle, WebhookClient, EmbedBuilder } from 'discord.js';
 import { networkMsgUpdate } from '../../Scripts/networkLogs/msgUpdate';
-import { checkIfStaff, getDb, getGuildName, replaceLinks, topgg } from '../../Utils/misc/utils';
+import { checkIfStaff, getDb, getGuildName, replaceLinks, topgg } from '../../Utils/utils';
 import { captureException } from '@sentry/node';
-import { HubSettingsBitField } from '../../Utils/hubs/hubSettingsBitfield';
-import wordFiler from '../../Utils/misc/wordFilter';
+import { HubSettingsBitField } from '../../Utils/hubSettingsBitfield';
+import wordFiler from '../../Utils/wordFilter';
 import emojis from '../../Utils/JSON/emoji.json';
 
 export default {

src/Commands/Apps/messageInfo.ts

@@ -1,5 +1,5 @@
 import { ActionRowBuilder, ApplicationCommandType, AttachmentBuilder, ButtonBuilder, ButtonStyle, ContextMenuCommandBuilder, EmbedBuilder, MessageContextMenuCommandInteraction } from 'discord.js';
-import { constants, getDb } from '../../Utils/misc/utils';
+import { constants, getDb } from '../../Utils/utils';
 import { stripIndents } from 'common-tags';
 import { profileImage } from 'discord-arts';
 import emojis from '../../Utils/JSON/emoji.json';

src/Commands/Apps/report.ts

@@ -1,4 +1,4 @@
-import { getDb, constants } from '../../Utils/misc/utils';
+import { getDb, constants } from '../../Utils/utils';
 import { ModalBuilder, ActionRowBuilder, EmbedBuilder, ContextMenuCommandBuilder, ApplicationCommandType, TextInputStyle, TextInputBuilder, MessageContextMenuCommandInteraction, GuildTextBasedChannel, StringSelectMenuBuilder, StringSelectMenuOptionBuilder, ComponentType, ButtonBuilder, ButtonStyle } from 'discord.js';
 import { captureException } from '@sentry/node';
 import logger from '../../Utils/logger';

src/Commands/Information/listwarns.ts

@@ -1,6 +1,6 @@
 import { stripIndents } from 'common-tags';
 import { AutocompleteInteraction, ChatInputCommandInteraction, EmbedBuilder, SlashCommandBuilder } from 'discord.js';
-import { checkIfStaff, getDb } from '../../Utils/misc/utils';
+import { checkIfStaff, getDb } from '../../Utils/utils';
 import emojis from '../../Utils/JSON/emoji.json';
 
 export default {

src/Commands/Information/rules.ts

@@ -1,5 +1,5 @@
 import { ChatInputCommandInteraction, SlashCommandBuilder } from 'discord.js';
-import { rulesEmbed } from '../../Utils/misc/utils';
+import { rulesEmbed } from '../../Utils/utils';
 
 export default {
   data: new SlashCommandBuilder()

src/Commands/Information/stats.ts

@@ -1,5 +1,5 @@
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ChatInputCommandInteraction, EmbedBuilder, SlashCommandBuilder } from 'discord.js';
-import { toHuman, getDb, constants } from '../../Utils/misc/utils';
+import { toHuman, getDb, constants } from '../../Utils/utils';
 import { totalmem } from 'os';
 
 export default {

src/Commands/Information/vote.ts

@@ -1,6 +1,6 @@
 import { stripIndents } from 'common-tags';
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ChatInputCommandInteraction, EmbedBuilder, SlashCommandBuilder } from 'discord.js';
-import { constants } from '../../Utils/misc/utils';
+import { constants } from '../../Utils/utils';
 
 export default {
   data: new SlashCommandBuilder()

src/Commands/Main/help.ts

@@ -1,5 +1,5 @@
 import { SlashCommandBuilder, ChatInputCommandInteraction, ActionRowBuilder, Interaction, StringSelectMenuBuilder, EmbedBuilder, APISelectMenuOption, ApplicationCommandType, ComponentType, Client, chatInputApplicationCommandMention, User } from 'discord.js';
-import { checkIfStaff, constants, getCredits } from '../../Utils/misc/utils';
+import { checkIfStaff, constants, getCredits } from '../../Utils/utils';
 import { InterchatCommand } from '../../../typings/discord';
 import emojis from '../../Utils/JSON/emoji.json';
 import { stripIndents } from 'common-tags';

src/Commands/Main/hub.ts

@@ -1,5 +1,5 @@
 import { SlashCommandBuilder, ChatInputCommandInteraction, ChannelType, AutocompleteInteraction } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 
 export default {
   data: new SlashCommandBuilder()

src/Commands/Main/network.ts

@@ -1,5 +1,5 @@
 import { SlashCommandBuilder, PermissionFlagsBits, ChatInputCommandInteraction, AutocompleteInteraction } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 import displaySettings from '../../Scripts/network/displaySettings';
 import emojis from '../../Utils/JSON/emoji.json';
 

src/Commands/Network/blacklist.ts

@@ -1,5 +1,5 @@
 import { AutocompleteInteraction, ChatInputCommandInteraction, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 
 export default {
   data: new SlashCommandBuilder()

src/Commands/Staff/purge.ts

@@ -1,6 +1,6 @@
 import { captureException } from '@sentry/node';
 import { ChannelType, ChatInputCommandInteraction, EmbedBuilder, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
-import { getDb, toHuman } from '../../Utils/misc/utils';
+import { getDb, toHuman } from '../../Utils/utils';
 import emojis from '../../Utils/JSON/emoji.json';
 
 export default {

src/Events/guildCreate.ts

@@ -1,8 +1,8 @@
 import { EmbedBuilder, AuditLogEvent, Guild, ButtonBuilder, ActionRowBuilder, ButtonStyle } from 'discord.js';
-import { sendInFirst, constants } from '../Utils/misc/utils';
+import { sendInFirst, constants } from '../Utils/utils';
 import { stripIndents } from 'common-tags';
 import { captureException } from '@sentry/node';
-import wordFilter from '../Utils/misc/wordFilter';
+import wordFilter from '../Utils/wordFilter';
 import emojis from '../Utils/JSON/emoji.json';
 
 export default {

src/Events/guildDelete.ts

@@ -1,4 +1,4 @@
-import { constants, getDb } from '../Utils/misc/utils';
+import { constants, getDb } from '../Utils/utils';
 import { EmbedBuilder, Guild, TextChannel } from 'discord.js';
 import { captureException } from '@sentry/node';
 import { stripIndents } from 'common-tags';

src/Events/interactionCreate.ts

@@ -1,10 +1,10 @@
 import { Interaction } from 'discord.js';
-import { checkIfStaff } from '../Utils/misc/utils';
+import { checkIfStaff } from '../Utils/utils';
 import { captureException } from '@sentry/node';
 import logger from '../Utils/logger';
 import reactionButton from '../Scripts/reactions/reactionButton';
 import viewReactionsMenu from '../Scripts/reactions/viewReactionsMenu';
-import { formatErrorCode } from '../Utils/misc/errorHandler';
+import { formatErrorCode } from '../Utils/errorHandler';
 
 export default {
   name: 'interactionCreate',

src/Events/messageCreate.ts

@@ -3,10 +3,10 @@ import messageContentModifiers from '../Scripts/message/messageContentModifiers'
 import cleanup from '../Scripts/message/cleanup';
 import emojis from '../Utils/JSON/emoji.json';
 import { APIMessage, ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder, HexColorString, Message, User, WebhookClient, WebhookMessageCreateOptions } from 'discord.js';
-import { getDb } from '../Utils/misc/utils';
-import { censor } from '../Utils/misc/wordFilter';
+import { getDb } from '../Utils/utils';
+import { censor } from '../Utils/wordFilter';
 import { messageData } from '@prisma/client';
-import { HubSettingsBitField } from '../Utils/hubs/hubSettingsBitfield';
+import { HubSettingsBitField } from '../Utils/hubSettingsBitfield';
 
 export interface NetworkMessage extends Message {
   censored_content: string,

src/Events/messageReactionAdd.ts

@@ -1,7 +1,7 @@
 import { MessageReaction, PartialMessageReaction, PartialUser, User } from 'discord.js';
-import { getDb } from '../Utils/misc/utils';
+import { getDb } from '../Utils/utils';
 import updateMessageReactions from '../Scripts/reactions/updateMessage';
-import { HubSettingsBitField } from '../Utils/hubs/hubSettingsBitfield';
+import { HubSettingsBitField } from '../Utils/hubSettingsBitfield';
 
 export default {
   name: 'messageReactionAdd',

src/Events/ready.ts

@@ -1,6 +1,6 @@
 import { Client, OAuth2Scopes, PermissionFlagsBits } from 'discord.js';
-import { topgg } from '../Utils/misc/utils';
-import startTimers from '../Utils/misc/timers';
+import { topgg } from '../Utils/utils';
+import startTimers from '../Utils/timers';
 import logger from '../Utils/logger';
 
 export default {

src/Scripts/badge/add.ts

@@ -1,5 +1,5 @@
 import { ChatInputCommandInteraction, User } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 
 export default {
   async execute(

src/Scripts/badge/list.ts

@@ -1,5 +1,5 @@
 import { ChatInputCommandInteraction, User } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 
 export default {
   async execute(

src/Scripts/badge/remove.ts

@@ -1,5 +1,5 @@
 import { ChatInputCommandInteraction, User } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 
 export default {
   async execute(

src/Scripts/blacklist/list.ts

@@ -1,8 +1,8 @@
 import { hubs } from '@prisma/client';
 import { stripIndents } from 'common-tags';
 import { APIEmbedField, ChatInputCommandInteraction, EmbedBuilder } from 'discord.js';
-import { paginate } from '../../Utils/misc/paginator';
-import { constants, getDb } from '../../Utils/misc/utils';
+import { paginate } from '../../Utils/paginator';
+import { constants, getDb } from '../../Utils/utils';
 
 module.exports = {
   async execute(interaction: ChatInputCommandInteraction, hub: hubs) {

src/Scripts/blacklist/server.ts

@@ -2,8 +2,9 @@ import { hubs } from '@prisma/client';
 import { captureException } from '@sentry/node';
 import { logger } from '@sentry/utils';
 import { ChatInputCommandInteraction } from 'discord.js';
-import { getDb, addServerBlacklist } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 import { modActions } from '../networkLogs/modActions';
+import { addServerBlacklist, notifyBlacklist, scheduleUnblacklist } from '../../Utils/blacklist';
 
 export default {
   async execute(interaction: ChatInputCommandInteraction, hub: hubs) {
@@ -39,25 +40,23 @@ export default {
       }
 
       try {
-        await addServerBlacklist(server.id, { moderator: interaction.user, expires, reason, hubId: hub.id });
+        await addServerBlacklist(server.id, interaction.user, hub.id, reason, expires);
         await connectedList.delete({ where: { channelId: serverSetup?.channelId } });
-        interaction.followUp(`Blacklisted **${server.name}** for reason \`${reason}\`.`);
       }
       catch (err) {
         logger.error(err);
         captureException(err);
         interaction.followUp(`Failed to blacklist **${server.name}**. Enquire with the bot developer for more information.`);
       }
 
+      if (expires && interaction.guildId) scheduleUnblacklist('server', interaction.client, interaction.guildId, hub.id, expires);
+      await interaction.followUp(`Blacklisted **${server.name}** for reason \`${reason}\`.`);
+
+
       // TODO: Use embeds for notifications?
       if (serverSetup) {
-        try {
-          const channel = await interaction.client.channels.fetch(serverSetup.channelId);
-          if (channel?.isTextBased()) channel.send(`This server has been blacklisted from hub **${hub.name}** for reason \`${reason}\`.`);
-        }
-        catch {
-          /* empty */
-        }
+        const channel = await interaction.client.channels.fetch(serverSetup.channelId);
+        if (channel?.isTextBased()) notifyBlacklist(channel, hub.id, expires, reason).catch(() => null);
       }
     }
     else if (subCommandGroup == 'remove') {
@@ -69,7 +68,8 @@ export default {
       interaction.reply(`The server **${serverInBlacklist.serverName}** has been removed from the blacklist.`);
 
       modActions(interaction.user, {
-        dbGuild: serverInBlacklist,
+        serverId: serverInBlacklist.serverId,
+        serverName: serverInBlacklist.serverName,
         action: 'unblacklistServer',
         timestamp: new Date(),
         reason,

src/Scripts/blacklist/user.ts

@@ -1,8 +1,9 @@
 import { ChatInputCommandInteraction, EmbedBuilder } from 'discord.js';
 import { cancelJob } from 'node-schedule';
-import { getDb, addUserBlacklist } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 import { modActions } from '../networkLogs/modActions';
 import emojis from '../../Utils/JSON/emoji.json';
+import { addUserBlacklist, scheduleUnblacklist } from '../../Utils/blacklist';
 
 export default {
   async execute(interaction: ChatInputCommandInteraction) {
@@ -58,6 +59,8 @@ export default {
       }
 
       await addUserBlacklist(hubInDb.id, interaction.user, user, String(reason), expires);
+      if (expires) scheduleUnblacklist('user', interaction.client, user.id, hubInDb.id, expires);
+
       const successEmbed = new EmbedBuilder()
         .setDescription(`${emojis.normal.tick} **${user.username}** has been successfully blacklisted!`)
         .setColor('Green')

src/Scripts/find/server.ts

@@ -1,6 +1,6 @@
 import { EmbedBuilder, ChatInputCommandInteraction, Guild, GuildMember } from 'discord.js';
 import { stripIndents } from 'common-tags';
-import { constants, getDb, toTitleCase } from '../../Utils/misc/utils';
+import { constants, getDb, toTitleCase } from '../../Utils/utils';
 import emojis from '../../Utils/JSON/emoji.json';
 
 export default {

src/Scripts/find/user.ts

@@ -1,6 +1,6 @@
 import { EmbedBuilder, ChatInputCommandInteraction, User } from 'discord.js';
 import { stripIndents } from 'common-tags';
-import { constants, getDb } from '../../Utils/misc/utils';
+import { constants, getDb } from '../../Utils/utils';
 import emojis from '../../Utils/JSON/emoji.json';
 
 

src/Scripts/hub/browse.ts

@@ -1,6 +1,6 @@
 import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, ButtonStyle, ChannelSelectMenuBuilder, ChannelType, ChatInputCommandInteraction, EmbedBuilder, GuildTextBasedChannel, ModalBuilder, TextInputBuilder, TextInputStyle } from 'discord.js';
-import { calculateAverageRating, createHubListingsEmbed, getDb } from '../../Utils/misc/utils';
-import { paginate } from '../../Utils/misc/paginator';
+import { calculateAverageRating, createHubListingsEmbed, getDb } from '../../Utils/utils';
+import { paginate } from '../../Utils/paginator';
 import { hubs } from '@prisma/client';
 import { captureException } from '@sentry/node';
 import createConnection from '../network/createConnection';

src/Scripts/hub/connections.ts

@@ -1,6 +1,6 @@
 import { ChatInputCommandInteraction, EmbedBuilder } from 'discord.js';
-import { getDb, getGuildName } from '../../Utils/misc/utils';
-import { paginate } from '../../Utils/misc/paginator';
+import { getDb, getGuildName } from '../../Utils/utils';
+import { paginate } from '../../Utils/paginator';
 import { stripIndent } from 'common-tags';
 import emojis from '../../Utils/JSON/emoji.json';
 

src/Scripts/hub/create.ts

@@ -1,6 +1,6 @@
 import { ChatInputCommandInteraction, ModalBuilder, TextInputBuilder, EmbedBuilder, ActionRowBuilder, TextInputStyle, Collection } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
-import { HubSettingsBits } from '../../Utils/hubs/hubSettingsBitfield';
+import { getDb } from '../../Utils/utils';
+import { HubSettingsBits } from '../../Utils/hubSettingsBitfield';
 
 const cooldowns = new Collection<string, number>();
 

src/Scripts/hub/delete.ts

@@ -1,6 +1,6 @@
 import { captureException } from '@sentry/node';
 import { ChatInputCommandInteraction, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, ComponentType } from 'discord.js';
-import { deleteHubs, getDb } from '../../Utils/misc/utils';
+import { deleteHubs, getDb } from '../../Utils/utils';
 import logger from '../../Utils/logger';
 import emojis from '../../Utils/JSON/emoji.json';
 

src/Scripts/hub/invite.ts

@@ -2,7 +2,7 @@ import { captureException } from '@sentry/node';
 import { logger } from '@sentry/utils';
 import { stripIndents } from 'common-tags';
 import { ChatInputCommandInteraction, EmbedBuilder } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 import emojis from '../../Utils/JSON/emoji.json';
 
 export default {

src/Scripts/hub/join.ts

@@ -1,5 +1,5 @@
 import { ChatInputCommandInteraction, ChannelType } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 import createConnection from '../network/createConnection';
 import displaySettings from '../network/displaySettings';
 import emojis from '../../Utils/JSON/emoji.json';

src/Scripts/hub/joined.ts

@@ -1,6 +1,6 @@
 import { ChatInputCommandInteraction, EmbedBuilder } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
-import { paginate } from '../../Utils/misc/paginator';
+import { getDb } from '../../Utils/utils';
+import { paginate } from '../../Utils/paginator';
 import emojis from '../../Utils/JSON/emoji.json';
 
 export default {

src/Scripts/hub/leave.ts

@@ -1,5 +1,5 @@
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ChatInputCommandInteraction, ComponentType, EmbedBuilder } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 import emojis from '../../Utils/JSON/emoji.json';
 
 export default {

src/Scripts/hub/manage.ts

@@ -2,7 +2,7 @@ import { blacklistedServers, blacklistedUsers, connectedList, hubs } from '@pris
 import { captureException } from '@sentry/node';
 import { logger } from '@sentry/utils';
 import { ActionRowBuilder, ChatInputCommandInteraction, ComponentType, EmbedBuilder, ModalBuilder, StringSelectMenuBuilder, TextInputBuilder, TextInputStyle } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 import { stripIndents } from 'common-tags';
 import emojis from '../../Utils/JSON/emoji.json';
 

src/Scripts/hub/moderator.ts

@@ -1,5 +1,5 @@
 import { ChatInputCommandInteraction, EmbedBuilder } from 'discord.js';
-import { getDb } from '../../Utils/misc/utils';
+import { getDb } from '../../Utils/utils';
 
 export default {
   async execute(interaction: ChatInputCommandInteraction) {

src/Scripts/hub/settings.ts

@@ -1,7 +1,7 @@
 import { ActionRowBuilder, ChatInputCommandInteraction, ComponentType, EmbedBuilder, StringSelectMenuBuilder } from 'discord.js';
-import { constants, getDb } from '../../Utils/misc/utils';
+import { constants, getDb } from '../../Utils/utils';
 import { hubs } from '@prisma/client';
-import { HubSettingsBitField, HubSettingsString } from '../../Utils/hubs/hubSettingsBitfield';
+import { HubSettingsBitField, HubSettingsString } from '../../Utils/hubSettingsBitfield';
 import emojis from '../../Utils/JSON/emoji.json';
 
 const genSettingsEmbed = (hub: hubs, yesEmoji: string, noEmoji: string) => {

src/Scripts/message/addBadges.ts

@@ -1,6 +1,6 @@
 import { PrismaClient } from '@prisma/client';
 import { EmbedBuilder, Message } from 'discord.js';
-import { badgeToEmoji } from '../../Utils/misc/utils';
+import { badgeToEmoji } from '../../Utils/utils';
 
 export default {
   async execute(message: Message, database: PrismaClient, embed: EmbedBuilder, censoredEmbed: EmbedBuilder) {