Complete implementation of rejoin notices

Author: Domin0de

events/guildMemberAdd.js

@@ -1,7 +1,7 @@
 const { Events } = require("discord.js");
 
 const CSESOC_SERVER_ID = "693779865916276746";
-const REPORT_CHANNEL_ID = "1225243371036082187";
+const REPORT_CHANNEL_ID = "1270283342176059443";
 
 module.exports = {
     name: Events.GuildMemberAdd,
@@ -13,11 +13,22 @@ module.exports = {
         // Get report channel
         if (member.user.bot || member.user.system || member.guild.id !== CSESOC_SERVER_ID) return;
 
-        userDB.user_join(member.id).then((joinType) => {
-            if (joinType === "rejoin") {
-                const reportChannel = member.guild.channels.cache.get(REPORT_CHANNEL_ID);
-                reportChannel.send(`${member.user} (${member.user.tag}) has rejoined the server.`);
-            }
+        // Get old user info before joining
+        userDB.get_user_info(member.id).then((user_data) => {
+            userDB.user_join(member.id).then((joinType) => {
+                if (joinType === "rejoin") {
+                    // Fetch the channel to output details
+                    const reportChannel = member.guild.channels.cache.get(REPORT_CHANNEL_ID);
+
+                    // Fetch formatted date values from joining and leaving events
+                    const joinDate = user_data.joinDate.toLocaleDateString("en-AU");
+                    const leaveDate = user_data.leaveDate.toLocaleDateString("en-AU");
+
+                    reportChannel.send(
+                        `${member.user} (${member.user.tag}) has rejoined the server. [Last in server: ${leaveDate}, Last joined: ${joinDate}]`,
+                    );
+                }
+            });
         });
     },
 };

lib/database/database.js

@@ -250,6 +250,38 @@ class DBuser {
         return type;
     }
 
+    async get_user_info(userid) {
+        const client = await this.pool.connect();
+        let info = null;
+
+        try {
+            await client.query("BEGIN");
+
+            const query = "select * from users where userid = $1";
+            const values = [userid];
+            const result = await client.query(query, values);
+
+            if (result.rows.length != 0) {
+                const row = result.rows[0];
+
+                info = {
+                    userId: row["userid"],
+                    joinDate: row["joindate"],
+                    leaveDate: row["leavedate"],
+                    userLeft: row["userleft"],
+                };
+            }
+        } catch (ex) {
+            console.log(`An unexpected error occurred: ${ex}`);
+        } finally {
+            await client.query("ROLLBACK");
+            client.release();
+            // console.log("Client released successfully.")
+        }
+
+        return info;
+    }
+
     // Adding a user role
     async add_user_role(userid, role) {
         const client = await this.pool.connect();