Auto Delete Custom Roles (#290)

Co-authored-by: Platformer444 <Platformer444@users.noreply.github.com> Co-authored-by: RedGuy12 <61329810+RedGuy12@users.noreply.github.com> Co-authored-by: RedGuy12 <RedGuy12@users.noreply.github.com>
scratchaddons-community · Aug 6, 2023 · 60886ba · 60886ba
1 parent 94c7422
commit 60886ba
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/modules/roles.ts b/modules/roles.ts
@@ -120,9 +120,7 @@ defineCommand(
 				content: `${constants.emojis.statuses.no} You don’t have permission to create a custom role!`,
 			});
 
-		const existingRole = interaction.member.roles
-			.valueOf()
-			.find((role) => role.name.startsWith(PREFIX));
+		const existingRole = getCustomRole(interaction.member);
 
 		await interaction.showModal({
 			title: "Create Custom Role",
@@ -168,10 +166,7 @@ defineModal("customRole", async (interaction) => {
 	const name = interaction.fields.fields.get("name")?.value;
 	const color = interaction.fields.fields.get("color")?.value;
 
-	const existingRole =
-		interaction.member instanceof GuildMember
-			? interaction.member.roles.valueOf().find((role) => role.name.startsWith(PREFIX))
-			: undefined;
+	const existingRole = getCustomRole(interaction.member);
 
 	if (!name) {
 		if (!existingRole) {
@@ -295,10 +290,7 @@ defineEvent("guildMemberUpdate", async (_, member) => {
 	if (member.guild.id !== config.guild.id) return;
 
 	if (!(await qualifiesForRole(member))) {
-		await member.roles
-			.valueOf()
-			.find((role) => role.name.startsWith(PREFIX))
-			?.delete("No longer qualifies");
+		await getCustomRole(member)?.delete("No longer qualifies");
 	}
 });
 
@@ -318,7 +310,11 @@ defineEvent("applicationCommandPermissionsUpdate", async (permissions) => {
 	}
 });
 
-async function qualifiesForRole(member: GuildMember) {
+export function getCustomRole(member: GuildMember) {
+	return member.roles.valueOf().find((role) => role.name.startsWith(PREFIX));
+}
+
+export async function qualifiesForRole(member: GuildMember) {
 	if (member.roles.premiumSubscriberRole) return true;
 
 	const recentXp = [...recentXpDatabase.data].sort((one, two) => one.time - two.time);

diff --git a/modules/xp/weekly.ts b/modules/xp/weekly.ts
@@ -11,6 +11,7 @@ import { nth } from "../../util/numbers.js";
 import { remindersDatabase, SpecialReminders } from "../reminders.js";
 import { getFullWeeklyData, recentXpDatabase, xpDatabase } from "./misc.js";
 import constants from "../../common/constants.js";
+import { getCustomRole, qualifiesForRole } from "../roles.js";
 
 export async function getChatters() {
 	const weeklyWinners = getFullWeeklyData();
@@ -146,6 +147,18 @@ export default async function getWeekly(nextWeeklyDate: Date) {
 		]);
 	}
 
+	weeklyWinners.forEach(async (weeklyWinner) => {
+		await config.guild.members.fetch(weeklyWinner.user).then(async (guildMember) => {
+			if (await qualifiesForRole(guildMember)) return;
+
+			const customRole = getCustomRole(guildMember);
+
+			if (!customRole) return;
+
+			customRole.delete("No longer meets custom role requirements");
+		});
+	});
+
 	return `__**🏆 Weekly Winners week of ${
 		[
 			"January",