1 files changed, 51 insertions, 24 deletions

diff --git a/src/api/routes/guilds/#guild_id/prune.ts b/src/api/routes/guilds/#guild_id/prune.ts
index 2e674349..d11244b1 100644
--- a/src/api/routes/guilds/#guild_id/prune.ts
+++ b/src/api/routes/guilds/#guild_id/prune.ts
@@ -5,7 +5,12 @@ import { route } from "@fosscord/api";
 const router = Router();
 
 //Returns all inactive members, respecting role hierarchy
-export const inactiveMembers = async (guild_id: string, user_id: string, days: number, roles: string[] = []) => {
+export const inactiveMembers = async (
+	guild_id: string,
+	user_id: string,
+	days: number,
+	roles: string[] = [],
+) => {
 	var date = new Date();
 	date.setDate(date.getDate() - days);
 	//Snowflake should have `generateFromTime` method? Or similar?
@@ -19,21 +24,27 @@ export const inactiveMembers = async (guild_id: string, user_id: string, days: n
 		where: [
 			{
 				guild_id,
-				last_message_id: LessThan(minId.toString())
+				last_message_id: LessThan(minId.toString()),
 			},
 			{
-				last_message_id: IsNull()
-			}
+				last_message_id: IsNull(),
+			},
 		],
-		relations: ["roles"]
+		relations: ["roles"],
 	});
 	console.log(members);
 	if (!members.length) return [];
 
 	//I'm sure I can do this in the above db query ( and it would probably be better to do so ), but oh well.
-	if (roles.length && members.length) members = members.filter((user) => user.roles?.some((role) => roles.includes(role.id)));
-
-	const me = await Member.findOneOrFail({ where: { id: user_id, guild_id }, relations: ["roles"] });
+	if (roles.length && members.length)
+		members = members.filter((user) =>
+			user.roles?.some((role) => roles.includes(role.id)),
+		);
+
+	const me = await Member.findOneOrFail({
+		where: { id: user_id, guild_id },
+		relations: ["roles"],
+	});
 	const myHighestRole = Math.max(...(me.roles?.map((x) => x.position) || []));
 
 	const guild = await Guild.findOneOrFail({ where: { id: guild_id } });
@@ -44,8 +55,8 @@ export const inactiveMembers = async (guild_id: string, user_id: string, days: n
 			member.roles?.some(
 				(role) =>
 					role.position < myHighestRole || //roles higher than me can't be kicked
-					me.id === guild.owner_id //owner can kick anyone
-			)
+					me.id === guild.owner_id, //owner can kick anyone
+			),
 	);
 
 	return members;
@@ -57,23 +68,39 @@ router.get("/", route({}), async (req: Request, res: Response) => {
 	var roles = req.query.include_roles;
 	if (typeof roles === "string") roles = [roles]; //express will return array otherwise
 
-	const members = await inactiveMembers(req.params.guild_id, req.user_id, days, roles as string[]);
+	const members = await inactiveMembers(
+		req.params.guild_id,
+		req.user_id,
+		days,
+		roles as string[],
+	);
 
 	res.send({ pruned: members.length });
 });
 
-router.post("/", route({ permission: "KICK_MEMBERS", right: "KICK_BAN_MEMBERS" }), async (req: Request, res: Response) => {
-	const days = parseInt(req.body.days);
-
-	var roles = req.query.include_roles;
-	if (typeof roles === "string") roles = [roles];
-
-	const { guild_id } = req.params;
-	const members = await inactiveMembers(guild_id, req.user_id, days, roles as string[]);
-
-	await Promise.all(members.map((x) => Member.removeFromGuild(x.id, guild_id)));
-
-	res.send({ purged: members.length });
-});
+router.post(
+	"/",
+	route({ permission: "KICK_MEMBERS", right: "KICK_BAN_MEMBERS" }),
+	async (req: Request, res: Response) => {
+		const days = parseInt(req.body.days);
+
+		var roles = req.query.include_roles;
+		if (typeof roles === "string") roles = [roles];
+
+		const { guild_id } = req.params;
+		const members = await inactiveMembers(
+			guild_id,
+			req.user_id,
+			days,
+			roles as string[],
+		);
+
+		await Promise.all(
+			members.map((x) => Member.removeFromGuild(x.id, guild_id)),
+		);
+
+		res.send({ purged: members.length });
+	},
+);
 
 export default router;