Compare commits

..

No commits in common. "f3e2715703f188fe26224b282728c5029fcc2e49" and "d0ec7fbb6c6897807231840d1cce8dc3283ce56b" have entirely different histories.

3 changed files with 21 additions and 78 deletions

View File

@ -1,4 +1,4 @@
import { ChannelType, SlashCommandBuilder } from 'discord.js';
import { SlashCommandBuilder } from 'discord.js';
import { VoiceChannel } from '../../../database.js';
export const data = new SlashCommandBuilder()
@ -39,22 +39,13 @@ export async function execute(interaction) {
step = 'create';
// Create new channel
const channel = await guild.channels.create({
const channel = await guild.create({
name, type: ChannelType.GuildVoice
});
// Save channel data
step = 'save';
await VoiceChannel.create({
id: channel.id,
create: true
});
// Reply success to acknowledge command
await interaction.reply({
content: `Successfully created channel!`,
ephemeral: true
});
await VoiceChannel.create({ id: channel.id });
break;
}
case 'register': {
@ -67,13 +58,7 @@ export async function execute(interaction) {
// Save channel data
step = 'save';
await VoiceChannel.create({ id, create: true });
// Reply success to acknowledge command
await interaction.reply({
content: `Successfully registered channel!`,
ephemeral: true
});
await VoiceChannel.create({ id });
break;
}
}

View File

@ -1,70 +1,36 @@
import { ChannelType, Events, PermissionsBitField } from 'discord.js';
import { VoiceChannel } from '../../database.js';
const getchannel = async (member, channels) => {
// Check database for existing channel
const ownCh = await VoiceChannel.findOne({
where: {
owner: member.user.id
}
});
if (ownCh !== null) {
return await channels.fetch(ownCh.id);
}
// Create private channel with all permissions
const name = member.user.username;
const chName = `${name}${name.endsWith('s') ? "'" : "'s"} channel`;
const privCh = await channels.create({
name: chName,
type: ChannelType.GuildVoice,
permissionOverwrites: [
{
id: member.id,
allow: [
PermissionsBitField.All
]
}
]
});
// Save newly created channel
await VoiceChannel.create({
id: privCh.id,
owner: member.user.id
})
return privCh;
};
export const name = Events.VoiceStateUpdate;
export async function execute(_, state) {
if (!state.channel) return;
// Find channel by id, return if not registered for customs
const createCh = await VoiceChannel.findOne({
where: {
id: state.channel.id,
create: true,
}
});
if (createCh === null) return;
// Extract user data
const member = state.member;
const name = member.user.username;
// Extract channel data
const channels = state.guild.channels;
let step = 'create';
try {
const privCh = await getchannel(member, channels);
// Create private channel with all permissions
const chName = `${name}${name.endsWith('s') ? "'" : "'s"} channel`;
const privCh = await channels.create({
name: chName,
type: ChannelType.GuildVoice,
permissionOverwrites: [
{
id: member.id,
allow: [
PermissionsBitField.All
]
}
]
});
step = 'move to';
// Move user to private channel
await state.setChannel(privCh);
console.info(`[INFO] User '${name}' created private channel with ID ${privCh.id}.`);
} catch (error) {
console.error(error);
await member.send(`Failed to ${step} channel! Please contact server staff.`);
await member.send('Could no create or move to channel! Please contact server staff.');
}
}

View File

@ -1,18 +1,10 @@
import { DataTypes } from 'sequelize';
export default function(sequelize) {
export default function (sequelize) {
return sequelize.define('VoiceChannel', {
id: {
type: DataTypes.STRING,
primaryKey: true
},
create: {
type: DataTypes.BOOLEAN
},
owner: {
type: DataTypes.STRING,
defaultValue: false,
allowNull: true
}
});
}