Revert 92 eventmanager

.vscode/settings.json

@@ -1,4 +1,4 @@
 {
   "typescript.tsdk": "node_modules/typescript/lib",
-  "editor.formatOnSave": true
+  "editor.formatOnSave": false
 }

src/classes/event.ts

@@ -1,9 +1,9 @@
 import { ClientEvents } from 'discord.js';
 
-export default class Event<K extends keyof ClientEvents> {
+export default class Event {
   public once: boolean;
 
-  public event: K;
+  public event: keyof ClientEvents;
 
   public execute: (...args) => Promise<void>;
 
@@ -12,12 +12,12 @@ export default class Event<K extends keyof ClientEvents> {
     return this;
   }
 
-  setEvent(event: K) {
+  setEvent(event: keyof ClientEvents) {
     this.event = event;
     return this;
   }
 
-  setResponse(response: (...args: ClientEvents[K]) => Promise<void>) {
+  setResponse(response: (...args) => Promise<void>) {
     this.execute = response;
     return this;
   }

src/classes/guild.ts

@@ -1,7 +1,7 @@
 import db from '@db';
 import { Alias, Guild as PrismaGuild } from '@prisma/client';
 import logger from '@utils/logger';
-import { Client, Guild as DiscordGuild, Guild } from 'discord.js';
+import { Client, Guild as DiscordGuild } from 'discord.js';
 
 export default class DynamicaGuild {
   private client: Client<true>;
@@ -30,57 +30,23 @@ export default class DynamicaGuild {
     if (!this.id) {
       throw new Error('No Id defined.');
     }
-
     try {
-      const guild = await this.fetchPrisma();
-      const discordGuild = await this.fetchDiscord();
+      const guild = await db.guild.findUnique({
+        where: { id: this.id },
+        include: { aliases: true },
+      });
+      const discordGuild = await this.client.guilds.cache.get(this.id);
       if (guild && discordGuild) {
         this.prisma = guild;
         this.discord = discordGuild;
       }
+      return undefined;
     } catch (error) {
       logger.error("Couldn't fetch guild:", error);
     }
     return this;
   }
 
-  async fetchPrisma(): Promise<
-    PrismaGuild & {
-      aliases: Alias[];
-    }
-  > {
-    const guild = await db.guild.findUnique({
-      where: { id: this.id },
-      include: { aliases: true },
-    });
-    if (!guild) {
-      logger.info('fetch prisma');
-      return db.guild.create({
-        data: { id: this.id },
-        include: { aliases: true },
-      });
-    } else {
-      return guild;
-    }
-  }
-
-  async fetchDiscord(): Promise<DiscordGuild> {
-    const discord = await this.client.guilds.cache.get(this.id);
-    if (!discord) {
-      this.deletePrisma();
-      return undefined;
-    }
-    return discord;
-  }
-
-  async deletePrisma(): Promise<PrismaGuild | undefined> {
-    const guild = await db.guild.findUnique({ where: { id: this.id } });
-    if (!guild) {
-      return undefined;
-    }
-    return db.guild.delete({ where: { id: this.id } });
-  }
-
   /**
    * Change the setting allowing people to request to join a locked channel.
    * @param enabled the state to set the setting to
@@ -93,7 +59,7 @@ export default class DynamicaGuild {
     if (!this.id) {
       throw new Error('No Id defined');
     }
-    this.prisma = await db.guild.update({
+    const updatedGuild = await db.guild.update({
       where: { id: this.id },
       include: {
         aliases: true,
@@ -102,6 +68,8 @@ export default class DynamicaGuild {
         allowJoinRequests: enabled,
       },
     });
+
+    this.prisma = updatedGuild;
     return this;
   }
 
@@ -117,24 +85,15 @@ export default class DynamicaGuild {
     if (!this.id) {
       throw new Error('No Id defined');
     }
-    this.prisma = await db.guild.update({
+    const updatedGuild = await db.guild.update({
       where: { id: this.id },
       include: { aliases: true },
       data: {
         textChannelsEnabled: enabled,
       },
     });
-    return this;
-  }
 
-  /**
-   * Create a guild entry in prisma
-   */
-  async create(id: Guild['id']) {
-    return db.guild.create({
-      data: {
-        id,
-      },
-    });
+    this.prisma = updatedGuild;
+    return this;
   }
 }