git subrepo pull discord-bot-core
subrepo: subdir: "discord-bot-core" merged: "a25486f" upstream: origin: "git@github.com:benji7425/discord-bot-core.git" branch: "master" commit: "a25486f" git-subrepo: version: "0.3.1" origin: "???" commit: "???"
This commit is contained in:
parent
723bbb1098
commit
f2313c7da4
|
@ -6,7 +6,7 @@
|
||||||
[subrepo]
|
[subrepo]
|
||||||
remote = git@github.com:benji7425/discord-bot-core.git
|
remote = git@github.com:benji7425/discord-bot-core.git
|
||||||
branch = master
|
branch = master
|
||||||
commit = 5c4a0b857e5d1267e7cd85aa013625e67d614726
|
commit = a25486f0bb65d592e0181e4531a7cc1e69f58e96
|
||||||
parent = 1f40c8800b5e74c96a2a83398d55964fce0ee5cb
|
parent = ccd9a172f89988157d43643d475e9027db258ad5
|
||||||
method = merge
|
method = merge
|
||||||
cmdver = 0.3.1
|
cmdver = 0.3.1
|
||||||
|
|
|
@ -61,7 +61,7 @@ module.exports = class Client extends Discord.Client {
|
||||||
}
|
}
|
||||||
|
|
||||||
onDebug(info) {
|
onDebug(info) {
|
||||||
if (!InternalConfig.debugIgnores.some(x => info.startsWith(x)))
|
info = info.replace(/Authenticated using token [^ ]+/, "Authenticated using token [redacted]");
|
||||||
CoreUtil.dateDebug(info);
|
CoreUtil.dateDebug(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -76,11 +76,11 @@ module.exports = class Client extends Discord.Client {
|
||||||
}
|
}
|
||||||
|
|
||||||
onUnhandledException(client, err) {
|
onUnhandledException(client, err) {
|
||||||
CoreUtil.dateError(err.message || err);
|
CoreUtil.dateError(err);
|
||||||
CoreUtil.dateLog("Destroying existing client...");
|
CoreUtil.dateLog("Destroying existing client...");
|
||||||
client.destroy().then(() => {
|
client.destroy().then(() => {
|
||||||
CoreUtil.dateLog("Client destroyed, recreating...");
|
CoreUtil.dateLog("Client destroyed, recreating...");
|
||||||
client.login(client._token);
|
setTimeout(() => client.login(client._token), InternalConfig.reconnectTimeout);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,7 +93,6 @@ module.exports = class Client extends Discord.Client {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {*} json
|
* @param {*} json
|
||||||
* @param {*} guildDataModel
|
|
||||||
*/
|
*/
|
||||||
fromJSON(json) {
|
fromJSON(json) {
|
||||||
const guildsData = Object.keys(json);
|
const guildsData = Object.keys(json);
|
||||||
|
|
|
@ -3,9 +3,5 @@
|
||||||
"website": "https://benji7425.github.io",
|
"website": "https://benji7425.github.io",
|
||||||
"discordInvite": "https://discord.gg/SSkbwSJ",
|
"discordInvite": "https://discord.gg/SSkbwSJ",
|
||||||
"defaultDMResponse": "This bot does not have any handling for direct messages. To learn more or get help please visit %s, or join my Discord server here: %s",
|
"defaultDMResponse": "This bot does not have any handling for direct messages. To learn more or get help please visit %s, or join my Discord server here: %s",
|
||||||
"debugIgnores":[
|
"reconnectTimeout": 5000
|
||||||
"[ws] [connection] Sending a heartbeat",
|
|
||||||
"[ws] [connection] Heartbeat acknowledged",
|
|
||||||
"Authenticated using token"
|
|
||||||
]
|
|
||||||
}
|
}
|
Loading…
Reference in a new issue