diff --git a/discord-bot-core/.gitrepo b/discord-bot-core/.gitrepo index cfd16dd..815ac70 100644 --- a/discord-bot-core/.gitrepo +++ b/discord-bot-core/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = git@github.com:benji7425/discord-bot-core.git branch = master - commit = 270d24d2119404ba42364584868a3ed364e87678 + commit = c4f07d0a8d4585083c3f167c1dce55cbeeda05d2 parent = 341964a90ddca9afc684fd9331fc4177b8b68c04 method = merge cmdver = 0.3.1 diff --git a/discord-bot-core/bootstrapper.js b/discord-bot-core/bootstrapper.js index 545dcf9..0dae333 100644 --- a/discord-bot-core/bootstrapper.js +++ b/discord-bot-core/bootstrapper.js @@ -11,7 +11,7 @@ const ParentPackageJSON = require("../package.json"); //used to provide some inf const DiscordUtil = require("./util.js"); //some discordjs helper functions of mine const MessageHandler = require("./message-handler.js"); -function bootstrap(component, guildDataModel, commands) { +function bootstrap(token, component, guildDataModel, commands) { process.on("uncaughtException", (err) => { DiscordUtil.dateError("Uncaught exception!", err); }); @@ -29,7 +29,7 @@ function bootstrap(component, guildDataModel, commands) { DiscordUtil.dateError("Bot was disconnected!", eventData.code, eventData.reason); }); - client.login(require("../token.json").token); + client.login(token); } function onReady(client, component, guildDataModel, commands) { @@ -69,6 +69,4 @@ function fromJSON(json, guildDataModel) { return json; } -module.exports = { - bootstrap -}; \ No newline at end of file +module.exports = bootstrap; \ No newline at end of file diff --git a/discord-bot-core/index.js b/discord-bot-core/index.js index cc68233..1080d1e 100644 --- a/discord-bot-core/index.js +++ b/discord-bot-core/index.js @@ -1,9 +1,7 @@ const Config = require("./config.json"); module.exports = { - bootstrap(component, guildDataModel, commands) { - require("./bootstrapper.js").bootstrap(component, guildDataModel, commands); - }, + bootstrap: require("./bootstrapper.js"), util: require("./util.js"), details: { website: Config.website,