last minute stuff

Signed-off-by: RedGuy12 <paul@reid-family.org>
scratchaddons-community · Sep 26, 2022 · da93075 · da93075
1 parent 8f35f98
commit da93075
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/common/board.js b/common/board.js
@@ -92,13 +92,7 @@ export async function generateBoardMessage(info, extraButtons = {}) {
 
 			content: `**${BOARD_EMOJI} ${count}** | ${
 				message.channel.isThread() && message.channel.parent
-					? `${
-							[CONSTANTS.channels.modmail?.id, CONSTANTS.channels.admin?.id].includes(
-								message.channel.parent.id,
-							)
-								? "#deleted-channel"
-								: message.channel.toString()
-					  } (${message.channel.parent.toString()})`
+					? `${message.channel.toString()} (${message.channel.parent.toString()})`
 					: message.channel.toString()
 			} | ${message.author.toString()}`,
 			embeds: [boardEmbed, ...embeds],

diff --git a/events/guild/member/update.js b/events/guild/member/update.js
@@ -21,7 +21,11 @@ export default async function event(oldMember, newMember) {
 			newMember.communicationDisabledUntil > new Date()
 		)
 			logs.push(" timed out until " + time(newMember.communicationDisabledUntil));
-		else if (oldMember.communicationDisabledUntil) logs.push("’s timeout was removed");
+		else if (
+			oldMember.communicationDisabledUntil &&
+			oldMember.communicationDisabledUntil > new Date()
+		)
+			logs.push("’s timeout was removed");
 	}
 	if (oldMember.nickname !== newMember.nickname) {
 		logs.push(

diff --git a/events/guild/update.js b/events/guild/update.js
@@ -95,20 +95,18 @@ export default async function event(oldGuild, newGuild) {
 		);
 	}
 	if (
-		oldGuild.features.includes("HAS_DIRECTORY_ENTRY") !==
-		newGuild.features.includes("HAS_DIRECTORY_ENTRY")
+		oldGuild.features.includes("INVITES_DISABLED") !==
+		newGuild.features.includes("INVITES_DISABLED")
 	) {
-		logs.push(
-			`➕ Invites ${newGuild.features.includes("HAS_DIRECTORY_ENTRY") ? "" : "un"}paused`,
-		);
+		logs.push(`➕ Invites ${newGuild.features.includes("INVITES_DISABLED") ? "" : "un"}paused`);
 	}
 	if (
-		oldGuild.features.includes("INVITES_DISABLED") !==
-		newGuild.features.includes("INVITES_DISABLED")
+		oldGuild.features.includes("HAS_DIRECTORY_ENTRY") !==
+		newGuild.features.includes("HAS_DIRECTORY_ENTRY")
 	) {
 		logs.push(
 			`Server ${
-				newGuild.features.includes("INVITES_DISABLED") ? "add" : "remov"
+				newGuild.features.includes("HAS_DIRECTORY_ENTRY") ? "add" : "remov"
 			}ed from a directory channel`,
 		);
 	}

diff --git a/events/voiceStateUpdate.js b/events/voiceStateUpdate.js
@@ -1,11 +1,12 @@
+import CONSTANTS from "../common/CONSTANTS.js";
 import log from "../common/moderation/logging.js";
 
 /** @type {import("../common/types/event").default<"voiceStateUpdate">} */
 export default async function event(oldState, newState) {
 	if (!newState.member || newState.guild.id !== process.env.GUILD_ID) return;
 
 	const logs = [];
-	if (oldState.channel?.id !== newState.channel?.id || !newState.channel) {
+	if (oldState.channel?.id !== newState.channel?.id && newState.member.id !== CONSTANTS.robotop) {
 		if (newState.channel) {
 			logs.push(
 				`joined voice channel ${newState.channel.toString()}, ${
@@ -16,7 +17,7 @@ export default async function event(oldState, newState) {
 		if (oldState.channel) {
 			logs.push(`left voice channel ${oldState.channel.toString()}`);
 		}
-	} else {
+	} else if (newState.channel) {
 		if (oldState.serverMute !== newState.serverMute) {
 			logs.push(`was${newState.serverMute ? "" : " un"} server muted`);
 		} else if (oldState.mute !== newState.mute) {