Organize imports

src/commands/finduser.ts

@@ -1,7 +1,6 @@
-import { ApplicationIntegrationType, ChatInputCommandInteraction, Client, GuildBasedChannel, InteractionContextType, MessageFlags, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
-import { Database } from '../shared/Database';
-import { channelIsInStaffCategory, deferInteraction, getDiscordAlts, getE621User } from '../utils';
+import { ApplicationIntegrationType, ChatInputCommandInteraction, Client, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
 import { config } from '../config';
+import { deferInteraction, getDiscordAlts, getE621User } from '../utils';
 
 export default {
   name: 'finduser',

src/commands/github-mapping.ts

@@ -1,5 +1,4 @@
-import { ApplicationIntegrationType, BitFieldResolvable, ChatInputCommandInteraction, Client, GuildBasedChannel, InteractionContextType, MessageFlags, MessageMentions, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
-import { channelIsInStaffCategory, handleWhoIsInteraction } from '../utils';
+import { ApplicationIntegrationType, ChatInputCommandInteraction, Client, InteractionContextType, MessageFlags, MessageMentions, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
 import { Database } from '../shared/Database';
 
 const mentionRegex = new RegExp(MessageMentions.UsersPattern);

src/commands/name-sync.ts

@@ -1,8 +1,6 @@
-import { ApplicationIntegrationType, ChatInputCommandInteraction, Client, InteractionContextType, MessageFlags, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
-import { Database } from '../shared/Database';
-import { getE621User, syncName } from '../utils';
+import { ApplicationIntegrationType, ChatInputCommandInteraction, Client, InteractionContextType, MessageFlags, SlashCommandBuilder } from 'discord.js';
 import { config } from '../config';
-import { E621User } from '../types';
+import { syncName } from '../utils';
 
 export default {
   name: 'name-sync',

src/commands/records.ts

@@ -1,5 +1,5 @@
-import { ApplicationIntegrationType, BitFieldResolvable, ChatInputCommandInteraction, Client, GuildBasedChannel, InteractionContextType, MessageFlags, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
-import { channelIsInStaffCategory, deferInteraction, handleWhoIsInteraction } from '../utils';
+import { ApplicationIntegrationType, ChatInputCommandInteraction, Client, InteractionContextType, MessageFlags, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
+import { deferInteraction } from '../utils';
 import { getRecordMessageFromDiscordId } from '../utils/record-utils';
 
 export default {

src/commands/settings.ts

@@ -1,5 +1,4 @@
-import { ApplicationIntegrationType, ChannelType, ChatInputCommandInteraction, Client, InteractionContextType, MessageFlags, PermissionFlagsBits, RateLimitError, SlashCommandBuilder } from 'discord.js';
-import { msToHuman } from '../utils';
+import { ApplicationIntegrationType, ChannelType, ChatInputCommandInteraction, Client, InteractionContextType, MessageFlags, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
 import { Database } from '../shared/Database';
 
 export default {

src/commands/softban.ts

@@ -1,6 +1,5 @@
-import { ApplicationIntegrationType, BitFieldResolvable, ChatInputCommandInteraction, Client, GuildBasedChannel, GuildMember, InteractionContextType, MessageFlags, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
-import { channelIsInStaffCategory, deferInteraction, handleWhoIsInteraction } from '../utils';
-import { getRecordMessageFromDiscordId } from '../utils/record-utils';
+import { ApplicationIntegrationType, ChatInputCommandInteraction, Client, GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
+import { deferInteraction } from '../utils';
 
 export default {
   name: 'softban',

src/commands/whois.ts

@@ -1,4 +1,4 @@
-import { ApplicationIntegrationType, BitFieldResolvable, ChatInputCommandInteraction, Client, GuildBasedChannel, InteractionContextType, MessageFlags, MessageMentions, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
+import { ApplicationIntegrationType, ChatInputCommandInteraction, Client, GuildBasedChannel, InteractionContextType, MessageMentions, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
 import { channelIsInStaffCategory, handleWhoIsInteraction } from '../utils';
 
 const mentionRegex = new RegExp(MessageMentions.UsersPattern);

src/context-menus/add-note.ts

@@ -1,5 +1,4 @@
-import { ApplicationIntegrationType, Client, InteractionContextType, PermissionFlagsBits, ContextMenuCommandBuilder, ApplicationCommandType, UserContextMenuCommandInteraction, GuildBasedChannel, ModalBuilder, TextInputBuilder, GuildMember, TextInputStyle, ActionRowBuilder } from 'discord.js';
-import { channelIsInStaffCategory, deferInteraction, getNoteMessage, handleWhoIsInteraction } from '../utils';
+import { ActionRowBuilder, ApplicationCommandType, ApplicationIntegrationType, Client, ContextMenuCommandBuilder, InteractionContextType, ModalBuilder, PermissionFlagsBits, TextInputBuilder, TextInputStyle, UserContextMenuCommandInteraction } from 'discord.js';
 
 export default {
   name: 'Add Note',

src/context-menus/list-notes.ts

@@ -1,5 +1,5 @@
-import { ApplicationIntegrationType, Client, InteractionContextType, PermissionFlagsBits, ContextMenuCommandBuilder, ApplicationCommandType, UserContextMenuCommandInteraction, GuildBasedChannel } from 'discord.js';
-import { channelIsInStaffCategory, deferInteraction, getNoteMessage, handleWhoIsInteraction } from '../utils';
+import { ApplicationCommandType, ApplicationIntegrationType, Client, ContextMenuCommandBuilder, InteractionContextType, PermissionFlagsBits, UserContextMenuCommandInteraction } from 'discord.js';
+import { deferInteraction, getNoteMessage } from '../utils';
 
 export default {
   name: 'List Notes',

src/context-menus/records.ts

@@ -1,5 +1,5 @@
-import { ApplicationIntegrationType, Client, InteractionContextType, PermissionFlagsBits, ContextMenuCommandBuilder, ApplicationCommandType, UserContextMenuCommandInteraction, GuildBasedChannel, MessageFlags } from 'discord.js';
-import { channelIsInStaffCategory, deferInteraction, getRecordMessageFromDiscordId, handleWhoIsInteraction } from '../utils';
+import { ApplicationCommandType, ApplicationIntegrationType, Client, ContextMenuCommandBuilder, InteractionContextType, PermissionFlagsBits, UserContextMenuCommandInteraction } from 'discord.js';
+import { deferInteraction, getRecordMessageFromDiscordId } from '../utils';
 
 export default {
   name: 'Get Records',

src/context-menus/sync-name.ts

@@ -1,7 +1,7 @@
-import { ApplicationIntegrationType, Client, InteractionContextType, PermissionFlagsBits, ContextMenuCommandBuilder, ApplicationCommandType, UserContextMenuCommandInteraction, GuildBasedChannel, MessageFlags, ActionRowBuilder, ModalBuilder, TextInputBuilder, TextInputStyle } from 'discord.js';
-import { channelIsInStaffCategory, deferInteraction, getRecordMessageFromDiscordId, handleWhoIsInteraction, syncName } from '../utils';
-import { Database } from '../shared/Database';
+import { ActionRowBuilder, ApplicationCommandType, ApplicationIntegrationType, Client, ContextMenuCommandBuilder, InteractionContextType, ModalBuilder, PermissionFlagsBits, TextInputBuilder, TextInputStyle, UserContextMenuCommandInteraction } from 'discord.js';
 import { config } from '../config';
+import { Database } from '../shared/Database';
+import { deferInteraction, syncName } from '../utils';
 
 export default {
   name: 'Sync Name',

src/events/handle-member-join.ts

@@ -1,7 +1,6 @@
-import { Guild, GuildMember, GuildTextBasedChannel } from 'discord.js';
+import { GuildMember, GuildTextBasedChannel } from 'discord.js';
 import { Database } from '../shared/Database';
-import { config } from '../config';
-import { getE621Alts, userIsBanned } from '../utils';
+import { getE621Alts } from '../utils';
 
 export async function handleMemberJoin(member: GuildMember) {
   const guildSettings = await Database.getGuildSettings(member.guild.id);

src/events/handle-voice-state-update.ts

@@ -1,4 +1,4 @@
-import { Guild, GuildMember, GuildTextBasedChannel, time, TimestampStyles, VoiceBasedChannel, VoiceState } from 'discord.js';
+import { Guild, GuildMember, GuildTextBasedChannel, time, VoiceBasedChannel, VoiceState } from 'discord.js';
 import { Database } from '../shared/Database';
 
 export async function handleVoiceStateUpdate(oldState: VoiceState, newState: VoiceState) {

src/utils/channel-utils.ts

@@ -1,4 +1,4 @@
-import { Channel, GuildBasedChannel, GuildChannel, GuildTextBasedChannel, TextBasedChannel, VoiceBasedChannel } from 'discord.js';
+import { GuildBasedChannel } from 'discord.js';
 import { Database } from '../shared/Database';
 
 export async function channelIsInStaffCategory(channel: GuildBasedChannel) {

src/utils/e621-utils.ts

@@ -1,7 +1,5 @@
-import { Guild } from 'discord.js';
 import { config } from '../config';
 import { E621Post, E621User, Record } from '../types';
-import { Database } from '../shared/Database';
 
 const BLACKLISTED_TAGS: string[] = [];
 const BLACKLISTED_NONSAFE_TAGS: string[] = ['young'];

src/utils/name-sync.ts

@@ -1,8 +1,7 @@
+import { ChatInputCommandInteraction, GuildMember, ModalSubmitInteraction, UserContextMenuCommandInteraction } from 'discord.js';
+import { Database } from '../shared/Database';
 import { E621User } from '../types';
 import { getE621User } from './e621-utils';
-import { Database } from '../shared/Database';
-import { config } from '../config';
-import { ChatInputCommandInteraction, GuildMember, ModalSubmitInteraction, UserContextMenuCommandInteraction } from 'discord.js';
 
 export async function syncName(interaction: ChatInputCommandInteraction | UserContextMenuCommandInteraction | ModalSubmitInteraction, member: GuildMember, id: number | null) {
   if (member.roles.highest.comparePositionTo(member.guild.members.me!.roles.highest) > 0) {

src/utils/note-utils.ts

@@ -1,4 +1,4 @@
-import { ActionRowBuilder, APIEmbedField, ButtonBuilder, ButtonStyle, EmbedBuilder, GuildMember, MessageActionRowComponentBuilder, time } from 'discord.js';
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle, time } from 'discord.js';
 import { Database } from '../shared/Database';
 import { MessageContent, Note } from '../types';
 

src/utils/record-utils.ts

@@ -1,9 +1,8 @@
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle, Embed, EmbedBuilder, Guild } from 'discord.js';
-import { Database } from '../shared/Database';
-import { E621User, MessageContent, Record, RecordCategory } from '../types';
-import { getE621User, getUserRecords } from './e621-utils';
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder, Guild } from 'discord.js';
 import { config } from '../config';
-import { e621IdsFromAltData, comprehensiveAltLookupFromDiscord } from './alt-utils';
+import { E621User, MessageContent, Record, RecordCategory } from '../types';
+import { comprehensiveAltLookupFromDiscord, e621IdsFromAltData } from './alt-utils';
+import { getE621User, getUserRecords } from './e621-utils';
 
 type RecordWithUserData = Record & { user: E621User, creator: E621User, updater: E621User }
 type AllRecords = RecordWithUserData[];