github-jwinterm/node-tip-bot
1
0
Fork 0
mirror of https://github.com/jwinterm/node-tip-bot.git synced 2026-10-17 05:41:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

untested fix to #17

Browse Source
This commit is contained in:
Unek
2014-12-25 12:22:50 +01:00
parent bbc69e7941
commit 9f0d64e112
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/tipbot.js
+18
View File
@@ -150,6 +150,7 @@ client.addListener('error', function(message) {
}); });
var last_active = {}; var last_active = {};
var locks = [];
client.addListener('message', function(from, channel, message) { client.addListener('message', function(from, channel, message) {
last_active[from] = Date.now(); last_active[from] = Date.now();
var match = message.match(/^(!?)(\S+)/); var match = message.match(/^(!?)(\S+)/);
@@ -217,8 +218,13 @@ client.addListener('message', function(from, channel, message) {
max = Math.floor(max); max = Math.floor(max);
} }
// lock
if(locks.hasOwnProperty(from.toLowerCase() && locks[from.toLowerCase()]) return;
locks[from.toLowerCase()] = true;
coin.getBalance(settings.rpc.prefix + from.toLowerCase(), settings.coin.min_confirmations, function(err, balance) { coin.getBalance(settings.rpc.prefix + from.toLowerCase(), settings.coin.min_confirmations, function(err, balance) {
if(err) { if(err) {
locks[from.toLowerCase()] = null;
winston.error('Error in !tip command.', err); winston.error('Error in !tip command.', err);
client.say(channel, settings.messages.error.expand({name: from})); client.say(channel, settings.messages.error.expand({name: from}));
return; return;
@@ -247,12 +253,14 @@ client.addListener('message', function(from, channel, message) {
names = names.slice(0, max); names = names.slice(0, max);
if(amount / max < settings.coin.min_rain) { if(amount / max < settings.coin.min_rain) {
locks[from.toLowerCase()] = null;
client.say(channel, settings.messages.rain_too_small.expand({from: from, amount: amount, min_rain: settings.coin.min_rain * max})); client.say(channel, settings.messages.rain_too_small.expand({from: from, amount: amount, min_rain: settings.coin.min_rain * max}));
return; return;
} }
for (var i = 0; i < names.length; i++) { for (var i = 0; i < names.length; i++) {
coin.move(settings.rpc.prefix + from.toLowerCase(), settings.rpc.prefix + names[i].toLowerCase(), amount / max, function(err, reply) { coin.move(settings.rpc.prefix + from.toLowerCase(), settings.rpc.prefix + names[i].toLowerCase(), amount / max, function(err, reply) {
if(i == names.length) locks[from.toLowerCase()] = null;
if(err || !reply) { if(err || !reply) {
winston.error('Error in !tip command', err); winston.error('Error in !tip command', err);
return; return;
@@ -278,7 +286,12 @@ client.addListener('message', function(from, channel, message) {
var random = match[2]; var random = match[2];
var amount = Number(match[3]); var amount = Number(match[3]);
// lock
if(locks.hasOwnProperty(from.toLowerCase() && locks[from.toLowerCase()]) return;
locks[from.toLowerCase()] = true;
if(isNaN(amount)) { if(isNaN(amount)) {
locks[from.toLowerCase()] = null;
client.say(channel, settings.messages.invalid_amount.expand({name: from, amount: match[3]})); client.say(channel, settings.messages.invalid_amount.expand({name: from, amount: match[3]}));
return; return;
} }
@@ -290,17 +303,20 @@ client.addListener('message', function(from, channel, message) {
} }
if(to.toLowerCase() == from.toLowerCase()) { if(to.toLowerCase() == from.toLowerCase()) {
locks[from.toLowerCase()] = null;
client.say(channel, settings.messages.tip_self.expand({name: from})); client.say(channel, settings.messages.tip_self.expand({name: from}));
return; return;
} }
if(amount < settings.coin.min_tip) { if(amount < settings.coin.min_tip) {
locks[from.toLowerCase()] = null;
client.say(channel, settings.messages.tip_too_small.expand({from: from, to: to, amount: amount})); client.say(channel, settings.messages.tip_too_small.expand({from: from, to: to, amount: amount}));
return; return;
} }
// check balance with min. 5 confirmations // check balance with min. 5 confirmations
coin.getBalance(settings.rpc.prefix + from.toLowerCase(), settings.coin.min_confirmations, function(err, balance) { coin.getBalance(settings.rpc.prefix + from.toLowerCase(), settings.coin.min_confirmations, function(err, balance) {
if(err) { if(err) {
locks[from.toLowerCase()] = null;
winston.error('Error in !tip command.', err); winston.error('Error in !tip command.', err);
client.say(channel, settings.messages.error.expand({name: from})); client.say(channel, settings.messages.error.expand({name: from}));
return; return;
@@ -309,6 +325,7 @@ client.addListener('message', function(from, channel, message) {
if(balance >= amount) { if(balance >= amount) {
coin.send('move', settings.rpc.prefix + from.toLowerCase(), settings.rpc.prefix + to.toLowerCase(), amount, function(err, reply) { coin.send('move', settings.rpc.prefix + from.toLowerCase(), settings.rpc.prefix + to.toLowerCase(), amount, function(err, reply) {
locks[from.toLowerCase()] = null;
if(err || !reply) { if(err || !reply) {
winston.error('Error in !tip command', err); winston.error('Error in !tip command', err);
client.say(channel, settings.messages.error.expand({name: from})); client.say(channel, settings.messages.error.expand({name: from}));
@@ -319,6 +336,7 @@ client.addListener('message', function(from, channel, message) {
client.say(channel, settings.messages.tipped.expand({from: from, to: to, amount: amount})); client.say(channel, settings.messages.tipped.expand({from: from, to: to, amount: amount}));
}); });
} else { } else {
locks[from.toLowerCase()] = null;
winston.info('%s tried to tip %s %d, but has only %d', from, to, amount, balance); winston.info('%s tried to tip %s %d, but has only %d', from, to, amount, balance);
client.say(channel, settings.messages.no_funds.expand({name: from, balance: balance, short: amount - balance, amount: amount})); client.say(channel, settings.messages.no_funds.expand({name: from, balance: balance, short: amount - balance, amount: amount}));
} }