export endEvent so we can call it externally

Author: Techbot121

app/services/discord/modules/discord-events.ts

@@ -5,6 +5,30 @@ import DiscordConfig from "@/config/discord.json";
 
 const iconsPath = join(process.cwd(), "resources/discord-event-icons");
 
+const GetParticipants = async (
+	event: Discord.GuildScheduledEvent | Discord.PartialGuildScheduledEvent
+) => {
+	const eventUsers = await event.fetchSubscribers({ withMember: true });
+	return eventUsers.map(evu => evu.member);
+};
+
+export const endEvent = async (
+	event?: Discord.GuildScheduledEvent | Discord.PartialGuildScheduledEvent,
+) => {
+	const bot = await globalThis.MetaConcord.container.getService("DiscordBot");
+	const guild = bot.getGuild();
+	const name = event?.name ?? "A event"
+	console.log(`"${name}" ended! Removing roles...`);
+	const users = (await guild?.roles.fetch(DiscordConfig.roles.event))?.members;
+	users?.forEach(usr => {
+		usr.roles.remove(DiscordConfig.roles.event);
+	})
+	const reason = name + " ended";
+	await bot.setIcon(undefined, reason);
+	await bot.setServerBanner(undefined, reason);
+	await bot.setNickname(undefined, reason);
+};
+
 export default async (bot: DiscordBot): Promise<void> => {
 	const events = [
 		{
@@ -28,27 +52,6 @@ export default async (bot: DiscordBot): Promise<void> => {
 		},
 	];
 
-	const GetParticipants = async (
-		event: Discord.GuildScheduledEvent | Discord.PartialGuildScheduledEvent
-	) => {
-		const eventUsers = await event.fetchSubscribers({ withMember: true });
-		return eventUsers.map(evu => evu.member);
-	};
-
-	const endEvent = async (
-		event: Discord.GuildScheduledEvent | Discord.PartialGuildScheduledEvent
-	) => {
-		console.log(`Event "${event.name}" ended! Removing roles...`);
-		const users = (await event.guild?.roles.fetch(DiscordConfig.roles.event))?.members;
-		users?.forEach(usr => {
-			usr.roles.remove(DiscordConfig.roles.event);
-		})
-		const reason = event.name + " ended";
-		await bot.setIcon(undefined, reason);
-		await bot.setServerBanner(undefined, reason);
-		await bot.setNickname(undefined, reason);
-	};
-
 	bot.discord.on("guildScheduledEventUpdate", async (old, now) => {
 		const event = now;
 

app/services/discord/modules/shitposting.ts

@@ -114,7 +114,7 @@ export const Shat = async (options?: {
 		} else {
 			const res: AxiosResponse<TenorResponse> = await (
 				await globalThis.MetaConcord.container.getService("Tenor")
-			).search(word, 4);
+			).search(word ?? "random", 4);
 			if (!res || res.data.results.length === 0)
 				return {
 					content: await markov?.generate(undefined, DefaultMarkovConfig),