misc fixes

discord/commands/Whois.ts

@@ -1,103 +1,139 @@
-import DiscordInteractionCommand from "../../util/DiscordInteractionCommand";
+import DiscordInteractionCommand from '../../util/DiscordInteractionCommand';
-import { MemberModel } from "../../database/Member";
+import { MemberModel } from '../../database/Member';
-import Partner, { PartnerCommissionType, PartnerDepartment, PartnerModel, PartnerRoleType } from "../../database/Partner";
+import Partner, {
-import { ChatInputCommandInteraction, EmbedBuilder, GuildMember } from "discord.js";
+  PartnerCommissionType,
-import MemberUtil from "../../util/MemberUtil";
+  PartnerDepartment,
-import EmojiConfig from "../../util/EmojiConfig"
+  PartnerModel,
+  PartnerRoleType,
+} from '../../database/Partner';
+import {
+  ChatInputCommandInteraction,
+  EmbedBuilder,
+  GuildMember,
+} from 'discord.js';
+import MemberUtil from '../../util/MemberUtil';
+import EmojiConfig from '../../util/EmojiConfig';
 
 export default class Whois extends DiscordInteractionCommand {
-    constructor() {
+  constructor() {
-        super("whois", "Retrieves information about a user.");
+    super('whois', 'Retrieves information about a user.');
-        this.builder.addUserOption(option => option.setName("member").setDescription("The member to get information about.").setRequired(true));
+    this.builder.addUserOption((option) =>
-    }
+      option
+        .setName('member')
+        .setDescription('The member to get information about.')
+        .setRequired(true)
+    );
+  }
 
-    public async execute(interaction: ChatInputCommandInteraction) {
+  public async execute(interaction: ChatInputCommandInteraction) {
-        // defer our reply and perform database/external API operations/lookups
+    // defer our reply and perform database/external API operations/lookups
-        await interaction.deferReply({ ephemeral: false });
+    await interaction.deferReply({ ephemeral: false });
-        const target = interaction.options.getUser("member", true);
+    const target = interaction.options.getUser('member', true);
-        const guild = interaction.guild || interaction.client.guilds.cache.get(this.GUILD_ID);
+    const guild =
-        const guildMember = await guild?.members.fetch(target.id);
+      interaction.guild || interaction.client.guilds.cache.get(this.GUILD_ID);
-        const databaseMember = await MemberModel.findOne({ discordID: target.id });
+    const guildMember = await guild?.members.fetch(target.id);
-        const partner = await PartnerModel.findOne({ discordID: target.id });
+    const databaseMember = await MemberModel.findOne({ discordID: target.id });
-        // return an error if target was not located
+    const partner = await PartnerModel.findOne({ discordID: target.id });
-        if (!guildMember) return interaction.editReply({ content: `Member target ${target.id} was not located.`});
+    // return an error if target was not located
-        // build our embed
+    if (!guildMember)
-        const embed = new EmbedBuilder();
+      return interaction.editReply({
-        // if the role type is managerial, add a [k] to the end of the name
+        content: `Member target ${target.id} was not located.`,
-        // if the partner exists, set the iconURL to the organizational logo
+      });
-        const formattedName = MemberUtil.formatName(guildMember, partner);
+    // build our embed
-        embed.setAuthor({ name: formattedName.text, iconURL: formattedName.iconURL });
+    const embed = new EmbedBuilder();
-        // set the thumbnail to the user's avatar
+    // if the role type is managerial, add a [k] to the end of the name
-        embed.setThumbnail(guildMember.user.displayAvatarURL());
+    // if the partner exists, set the iconURL to the organizational logo
-        // initialize the description string
+    const formattedName = MemberUtil.formatName(guildMember, partner);
-        let embedDescription = '';
+    embed.setAuthor({
-        if (partner) {
+      name: formattedName.text,
-            // set the title to the partner's title if applicable
+      iconURL: formattedName.iconURL,
-            if (partner.title) embedDescription += `## __${EmojiConfig.LOC} ${partner.title}__\n`;
+    });
-            embedDescription += "### Partner Information\n";
+    // set the thumbnail to the user's avatar
-            if (partner.emailAddress) embedDescription += `**Email Address**: ${partner.emailAddress}\n`;
+    embed.setThumbnail(guildMember.user.displayAvatarURL());
-            switch (partner.department) {
+    // initialize the description string
-                case PartnerDepartment.ENGINEERING:
+    let embedDescription = '';
-                    embedDescription += "**Department**: Dept. of Engineering\n";
+    if (partner) {
-                    break;
+      // set the title to the partner's title if applicable
-                case PartnerDepartment.OPERATIONS:
+      if (partner.title)
-                    embedDescription += "**Department**: Dept. of Operations\n";
+        embedDescription += `## __${EmojiConfig.LOC} ${partner.title}__\n`;
-                    break;
+      embedDescription += '### Partner Information\n';
-                case PartnerDepartment.INDEPENDENT_AGENCY:
+      if (partner.emailAddress)
-                    embedDescription += "**Department**: Independent Agency/Contractor\n";
+        embedDescription += `**Email Address**: ${partner.emailAddress}\n`;
-                    break;
+      switch (partner.department) {
-            }
+        case PartnerDepartment.ENGINEERING:
-            switch (partner.commissionType) {
+          embedDescription += '**Department**: Dept. of Engineering\n';
-                case PartnerCommissionType.TENURE:
+          break;
-                    embedDescription += "**Commission Type**: Tenure\n";
+        case PartnerDepartment.OPERATIONS:
-                    break;
+          embedDescription += '**Department**: Dept. of Operations\n';
-                case PartnerCommissionType.PROVISIONAL:
+          break;
-                    embedDescription += "**Commission Type**: Provisional\n";
+        case PartnerDepartment.INDEPENDENT_AGENCY:
-                    break;
+          embedDescription += '**Department**: Independent Agency/Contractor\n';
-                case PartnerCommissionType.CONTRACTUAL:
+          break;
-                    embedDescription += "**Commission Type**: Contractual/Independent/Collaborator\n";
+      }
-                    break;
+      switch (partner.commissionType) {
-                case PartnerCommissionType.ACTING:
+        case PartnerCommissionType.TENURE:
-                    embedDescription += "**Commission Type**: Acting\n";
+          embedDescription += '**Commission Type**: Tenure\n';
-                    break;
+          break;
-                case PartnerCommissionType.INTERIM:
+        case PartnerCommissionType.PROVISIONAL:
-                    embedDescription += "**Commission Type**: Interim\n";
+          embedDescription += '**Commission Type**: Provisional\n';
-                    break;
+          break;
-                case PartnerCommissionType.TRIAL:
+        case PartnerCommissionType.CONTRACTUAL:
-                    embedDescription += "**Commission Type**: Trial/Intern\n";
+          embedDescription +=
-                    break;
+            '**Commission Type**: Contractual/Independent/Collaborator\n';
-            }
+          break;
-            if (partner.directReport) {
+        case PartnerCommissionType.ACTING:
-                if (partner.directReport instanceof Partner) {
+          embedDescription += '**Commission Type**: Acting\n';
-                    embedDescription += `**Direct Report**: ${partner.directReport.title}\n`;
+          break;
-                }
+        case PartnerCommissionType.INTERIM:
-            }
+          embedDescription += '**Commission Type**: Interim\n';
+          break;
+        case PartnerCommissionType.TRIAL:
+          embedDescription += '**Commission Type**: Trial/Intern\n';
+          break;
+      }
+      if (partner.directReport) {
+        if (partner.directReport instanceof Partner) {
+          embedDescription += `**Direct Report**: ${partner.directReport.title}\n`;
         }
-        embed.setColor(guildMember.displayColor);
+      }
-        if (embedDescription?.length > 0) embed.setDescription(embedDescription);
-        // add status to embed
-        if (guildMember.presence?.status) { // TODO: this currently doesn't work for some reason
-            switch (guildMember.presence.status) {
-                case "online":
-                    embed.addFields({ name: "Status", value: "Online", inline: true });
-                    break;
-                case "idle":
-                    embed.addFields({ name: "Status", value: "Idle", inline: true });
-                    break;
-                case "dnd":
-                    embed.addFields({ name: "Status", value: "Do Not Disturb", inline: true });
-                    break;
-                case "offline" || "invisible":
-                    embed.addFields({ name: "Status", value: "Online", inline: true });
-                    break;
-                default:
-                    // TODO: decide what placeholder we should use for values that fall "out of range"
-                    embed.addFields({ name: "Status", value: "", inline: true });
-                    break;
-            }
-        }
-        embed.setFooter({ text: `Discord ID: ${guildMember.id}${databaseMember ? `Internal ID: ${databaseMember?._id}` : ''}` });
-
-        return await interaction.editReply({ embeds: [embed] });
     }
+    embed.setColor(guildMember.displayColor);
+    if (embedDescription?.length > 0) embed.setDescription(embedDescription);
+    // add status to embed
+    if (guildMember.presence?.status) {
+      // TODO: this currently doesn't work for some reason
+      switch (guildMember.presence.status) {
+        case 'online':
+          embed.addFields({ name: 'Status', value: 'Online', inline: true });
+          break;
+        case 'idle':
+          embed.addFields({ name: 'Status', value: 'Idle', inline: true });
+          break;
+        case 'dnd':
+          embed.addFields({
+            name: 'Status',
+            value: 'Do Not Disturb',
+            inline: true,
+          });
+          break;
+        case 'offline':
+          embed.addFields({ name: 'Status', value: 'Offline', inline: true });
+          break;
+        case 'invisible':
+          embed.addFields({ name: 'Status', value: 'invisible', inline: true });
+          break;
+        default:
+          // TODO: decide what placeholder we should use for values that fall "out of range"
+          embed.addFields({ name: 'Status', value: '', inline: true });
+          break;
+      }
+    }
+    embed.setFooter({
+      text: `Discord ID: ${guildMember.id}${
+        databaseMember ? `Internal ID: ${databaseMember?._id}` : ''
+      }`,
+    });
+
+    return await interaction.editReply({ embeds: [embed] });
+  }
 }

index.ts

@@ -1,77 +1,88 @@
-import { Client, GatewayIntentBits, Partials, REST, Routes } from "discord.js";
+import { Client, GatewayIntentBits, Partials, REST, Routes } from 'discord.js';
-import { discordBotToken, discordClientID } from "./config.json"
+import { discordBotToken, discordClientID, MongoDbUrl } from './config.json';
-import Collection from "./util/Collection";
+import Collection from './util/Collection';
-import DiscordInteractionCommand from "./util/DiscordInteractionCommand";
+import DiscordInteractionCommand from './util/DiscordInteractionCommand';
-import DiscordEvent from "./util/DiscordEvent";
+import DiscordEvent from './util/DiscordEvent';
-import * as DiscordInteractionCommandsIndex from "./discord/commands";
+import * as DiscordInteractionCommandsIndex from './discord/commands';
-import * as DiscordEventsIndex from "./discord/events";
+import * as DiscordEventsIndex from './discord/events';
-import mongoose from "mongoose";
+import mongoose from 'mongoose';
 
-export const DiscordInteractionCommands: Collection<DiscordInteractionCommand> = new Collection();
+export const DiscordInteractionCommands: Collection<DiscordInteractionCommand> =
+  new Collection();
 export const DiscordEvents: Collection<DiscordEvent> = new Collection();
 
 // Instantiates a new Discord client
 const discordClient = new Client({
-    intents: [
+  intents: [
-        GatewayIntentBits.DirectMessages,
+    GatewayIntentBits.DirectMessages,
-        GatewayIntentBits.GuildIntegrations,
+    GatewayIntentBits.GuildIntegrations,
-        GatewayIntentBits.GuildPresences,
+    GatewayIntentBits.GuildPresences,
-        GatewayIntentBits.GuildMessages,
+    GatewayIntentBits.GuildMessages,
-        GatewayIntentBits.Guilds,
+    GatewayIntentBits.Guilds,
-        GatewayIntentBits.GuildInvites,
+    GatewayIntentBits.GuildInvites,
-        GatewayIntentBits.GuildModeration,
+    GatewayIntentBits.GuildModeration,
-    ],
+  ],
-    partials: [ Partials.GuildMember, Partials.Message, Partials.User, Partials.Channel, ],
+  partials: [
+    Partials.GuildMember,
+    Partials.Message,
+    Partials.User,
+    Partials.Channel,
+  ],
 });
 const discordREST = new REST().setToken(discordBotToken);
 // const stripeClient = new Stripe(stripeToken, { typescript: true });
 
 export async function main() {
-    // Connect to the databases
+  // Connect to the databases
-    try {
+  try {
-        mongoose.connection.once("open", () => {
+    //@ts-ignore
-            console.info("[Info - Database] Connected to MongoDB");
+    mongoose.connection.once('open', () => {
-        })
+      console.info('[Info - Database] Connected to MongoDB');
-        // TODO: Fetch the MongoDB URI from the config file
+    });
-        await mongoose.connect("mongodb://localhost:27017/crra-main", {});
+    // TODO: Fetch the MongoDB URI from the config file
-    } catch (error) {
+    await mongoose.connect(MongoDbUrl, {});
-        console.error(`[Error - Database] Failed to connect to MongoDB: ${error}`);
+  } catch (error) {
-        process.exit(1);
+    console.error(`[Error - Database] Failed to connect to MongoDB: ${error}`);
-    }
+    process.exit(1);
-    // Load Discord interaction commands
+  }
-    for (const Command of Object.values(DiscordInteractionCommandsIndex)) {
+  // Load Discord interaction commands
-        const instance = new Command();
+  for (const Command of Object.values(DiscordInteractionCommandsIndex)) {
-        DiscordInteractionCommands.add(instance.name, instance);
+    const instance = new Command();
-        console.info(`[Info - Discord] Loaded interaction command: ${instance.name}`);
+    DiscordInteractionCommands.add(instance.name, instance);
-    }
+    console.info(
-    // Load Discord events
+      `[Info - Discord] Loaded interaction command: ${instance.name}`
-    for (const Event of Object.values(DiscordEventsIndex)) {
+    );
-        const instance = new Event(discordClient);
+  }
-        DiscordEvents.add(instance.name, instance);
+  // Load Discord events
-        discordClient.on(instance.name, instance.execute);
+  for (const Event of Object.values(DiscordEventsIndex)) {
-        console.info(`[Info - Discord] Loaded event: ${instance.name}`);
+    const instance = new Event(discordClient);
-    }
+    DiscordEvents.add(instance.name, instance);
-    await discordClient.login(discordBotToken);
+    discordClient.on(instance.name, instance.execute);
+    console.info(`[Info - Discord] Loaded event: ${instance.name}`);
+  }
+  await discordClient.login(discordBotToken);
 
-    try {
+  try {
-        console.log(`Started refreshing ${DiscordInteractionCommands.size} application (/) commands.`);
+    console.log(
-        const interactionCommandsData = [];
+      `Started refreshing ${DiscordInteractionCommands.size} application (/) commands.`
-        for (const command of DiscordInteractionCommands.values()) {
+    );
-            interactionCommandsData.push(command.builder.toJSON());
+    const interactionCommandsData = [];
-        }
+    for (const command of DiscordInteractionCommands.values()) {
-
+      interactionCommandsData.push(command.builder.toJSON());
-        // The put method is used to fully refresh all commands in the guild with the current set
-        const data = await discordREST.put(
-            Routes.applicationCommands(discordClientID),
-            { body: interactionCommandsData },
-        );
-
-        // @ts-ignore
-        console.log(`Successfully reloaded ${data?.length} application (/) commands.`);
-    } catch (error) {
-        // And of course, make sure you catch and log any errors!
-        console.error(error);
     }
+
+    // The put method is used to fully refresh all commands in the guild with the current set
+    const data = await discordREST.put(
+      Routes.applicationCommands(discordClientID),
+      { body: interactionCommandsData }
+    );
+    console.log(
+      `Successfully reloaded ${interactionCommandsData?.length} application (/) commands.`
+    );
+  } catch (error) {
+    // And of course, make sure you catch and log any errors!
+    console.error(error);
+  }
 }
 
 main();

package.json

@@ -1,4 +1,7 @@
 {
+  "scripts": {
+    "start": "npx tsc && node dist/index.js"
+  },
   "devDependencies": {
     "@types/uuid": "^9.0.8",
     "ts-node": "^10.9.2",

tsconfig.json

@@ -11,11 +11,11 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
-    "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
+    "experimentalDecorators": true /* Enable experimental support for legacy experimental decorators. */,
-    "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
+    "emitDecoratorMetadata": true /* Emit design-type metadata for decorated declarations in source files. */,
     // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
     // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
     // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
@@ -25,7 +25,7 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
+    "module": "commonjs" /* Specify what module code is generated. */,
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
@@ -39,7 +39,7 @@
     // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
     // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
     // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
-    "resolveJsonModule": true,                        /* Enable importing .json files. */
+    "resolveJsonModule": true /* Enable importing .json files. */,
     // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
     // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
 
@@ -55,7 +55,7 @@
     // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
     // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+    "outDir": "./dist" /* Specify an output folder for all emitted files. */,
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
@@ -77,12 +77,12 @@
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
     // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
     // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
     // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
 
     /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
+    "strict": true /* Enable all strict type-checking options. */,
     // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
     // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
@@ -104,6 +104,6 @@
 
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
   }
 }