From 641d37b241d035f8f54a5bb248b0031fcad66145 Mon Sep 17 00:00:00 2001 From: pandacoin-official Date: Tue, 27 May 2014 23:25:06 +0200 Subject: [PATCH 1/3] Add possbility to tip random amount. Usage: !tip random --- bin/tipbot.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/bin/tipbot.js b/bin/tipbot.js index 7ebd705..5e64daf 100644 --- a/bin/tipbot.js +++ b/bin/tipbot.js @@ -260,19 +260,26 @@ client.addListener('message', function(from, channel, message) { }) break; case 'tip': - var match = message.match(/^.?tip (\S+) ([\d\.]+)/); + var match = message.match(/^.?tip (\S+) (random)?([\d\.]+)/); if(match == null || match.length < 3) { client.say(channel, 'Usage: !tip ') return; } var to = match[1]; + var random = match[2]; var amount = Number(match[2]); if(isNaN(amount)) { - client.say(channel, settings.messages.invalid_amount.expand({name: from, amount: match[2]})); + client.say(channel, settings.messages.invalid_amount.expand({name: from, amount: match[3]})); return; } + if(random) { + var min = settings.coin.min_tip; + var max = amount; + amount = Math.floor(Math.random() * (max - min + 1)) + min; + } + if(to.toLowerCase() == from.toLowerCase()) { client.say(channel, settings.messages.tip_self.expand({name: from})); return; From 735f8903a6dab29ad15dd5f86f5c76ed0dc8e810 Mon Sep 17 00:00:00 2001 From: pandacoin-official Date: Tue, 27 May 2014 23:27:30 +0200 Subject: [PATCH 2/3] amount is now 3. --- bin/tipbot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tipbot.js b/bin/tipbot.js index 5e64daf..144d731 100644 --- a/bin/tipbot.js +++ b/bin/tipbot.js @@ -267,7 +267,7 @@ client.addListener('message', function(from, channel, message) { } var to = match[1]; var random = match[2]; - var amount = Number(match[2]); + var amount = Number(match[3]); if(isNaN(amount)) { client.say(channel, settings.messages.invalid_amount.expand({name: from, amount: match[3]})); From 838d2ca39823b50f43a1b9dee5f2ea936a2e47a4 Mon Sep 17 00:00:00 2001 From: pandacoin-official Date: Tue, 27 May 2014 23:47:40 +0200 Subject: [PATCH 3/3] Same thing for rain. --- bin/tipbot.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/bin/tipbot.js b/bin/tipbot.js index 144d731..496a0be 100644 --- a/bin/tipbot.js +++ b/bin/tipbot.js @@ -194,20 +194,27 @@ client.addListener('message', function(from, channel, message) { switch(command) { case 'rain': - var match = message.match(/^.?rain ([\d\.]+) ?(\d+)?/); - if(match == null || !match[1]) { + var match = message.match(/^.?rain (random)?([\d\.]+) ?(\d+)?/); + if(match == null || !match[2]) { client.say(channel, 'Usage: !rain [max people]'); return; } - var amount = Number(match[1]); - var max = Number(match[2]); + var random = match[1]; + var amount = Number(match[2]); + var max = Number(match[3]); if(isNaN(amount)) { client.say(channel, settings.messages.invalid_amount.expand({name: from, amount: match[2]})); return; } + if(random) { + var min = settings.coin.min_rain; + var maxAmount = amount; + amount = Math.floor(Math.random() * (maxAmount - min + 1)) + min; + } + if(isNaN(max) || max < 1) { max = false; }