feat: added member remove event

Author: GalvinPython

.eslintrc.json

@@ -39,6 +39,10 @@ bun run dev:bot
 ```
 
 # Changelog
+## Stable 1.0
+* A new, redesigned site using NextJS
+* Users that are no longer in your server will be hidden from the public leaderboard
+
 ## Beta 0.1
 Thanks to @ToastedDev for his contributions to the bot. Here are some changes that were made
 * General formatting fixes (#8)
@@ -52,11 +56,14 @@ Thanks to @ToastedDev for his contributions to the bot. Here are some changes th
 * Fixed wrong data being shown on the leaderboard
 
 # Roadmap
-* Rewritten site using NextJS
+Anything crossed out means that it's been done on the dev branch, but not pushed out to production
+* ~~Rewritten site using NextJS~~
 * Auto-updating cached user information
 * Better privacy controls
-* Live updates
+* ~~Live updates~~
 * Track guilds and users xp
+* Live updates (FIX)
+* Hourly/daily updates etc in a chosen channel
 
 
 Want to add more features? Join our server (linked above) and add a post to `feature-requests`

README.md

@@ -1,7 +1,7 @@
 import { pool } from ".";
 
 export async function initTables() {
-  const createGuildsTable = `
+	const createGuildsTable = `
 		CREATE TABLE IF NOT EXISTS guilds (
 			id VARCHAR(255) NOT NULL PRIMARY KEY,
 			name VARCHAR(255),
@@ -13,7 +13,7 @@ export async function initTables() {
 			is_in_guild BOOLEAN DEFAULT TRUE
 		)
 	`;
-  const createUsersTable = `
+	const createUsersTable = `
 		CREATE TABLE IF NOT EXISTS users (
 			id VARCHAR(255) NOT NULL,
 			guild_id VARCHAR(255) NOT NULL,
@@ -24,41 +24,40 @@ export async function initTables() {
 			level INT DEFAULT 0,
 			xp_needed_next_level INT,
 			progress_next_level DECIMAL(6, 2),
+			user_is_in_guild BOOLEAN DEFAULT TRUE,
 			PRIMARY KEY (id, guild_id)
 		)
 	`;
-  // FOREIGN KEY (guild_id) REFERENCES guilds(id)
-  const createRolesTable = `
+	const createRolesTable = `
 		CREATE TABLE IF NOT EXISTS roles (
 			id VARCHAR(255) NOT NULL PRIMARY KEY,
 			guild_id VARCHAR(255) NOT NULL,
 			name VARCHAR(255),
 			level INT NOT NULL
 		)
 	`;
-  // FOREIGN KEY (guild_id) REFERENCES guilds(id)
 
-  pool.query(createGuildsTable, (err) => {
-    if (err) {
-      console.error("Error creating guilds table:", err);
-    } else {
-      console.log("Guilds table created");
-    }
-  });
+	pool.query(createGuildsTable, (err) => {
+		if (err) {
+			console.error("Error creating guilds table:", err);
+		} else {
+			console.log("Guilds table created");
+		}
+	});
 
-  pool.query(createUsersTable, (err) => {
-    if (err) {
-      console.error("Error creating users table:", err);
-    } else {
-      console.log("Users table created");
-    }
-  });
+	pool.query(createUsersTable, (err) => {
+		if (err) {
+			console.error("Error creating users table:", err);
+		} else {
+			console.log("Users table created");
+		}
+	});
 
-  pool.query(createRolesTable, (err) => {
-    if (err) {
-      console.error("Error creating roles table:", err);
-    } else {
-      console.log("Roles table created");
-    }
-  });
+	pool.query(createRolesTable, (err) => {
+		if (err) {
+			console.error("Error creating roles table:", err);
+		} else {
+			console.log("Roles table created");
+		}
+	});
 }

api/src/db/init.ts

@@ -15,7 +15,7 @@ export interface User {
 
 export async function getUsers(guildId: string): Promise<[QueryError, null] | [null, User[]]> {
 	return new Promise((resolve, reject) => {
-		pool.query("SELECT * FROM users WHERE guild_id = ? ORDER BY xp DESC", [guildId], (err, results) => {
+		pool.query("SELECT * FROM users WHERE guild_id = ? AND user_is_in_guild = ? ORDER BY xp DESC", [guildId, true], (err, results) => {
 			if (err) {
 				reject([err, null]);
 			} else {
@@ -37,6 +37,19 @@ export async function getUser(userId: string, guildId: string): Promise<[QueryEr
 	});
 }
 
+export async function removeUser(userId: string, guildId: string): Promise<[QueryError | null, boolean]> {
+	return new Promise((resolve, reject) => {
+		pool.query("UPDATE users SET user_is_in_guild = ? WHERE id = ? AND guild_id = ?", [false, userId, guildId], (err) => {
+			if (err) {
+				reject([err, false]);
+			} else {
+				resolve([null, true]);
+			}
+		});
+	});
+
+}
+
 export async function setXP(guildId: string, userId: string, xp: number): Promise<[QueryError | null, boolean]> {
 	const newLevel = Math.floor(Math.sqrt(xp / 100));
 	const nextLevel = newLevel + 1;
@@ -47,7 +60,7 @@ export async function setXP(guildId: string, userId: string, xp: number): Promis
 		((xp - currentLevelXp) / (nextLevelXp - currentLevelXp)) * 100;
 
 	return new Promise((resolve, reject) => {
-		pool.query("UPDATE users SET xp = ?, level = ?, xp_needed_next_level = ?, progress_next_level = ? WHERE id = ? AND guild_id = ?", [xp, newLevel, xpNeededForNextLevel.toFixed(2), progressToNextLevel.toFixed(2), userId, guildId], (err) => {
+		pool.query("UPDATE users SET xp = ?, level = ?, xp_needed_next_level = ?, progress_next_level = ?, user_is_in_guild = ? WHERE id = ? AND guild_id = ?", [xp, newLevel, xpNeededForNextLevel.toFixed(2), progressToNextLevel.toFixed(2), true, userId, guildId], (err) => {
 			if (err) {
 				reject([err, false]);
 			} else {

api/src/db/queries/users.ts

@@ -1,7 +1,7 @@
 import express, { type NextFunction, type Request, type Response } from "express";
 import cors from "cors";
 import path from "path";
-import { getBotInfo, getGuild, getUser, getUsers, initTables, pool, updateGuild, enableUpdates, disableUpdates, setCooldown, setUpdatesChannel, setXP, setLevel, removeGuild } from "./db";
+import { getBotInfo, getGuild, getUser, getUsers, initTables, pool, updateGuild, enableUpdates, disableUpdates, setCooldown, setUpdatesChannel, setXP, setLevel, removeGuild, removeUser } from "./db";
 
 const app = express();
 const PORT = 18103;
@@ -56,6 +56,17 @@ app.post('/post/:guild/remove', authMiddleware, async (req, res) => {
 	}
 })
 
+app.post('/post/:guild/:user/remove', authMiddleware, async (req, res) => {
+	const { guild, user } = req.params;
+	const [err, results] = await removeUser(user, guild);
+
+	if (err) {
+		res.status(500).json({ message: "Internal server error" });
+	} else {
+		res.status(200).json(results);
+	}
+})
+
 app.post("/post/:guild/:user", authMiddleware, async (req, res) => {
 	const { guild, user } = req.params;
 	const { name, pfp, xp, nickname } = req.body;
@@ -128,6 +139,15 @@ app.post("/post/:guild/:user", authMiddleware, async (req, res) => {
 	);
 });
 
+app.get('/get/botinfo', async (_req, res) => {
+	const [err, data] = await getBotInfo();
+	if (err) {
+		console.error("Error fetching bot info:", err);
+		return res.status(500).json({ message: "Internal server error" });
+	}
+	return res.status(200).json(data);
+});
+
 app.get("/get/:guild/:user", async (req, res) => {
 	const { guild, user } = req.params;
 

api/src/index.ts

@@ -0,0 +1,16 @@
+import { Events } from "discord.js";
+import client from "../index";
+import { removeUser } from "../utils/requestAPI";
+
+client.on(Events.GuildMemberRemove, async (member) => {
+	try {
+		const success = await removeUser(member.id, member.guild.id);
+		if (success) {
+			console.log(`Removed user ${member.user.username} from the database`);
+		} else {
+			console.error(`Failed to remove user ${member.user.username} from the database`);
+		}
+	} catch (e) {
+		console.error(e);
+	}
+})

bot/src/events/memberRemove.ts

@@ -64,6 +64,17 @@ export async function removeGuild(guild: string) {
 	})
 }
 
+export async function removeUser(guild: string, user: string) {
+	const response = await fetch(`http://localhost:18103/post/${guild}/${user}/remove`, {
+		headers: {
+			'Content-Type': 'application/json',
+			'Authorization': process.env.AUTH as string,
+		},
+		method: 'POST',
+	})
+	return response.status === 200;
+}
+
 export async function setXP(guild: string, user: string, xp: number) {
 	const response = await fetch(`http://localhost:18103/admin/set/${guild}/xp`, {
 		"headers": {

bot/src/utils/requestAPI.ts

@@ -6,18 +6,18 @@ import tseslint from "typescript-eslint";
 import nextjsConfig from "eslint-config-neon/flat/next.js";
 
 export default tseslint.config(
-  {
-    ignores: ["web/.next"],
-  },
-  eslint.configs.recommended,
-  ...tseslint.configs.recommended,
-  ...tseslint.configs.stylistic,
-  {
-    files: ["apps/web/**/*.{ts,tsx,js,jsx}"],
-    ...nextjsConfig[0],
-    rules: {
-      ...nextjsConfig[0].rules,
-      "@next/next/no-duplicate-head": 0,
-    },
-  },
+	{
+		ignores: ["web/.next"],
+	},
+	eslint.configs.recommended,
+	...tseslint.configs.recommended,
+	...tseslint.configs.stylistic,
+	{
+		files: ["apps/web/**/*.{ts,tsx,js,jsx}"],
+		...nextjsConfig[0],
+		rules: {
+			...nextjsConfig[0].rules,
+			"@next/next/no-duplicate-head": 0,
+		},
+	},
 );