Squashed commit of the following:

commit d082de6 Author: yanukadeneth99 <[email protected]> Date: Sun Aug 21 16:42:34 2022 +0530 Worked on getting the balance of goerli commit 4d83345 Author: yanukadeneth99 <[email protected]> Date: Sun Aug 21 15:34:47 2022 +0530 Worked on Feedback commit 84e42c8 Author: yanukadeneth99 <[email protected]> Date: Sun Aug 21 02:05:14 2022 +0530 Removed website command commit 1421fa9 Author: yanukadeneth99 <[email protected]> Date: Sun Aug 21 00:22:56 2022 +0530 Removed unwanted packages and moved to discord.js commit 4d897b0 Author: yanukadeneth99 <[email protected]> Date: Sun Aug 21 00:10:15 2022 +0530 Checking Webhook discord github commit bd0ddcb Author: yanukadeneth99 <[email protected]> Date: Sat Aug 20 23:30:42 2022 +0530 Updated code
yanukadeneth99 · Aug 21, 2022 · a771777 · a771777
1 parent 80c70a5
commit a771777
Show file tree

Hide file tree

Showing 21 changed files with 761 additions and 357 deletions.
diff --git a/README.md b/README.md
@@ -14,5 +14,13 @@ DCB_CLIENT_ID="00000000000"
 # Discord Server ID
 DCB_GUILD_ID="00000000000"
 # Discord Channel ID to post log
-DCB_BOT_LOG_CHANNEL="000000000"
+DCB_LOG_CHANNEL="000000000"
+# Discord Admin Role ID
+DCB_ADMIN_ROLE_ID="00000000"
+# Discord Feedback Channel ID
+DCB_FEEDBACK_CHANNEL="00000000000"
+# Goerli Alchemy Key
+ALCHEMY_GOERLI_URL="https://eth-goerli.g.alchemy.com/v2/xxxxxxxxxxxxxxxxxxxx"
+# Own Wallet Address
+WALLET_ADDRESS="xxxxxxxxxxxxxxxxxxxxx"
 ```
diff --git a/client.js b/client.js
@@ -1,8 +1,8 @@
 // Exporting the Client
 
-const { Client, Intents } = require("discord.js");
+const { Client, GatewayIntentBits } = require("discord.js");
 
 // Create a new Client with these permissions
-const client = new Client({ intents: [Intents.FLAGS.GUILDS] });
+const client = new Client({ intents: [GatewayIntentBits.Guilds] });
 
 module.exports = client;
diff --git a/commands/balance.js b/commands/balance.js
@@ -0,0 +1,31 @@
+// Get the balance of the Address only for admins
+
+const { SlashCommandBuilder, PermissionFlagsBits } = require("discord.js");
+
+module.exports = {
+  data: new SlashCommandBuilder()
+    .setName("balance")
+    .setDescription("Get the balance remaining of the contract")
+    .setDMPermission(true)
+    .setDefaultMemberPermissions(PermissionFlagsBits.Administrator)
+    .addStringOption((option) =>
+      option
+        .setName("network")
+        .setDescription("Select the network to view balance")
+        .setRequired(true)
+        .addChoices({
+          name: "Goerli",
+          value: "goerli",
+        })
+    )
+    .addStringOption((option) =>
+      option
+        .setName("token")
+        .setDescription("Token Type to search")
+        .setRequired(false)
+        .addChoices({
+          name: "ETH",
+          value: "eth",
+        })
+    ),
+};
diff --git a/commands/beep.js b/commands/beep.js
@@ -1,9 +1,10 @@
 // Respond user beep with Boop
 
-const { SlashCommandBuilder } = require("@discordjs/builders");
+const { SlashCommandBuilder } = require("discord.js");
 
 module.exports = {
   data: new SlashCommandBuilder()
     .setName("beep")
-    .setDescription("Replies with boop!"),
+    .setDescription("Replies with boop!")
+    .setDMPermission(true),
 };
diff --git a/commands/echo.js b/commands/echo.js
@@ -1,11 +1,12 @@
 // Replying the User with what the user typed
 
-const { SlashCommandBuilder } = require("@discordjs/builders");
+const { SlashCommandBuilder } = require("discord.js");
 
 module.exports = {
   data: new SlashCommandBuilder()
     .setName("echo")
     .setDescription("Replies with your input!")
+    .setDMPermission(true)
     .addStringOption((option) =>
       option
         .setName("input")

diff --git a/commands/feedback.js b/commands/feedback.js
@@ -0,0 +1,11 @@
+// Generate a Modal where you can enter your required eth
+// Address, Token(LINK, ETH, MATIC), Network(Mumbai,Rinkeby)
+
+const { SlashCommandBuilder } = require("discord.js");
+
+module.exports = {
+  data: new SlashCommandBuilder()
+    .setName("feedback")
+    .setDescription("Send Feedback to the Faucet Bot")
+    .setDMPermission(true),
+};
diff --git a/commands/info.js b/commands/info.js
@@ -1,11 +1,12 @@
 // Replies user with user info or server info
 
-const { SlashCommandBuilder } = require("@discordjs/builders");
+const { SlashCommandBuilder } = require("discord.js");
 
 module.exports = {
   data: new SlashCommandBuilder()
     .setName("info")
     .setDescription("Get info about a user or a server!")
+    .setDMPermission(false)
     .addSubcommand((subcommand) =>
       subcommand
         .setName("user")
@@ -15,8 +16,6 @@ module.exports = {
         )
     )
     .addSubcommand((subcommand) =>
-      subcommand
-      .setName("server")
-      .setDescription("Info about the server")
+      subcommand.setName("server").setDescription("Info about the server")
     ),
 };
diff --git a/commands/ping.js b/commands/ping.js
@@ -1,9 +1,11 @@
 // Respond the user with the bot's ping
 
-const { SlashCommandBuilder } = require("@discordjs/builders");
+const { SlashCommandBuilder, PermissionFlagsBits } = require("discord.js");
 
 module.exports = {
   data: new SlashCommandBuilder()
     .setName("ping")
-    .setDescription("Check the ping of the bot (for admins only)"),
+    .setDescription("Check the ping of the bot (for admins only)")
+    .setDMPermission(true)
+    .setDefaultMemberPermissions(PermissionFlagsBits.Administrator),
 };
diff --git a/delete-commands.js b/delete-commands.js
@@ -0,0 +1,26 @@
+//! Run `node delete-commands.js` to delete all the commands
+
+const { REST } = require("@discordjs/rest");
+const { Routes } = require("discord.js");
+require("dotenv").config();
+
+// Get the REST
+const rest = new REST({ version: "10" }).setToken(process.env.DCB_TOKEN);
+
+//* Use to remove all commands from the Guild
+// rest
+//   .put(
+//     Routes.applicationGuildCommands(
+//       process.env.DCB_CLIENT_ID,
+//       process.env.DCB_GUILD_ID
+//     ),
+//     { body: [] }
+//   )
+//   .then(() => console.log("Successfully deleted all guild commands."))
+//   .catch(console.error);
+
+//* Use to remove all commands publically
+rest
+  .put(Routes.applicationCommands(process.env.DCB_CLIENT_ID), { body: [] })
+  .then(() => console.log("Successfully deleted all application commands."))
+  .catch(console.error);
diff --git a/deploy-commands.js b/deploy-commands.js
@@ -1,28 +1,43 @@
-const fs = require("fs");
+//? Run `node deploy-commands.js` to set the commands
+
+const fs = require("node:fs");
+const path = require("node:path");
 const { REST } = require("@discordjs/rest");
-const { Routes } = require("discord-api-types/v9");
-require("dotenv").config({ path: ".env" });
+const { Routes } = require("discord.js");
+require("dotenv").config();
 
+// Get the commands from the `/commands` folder and to the array
 const commands = [];
+const commandsPath = path.join(__dirname, "commands");
 const commandFiles = fs
-  .readdirSync("./commands")
+  .readdirSync(commandsPath)
   .filter((file) => file.endsWith(".js"));
 
 for (const file of commandFiles) {
-  const command = require(`./commands/${file}`);
+  const commandPath = path.join(commandsPath, file);
+  const command = require(commandPath);
   commands.push(command.data.toJSON());
 }
 
-const rest = new REST({ version: "9" }).setToken(process.env.DCB_TOKEN);
+// Get the REST
+const rest = new REST({ version: "10" }).setToken(process.env.DCB_TOKEN);
 
+//* Use for Development (Updates only the passed guild data)
 rest
   .put(
     Routes.applicationGuildCommands(
       process.env.DCB_CLIENT_ID,
       process.env.DCB_GUILD_ID
-    ), //* Use for Production
-    //Routes.applicationCommands(process.env.DBC_CLIENT_ID) //* Use for Development as its updated instantly (no cache)
+    ),
     { body: commands }
   )
   .then(() => console.log("Successfully registered application commands"))
   .catch(console.error);
+
+//* Use for Production as it updates the commands public
+// rest
+//   .put(Routes.applicationCommands(process.env.DCB_CLIENT_ID), {
+//     body: commands,
+//   })
+//   .then(() => console.log("Successfully registered application commands"))
+//   .catch(console.error);
diff --git a/events/interactionCreate.js b/events/interactionCreate.js
@@ -1,18 +1,47 @@
 // For all the Interactions
 
+const { InteractionType } = require("discord.js");
+
 module.exports = {
   name: "interactionCreate",
-  async execute(interaction) {
-    if (!interaction.isCommand()) return;
-
-    if (interaction.commandName === "beep") {
-      await require("../responses/beep_response")(interaction);
-    } else if (interaction.commandName === "echo") {
-      await require("../responses/echo_response")(interaction);
-    } else if (interaction.commandName === "info") {
-      await require("../responses/info_response")(interaction);
-    } else if (interaction.commandName === "ping") {
-      await require("../responses/ping_response")(interaction);
+  async execute(client, interaction) {
+    // Chat Commands only
+    if (interaction.isChatInputCommand()) {
+      if (interaction.commandName === "beep") {
+        await require("../responses/beep_response")(interaction);
+      } else if (interaction.commandName === "echo") {
+        await require("../responses/echo_response")(interaction);
+      } else if (interaction.commandName === "info") {
+        await require("../responses/info_response")(interaction);
+      } else if (interaction.commandName === "ping") {
+        await require("../responses/ping_response")(interaction);
+      } else if (interaction.commandName === "feedback") {
+        await require("../responses/feedback_response")(interaction);
+      } else if (interaction.commandName === "balance") {
+        await require("../responses/balance_response")(interaction);
+      }
+    }
+    // Modal Commands
+    else if (interaction.type === InteractionType.ModalSubmit) {
+      if (interaction.customId === "feedbackModal") {
+        // Get the Feedback Channel
+        const fdChannel = await client.channels.cache.get(
+          process.env.DCB_FEEDBACK_CHANNEL
+        );
+        // Get the value of the sent messages and send on the feedback channel
+        const subject = interaction.fields.getTextInputValue("subject");
+        const description = interaction.fields.getTextInputValue("description");
+        fdChannel.send(
+          `[FEEDBACK] | ${new Date(
+            Date.now()
+          ).toUTCString()} | Subject : ${subject} | Description : ${description}`
+        );
+        // Reply the user
+        await interaction.reply({
+          content: `Your feedback of ${subject} was received successfully!`,
+          ephemeral: true,
+        });
+      }
     }
     // Final Reply if non exists
     else {

diff --git a/events/ready.js b/events/ready.js
@@ -9,13 +9,13 @@ module.exports = {
     console.log(`Ready! Logged in as ${client.user.tag}`);
 
     const logchannel = await client.channels.cache.get(
-      process.env.DCB_BOT_LOG_CHANNEL
-    );
-    logchannel.send(
-      `${new Date(
-        Date.now()
-      ).toUTCString()} | Faucet Bot | Restarted, and set activity`
+      process.env.DCB_LOG_CHANNEL
     );
+    // logchannel.send(
+    //   `[LOGIN] | ${new Date(
+    //     Date.now()
+    //   ).toUTCString()} | Faucet Bot | Restarted, and set activity`
+    // );
 
     // Setting Status of Bot
     await client.user.setActivity("a tutorial on how to be a good bot", {

diff --git a/index.js b/index.js
@@ -1,37 +1,39 @@
-//* Run node deploy-commands to register the commands added
-
 // Requires
-const fs = require("fs");
+const fs = require("node:fs");
+const path = require("node:path");
 const { Collection } = require("discord.js");
 require("dotenv").config({ path: ".env" });
 const client = require("./client"); // Get Client
 
-// Get the Events
+// Run the Events depending on whether it's once or on.
+const eventsPath = path.join(__dirname, "events");
 const eventFiles = fs
-  .readdirSync("./events")
+  .readdirSync(eventsPath)
   .filter((file) => file.endsWith(".js"));
 
-// Run the Events depending on whether it's once or on.
 for (const file of eventFiles) {
-  const event = require(`./events/${file}`);
+  const ePath = path.join(eventsPath, file);
+  const event = require(ePath);
   if (event.once) {
     client.once(event.name, (...args) => event.execute(...args));
   } else {
-    client.on(event.name, (...args) => event.execute(...args));
+    client.on(event.name, (...args) => event.execute(client, ...args));
   }
 }
 
 // Setting Commands
 client.commands = new Collection();
 
 // Gets all command files
+const commandsPath = path.join(__dirname, "commands");
 const commandFiles = fs
-  .readdirSync("./commands")
+  .readdirSync(commandsPath)
   .filter((file) => file.endsWith(".js"));
 
 // Setting the command for every file
 for (const file of commandFiles) {
-  const command = require(`./commands/${file}`);
+  const filePath = path.join(commandsPath, file);
+  const command = require(filePath);
   //Set a new item in the Collection
   // With the key as the command name and the value as the exported module
   client.commands.set(command.data.name, command);

diff --git a/package.json b/package.json
@@ -12,13 +12,11 @@
   "author": "Yanuka Deneth",
   "license": "MIT",
   "dependencies": {
-    "@discordjs/builders": "^0.12.0",
-    "@discordjs/rest": "^0.3.0",
+    "@discordjs/rest": "^1.0.1",
     "axios": "^0.26.1",
-    "discord-api-types": "^0.27.1",
-    "discord-rpc": "^4.0.1",
-    "discord.js": "^13.6.0",
-    "discordbot": "^0.0.21",
-    "dotenv": "^16.0.1"
+    "discord-api-types": "^0.37.3",
+    "discord.js": "^14.2.0",
+    "dotenv": "^16.0.1",
+    "ethers": "^5.7.0"
   }
 }