Added database

discordbot/.eslintrc.json

@@ -17,7 +17,7 @@
 		"curly": ["error", "multi-line", "consistent"],
 		"dot-location": ["error", "property"],
 		"handle-callback-err": "off",
-		"indent": ["error", "tab"],
+		"indent": ["error", 2],
 		"keyword-spacing": "error",
 		"max-nested-callbacks": ["error", { "max": 4 }],
 		"max-statements-per-line": ["error", { "max": 2 }],

discordbot/commands/clear.js

@@ -0,0 +1,23 @@
+const { SlashCommandBuilder, PermissionFlagsBits } = require('discord.js');
+const { simpleEmbed } = require('../functions/embeds.js');
+
+module.exports = {
+  data: new SlashCommandBuilder()
+    .setName('clear')
+    .setDescription('Clear 1-100 messages')
+    .setDefaultMemberPermissions(PermissionFlagsBits.Administrator)
+    .addNumberOption(option => option
+      .setName('amount')
+      .setDescription('The amount of messages to clear')
+      .setRequired(true)),
+
+  async execute(interaction) {
+    const amount = interaction.options.getNumber('amount');
+
+    if (amount < 1 || amount > 100) return await interaction.reply({ embeds: [simpleEmbed('The amount must be between 1-100')] });
+
+    interaction.channel.bulkDelete(amount, true);
+
+    await interaction.reply({ embeds: [simpleEmbed(`Cleared **${amount}** messages`)], ephemeral: true });
+  },
+};

discordbot/commands/ping.js

@@ -3,12 +3,12 @@ const { simpleEmbed } = require('../functions/embeds.js');
 const { client } = require('../index.js');
 
 module.exports = {
-	data: new SlashCommandBuilder()
+  data: new SlashCommandBuilder()
-		.setName('ping')
+    .setName('ping')
-		.setDescription('Replies with Pong!'),
+    .setDescription('Replies with Pong!'),
-	async execute(interaction) {
+  async execute(interaction) {
-		const reply = await interaction.reply({ embeds: [simpleEmbed(`Websocket heartbeat: **${client.ws.ping}ms**\n Roundtrip latency: **Pinging...**`)], fetchReply: true, emphemeral: true });
+    const reply = await interaction.reply({ embeds: [simpleEmbed(`Websocket heartbeat: **${client.ws.ping}ms**\n Roundtrip latency: **Pinging...**`)], fetchReply: true, emphemeral: true });
 
-		interaction.editReply({ embeds: [simpleEmbed(`Websocket heartbeat: **${client.ws.ping}ms**\n Roundtrip latency: **${reply.createdTimestamp - interaction.createdTimestamp}ms**`)] });
+    interaction.editReply({ embeds: [simpleEmbed(`Websocket heartbeat: **${client.ws.ping}ms**\n Roundtrip latency: **${reply.createdTimestamp - interaction.createdTimestamp}ms**`)] });
-	},
+  },
 };

discordbot/events/guildMemberAdd.js

@@ -0,0 +1,25 @@
+const { Events, EmbedBuilder } = require('discord.js');
+const { client } = require('../index.js');
+const { Users } = require('../functions/models');
+
+module.exports = {
+  name: Events.GuildMemberAdd,
+  async execute(member) {
+    const addMemberEmbed = new EmbedBuilder()
+      .setTitle(`${member.user.globalName} has joined!`)
+      .setDescription(`Welcome ${member} to the **Polarcraft** Discord server!`)
+      .setColor(process.env.EMBED_COLOR)
+      .setThumbnail(member.user.avatarURL());
+
+    const channel = client.channels.cache.get(process.env.LOG_CHANNEL_ID);
+    channel.send({ embeds: [addMemberEmbed] });
+
+    try {
+      await Users.create({
+        id: member.user.id,
+      });
+    } catch (error) {
+      console.error(error);
+    }
+  },
+};

discordbot/events/guildMemberRemove.js

@@ -0,0 +1,14 @@
+const { Events, EmbedBuilder } = require('discord.js');
+const { client } = require('../index.js');
+
+module.exports = {
+  name: Events.GuildMemberRemove,
+  async execute(member) {
+    const removeMemberEmbed = new EmbedBuilder()
+      .setTitle(`${member.user.globalName} has left!`)
+      .setColor(process.env.EMBED_COLOR);
+
+    const channel = client.channels.cache.get(process.env.LOG_CHANNEL_ID);
+    channel.send({ embeds: [removeMemberEmbed] });
+  },
+};

discordbot/events/interactionCreate.js

@@ -1,22 +1,22 @@
 const { Events } = require('discord.js');
 
 module.exports = {
-	name: Events.InteractionCreate,
+  name: Events.InteractionCreate,
-	async execute(interaction) {
+  async execute(interaction) {
-		if (!interaction.isChatInputCommand()) return;
+    if (!interaction.isChatInputCommand()) return;
 
-		const command = interaction.client.commands.get(interaction.commandName);
+    const command = interaction.client.commands.get(interaction.commandName);
 
-		if (!command) {
+    if (!command) {
-			console.error(`No command matching ${interaction.commandName} was found.`);
+      console.error(`No command matching ${interaction.commandName} was found.`);
-			return;
+      return;
-		}
+    }
 
-		try {
+    try {
-			await command.execute(interaction);
+      await command.execute(interaction);
-		} catch (error) {
+    } catch (error) {
-			console.error(`Error executing ${interaction.commandName}`);
+      console.error(`Error executing ${interaction.commandName}`);
-			console.error(error);
+      console.error(error);
-		}
+    }
-	},
+  },
 };

discordbot/events/ready.js

@@ -1,12 +1,17 @@
 const { Events } = require('discord.js');
 const deployCommands = require('../functions/deployCommands');
+const { Users, Teams, Minecraft } = require('../functions/models');
 
 module.exports = {
-	name: Events.ClientReady,
+  name: Events.ClientReady,
-	once: true,
+  once: true,
-	execute(client) {
+  execute(client) {
-		console.log(`Ready! Logged in as ${client.user.tag}`);
+    Users.sync();
+    Teams.sync();
+    Minecraft.sync();
 
-		deployCommands();
+    console.log(`Ready! Logged in as ${client.user.tag}`);
-	},
+
+    deployCommands();
+  },
 };

discordbot/functions/deployCommands.js

@@ -3,43 +3,43 @@ const fs = require('node:fs');
 const path = require('node:path');
 
 module.exports = function deployCommands() {
-	const commands = [];
+  const commands = [];
 
-	const commandsPath = path.join(__dirname, '../commands');
+  const commandsPath = path.join(__dirname, '../commands');
-	const commandFiles = fs.readdirSync(commandsPath).filter(file => file.endsWith('.js'));
+  const commandFiles = fs.readdirSync(commandsPath).filter(file => file.endsWith('.js'));
 
-	for (const file of commandFiles) {
+  for (const file of commandFiles) {
-		const filePath = path.join(commandsPath, file);
+    const filePath = path.join(commandsPath, file);
-		const command = require(filePath);
+    const command = require(filePath);
-		if ('data' in command && 'execute' in command) {
+    if ('data' in command && 'execute' in command) {
-			commands.push(command.data.toJSON());
+      commands.push(command.data.toJSON());
-		} else {
+    } else {
-			console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
+      console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
-		}
+    }
-	}
+  }
 
-	const rest = new REST().setToken(process.env.DISCORD_TOKEN);
+  const rest = new REST().setToken(process.env.DISCORD_TOKEN);
 
-	(async () => {
+  (async () => {
-		try {
+    try {
-			console.log(`Started refreshing ${commands.length} application (/) commands.`);
+      console.log(`Started refreshing ${commands.length} application (/) commands.`);
 
-			let data;
+      let data;
-			if (process.env.GUILD_ID === 'production') {
+      if (process.env.GUILD_ID === 'production') {
-				data = await rest.put(
+        data = await rest.put(
-					Routes.applicationCommands(process.env.DISCORD_APPLICATION_ID),
+          Routes.applicationCommands(process.env.DISCORD_APPLICATION_ID),
-					{ body: commands },
+          { body: commands },
-				);
+        );
-			} else {
+      } else {
-				data = await rest.put(
+        data = await rest.put(
-					Routes.applicationGuildCommands(process.env.DISCORD_APPLICATION_ID, process.env.GUILD_ID),
+          Routes.applicationGuildCommands(process.env.DISCORD_APPLICATION_ID, process.env.GUILD_ID),
-					{ body: commands },
+          { body: commands },
-				);
+        );
-			}
+      }
 
-			console.log(`Successfully reloaded ${data.length} application (/) commands.`);
+      console.log(`Successfully reloaded ${data.length} application (/) commands.`);
-		} catch (error) {
+    } catch (error) {
-			console.error(error);
+      console.error(error);
-		}
+    }
-	})();
+  })();
 };

discordbot/functions/embeds.js

@@ -1,9 +1,9 @@
 const { EmbedBuilder } = require('discord.js');
 
 const simpleEmbed = (value) => {
-	return new EmbedBuilder()
+  return new EmbedBuilder()
-		.setColor(process.env.EMBED_COLOR)
+    .setColor(process.env.EMBED_COLOR)
-		.setDescription(value);
+    .setDescription(value);
 };
 
 module.exports = { simpleEmbed };

discordbot/functions/models.js

@@ -0,0 +1,56 @@
+const { sequelize } = require('../index');
+const Sequelize = require('sequelize');
+
+const Users = sequelize.define('users', {
+  id: {
+    type: Sequelize.STRING,
+    primaryKey: true,
+    unique: true,
+  },
+  teamId: {
+    type: Sequelize.STRING,
+  },
+  moderator: {
+    type: Sequelize.BOOLEAN,
+    defaultValue: false,
+  },
+  admin: {
+    type: Sequelize.BOOLEAN,
+    defaultValue: false,
+  },
+});
+
+const Teams = sequelize.define('teams', {
+  name: {
+    type: Sequelize.STRING,
+    unique: true,
+    validate: {
+      len: [3, 16],
+      isAlphanumeric: true,
+    },
+  },
+  color: {
+    type: Sequelize.STRING,
+    validate: {
+      is: /^#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/,
+    },
+  },
+});
+
+const Minecraft = sequelize.define('minecraft', {
+  uuid: {
+    type: Sequelize.UUID,
+    unique: true,
+    primaryKey: true,
+  },
+  whitelisted: {
+    type: Sequelize.BOOLEAN,
+    defaultValue: false,
+  },
+  code: {
+    type: Sequelize.STRING,
+    unique: true,
+  },
+});
+
+module.exports = { Users, Teams, Minecraft };

discordbot/index.js

@@ -1,12 +1,22 @@
 const { Client, GatewayIntentBits, Collection } = require('discord.js');
+const Sequelize = require('sequelize');
 const dotenv = require('dotenv');
 const fs = require('node:fs');
 const path = require('node:path');
 
 dotenv.config();
 
+const sequelize = new Sequelize('polarcraft', 'user', process.env.DATABSE_PASSWORD, {
+  host: 'localhost',
+  dialect: 'sqlite',
+  logging: false,
+  // SQLite only
+  storage: 'database.sqlite',
+});
 
-const client = new Client({ intents: [GatewayIntentBits.Guilds] });
+exports.sequelize = sequelize;
+
+const client = new Client({ intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildVoiceStates, GatewayIntentBits.GuildMembers, GatewayIntentBits.GuildMessages, GatewayIntentBits.MessageContent] });
 exports.client = client;
 
 client.commands = new Collection();
@@ -15,27 +25,28 @@ const commandsPath = path.join(__dirname, 'commands');
 const commandFiles = fs.readdirSync(commandsPath).filter(file => file.endsWith('.js'));
 
 for (const file of commandFiles) {
-	const filePath = path.join(commandsPath, file);
+  const filePath = path.join(commandsPath, file);
-	const command = require(filePath);
+  const command = require(filePath);
 
-	if ('data' in command && 'execute' in command) {
+  if ('data' in command && 'execute' in command) {
-		client.commands.set(command.data.name, command);
+    client.commands.set(command.data.name, command);
-	} else {
+  } else {
-		console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
+    console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
-	}
+  }
 }
 
 const eventsPath = path.join(__dirname, 'events');
 const eventFiles = fs.readdirSync(eventsPath).filter(file => file.endsWith('.js'));
 
 for (const file of eventFiles) {
-	const filePath = path.join(eventsPath, file);
+  const filePath = path.join(eventsPath, file);
-	const event = require(filePath);
+  const event = require(filePath);
-	if (event.once) {
+  if (event.once) {
-		client.once(event.name, (...args) => event.execute(...args));
+    client.once(event.name, (...args) => event.execute(...args));
-	} else {
+  } else {
-		client.on(event.name, (...args) => event.execute(...args));
+    client.on(event.name, (...args) => event.execute(...args));
-	}
+  }
 }
 
 client.login(process.env.DISCORD_TOKEN);
+

discordbot/package.json

@@ -10,7 +10,9 @@
   "license": "ISC",
   "dependencies": {
     "discord.js": "^14.12.1",
-    "dotenv": "^16.3.1"
+    "dotenv": "^16.3.1",
+    "sequelize": "^6.32.1",
+    "sqlite3": "^5.1.6"
   },
   "devDependencies": {
     "eslint": "^8.46.0"