From 427d2ac085a21ac562f6f2f768ca8017430eb135 Mon Sep 17 00:00:00 2001
From: 8cy <50817549+8cy@users.noreply.github.com>
Date: Sun, 14 Jun 2020 05:28:23 -0700
Subject: more config shit

---
 src/bot.ts                      | 2 +-
 src/commands/server/goodbye.ts  | 3 ++-
 src/commands/server/welcome.ts  | 3 ++-
 src/commands/zerotwo/darling.ts | 5 +++--
 src/config.json                 | 3 ++-
 5 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/bot.ts b/src/bot.ts
index 3e07da2..9e89b72 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -5,7 +5,7 @@ import { CommandoClient } from 'discord.js-commando';
 import Welcome from './models/welcome.js';
 import Goodbye from './models/goodbye.js';
 import mongoose from 'mongoose';
-mongoose.connect('mongodb://sin:cSDZEygGZz232eJ5bS@ds047107.mlab.com:47107/heroku_4qrjvmb9', { useNewUrlParser: true, useUnifiedTopology: true })
+mongoose.connect(config['mongodburi'], { useNewUrlParser: true, useUnifiedTopology: true })
 import path from 'path';
 // @ts-ignore emoji-random doesnt have types
 import emoji from 'emoji-random';
diff --git a/src/commands/server/goodbye.ts b/src/commands/server/goodbye.ts
index 2300fe2..8a4669f 100644
--- a/src/commands/server/goodbye.ts
+++ b/src/commands/server/goodbye.ts
@@ -2,7 +2,8 @@ import { Command, CommandoMessage } from 'discord.js-commando';
 import emoji from 'emoji-random';
 import Goodbye from '../../models/goodbye.js';
 import mongo from 'mongoose';
-mongo.connect('mongodb://sin:cSDZEygGZz232eJ5bS@ds047107.mlab.com:47107/heroku_4qrjvmb9', { useNewUrlParser: true, useUnifiedTopology: true })
+import config from '../../config.json';
+mongo.connect(config['mongodburi'], { useNewUrlParser: true, useUnifiedTopology: true })
 
 module.exports = class GoodbyeServer extends Command {
     constructor(client) {
diff --git a/src/commands/server/welcome.ts b/src/commands/server/welcome.ts
index 08a2911..e2a197d 100644
--- a/src/commands/server/welcome.ts
+++ b/src/commands/server/welcome.ts
@@ -2,7 +2,8 @@ import { Command, CommandoMessage } from 'discord.js-commando';
 import emoji from 'emoji-random';
 import Welcome from '../../models/welcome.js';
 import mongo from 'mongoose';
-mongo.connect('mongodb://sin:cSDZEygGZz232eJ5bS@ds047107.mlab.com:47107/heroku_4qrjvmb9', { useNewUrlParser: true, useUnifiedTopology: true })
+import config from '../../config.json';
+mongo.connect(config['mongodburi'], { useNewUrlParser: true, useUnifiedTopology: true })
 
 module.exports = class WelcomeServer extends Command {
     constructor(client) {
diff --git a/src/commands/zerotwo/darling.ts b/src/commands/zerotwo/darling.ts
index d833537..505df19 100644
--- a/src/commands/zerotwo/darling.ts
+++ b/src/commands/zerotwo/darling.ts
@@ -2,7 +2,8 @@ import { Command, CommandoMessage } from 'discord.js-commando';
 import emoji from 'emoji-random';
 import Darling from '../../models/darling.js';
 import mongo from 'mongoose';
-mongo.connect('mongodb://sin:cSDZEygGZz232eJ5bS@ds047107.mlab.com:47107/heroku_4qrjvmb9', { useNewUrlParser: true, useUnifiedTopology: true })
+import config from '../../config.json';
+mongo.connect(config['mongodburi'], { useNewUrlParser: true, useUnifiedTopology: true })
 
 module.exports = class DarlingZeroTwo extends Command {
     constructor(client) {
@@ -42,7 +43,7 @@ module.exports = class DarlingZeroTwo extends Command {
             guildID: msg.guild.id,
             time: msg.createdAt
         })
-        const guildExist = await Darling.findOne({ guildID: msg.guild.id })
+        // const guildExist = await Darling.findOne({ guildID: msg.guild.id })
 
         Darling.findOne({ guildID: msg.guild.id }, async (error, guild) => {
             if (error) {
diff --git a/src/config.json b/src/config.json
index 6ab342c..1ddad19 100644
--- a/src/config.json
+++ b/src/config.json
@@ -3,5 +3,6 @@
     "secret-dev":"NzEyMDg4MzY5MjA2OTE5MjY5.XsMeEw.Yy0a8m2vZLDbPi7cZ8aqCalMR68",
     "yt-api-key":"AIzaSyCeG1lQAeInv4vjFv_eTL9IFAFNdQC9Nk8",
     "version":"1.10.22",
-    "fortniteTrackerNetworkToken": "4cf21f95-5f1a-412a-b4a7-e5424adc314a"
+    "fortniteTrackerNetworkToken": "4cf21f95-5f1a-412a-b4a7-e5424adc314a",
+    "mongodburi": "mongodb://sin:cSDZEygGZz232eJ5bS@ds047107.mlab.com:47107/heroku_4qrjvmb9"
 }
\ No newline at end of file
-- 
cgit v1.2.3