Lots of changes

.eslintrc.json

@@ -1,47 +1,47 @@
-{
+// {
-	"extends": "eslint:recommended",
+// 	"extends": "eslint:recommended",
-	"env": {
+// 	"env": {
-		"node": true,
+// 		"node": true,
-		"es6": true
+// 		"es6": true
-	},
+// 	},
-	"parserOptions": {
+// 	"parserOptions": {
-		"ecmaVersion": 2021
+// 		"ecmaVersion": 2021
-	},
+// 	},
-	"rules": {
+// 	"rules": {
-		"arrow-spacing": ["warn", { "before": true, "after": true }],
+// 		// "arrow-spacing": ["warn", { "before": true, "after": true }],
-		"comma-dangle": ["error", "always-multiline"],
+// 		// "comma-dangle": ["error", "always-multiline"],
-		"comma-spacing": "error",
+// 		// "comma-spacing": "error",
-		"comma-style": "error",
+// 		// "comma-style": "error",
-		"curly": ["error", "multi-line", "consistent"],
+// 		// "curly": ["error", "multi-line", "consistent"],
-		"dot-location": ["error", "property"],
+// 		// "dot-location": ["error", "property"],
-		"handle-callback-err": "off",
+// 		// "handle-callback-err": "off",
-		"keyword-spacing": "error",
+// 		// "keyword-spacing": "error",
-		"max-nested-callbacks": ["error", { "max": 4 }],
+// 		// "max-nested-callbacks": ["error", { "max": 4 }],
-		"max-statements-per-line": ["error", { "max": 2 }],
+// 		// "max-statements-per-line": ["error", { "max": 2 }],
-		"no-console": "off",
+// 		// "no-console": "off",
-		"no-empty-function": "error",
+// 		// "no-empty-function": "error",
-		"no-floating-decimal": "error",
+// 		// "no-floating-decimal": "error",
-		"no-inline-comments": "error",
+// 		// "no-inline-comments": "error",
-		"no-lonely-if": "error",
+// 		// "no-lonely-if": "error",
-		"no-multi-spaces": "error",
+// 		// "no-multi-spaces": "error",
-		"no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1, "maxBOF": 0 }],
+// 		// "no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1, "maxBOF": 0 }],
-		"no-shadow": ["error", { "allow": ["err", "resolve", "reject"] }],
+// 		// "no-shadow": ["error", { "allow": ["err", "resolve", "reject"] }],
-		"no-trailing-spaces": ["error"],
+// 		// "no-trailing-spaces": ["error"],
-		"no-var": "error",
+// 		// "no-var": "error",
-		"object-curly-spacing": ["error", "always"],
+// 		// "object-curly-spacing": ["error", "always"],
-		"prefer-const": "error",
+// 		// "prefer-const": "error",
-		"quotes": ["error", "single"],
+// 		// "quotes": ["error", "single"],
-		"semi": ["error", "always"],
+// 		// "semi": ["error", "always"],
-		"space-before-blocks": "error",
+// 		// "space-before-blocks": "error",
-		"space-before-function-paren": ["error", {
+// 		// "space-before-function-paren": ["error", {
-			"anonymous": "never",
+// 		// 	"anonymous": "never",
-			"named": "never",
+// 		// 	"named": "never",
-			"asyncArrow": "always"
+// 		// 	"asyncArrow": "always"
-		}],
+// 		// }],
-		"space-in-parens": "error",
+// 		// "space-in-parens": "error",
-		"space-infix-ops": "error",
+// 		// "space-infix-ops": "error",
-		"space-unary-ops": "error",
+// 		// "space-unary-ops": "error",
-		"spaced-comment": "error",
+// 		// "spaced-comment": "error",
-		"yoda": "error"
+// 		// "yoda": "error"
-	}
+// 	}
-}
+// }

commands/100-games/beatGame.js

@@ -1,19 +1,27 @@
-const { SlashCommandBuilder } = require('discord.js');
+import { SlashCommandBuilder, EmbedBuilder } from 'discord.js';
 
-module.exports = {
+export const data = new SlashCommandBuilder()
-    data: new SlashCommandBuilder()
     .setName('beatgame')
     .setDescription('Log a game that you have beat towards the 100 game challenge!')
     .addStringOption(option => option.setName('gamename').setDescription('The name of the game.'))
-        .addNumberOption(option => option.setName('gameid').setDescription('The IGDB game id.'))
+    .addNumberOption(option => option.setName('gameid').setDescription('The IGDB game id.').setMinValue(0))
     .addStringOption(option => option.setName('datestarted').setDescription('The date you started playing the game (today if empty).'))
-        .addStringOption(option => option.setName('datebeaten').setDescription('The date you beat the game (today if empty).')),
+    .addStringOption(option => option.setName('datebeaten').setDescription('The date you beat the game (today if empty).'));
-    async execute(interaction) {
+
+export async function execute(interaction) {
     const gamename = interaction.options.getString('gamename');
     const gameid = interaction.options.getNumber('gameid');
 
     if (!gamename && !gameid) return interaction.reply('No gamename or gameid supplied, please supply an option to register a game!');
-        if (gameid) return interaction.reply(`Game ID "${gameid}" has been beaten, Game logged!`);
+
-        return interaction.reply(`Game "${gamename}" has been beaten, Game logged!`);
+    const embed = new EmbedBuilder()
-    },
+        .setColor(0xFFD700)
-};
+        .setAuthor({ name: `${interaction.user.displayName} beat a new game!`, iconURL: interaction.user.avatarURL() })
+        .setTitle('osu! beaten')
+        .setThumbnail('https://upload.wikimedia.org/wikipedia/en/8/8d/Dark_Souls_Cover_Art.jpg')
+        .setDescription(`${interaction.user.displayName} has beaten 69 games, they have 31 games remaining.`)
+        .setFooter({ text: 'The Ochulus • 100 Games Challenge', iconURL: interaction.client.user.avatarURL() })
+        .setTimestamp();
+
+    return interaction.reply({ embeds: [embed] });
+}

commands/testing/avatar.js

@@ -1,13 +1,12 @@
-const { SlashCommandBuilder } = require('discord.js');
+import { SlashCommandBuilder } from 'discord.js';
 
-module.exports = {
+export const data = new SlashCommandBuilder()
-    data: new SlashCommandBuilder()
     .setName('avatar')
     .setDescription('Get the avatar URL of the selected user, or your own avatar.')
-        .addUserOption(option => option.setName('user').setDescription('The user\'s avatar to show')),
+    .addUserOption(option => option.setName('user').setDescription('The user\'s avatar to show'));
-    async execute(interaction) {
+
+export async function execute(interaction) {
     const user = interaction.options.getUser('user');
     if (user) return interaction.reply(`${user.username}'s avatar: ${user.displayAvatarURL()}`);
     return interaction.reply(`Your avatar: ${interaction.user.displayAvatarURL()}`);
-    },
+}
-};

commands/testing/ping.js

@@ -1,10 +1,9 @@
-const { SlashCommandBuilder } = require('discord.js');
+import { SlashCommandBuilder } from 'discord.js';
 
-module.exports = {
+export const data = new SlashCommandBuilder()
-	data: new SlashCommandBuilder()
 	.setName('ping')
-		.setDescription('Replies with pong!'),
+	.setDescription('Replies with pong!');	
-	async execute(interaction) {
+
+export async function execute(interaction) {
 	await interaction.reply('Pong!');	
-	},
+}
-};

commands/testing/reload.js

@@ -1,14 +1,14 @@
-const { SlashCommandBuilder } = require('discord.js');
+import { SlashCommandBuilder } from 'discord.js';
 
-module.exports = {
+export const data = new SlashCommandBuilder()
-    data: new SlashCommandBuilder()
     .setName('reload')
     .setDescription('Reload a command.')
     .addStringOption(option =>
         option.setName('command')
             .setDescription('The command to reload.')
-            .setRequired(true)),
+            .setRequired(true));
-    async execute(interaction) {
+
+export async function execute(interaction) {
     const commandName = interaction.options.getString('command', true).toLowerCase();
     const command = interaction.client.commands.get(commandName);
 
@@ -27,5 +27,4 @@ module.exports = {
         console.error(error);
         await interaction.reply(`There was an error while reloading a command \`${command.data.name}\`:\n\`${error.message}\``);
     }
-    },
+}
-};

commands/testing/server.js

@@ -1,10 +1,9 @@
-const { SlashCommandBuilder } = require('discord.js');
+import { SlashCommandBuilder } from 'discord.js';
 
-module.exports = {
+export const data = new SlashCommandBuilder()
-    data: new SlashCommandBuilder()
+.setName('server')
-        .setName('server')
+.setDescription('Provides information about the server.');
-        .setDescription('Provides information about the server.'),
+
-    async execute(interaction) {
+export async function execute(interaction) {
     await interaction.reply(`This server is ${interaction.guild.name} and has ${interaction.guild.memberCount} members.`);
-    },
+}
-};

commands/testing/user.js

@@ -1,12 +1,12 @@
-const { SlashCommandBuilder } = require('discord.js');
+import { SlashCommandBuilder } from 'discord.js';
 
-module.exports = {
+export const data = new SlashCommandBuilder()
-    data: new SlashCommandBuilder()
     .setName('user')
-        .setDescription('Provides information about the user.'),
+    .setDescription('Provides information about the user.');
-    async execute(interaction) {
+
+export async function execute(interaction) {
         // interaction.user is the object representing the user who ran the command
         // interaction.member is the GuildMember object, which represents the user in the specific guild
         await interaction.reply(`This command was run by ${interaction.user.username}, who joined on ${interaction.member.joinedAt}.`);
-    },
+
-};
+}

deploy-commands.js

@@ -1,10 +1,17 @@
-const { REST, Routes } = require('discord.js');
+import { REST, Routes } from 'discord.js';
-const { clientId, guildId, token } = require('./config.json');
+//import { clientId, guildId, token } from './config.json';
-const fs = require('node:fs');
+import fs from 'node:fs';
-const path = require('node:path');
+import path from 'node:path';
+import { fileURLToPath } from 'url';
+import { pathToFileURL } from 'node:url';
+
+import { config } from 'dotenv';
+config();
 
 const commands = [];
 // Grab all the command files from the commands directory you created earlier
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 const foldersPath = path.join(__dirname, 'commands');
 const commandFolders = fs.readdirSync(foldersPath);
 
@@ -15,7 +22,7 @@ for (const folder of commandFolders) {
 	// Grab the SlashCommandBuilder#toJSON() output of each command's data for deployment
 	for (const file of commandFiles) {
 		const filePath = path.join(commandsPath, file);
-		const command = require(filePath);
+		const command = await import(pathToFileURL(filePath));
 		if ('data' in command && 'execute' in command) {
 			commands.push(command.data.toJSON());
 		} else {
@@ -25,7 +32,7 @@ for (const folder of commandFolders) {
 }
 
 // Construct and prepare an instance of the REST module
-const rest = new REST().setToken(token);
+const rest = new REST().setToken(process.env.token);
 
 // and deploy your commands!
 (async () => {
@@ -34,7 +41,7 @@ const rest = new REST().setToken(token);
 
 		// The put method is used to fully refresh all commands in the guild with the current set
 		const data = await rest.put(
-			Routes.applicationGuildCommands(clientId, guildId),
+			Routes.applicationGuildCommands(process.env.clientId, process.env.guildId),
 			{ body: commands },
 		);
 

events/interactionCreate.js

@@ -1,8 +1,8 @@
-const { Events, Collection } = require('discord.js');
+import { Events, Collection } from 'discord.js';
 
-module.exports = {
+export const name = Events.InteractionCreate;
-    name: Events.InteractionCreate,
+
-    async execute(interaction) {
+export async function execute(interaction) {
     if (!interaction.isChatInputCommand()) return;
 
     console.log(interaction);
@@ -47,5 +47,11 @@ module.exports = {
             await interaction.reply({ content: 'There was an error while executing this command!', ephemeral: true });
         }
     }
-    },
+}
-};
+
+// module.exports = {
+//     name: Events.InteractionCreate,
+//     async execute(interaction) {
+        
+//     },
+// };

events/ready.js

@@ -1,9 +1,9 @@
-const { Events } = require('discord.js');
+import { Events } from 'discord.js';
 
-module.exports = {
+export const name = Events.ClientReady;
-    name: Events.ClientReady,
+
-    once: true,
+export const once = true;
-    execute(client) {
+
+export async function execute(client) {
         console.log(`Ready! Logged in as ${client.user.tag}`);
-    },
+}
-};

index.js

@@ -1,8 +1,12 @@
 // Require the necessary discord.js classes
-const fs = require('node:fs');
+import fs from 'node:fs';
-const path = require('node:path');
+import path from 'node:path';
-const { Client, Collection, GatewayIntentBits } = require('discord.js');
+import { pathToFileURL } from 'node:url';
-const { token } = require('./config.json');
+import { fileURLToPath } from 'url';
+import { Client, Collection, GatewayIntentBits } from 'discord.js';
+
+import { config } from 'dotenv';
+config();
 
 // Create a new client instance
 const client = new Client({ intents: [GatewayIntentBits.Guilds] });
@@ -10,6 +14,8 @@ const client = new Client({ intents: [GatewayIntentBits.Guilds] });
 client.commands = new Collection();
 client.cooldowns = new Collection();
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 const foldersPath = path.join(__dirname, 'commands');
 const commandFolders = fs.readdirSync(foldersPath);
 
@@ -19,7 +25,7 @@ for (const folder of commandFolders) {
 
 	for (const file of commandFiles) {
 		const filePath = path.join(commandsPath, file);
-		const command = require(filePath);
+		const command = await import(pathToFileURL(filePath));
 
 		// Set a new item in the collection with the key as the command name and the value as the exported module
 		if ('data' in command && 'execute' in command) {
@@ -35,7 +41,7 @@ const eventFiles = fs.readdirSync(eventsPath).filter(file => file.endsWith('.js'
 
 for (const file of eventFiles) {
 	const filePath = path.join(eventsPath, file);
-	const event = require(filePath);
+	const event = await import(pathToFileURL(filePath));
 	if (event.once) {
 		client.once(event.name, (...args) => event.execute(...args));
 	} else {
@@ -43,5 +49,23 @@ for (const file of eventFiles) {
 	}
 }
 
-// Log in to Discord with your client's token
+fetch(
-client.login(token);
+	`https://id.twitch.tv/oauth2/token?client_id=${process.env.igdbClientId}&client_secret=${process.env.igdbClientSecret}&grant_type=client_credentials`,
+	{
+		method: 'POST',
+	},
+)
+.then(r => r.json().then(data => ({ status: r.status, headers: r.headers, body: data })))
+.then(resp => {
+	if (resp.status != 200) {
+		console.log('Failed with ', resp.status, resp.body);
+		return;
+	}
+	console.log(resp.body.access_token);
+})
+.catch(err => {
+	console.error(err);
+})
+.finally();
+
+client.login(process.env.token);

package-lock.json

@@ -9,7 +9,8 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "discord.js": "^14.14.1"
+        "discord.js": "^14.14.1",
+        "dotenv": "^16.3.1"
       },
       "devDependencies": {
         "eslint": "^8.53.0"
@@ -526,6 +527,17 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/dotenv": {
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
+      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/motdotla/dotenv?sponsor=1"
+      }
+    },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",

package.json

@@ -6,10 +6,12 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
+  "type": "module",
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "discord.js": "^14.14.1"
+    "discord.js": "^14.14.1",
+    "dotenv": "^16.3.1"
   },
   "devDependencies": {
     "eslint": "^8.53.0"