FIxerinoed config

This commit is contained in:
CBenni 2017-12-11 16:51:06 +01:00
parent 69c545e79f
commit 868109fe65
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,4 @@
var _ = require('lodash');
var express = require("express"); var express = require("express");
var request = require("request"); var request = require("request");
var Discord = require('discord.js'); var Discord = require('discord.js');
@ -8,7 +9,12 @@ const Image = Canvas.Image;
const twemoji = require("./twemoji"); const twemoji = require("./twemoji");
var app = express() var app = express()
var config = require("./config"); var config = require("./config.default.json");
try {
_.extend(config, require("./config"));
}catch(err) {
console.log("No config.json found!");
}
var cache = {}; var cache = {};

View file

@ -12,6 +12,7 @@
"canvas": "^1.6.5", "canvas": "^1.6.5",
"discord.js": "^11.1.0", "discord.js": "^11.1.0",
"express": "^4.15.2", "express": "^4.15.2",
"lodash": "^4.17.4",
"request": "^2.81.0" "request": "^2.81.0"
} }
} }