Fix inconsistent logging to discord

Author: Rikthepixel

src/clients/discord.ts

@@ -9,6 +9,10 @@ export interface IClient extends Client {
     commands: Map<string, Command>;
     addCommand: (command: Command) => void;
     saveCommands: () => Promise<void>;
+    /*
+    * Waits for client to be ready, if it is already ready it will immidiately resolve
+    */
+    awaitReady: () => Promise<void>;
 }
 
 const client = new Client({
@@ -50,4 +54,14 @@ client.on("interactionCreateHook", (interaction: Interaction) => {
     command.execute(interaction);
 });
 
+client.awaitReady = async function () {
+    const isReady = this.isReady();
+    if (isReady) return;
+
+    return new Promise((resolve) => {
+        this.on("ready", () => resolve());
+    });
+
+};
+
 export default client;

src/index.ts

@@ -6,16 +6,13 @@ import router from "./routes";
 import poweredBy from "./middleware/poweredBy";
 import cors from "./middleware/cors";
 
-// import "./commands";
-
 const app = new Koa();
 
 app
+    .use(poweredBy("rocket-fuel (koa)"))
+    .use(router.allowedMethods())
     .use(cors({
-        allowMethods: ["GET", "POST", "DELETE"],
         origin: ["https://www.commitrocket.com", "https://commitrocket.com", "http://localhost:3000"]
     }))
-    .use(poweredBy("rocket-fuel (koa)"))
     .use(router.routes())
-    .use(router.allowedMethods())
     .listen(3001, async () => console.log("Server started on port 3001 (http://localhost:3001)"));

src/routes/email.ts

@@ -1,5 +1,6 @@
 import Router from "koa-zod-router";
 import { z } from "zod";
+
 import db from "../storage/db";
 import { logToChannel } from "../storage/discord";
 import { sanitizeHtml } from "../utils/sanitize";
@@ -27,6 +28,7 @@ const successResponse: z.infer<typeof subscriptionResponseSchema> = {
 };
 
 router.post("/subscribe", async (ctx) => {
+    
     const body = ctx.request.body;
     const mailingList = db.collection("mailing-list");
 
@@ -38,9 +40,10 @@ router.post("/subscribe", async (ctx) => {
         ctx.body = successResponse;
         return;
     }
+
     await Promise.all([
-        mailingList.set(body.email, newSubscriber, {}),
-        logToChannel(body.email, process.env.DISCORD_MAIL_CHANNEL!)
+        logToChannel(body.email, process.env.DISCORD_MAIL_CHANNEL!),
+        mailingList.set(body.email, newSubscriber, {})
     ]);
 
     ctx.body = successResponse;

src/routes/feedback.ts

@@ -1,7 +1,6 @@
 import Router from "koa-zod-router";
-import { v4 as generateUuidV4 } from "uuid";
 import { z } from "zod";
-import db from "../storage/db";
+
 import { logToChannel } from "../storage/discord";
 import { sanitizeHtml } from "../utils/sanitize";
 

src/storage/db.ts

@@ -1,6 +1,5 @@
 import CyclicDb from "@cyclic.sh/dynamodb";
 import CyclicItem from "@cyclic.sh/dynamodb/dist/cy_db_item";
-import CyclicCollection from "@cyclic.sh/dynamodb/dist/cy_db_collection";
 import CyclicIndex from "@cyclic.sh/dynamodb/dist/cy_db_index";
 
 interface QueryResults<ResultType extends any> {

src/storage/discord.ts

@@ -2,15 +2,14 @@ import { ChannelType } from "discord.js";
 import client from "../clients/discord";
 
 export const logToChannel = async (text: string, channelID: string) => {
-    const channel = await client.channels.fetch(channelID, { cache: true });
+    await client.awaitReady();
+    const channel = await client.channels.fetch(channelID);
 
-    if (!channel)
-        throw new Error("Channel doesn't exist");
-
-    if (channel.type !== ChannelType.GuildText)
-        throw new Error("Channel needs to be a Text-based channel");
+    if (!channel) throw new Error("Channel doesn't exist");
+    if (channel.type !== ChannelType.GuildText) throw new Error("Channel needs to be a Text-based channel");
 
     await channel.send({
         content: text,
     });
+    return true;
 };