From e185d2278a07aa42714eaf47153abfaffc2e2cd8 Mon Sep 17 00:00:00 2001 From: Alee Date: Sun, 24 Jun 2018 09:35:34 -0400 Subject: Fixes the daily command and added the pay command --- commands/balance.js | 5 ++++- commands/changelog.js | 3 ++- commands/daily.js | 11 +++++++--- commands/pay.js | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ update_dep.bat | 2 +- 5 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 commands/pay.js diff --git a/commands/balance.js b/commands/balance.js index fe3b9f8..e0b87e5 100644 --- a/commands/balance.js +++ b/commands/balance.js @@ -25,7 +25,10 @@ module.exports.run = async (client, message) => { let balance = await db.fetch(`userBalance_${user.id}`); - if (balance === null) balance = 0; + if (balance === null) { + db.set(`userBalance_${message.author.id}`, 0); + balance = 0; + } const embed = new RichEmbed() .setDescription(`**AleeCorp Bank**`) .addField('Account Holder: ', user.username, true) diff --git a/commands/changelog.js b/commands/changelog.js index adfbb64..8cb07b2 100644 --- a/commands/changelog.js +++ b/commands/changelog.js @@ -23,6 +23,7 @@ module.exports.run = async (client, message) => { .setAuthor('AleeBot ' + require('../storage/settings.json').abVersion + ' Changelog', 'https://cdn.discordapp.com/avatars/282547024547545109/6c147a444ae328c38145ef1f74169e38.png?size=2048') .setDescription('What\'s new in AleeBot '+ require('../storage/settings.json').abVersion +'?') .addField('1. Economy features has been added back!', 'We just rewritten the economy features.') + .addField('2. We have reorganized commands.', 'Yes, I have redesign the help command a bit.') .setColor('#1fd619'); message.channel.send({embed}); @@ -36,5 +37,5 @@ exports.help = { name: 'changelog', description: 'What\'s new', usage: 'changelog', - category: '- General Commands', + category: '- Information Commands', }; diff --git a/commands/daily.js b/commands/daily.js index d5db462..0d844a2 100644 --- a/commands/daily.js +++ b/commands/daily.js @@ -21,7 +21,7 @@ const db = require('quick.db'); ms = require('parse-ms'); module.exports.run = async (client, message) => { -/* + let cooldown = 8.64e+7, amount = 100; @@ -34,11 +34,16 @@ module.exports.run = async (client, message) => { } else { message.channel.send(`You have successfully collected $${amount} dollars!`); + let balance = await db.fetch(`userBalance_${message.author.id}`); + + if (balance == null) { + db.set(`userBalance_${message.author.id}`, 0); + } + db.set(`lastDaily_${message.author.id}`, Date.now()); db.add(`userBalance_${message.author.id}`, 100); } -*/ - message.reply('This command is broken for now.'); + }; exports.conf = { diff --git a/commands/pay.js b/commands/pay.js new file mode 100644 index 0000000..5549e18 --- /dev/null +++ b/commands/pay.js @@ -0,0 +1,60 @@ +/**************************************** + * + * Pay: Command for AleeBot + * Copyright (C) 2018 AleeCorp + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * *************************************/ + +module.exports.run = async (client, message, args) => { + const db = require('quick.db'); + if (!message.mentions.members.first()) return message.reply('Please mention a user...'); + + let targetMember = message.mentions.members.first(), + amount = parseInt(args.join(' ').replace(targetMember, '')); + + if (isNaN(amount)) return message.reply('Please define an amount.') + + let targetBalance = await db.fetch(`userBalance_${targetMember.id}`), + selfBalance = await db.fetch(`userBalance_${message.author.id}`); + + if (targetBalance === null) { + db.set(`userBalance_${targetMember.id}`, 0); + targetBalance = 0 + } + + if (selfBalance === null) { + db.set(`userBalance_${message.author.id}`, 0); + selfBalance = 0 + } + + if (amount > selfBalance) return message.reply('Sorry you don\'t have enough money.'); + + db.add(`userBalance_${targetMember.id}`, amount); + db.subtract(`userBalance_${message.author.id}`, amount); + + message.reply(`Successfully transfered $${amount} to ${targetMember.user}`) + }; + + exports.conf = { + aliases: [], + guildOnly: false, + }; + exports.help = { + name: 'pay', + description: 'You can pay others!', + usage: 'pay [@user] [interger]', + category: '- Economy Commands', + }; \ No newline at end of file diff --git a/update_dep.bat b/update_dep.bat index 5de4c3e..26c9f44 100644 --- a/update_dep.bat +++ b/update_dep.bat @@ -1,6 +1,6 @@ @echo off title Installing/Updating Dependencies git pull -npm install +npm install --save pause exit -- cgit v1.2.3