feat: bug fixes and improvements

Author: mrepol742

.gitignore

@@ -5,5 +5,3 @@ dist
 .temp
 *.log
 *.env
-
-/src/generated/prisma

prisma/schema.prisma

@@ -6,7 +6,6 @@
 
 generator client {
   provider = "prisma-client-js"
-  output   = "../src/generated/prisma"
 }
 
 datasource db {

src/commands/quiz.ts

@@ -18,9 +18,6 @@ export default async function (msg: Message) {
   const id = Math.floor(Math.random() * quiz.length);
   const response = quiz[id];
 
-  if (response.length === 0)
-    return await msg.reply("I don't have any quiz questions right now...");
-
   let text = `
     \`${response.question}\`
   `;

src/commands/wyr.ts

@@ -1,4 +1,4 @@
-import { Message } from "../../types/message"
+import { Message } from "../../types/message";
 import { wyr } from "../components/utils/data";
 
 export const info = {
@@ -14,8 +14,6 @@ export default async function (msg: Message) {
   if (!/^wyr$/i.test(msg.body)) return;
 
   const response = wyr[Math.floor(Math.random() * wyr.length)];
-  if (response.length === 0)
-    return await msg.reply("I don't have any jokes right now...");
   const text = `
     \`Would you rather?\`
 

src/components/prisma.ts

@@ -1,6 +1,7 @@
-import { PrismaClient } from "../generated/prisma";
+import { PrismaClient } from "@prisma/client";
 
 const nodeEnv = process.env.NODE_ENV || "development";
+
 const globalForPrisma = globalThis as unknown as {
   prisma: PrismaClient | undefined;
 };

src/components/utils/data.ts

@@ -1,45 +1,21 @@
-import fs from "fs";
-import log from "./log";
-import path from "path";
-import LoadingBar from "./loadingBar";
+import greetings from "../../data/greetings.json";
+import ball from "../../data/8ball.json";
+import cat from "../../data/cat.json";
+import dyk from "../../data/dyk.json";
+import joke from "../../data/joke.json";
+import quiz from "../../data/quiz.json";
+import wyr from "../../data/wyr.json";
+import errors from "../../data/errors.json";
 
-function safeReadJSON(filePath: string) {
-  try {
-    return JSON.parse(
-      fs.readFileSync(path.resolve(__dirname, filePath), "utf-8")
-    );
-  } catch (error) {
-    log.error("Data", `Failed to read JSON from ${filePath}`, error);
-    return [];
-  }
-}
-
-const files: Record<string, string> = {
-  greetings: "../../data/greetings.json",
-  ball: "../../data/8ball.json",
-  cat: "../../data/cat.json",
-  dyk: "../../data/dyk.json",
-  joke: "../../data/joke.json",
-  quiz: "../../data/quiz.json",
-  wyr: "../../data/wyr.json",
-  errors: "../../data/errors.json",
+const files = {
+  greetings,
+  ball,
+  cat,
+  dyk,
+  joke,
+  quiz,
+  wyr,
+  errors,
 };
 
-const progressBar = LoadingBar(
-  "Loading Data     | {bar} | {value}/{total} {filename}"
-);
-
-progressBar.start(Object.keys(files).length, 0, {
-  filename: "",
-});
-
-const data: Record<string, any> = {};
-for (const [key, filePath] of Object.entries(files)) {
-  data[key] = safeReadJSON(filePath);
-  progressBar.increment(1, { filename: path.basename(filePath) });
-}
-
-progressBar.stop();
-
-const { greetings, ball, cat, dyk, joke, quiz, wyr, errors } = data;
 export { greetings, ball, cat, dyk, joke, quiz, wyr, errors };

tsconfig.json

@@ -11,8 +11,8 @@
     "rootDir": "./src",
     "strict": true,
     "moduleResolution": "node",
-    "skipLibCheck": true, 
-    "typeRoots": ["./node_modules/@types", "./types"]
+    "skipLibCheck": true,
+    "typeRoots": ["./node_modules/@types", "./types"],
   },
   "include": ["src"]
 }