From bf77f8c224c26102709fe97a0aea21473efb8216 Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Thu, 6 Apr 2023 21:58:10 +0200
Subject: [PATCH] Moved from config json to .env

---
 .gitignore               | 3 ++-
 commands-testing/mute.js | 3 ++-
 commands/check.js        | 3 ++-
 commands/devel.js        | 3 ++-
 commands/forceverify.js  | 3 ++-
 commands/update.js       | 3 ++-
 commands/verify.js       | 3 ++-
 deploy-commands.js       | 4 +++-
 deploy-testing.js        | 7 ++++++-
 index.js                 | 4 +++-
 10 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index d077eaa..8b1f307 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules/*
-config.json
\ No newline at end of file
+config.json
+.env
\ No newline at end of file
diff --git a/commands-testing/mute.js b/commands-testing/mute.js
index 145d545..607cbed 100644
--- a/commands-testing/mute.js
+++ b/commands-testing/mute.js
@@ -1,6 +1,7 @@
 const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require('discord.js');
+const env = require('dotenv').config();
+const dev = process.env.DEV;
 const { color } = require('../config/options.json');
-const { dev } = require('../config.json');
 const { admin, helper, muted } = require('../config/roles.json');
 const { staffOtherChannel } = require('../config/options.json');
 
diff --git a/commands/check.js b/commands/check.js
index 2dc6e4a..dc85588 100644
--- a/commands/check.js
+++ b/commands/check.js
@@ -1,6 +1,7 @@
 const { SlashCommandBuilder, EmbedBuilder, PermissionFlagsBits } = require('discord.js');
 const { bwfdkr, bwstars, bwwins, duelswins, swstars } = require('../config/reqs.json')
-const { hypixelApiKey } = require('../config.json');
+const env = require('dotenv').config();
+const hypixelApiKey = process.env.HYPIXELAPI;
 const { color } = require('../config/options.json');
 const fetch = require('axios');
 
diff --git a/commands/devel.js b/commands/devel.js
index 1645f3d..4eb26e6 100644
--- a/commands/devel.js
+++ b/commands/devel.js
@@ -1,7 +1,8 @@
 const { SlashCommandBuilder, PermissionFlagsBits, userMention, EmbedBuilder } = require('discord.js');
 const { hypixelGuildID, color } = require('../config/options.json');
 const verify = require('../schemas/verifySchema.js');
-const { dev } = require('../config.json');
+const env = require('dotenv').config();
+const dev = process.env.DEV;
 const fetch = require('axios');
 
 module.exports = {
diff --git a/commands/forceverify.js b/commands/forceverify.js
index df626ae..05d5199 100644
--- a/commands/forceverify.js
+++ b/commands/forceverify.js
@@ -1,5 +1,6 @@
 const { SlashCommandBuilder, PermissionFlagsBits } = require('discord.js');
-const { hypixelApiKey } = require('../config.json');
+const env = require('dotenv').config();
+const hypixelApiKey = process.env.HYPIXELAPIKEY;
 const fetch = require('axios');
 const { color, hypixelGuildID } = require('../config/options.json');
 const verify = require('../schemas/verifySchema.js')
diff --git a/commands/update.js b/commands/update.js
index fa81aca..dc9025a 100644
--- a/commands/update.js
+++ b/commands/update.js
@@ -1,5 +1,6 @@
 const { SlashCommandBuilder } = require('discord.js');
-const { hypixelApiKey } = require('../config.json');
+const env = require('dotenv').config();
+const hypixelApiKey = process.env.HYPIXELAPIKEY;
 const fetch = require('axios');
 const verify = require('../schemas/verifySchema.js')
 const { color, hypixelGuildID } = require('../config/options.json');
diff --git a/commands/verify.js b/commands/verify.js
index 8f17ace..50a84b7 100644
--- a/commands/verify.js
+++ b/commands/verify.js
@@ -1,5 +1,6 @@
 const { SlashCommandBuilder } = require('discord.js');
-const { hypixelApiKey } = require('../config.json');
+const env = require('dotenv').config();
+const hypixelApiKey = process.env.HYPIXELAPIKEY;
 const fetch = require('axios');
 const { color, hypixelGuildID } = require('../config/options.json');
 const verify = require('../schemas/verifySchema.js')
diff --git a/deploy-commands.js b/deploy-commands.js
index 6388828..f2bd8d0 100644
--- a/deploy-commands.js
+++ b/deploy-commands.js
@@ -1,5 +1,7 @@
 const { REST, Routes } = require('discord.js');
-const { clientId, guildId, token } = require('./config.json');
+const env = require('dotenv').config();
+const token = process.env.TOKEN;
+const clientId = process.env.CLIENTID;
 const fs = require('node:fs');
 
 
diff --git a/deploy-testing.js b/deploy-testing.js
index 579fbe8..9f4d805 100644
--- a/deploy-testing.js
+++ b/deploy-testing.js
@@ -1,5 +1,10 @@
 const { REST, Routes } = require('discord.js');
-const { clientId, guildId, token } = require('./config.json');
+const env = require('dotenv').config();
+const token = process.env.TOKEN;
+const clientId = process.env.CLIENTID;
+const guildId = process.env.GUILDID;
+
+//const { clientId, guildId, token } = require('./config.json');
 const fs = require('node:fs');
 
 
diff --git a/index.js b/index.js
index 737cb94..da7b70f 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,7 @@
 const { Client, GatewayIntentBits, Partials, ActivityType, Events, Collection } = require('discord.js');
-const { token, mongoURI } = require('./config.json');
+const env = require('dotenv').config();
+const token = process.env.TOKEN;
+const mongoURI = process.env.MONGOURI;
 const { connect } = require('mongoose');
 const path = require('path');
 const fs = require('fs');