chore: reorganize modules

Author: uetchy

.env.placeholder

@@ -1,9 +1,12 @@
-GOOGLE_CLIENT_ID=
-GOOGLE_CLIENT_SECRET=
-DISCORD_TOKEN=
-BOT_PREFIX=
 JWT_SECRET=
+
+DISCORD_CLIENT_ID=
+DISCORD_CLIENT_SECRET=
+
+DISCORD_TOKEN=
+DISCORD_GUILD_ID=
+
 HB_MONGO_URI=
 HB_TEST_CHANNEL_ID=
 HB_TEST_ORIGIN_CHANNEL_ID=
-HB_TEST_ORIGIN_CHANNEL_ID_NE=
+HB_TEST_ORIGIN_CHANNEL_ID_NE=

Dockerfile

@@ -7,4 +7,4 @@ RUN yarn install --frozen-lockfile
 COPY . .
 RUN yarn build
 
-CMD ["node", "./lib/server.js"]
+CMD ["node", "./lib/index.js"]

package.json

@@ -16,7 +16,7 @@
     "start": "node .",
     "test": "jest"
   },
-  "main": "./lib/server.js",
+  "main": "./lib/index.js",
   "files": [
     "lib"
   ],

src/modules/discord/auth.ts src/discord/auth.ts

@@ -2,10 +2,10 @@ import { APIConnection } from "discord-api-types";
 import { Request, Response, Router } from "express";
 import jwt from "jsonwebtoken";
 import fetch from "node-fetch";
-import { JWT_SECRET } from "../../constants";
-import { createOrUpdateUser } from "../../db";
-import { log } from "../../util";
-import { JwtToken } from "../auth";
+import { JWT_SECRET } from "../constants";
+import { createOrUpdateUser } from "../db";
+import { log } from "../util";
+import { JwtToken } from "./interfaces";
 
 const DISCORD_AUTHORIZE_URL = "https://discord.com/api/oauth2/authorize";
 const DISCORD_TOKEN_URL = "https://discord.com/api/oauth2/token";
@@ -51,7 +51,7 @@ async function getConnections(token: string): Promise<APIConnection[]> {
   return await res.json();
 }
 
-export function createDiscordOAuthHandler({
+export function createAuthHandler({
   clientId,
   clientSecret,
   redirectUri,

src/modules/discord/index.ts src/discord/bot.ts

@@ -1,7 +1,7 @@
 import { Client, Intents } from "discord.js";
-import { HB_MONGO_URI } from "../../constants";
-import { Honeybee } from "../../modules/honeybee";
-import { log } from "../../util";
+import { HB_MONGO_URI } from "../constants";
+import { Honeybee } from "../honeybee";
+import { log } from "../util";
 import { commands } from "./commands";
 import { CommandContext } from "./interfaces";
 

src/modules/discord/commands/index.ts src/discord/commands/index.ts

@@ -1,8 +1,7 @@
 import { SlashCommandBuilder } from "@discordjs/builders";
 import { CommandInteraction } from "discord.js";
-import { findOrCreateGuild } from "../../../db";
-import { log } from "../../../util";
-import { assertValidModerator } from "../util";
+import { findOrCreateGuild } from "../../db";
+import { log } from "../../util";
 
 export default {
   data: new SlashCommandBuilder()
@@ -54,3 +53,16 @@ Channel: https://www.youtube.com/channel/${channel}`,
     });
   },
 };
+
+async function assertValidModerator(intr: CommandInteraction) {
+  if (!(intr.channel && intr.channel.type === "GUILD_TEXT")) {
+    throw new Error("Invalid channel");
+  }
+
+  const hasPermission =
+    intr.channel.permissionsFor(intr.user)?.has("MANAGE_CHANNELS") ?? false;
+
+  if (!hasPermission) {
+    throw new Error("You are not allowed to run this command");
+  }
+}

src/modules/discord/commands/pair.ts src/discord/commands/pair.ts

@@ -1,7 +1,7 @@
 import { SlashCommandBuilder } from "@discordjs/builders";
 import { CommandInteraction, MessageEmbed, User } from "discord.js";
-import { getUserByDiscordId } from "../../../db";
-import { log } from "../../../util";
+import { getUserByDiscordId } from "../../db";
+import { log } from "../../util";
 import { Command, RoleChangeset } from "../interfaces";
 import { applyRoles } from "../phases/applyRoles";
 import { onboardingPhase } from "../phases/onboarding";

src/modules/discord/commands/verify.ts src/discord/commands/verify.ts

@@ -1,6 +1,6 @@
 import { REST } from "@discordjs/rest";
 import { Routes } from "discord-api-types/v9";
-import { DISCORD_TOKEN } from "../../constants";
+import { DISCORD_TOKEN } from "../constants";
 import { commands } from "./commands";
 
 const clientId = process.env.DISCORD_CLIENT_ID!;

src/modules/discord/deploy-commands.ts src/discord/deploy-commands.ts

@@ -1,7 +1,7 @@
 import { SlashCommandBuilder } from "@discordjs/builders";
 import { CommandInteraction } from "discord.js";
-import { Status } from "../../models/verification";
-import { Honeybee } from "../../modules/honeybee";
+import { Status } from "../models/verification";
+import { Honeybee } from "../honeybee";
 
 export interface CommandContext {
   hb: Honeybee;
@@ -18,3 +18,8 @@ export interface RoleChangeset {
   roleId: string;
   status: Status;
 }
+
+export interface JwtToken {
+  discordId: string;
+  iat: number;
+}

src/modules/discord/interfaces.ts src/discord/interfaces.ts

@@ -1,4 +1,4 @@
-import { CommandInteraction, Message } from "discord.js";
+import { CommandInteraction } from "discord.js";
 import { RoleChangeset } from "../interfaces";
 
 export async function applyRoles(

src/modules/discord/phases/applyRoles.ts src/discord/phases/applyRoles.ts

@@ -1,8 +1,8 @@
-import { Message, User } from "discord.js";
+import { User } from "discord.js";
 import jwt from "jsonwebtoken";
-import { JwtToken } from "../../auth";
-import { HOST, JWT_SECRET } from "../../../constants";
-import { log } from "../../../util";
+import { HOST, JWT_SECRET } from "../../constants";
+import { log } from "../../util";
+import { JwtToken } from "../interfaces";
 
 export function onboardingPhase(user: User) {
   log("onboardingPhase");

src/modules/discord/phases/onboarding.ts src/discord/phases/onboarding.ts

@@ -4,10 +4,10 @@ import {
   getRoleMapsForGuild,
   saveVerification,
   updateVerification,
-} from "../../../db";
-import { User } from "../../../models/user";
+} from "../../db";
+import { User } from "../../models/user";
 import { Honeybee } from "../../honeybee";
-import { log } from "../../../util";
+import { log } from "../../util";
 import { RoleChangeset } from "../interfaces";
 
 import { DateTime } from "luxon";

src/modules/discord/phases/verification.ts src/discord/phases/verification.ts

@@ -10,8 +10,8 @@ import {
   MONGODB_URL,
   PORT,
 } from "./constants";
-import { createBot } from "./modules/discord";
-import { createDiscordOAuthHandler } from "./modules/discord/auth";
+import { createBot } from "./discord/bot";
+import { createAuthHandler } from "./discord/auth";
 
 // setup db
 mongoose.connect(MONGODB_URL, {
@@ -23,7 +23,7 @@ mongoose.connect(MONGODB_URL, {
 // setup discord bot
 const bot = createBot();
 
-const discordOAuthHandler = createDiscordOAuthHandler({
+const discordOAuthHandler = createAuthHandler({
   clientId: DISCORD_CLIENT_ID,
   clientSecret: DISCORD_CLIENT_SECRET,
   redirectUri: `${HOST}/discord/callback`,

src/modules/honeybee/chat.ts src/honeybee/chat.ts

@@ -3,7 +3,7 @@
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
     "incremental": true,
-    "target": "es2019",
+    "target": "es2020",
     "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
     "sourceMap": false /* Generates corresponding '.map' file. */,
     "declaration": false,