From 5de97ac4d125a831597eea5ee456b58ce2ce5a98 Mon Sep 17 00:00:00 2001
From: Eric <eric.wu3@student.unsw.edu.au>
Date: Thu, 11 Apr 2024 12:24:34 +1000
Subject: [PATCH 1/3] Adding bot-status for events and member count

---
 events/log_ready.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/events/log_ready.js b/events/log_ready.js
index 23a7e8da..902671b4 100644
--- a/events/log_ready.js
+++ b/events/log_ready.js
@@ -1,5 +1,10 @@
 const { DBlog } = require("../lib/database/dblog");
 
+let currentStatusIndex = 0;
+let currentEventIndex = 0;
+const statusSeconds = 30;
+const events = ["EVENT"];
+
 module.exports = {
     name: "ready",
     once: true,
@@ -23,5 +28,29 @@ module.exports = {
                 }
             }
         })();
+
+        // Status change functions
+        const statusFunctions = [
+            () => memberCountStatus(client),
+            () => specialEventStatus(client, events[currentEventIndex])
+        ];
+        
+        setInterval(() => {
+            statusFunctions[currentStatusIndex]();
+            currentStatusIndex = (currentStatusIndex + 1) % statusFunctions.length;
+        }, 1000*statusSeconds);
     },
 };
+
+function memberCountStatus(client) {
+    let memberCount = 0;
+    client.guilds.cache.forEach(guild => {
+        memberCount += guild.memberCount;
+    });
+    client.user.setActivity(`${memberCount} total members!`, { type: "LISTENING"});
+}
+
+function specialEventStatus(client, event) {
+    client.user.setActivity(event, { type: "COMPETING"})
+    currentEventIndex = (currentEventIndex + 1) % events.length;
+}
\ No newline at end of file

From 15183564d4903b5379ce600cad13f6834380d08b Mon Sep 17 00:00:00 2001
From: Eric <uni.ericwu@gmail.com>
Date: Thu, 11 Apr 2024 12:59:12 +1000
Subject: [PATCH 2/3] Fixing lint errors

---
 events/log_ready.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/events/log_ready.js b/events/log_ready.js
index 902671b4..3013f58e 100644
--- a/events/log_ready.js
+++ b/events/log_ready.js
@@ -32,25 +32,25 @@ module.exports = {
         // Status change functions
         const statusFunctions = [
             () => memberCountStatus(client),
-            () => specialEventStatus(client, events[currentEventIndex])
+            () => specialEventStatus(client, events[currentEventIndex]),
         ];
-        
+
         setInterval(() => {
             statusFunctions[currentStatusIndex]();
             currentStatusIndex = (currentStatusIndex + 1) % statusFunctions.length;
-        }, 1000*statusSeconds);
+        }, 1000 * statusSeconds);
     },
 };
 
 function memberCountStatus(client) {
     let memberCount = 0;
-    client.guilds.cache.forEach(guild => {
+    client.guilds.cache.forEach((guild) => {
         memberCount += guild.memberCount;
     });
-    client.user.setActivity(`${memberCount} total members!`, { type: "LISTENING"});
+    client.user.setActivity(`${memberCount} total members!`, { type: "LISTENING" });
 }
 
 function specialEventStatus(client, event) {
-    client.user.setActivity(event, { type: "COMPETING"})
+    client.user.setActivity(event, { type: "COMPETING" });
     currentEventIndex = (currentEventIndex + 1) % events.length;
-}
\ No newline at end of file
+}

From 824ea1fd92b73b2c607f80ed08170e887126dd15 Mon Sep 17 00:00:00 2001
From: Eric <uni.ericwu@gmail.com>
Date: Thu, 18 Apr 2024 19:42:32 +1000
Subject: [PATCH 3/3] Adding fixes to how member count is calculated

---
 events/log_ready.js | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/events/log_ready.js b/events/log_ready.js
index 3013f58e..592de743 100644
--- a/events/log_ready.js
+++ b/events/log_ready.js
@@ -1,9 +1,12 @@
 const { DBlog } = require("../lib/database/dblog");
 
 let currentStatusIndex = 0;
-let currentEventIndex = 0;
+const CSESOC_SERVER_ID = "693779865916276746";
 const statusSeconds = 30;
-const events = ["EVENT"];
+
+// In case of events working
+// let currentEventIndex = 0;
+// const events = ["EVENT"];
 
 module.exports = {
     name: "ready",
@@ -32,7 +35,7 @@ module.exports = {
         // Status change functions
         const statusFunctions = [
             () => memberCountStatus(client),
-            () => specialEventStatus(client, events[currentEventIndex]),
+            // () => specialEventStatus(client, events[currentEventIndex]),
         ];
 
         setInterval(() => {
@@ -43,14 +46,15 @@ module.exports = {
 };
 
 function memberCountStatus(client) {
-    let memberCount = 0;
-    client.guilds.cache.forEach((guild) => {
-        memberCount += guild.memberCount;
-    });
-    client.user.setActivity(`${memberCount} total members!`, { type: "LISTENING" });
-}
+    const server = client.guilds.cache.get(CSESOC_SERVER_ID);
+    if (!server) {
+        return;
+    }
 
-function specialEventStatus(client, event) {
-    client.user.setActivity(event, { type: "COMPETING" });
-    currentEventIndex = (currentEventIndex + 1) % events.length;
+    client.user.setActivity(`${server.memberCount} members!`, { type: "LISTENING" });
 }
+
+// function specialEventStatus(client, event) {
+//     client.user.setActivity(event, { type: "COMPETING" });
+//     currentEventIndex = (currentEventIndex + 1) % events.length;
+// }