commands/admin/custom_vc/slash.js

@@ -19,25 +19,12 @@ export const data = new SlashCommandBuilder()
     .addSubcommand((subcommand) =>
         subcommand
             .setName('register')
-            .setDescription('Registers an existing voice channel for custom channel creation.')
+            .setDescription('Registers an existing voice channel.')
-            .addChannelOption((option) =>
+            .addStringOption((option) =>
                 option
+                    .setName('id')
                     .setRequired(true)
-                    .setName('channel')
+                    .setDescription('The ID to reference the voice channel to be used.')
-                    .addChannelTypes(ChannelType.GuildVoice)
-                    .setDescription('The voice channel to be used.')
-            )
-    )
-    .addSubcommand((subcommand) =>
-        subcommand
-            .setName('remove')
-            .setDescription('Remove a voice channel from custom channel creation.')
-            .addChannelOption((option) =>
-                option
-                    .setRequired(true)
-                    .setName('channel')
-                    .addChannelTypes(ChannelType.GuildVoice)
-                    .setDescription('The voice channel to be unregistered.')
             )
     );
 export async function execute(interaction) {
@@ -68,13 +55,15 @@ export async function execute(interaction) {
                     content: `Successfully created channel!`,
                     ephemeral: true
                 });
-
-                console.info(`[INFO] New custom VC created with ID '${channel.id}'.`);
                 break;
             }
             case 'register': {
                 // Get channel id from user input
-                const { id } = options.getChannel('channel');
+                const id = options.getString('id');
+
+                step = 'fetch';
+                // Try fetching channel by id
+                await guild.channels.fetch(id);
 
                 // Save channel data
                 step = 'save';
@@ -85,35 +74,6 @@ export async function execute(interaction) {
                     content: `Successfully registered channel!`,
                     ephemeral: true
                 });
-
-                console.info(`[INFO] New custom VC registered using ID '${id}'.`);
-                break;
-            }
-            case 'remove': {
-                // Get channel id from user input
-                const { id } = options.getChannel('channel');
-
-                // Remove channel from guild
-                step = 'remove';
-                const count = await VoiceChannel.destroy({
-                    where: {
-                        id,
-                        create: true
-                    }
-                });
-
-                // Set reply based on result of deletion
-                let response = 'Successfully removed';
-                if (count === 0)
-                    response = 'Failed to remove';
-
-                // Reply to acknowledge command
-                await interaction.reply({
-                    content: `${response} channel from custom channel creation!`,
-                    ephemeral: true
-                });
-
-                console.info(`[INFO] Removed custom VC with ID '${id}'.`);
                 break;
             }
         }

commands/admin/self_roles/context/remove.js

@@ -1,11 +0,0 @@
-import { removeSelfRoles } from '../../../../shared.js';
-import { ApplicationCommandType, ContextMenuCommandBuilder } from 'discord.js';
-
-export const data = new ContextMenuCommandBuilder()
-	.setDMPermission(false)
-	.setName('Remove self roles')
-	.setType(ApplicationCommandType.Message);
-export async function execute(interaction) {
-	const id = interaction.targetMessage.id;
-	await removeSelfRoles(interaction, id);
-}

commands/admin/self_roles/slash.js

@@ -50,25 +50,6 @@ const registerSelfRoles = async (interaction) => {
 	return response;
 };
 
-const removeSelfRoles = async (interaction, msgID) => {
-	const { channel } = interaction;
-
-	try {
-		// Try fetching message from channel
-		await channel.messages.fetch(msgID);
-	} catch (error) {
-		console.error(error);
-		// Reply to acknowledge command
-		await interaction.reply({
-			content: `Failed to fetch message!`,
-			ephemeral: true
-		});
-		return;
-	}
-
-	await removeSelfRoles(interaction, msgID);
-};
-
 export const data = new SlashCommandBuilder()
 	.setName('self_roles')
 	.setDMPermission(false)
@@ -111,17 +92,6 @@ export const data = new SlashCommandBuilder()
 			.addStringOption((option) =>
 				option.setName('emoji').setRequired(true).setDescription('The emoji to be reacted with.')
 			)
-	)
-	.addSubcommand((subcommand) =>
-		subcommand
-			.setName('remove')
-			.setDescription('Remove self roles from a message.')
-			.addStringOption((option) =>
-				option
-					.setName('id')
-					.setRequired(true)
-					.setDescription('The ID to reference the message to be removed.')
-			)
 	);
 export async function execute(interaction) {
 	const { options } = interaction;
@@ -150,11 +120,6 @@ export async function execute(interaction) {
 			await addSelfRoles(interaction, msgID, role, emoji);
 			break;
 		}
-		case 'remove': {
-			const msgID = options.getString('id');
-			await removeSelfRoles(interaction, msgID);
-			break;
-		}
 	}
 
 	if (createNew) {

events/channels/voiceStateUpdate.js

@@ -2,23 +2,24 @@ import { ChannelType, Events, PermissionFlagsBits } from 'discord.js';
 import { VoiceChannel } from '../../database.js';
 
 const vcPermissionOverwrites = [
-	PermissionFlagsBits.ReadMessageHistory,
-	PermissionFlagsBits.PrioritySpeaker,
-	PermissionFlagsBits.ManageMessages,
-	PermissionFlagsBits.ManageChannels,
-	PermissionFlagsBits.DeafenMembers,
-	PermissionFlagsBits.SendMessages,
-	PermissionFlagsBits.ViewChannel,
-	PermissionFlagsBits.MuteMembers,
-	PermissionFlagsBits.MoveMembers,
 	PermissionFlagsBits.ManageRoles,
+	PermissionFlagsBits.ManageChannels,
+	PermissionFlagsBits.ViewChannel,
+	PermissionFlagsBits.ModerateMembers,
+	PermissionFlagsBits.SendMessages,
+	PermissionFlagsBits.SendMessagesInThreads,
+	PermissionFlagsBits.ManageMessages,
+	PermissionFlagsBits.ReadMessageHistory,
+	PermissionFlagsBits.AddReactions,
 	PermissionFlagsBits.Connect,
-	PermissionFlagsBits.Stream,
+	PermissionFlagsBits.Speak,
-	PermissionFlagsBits.UseVAD,
+	PermissionFlagsBits.MuteMembers,
-	PermissionFlagsBits.Speak
+	PermissionFlagsBits.DeafenMembers,
+	PermissionFlagsBits.MoveMembers,
+	PermissionFlagsBits.UseVAD
 ];
 
-const getChannel = async (member, channels) => {
+const getchannel = async (member, channels) => {
 	// Check database for existing channel
 	const ownCh = await VoiceChannel.findOne({
 		where: {
@@ -52,68 +53,31 @@ const getChannel = async (member, channels) => {
 	return privCh;
 };
 
-const leftVoiceChat = async (state) => {
-	const { channel } = state;
-
-	// Isn't this always false?
-	if (!channel) return;
-
-	// Get active members from channel
-	const members = Array.from(channel.members);
-	if (members.length > 0) return;
-
-	// Find channel by id, return if not registered as custom
-	const custom = await VoiceChannel.findOne({
-		where: {
-			id: channel.id,
-			create: false
-		}
-	});
-	if (custom === null) return;
-
-	// Delete channel from guild
-	await channel.guild.channels.delete(channel.id);
-	console.info(`[INFO] Custom VC with ID '${channel.id}' was empty and got deleted.`);
-};
-
 export const name = Events.VoiceStateUpdate;
-export async function execute(oldState, newState) {
+export async function execute(_, state) {
-	if (!newState.channel)
+	if (!state.channel) return;
-		return await leftVoiceChat(oldState);
-
-	console.log(
-		Array.from(
-			newState
-				.channel
-				.permissionOverwrites
-				.cache
-				.values()
-		).forEach(overwrite =>
-			console.log(overwrite.allow.toArray())
-		)
-	);
 
 	// Find channel by id, return if not registered for customs
 	const createCh = await VoiceChannel.findOne({
 		where: {
-			id: newState.channel.id,
+			id: state.channel.id,
 			create: true,
 		}
 	});
 	if (createCh === null) return;
 
 	// Extract user data
-	const member = newState.member;
+	const member = state.member;
 
 	// Extract channel data
-	const channels = newState.guild.channels;
+	const channels = state.guild.channels;
 	let step = 'create';
 	try {
-		const privCh = await getChannel(member, channels);
+		const privCh = await getchannel(member, channels);
 
 		step = 'move to';
 		// Move user to private channel
-		await newState.setChannel(privCh);
+		await state.setChannel(privCh);
 		console.info(`[INFO] User '${name}' created private channel with ID ${privCh.id}.`);
 	} catch (error) {
 		console.error(error);

shared.js

@@ -1,30 +1,6 @@
-import { join } from 'path';
 import { Op } from 'sequelize';
-import { readdir } from 'fs/promises';
 import { Message, RoleEmojiPair } from './database.js';
 
-export const removeSelfRoles = async (interaction, id) => {
-	// Try deleting message from database
-	const count = await Message.destroy({
-		where: {
-			id: id
-		}
-	});
-
-	// Set reply based on result of deletion
-	let response = 'Successfully removed';
-	if (count === 0)
-		response = 'Failed to remove';
-
-	// Reply to acknowledge command
-	await interaction.reply({
-		content: `${response} self roles from message!`,
-		ephemeral: true
-	});
-
-	console.info(`[INFO] Removed self roles from message with ID '${id}'.`);
-};
-
 const saveMessageData = async (id, role, emoji) => {
 	// Try finding message
 	const msg = await Message.findOne({ where: { id } });
@@ -86,6 +62,8 @@ export const addSelfRoles = async (interaction, msgID, role, emoji) => {
 		});
 	}
 };
+import { join } from 'path';
+import { readdir } from 'fs/promises';
 
 const required = ['data', 'execute'];
 const optional = ['autocomplete', 'modalSubmit'];