MattTheTekie/I-SH
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

updated names

Browse source
This commit is contained in:
Phil 2020-10-25 13:56:16 +01:00
commit 9d3c105dfb
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
commands/eval.js
View file

@ -6,7 +6,7 @@ const clean = (text) => {
module.exports.run = async (client, message, args, config) => {
const args_eval = message.content.split(' ').slice(1);
if (message.author.id !== '172031697355800577') return message.react('❌');
if (message.content.indexOf('token') !== -1) return message.channel.send('Nice try...');
if (message.content.indexOf('discordToken') !== -1) return message.channel.send('Nice try...');
try {
const code = args_eval.join(' ');
let evaled = eval(code);

2
config/example_config.json
View file

@ -1,5 +1,5 @@
{
"token": "**************************",
"discordToken": "**************************",
"production": {
"username": "***",
"password": "*****************",

4
database/SETUP_DBConnection.js
View file

@ -1,6 +1,6 @@
const Sequelize = require('sequelize');
const testToken = '../config/config.json';
const testdiscordToken = '../config/config.json';
const config = require('../config/main.json');
@ -10,7 +10,7 @@ let user;
let password;
let host;
if (config.env.get('inDev')) {
const DBCredentials = require(testToken).development;
const DBCredentials = require(testdiscordToken).development;
database = DBCredentials.database;
user = DBCredentials.username;
password = DBCredentials.password;

10
functions/STARTUP_envPrep.js
View file

@ -1,15 +1,15 @@
const testToken = './config/config.json';
const testdiscordToken = './config/config.json';
module.exports.run = async (client, fs, config) => {
// setting inDev var
console.log(`[${module.exports.help.name}] Setting environment variables...`);
if (fs.existsSync(testToken)) {
const token = require(`.${testToken}`).token;
if (fs.existsSync(testdiscordToken)) {
const discordToken = require(`.${testdiscordToken}`).discordToken;
config.env.set('inDev', true);
config.env.set('token', token);
config.env.set('discordToken', discordToken);
} else {
config.env.set('inDev', false);
config.env.set('token', process.env.BotTokenISH);
config.env.set('discordToken', process.env.BotdiscordTokenISH);
}
console.log(`[${module.exports.help.name}] Environment variables set!`);
};

2
index.js
View file

@ -24,7 +24,7 @@ config.setup.startupFunctions.forEach((FCN) => {
require('./database/SETUP_DBConnection');
// Login the bot
client.login(config.env.get('token'));
client.login(config.env.get('discordToken'));
// trigger on bot login
client.on('ready', () => {