Merge pull request #6 from NebulaServices/2.3

2.3

.env.example

@@ -0,0 +1,22 @@
+# Your bot token
+TOKEN=
+
+# The ID of the server you are going to add the bot to.
+GUILDID=
+
+# The ID of the bot profile
+CLIENTID=
+
+# An array of bot owner IDs
+OWNERID=
+
+# The text you see in the embeds of footers - i.e. "A Nebula service"
+EMBEDFOOTERTEXT=
+
+# These next few values are about reporting. If you leave them blank, the report feature will be disabled.
+REPORTWEBHOOK=
+REPORTUSERNAME=
+REPORTAVATAR=
+
+# The status displayed on your bot profile
+STATUS=

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 config.json
-database.sqlite
+database.sqlite
+.env

Handler/index.js

@@ -13,7 +13,8 @@ const dispense = async (client, interaction) => {
                 usage_count: 0
             })
             console.log(client.colors.warn('[DB]'), `User ${interaction.user.tag} added to db`)
-            return interaction.reply({ content: 'You have been added to the database - click the button again.', ephemeral: true })
+            // return interaction.reply({ content: 'You have been added to the database - click the button again.', ephemeral: true })
+            return dispense(client, interaction);
         }
     } catch (err) {
         console.log(client.colors.error(err))

README.md

@@ -43,10 +43,15 @@
 <td>/list</td>
 </tr>
 <tr>
-<td>/reset</td>
+<td>/reset-all</td>
 <td>Resets all users in the database</td>
 <td>/reset</td>
 </tr>
+<tr>
+<td>/reset</td>
+<td>Reset a user</td>
+<td>/reset [user]</td>
+</tr>
 </tbody>
 </table>
 
@@ -60,10 +65,10 @@ Installation instructions can be found on the [wiki](https://github.com/NebulaSe
 
 ## Credits
 
-Written by [Phene](https://github.com/joebobbio) and [illusions](https://github.com/illusionTBA) for Nebula Services
+See our [contributors](https://github.com/NebulaServices/Dispenser/graphs/contributors)
 
 Dispenser is a product of Nebula Services | Copyright Nebula Services 2022
 <br>
-Copyright Questions ----> accounts-management@nebula.bio
+Copyright questions ----> accounts-management@nebula.bio
 <br>
-Need Help? Open a ticket -> https://discord.nebula.bio
+Need help or want to contribute? Open a ticket -> https://discord.nebula.bio

commands/reset-all.js

@@ -0,0 +1,21 @@
+const {SlashCommandBuilder} = require('@discordjs/builders')
+const {Users} = require('../db')
+module.exports = {
+    data: new SlashCommandBuilder()
+    .setName('reset-all')
+    .setDescription('Reset ALL USERS'),
+    ownerOnly: true,
+    async execute(interaction){
+        try{
+            Users.destroy({
+                where: {}
+            })    
+            return interaction.reply('All users have been reset.')
+        }
+        catch(err){
+            interaction.reply('Something went wrong. Check the log!')
+            console.log(client.colors.error(err))
+        }
+
+    }
+}

commands/reset.js

@@ -3,19 +3,20 @@ const {Users} = require('../db')
 module.exports = {
     data: new SlashCommandBuilder()
     .setName('reset')
-    .setDescription('Reset ALL USERS'),
+    .setDescription('Reset a user\'s monthly count')
+    .addUserOption(option => option.setName('user').setDescription('The user to reset').setRequired(true)),
     ownerOnly: true,
     async execute(interaction){
-        try{
+        const user = interaction.options.getMember('user')
+        try {
             Users.destroy({
-                where: {}
-            })    
-            return interaction.reply('All users have been reset.')
+                where: {id:user.id}
+            })
+            return interaction.reply(`Reset user ${user.user.tag}`)
         }
         catch(err){
-            interaction.reply('Something went wrong. Check the log!')
+            interaction.reply('User either does not exist or an unknown error occurred.')
             console.log(client.colors.error(err))
         }
-
     }
 }

deploy-commands.js

@@ -1,8 +1,11 @@
+require("dotenv").config();
 const fs = require('node:fs');
 const path = require('node:path');
 const { REST } = require('@discordjs/rest');
 const { Routes } = require('discord-api-types/v9');
-const { clientID, guildID, token } = require('./config.json');
+const clientID = process.env.CLIENTID;
+const guildID = process.env.guildID;
+const token = process.env.TOKEN;
 const { colors } = require('./colors');
 const commands = [];
 const commandsPath = path.join(__dirname, 'commands');

index.js

@@ -1,3 +1,4 @@
+require("dotenv").config();
 const { Client, Collection, Intents } = require('discord.js');
 const fs = require('node:fs');
 const path = require('node:path');
@@ -9,7 +10,7 @@ const { loadEvents, loadCommands } = require('./Handler');
 
 // global sexy variables
 module.exports = client;
-client.config = require('./config.json');
+client.config = process.env;
 client.Discord = Discord;
 client.commands = new Collection();
 client.colors = colors;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "neb-dispenser",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "Distribute domains to a Discord server",
   "main": "index.js",
   "scripts": {