From a67274d8cf0c7d28422ec1941c7c635231a84e74 Mon Sep 17 00:00:00 2001 From: Daniel Odendahl Jr Date: Wed, 10 May 2017 00:56:13 +0000 Subject: [PATCH] Prettier carbon and dbots --- index.js | 32 ++++++-------------------------- structures/Stats.js | 22 +++++++++++++--------- 2 files changed, 19 insertions(+), 35 deletions(-) diff --git a/index.js b/index.js index 3d47fd13..9661ace3 100644 --- a/index.js +++ b/index.js @@ -10,7 +10,7 @@ const client = new CommandoClient({ }); const path = require('path'); -const { carbon, discordBots } = require('./structures/Stats'); +const { carbon, dBots } = require('./structures/Stats'); const SequelizeProvider = require('./providers/Sequelize'); const Database = require('./structures/PostgreSQL'); @@ -98,23 +98,13 @@ client.on('guildMemberRemove', (member) => { return channel.send(msg); }); -client.on('guildCreate', async (guild) => { +client.on('guildCreate', (guild) => { console.log(`[Guild] I have joined ${guild.name}! (${guild.id})`); const guilds = await client.shard.fetchClientValues('guilds.size'); const count = guilds.reduce((prev, val) => prev + val, 0); console.log(`[Count] ${count}`); - try { - await carbon(count); - console.log('[Carbon] Successfully posted to Carbon.'); - } catch (err) { - console.log(`[Carbon] Failed to post to Carbon. ${err}`); - } - try { - await discordBots(count, client.user.id); - console.log('[Discord Bots] Successfully posted to Discord Bots.'); - } catch (err) { - console.log(`[Discord Bots] Failed to post to Discord Bots. ${err}`); - } + carbon(count); + dBots(count, client.user.id); }); client.on('guildDelete', async (guild) => { @@ -122,18 +112,8 @@ client.on('guildDelete', async (guild) => { const guilds = await client.shard.fetchClientValues('guilds.size'); const count = guilds.reduce((prev, val) => prev + val, 0); console.log(`[Count] ${count}`); - try { - await carbon(count); - console.log('[Carbon] Successfully posted to Carbon.'); - } catch (err) { - console.log(`[Carbon] Failed to post to Carbon. ${err}`); - } - try { - await discordBots(count, client.user.id); - console.log('[Discord Bots] Successfully posted to Discord Bots.'); - } catch (err) { - console.log(`[Discord Bots] Failed to post to Discord Bots. ${err}`); - } + carbon(count); + dBots(count, client.user.id); }); client.setTimeout(() => { diff --git a/structures/Stats.js b/structures/Stats.js index 868ff79c..42d3aa58 100644 --- a/structures/Stats.js +++ b/structures/Stats.js @@ -1,18 +1,22 @@ const request = require('superagent'); -const { CARBON_KEY, DISCORD_BOTS_KEY } = process.env; +const { CARBON_KEY, DBOTS_KEY } = process.env; class Stats { - static discordBots(server_count, userID) { - return request - .post(`https://bots.discord.pw/api/bots/${userID}/stats`) - .set({ 'Authorization': DISCORD_BOTS_KEY }) - .send({ server_count }); + static dBots(server_count, id) { + request + .post(`https://bots.discord.pw/api/bots/${id}/stats`) + .set({ 'Authorization': DBOTS_KEY }) + .send({ server_count }) + .then(() => console.log('[Carbon] Successfully posted to Carbon.')) + .catch(err => console.error(`[Carbon] Failed to post to Carbon. ${err}`)); } - + static carbon(servercount) { - return request + request .post('https://www.carbonitex.net/discord/data/botdata.php') - .send({ key: CARBON_KEY, servercount }); + .send({ key: CARBON_KEY, servercount }) + .then(() => console.log('[DBots] Successfully posted to DBots.')) + .catch(err => console.error(`[DBots] Failed to post to DBots. ${err}`)); } }