Skip to content

Commit 5b67089

Browse files
committed
Merge branch 'hotfix/1.0.1' into production
2 parents f8fe4f7 + 28de9ae commit 5b67089

2 files changed

Lines changed: 13 additions & 14 deletions

File tree

app.js

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,17 @@ function connectToDiscord() {
256256
api.misc = {
257257
serverFromChannel: discord.serverFromChannel
258258
};
259+
// Load all Plugins in the ./plugins directory
260+
var quiet_loading = true;
261+
plugin_loader.listPlugins().forEach(function (item) {
262+
var plugin_state = plugin_loader.getInitialPluginState(item);
263+
if (plugin_state === "running" || plugin_state === "loaded") {
264+
plugin_loader.loadPlugin(item, quiet_loading);
265+
}
266+
if (plugin_state === "running") {
267+
plugin_loader.startPlugin(item, quiet_loading);
268+
}
269+
});
259270
}).on("message", function (_username, _userID, _channelID, _message, _rawEvent) {
260271
api.Events.emit("message_raw", _rawEvent);
261272
if (_userID === api.client.id) {
@@ -331,18 +342,6 @@ function connectToDiscord() {
331342
api.Events.emit("chatCmd_raw", _rawEvent);
332343
api.Events.emit("chatCmd#" + cmd + "_raw", _rawEvent);
333344
}
334-
335-
// Load all Plugins in the ./plugins directory
336-
var quiet_loading = true;
337-
plugin_loader.listPlugins().forEach(function (item) {
338-
var plugin_state = plugin_loader.getInitialPluginState(item);
339-
if (plugin_state === "running" || plugin_state === "loaded") {
340-
plugin_loader.loadPlugin(item, quiet_loading);
341-
}
342-
if (plugin_state === "running") {
343-
plugin_loader.startPlugin(item, quiet_loading);
344-
}
345-
});
346345
}).on("presence", function (_username, _userID, _status, _gameName, _rawEvent) {
347346
api.Events.emit("presence", {
348347
username: _username,
@@ -368,7 +367,7 @@ function connectToDiscord() {
368367
initPluginLoader();
369368

370369
// Load commandline args as env variables
371-
commander.version("1.0.0").usage("[options]")
370+
commander.version("1.0.1").usage("[options]")
372371
.option("-e, --email <Picarto Channel>", "Set the bots Login Username.")
373372
.option("-p, --password <Bot name>", "Set the bot's Login Password.")
374373
.option("-t, --token <Token>", "Use an already existing token to login.")

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@
3939
"scripts": {
4040
"test": "echo \"Error: no test specified\" && exit 1"
4141
},
42-
"version": "1.0.0"
42+
"version": "1.0.1"
4343
}

0 commit comments

Comments
 (0)