🤔 Updated Events to no longer take any

wiki-Bird · Aug 15, 2023 · 420b1e1 · 420b1e1
1 parent 098d07f
commit 420b1e1
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 20 deletions.
diff --git a/src/events/buttonInteraction.ts b/src/events/buttonInteraction.ts
@@ -1,7 +1,9 @@
+import { ButtonInteraction } from 'discord.js';
 import Event from '../types/Event';
 
 
-const buttonInteraction: Event = {
+// const buttonInteraction: Event = {
+const buttonInteraction: Event<[ButtonInteraction]> = {
     name: 'buttonInteraction',
     execute: function (){
         console.log("Button interaction event fired.");

diff --git a/src/events/guildBanAdd.ts b/src/events/guildBanAdd.ts
@@ -5,7 +5,8 @@ import { MessageEmbed, TextChannel, GuildBan  } from 'discord.js';
 import Event from '../types/Event';
 import { ref } from '..';
 
-const guildBanAdd: Event = {
+// const guildBanAdd: Event = {
+const guildBanAdd: Event<[GuildBan]> = {
     name: 'guildBanAdd',
     execute: async function (ban: GuildBan) {
         let channelToSend;
@@ -21,10 +22,10 @@ const guildBanAdd: Event = {
 
         if (!latestBan) return console.log(`${ban.user.tag} was banned from ${ban.guild.name} but no audit log could be found.`);
 
-        const { executor, target, reason } = latestBan;
+        const { executor, reason } = latestBan;
 
 
-        if (reason !== null || reason !== undefined) {
+        if (reason !== null && reason !== undefined) {
             reasonGiven = reason!;
         }
 

diff --git a/src/events/guildCreate.ts b/src/events/guildCreate.ts
@@ -1,6 +1,8 @@
+import { Guild } from 'discord.js';
 import Event from '../types/Event';
 
-const guildCreate: Event = {
+// const guildCreate: Event = {
+const guildCreate: Event<[Guild]> = {
     name: 'guildCreate',
     execute: function () {
         console.log("Joined a new server");

diff --git a/src/events/guildDelete.ts b/src/events/guildDelete.ts
@@ -1,9 +1,10 @@
-import { Interaction } from 'discord.js';
+import { Guild } from 'discord.js';
 import Event from '../types/Event';
 
-const guildDelete: Event = {
+// const guildDelete: Event = {
+const guildDelete: Event<[Guild]> = {
     name: 'guildDelete',
-    execute: function(interaction: Interaction) {
+    execute: function() {
     console.log("Left a server");
 
     }

diff --git a/src/events/guildMemberRemove.ts b/src/events/guildMemberRemove.ts
@@ -3,7 +3,8 @@ import { MessageEmbed, TextChannel, GuildMember  } from 'discord.js';
 import Event from '../types/Event';
 import { ref } from '..';
 
-const guildMemberRemove: Event = {
+// const guildMemberRemove: Event = {
+const guildMemberRemove: Event<[GuildMember]> = {
     name: 'guildMemberRemove',
     execute: async function(member: GuildMember) {
         const guild = member.guild;
@@ -47,9 +48,9 @@ const guildMemberRemove: Event = {
 
         if (kickLog.target!.id === member.id && kickLog.createdAt > member.joinedAt!) {
 
-            const { executor, target, reason } = kickLog;
+            const { executor, reason } = kickLog;
             let reasonGiven = "No reason given.";
-            if (reason !== null || reason !== undefined) {
+            if (reason !== null && reason !== undefined) {
                 reasonGiven = reason!;
             }
 

diff --git a/src/events/interactionCreate.ts b/src/events/interactionCreate.ts
@@ -2,7 +2,8 @@ import { client } from '..';
 import { Interaction } from 'discord.js';
 import Event from '../types/Event';
 
-const interactionCreate: Event = {
+// const interactionCreate: Event = {
+const interactionCreate: Event<[Interaction]> = {
     name: 'interactionCreate',
     execute: function (interaction: Interaction) {
         if (!interaction.isCommand() || !interaction.inGuild()) return;

diff --git a/src/events/messageCreate.ts b/src/events/messageCreate.ts
@@ -5,7 +5,8 @@ import { ref } from '..';
 import muteUser from '../functions/muteUser';
 import MemberServerPair from '../types/MemberServerPair';
 
-const messageCreate: Event = {
+// const messageCreate: Event = {
+const messageCreate: Event<[Message]> = {
     name: 'messageCreate',
     execute: async function (message: Message) {
 

diff --git a/src/events/ready.ts b/src/events/ready.ts
@@ -1,7 +1,8 @@
 import Event from '../types/Event';
 import OtterClient from '../types/OtterClient';
 
-const ready: Event = {
+//const ready: Event = {
+const ready: Event<[OtterClient]> = {
 	name: 'ready',
 	once: true,
 	execute: function (client: OtterClient) {

diff --git a/src/index.ts b/src/index.ts
@@ -40,9 +40,8 @@ const database = getDatabase(app);
 export const ref = database.ref("restricted_access/secret_document");
 
 // As an admin, the app has access to read and write all data, regardless of Security Rules
-ref.once("value", function(snapshot) {
-//   console.log(snapshot.val());
-    console.log("Database loaded");
+ref.once("value", function() {
+    console.log("Connected to Firebase Database");
 });
 
 

diff --git a/src/types/Event.ts b/src/types/Event.ts
@@ -1,5 +1,12 @@
-export default interface Event {
+// export default interface Event {
+//     name: string;
+//     once?: boolean;
+//     execute: (...args: any[]) => any;
+// }
+
+
+export default interface Event<T extends unknown[]> {
     name: string;
     once?: boolean;
-    execute: (...args: any[]) => any;
-}
+    execute: (...args: T) => void;  // Adjust the return type if needed.
+}