diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | bot_discord.js | 16 | ||||
| -rw-r--r-- | commands/help.js | 2 | ||||
| -rw-r--r-- | storage/settings.json | 4 |
4 files changed, 16 insertions, 8 deletions
@@ -4,6 +4,8 @@ </a><a href="https://discord.gg/EFhRDqG"><img src="https://img.shields.io/discord/243022206437687296.svg?colorB=7289DA&label=discord" alt="Discord Badge"> </a><a href="https://travis-ci.org/AleeCorp/AleeBot"><img src="https://travis-ci.org/AleeCorp/AleeBot.svg?branch=master" alt="Travis CI Build Status" /></a>
<p>AleeBot: A bot that's made for the discord app</p>
+ <br>
+ <p>PROJECT MERGE: WE ARE GOING TO MERGE WITH GALAXY REPO <a href="https://github.com/UniverseDevGroup/GalaxyBot">HERE</a></p>
</div>
<br>
<h1>What features does AleeBot have?</h1>
diff --git a/bot_discord.js b/bot_discord.js index 775a1e7..3b6f0fa 100644 --- a/bot_discord.js +++ b/bot_discord.js @@ -64,12 +64,14 @@ if (process.argv.indexOf("--debug") == -1) { if (process.argv.indexOf("--beta") == -1) {
client.login(api.abtoken).catch(function() {
- log('[X] Login failed. The token that you put in is invalid, please put in a new one...'.red);
+ console.log('[X] Login failed. The token that you put in is invalid, please put in a new one...'.red);
+ process.exit(0);
});
} else {
client.login(api.abbtoken).catch(function() {
- log('[X] Login failed. The token that you put in is invalid, please put in a new one...'.red);
+ console.log('[X] Login failed. The token that you put in is invalid, please put in a new one...'.red);
+ process.exit(0);
});
}
@@ -315,7 +317,11 @@ process.on('unhandledRejection', function(err, p) { log("[X | UNCAUGHT PROMISE] " + err.stack.red);
});
-
-process.on('uncaughtException', function (exception) {
- log("[X | UNCAUGHT EXCEPTION]" + exception.red);
+client.on('reconnecting', function() {
+ log("[!] AleeBot has disconnected from Discord and is now attempting to reconnect.".yellow);
});
+
+client.on('disconnect', function() {
+ log("[X] AleeBot has disconnected from Discord and will not attempt to reconnect.".red);
+ console.log("At this point, you'll need to restart AleeBot.".red);
+});
\ No newline at end of file diff --git a/commands/help.js b/commands/help.js index 4b19a57..8552c84 100644 --- a/commands/help.js +++ b/commands/help.js @@ -41,7 +41,7 @@ module.exports.run = async (client, message) => { if (!message.guild.member(client.user).hasPermission('EMBED_LINKS')) return message.reply('ERROR: AleeBot doesn\'t have the permission to send embed links please enable them to use the full help.');
const embed = new Discord.RichEmbed()
.setAuthor('AleeBot ' + require('../storage/settings.json').abVersion + ` Help and on ${client.guilds.size} servers`, client.user.avatarURL)
- .setDescription('Every command you input into AleeBot is `' + prefix + '`')
+ .setDescription('Every command you input into AleeBot is `' + prefix + '`\n\nATTENTION ALL: ALEEBOT WILL MERGE WITH GALAXY AND NO LONGER RECIEVE UPDATES AFTER 2.11.3. SERVICE WILL GO DOWN IN NOVEMBER 1ST 2018.\n\nInvite link here: https://discordapp.com/oauth2/authorize?client_id=417096530596724737&permissions=2146954487&scope=bot')
.setColor('#1fd619')
.setFooter('AleeCorp Copyright 2018, Licensed with GPL-3.0');
diff --git a/storage/settings.json b/storage/settings.json index 5932738..46bf845 100644 --- a/storage/settings.json +++ b/storage/settings.json @@ -1,4 +1,4 @@ { - "abVersion": "2.11.2", - "prefix": "ab:" + "abVersion": "2.11.3", + "prefix": "abb:" } |