no more excess floods

bin/tipbot.js

@@ -152,11 +152,13 @@ client.addListener('message', function(from, channel, message) {
   // comands that don't require identifying
   if(command == 'help' || command == 'terms')
   {
+    var msg = [];
     for(var i = 0; i < settings.messages[command].length; i++) {
-      var message = settings.messages[command][i];
+      msg.push(settings.messages[command][i].expand({}));
-      client.say(channel, message.expand({}));
     }
 
+    client.say(msg.join(', '));
+
     return;
   }
 
@@ -196,11 +198,6 @@ client.addListener('message', function(from, channel, message) {
           max = Math.floor(max);
         }
 
-        if(amount < settings.coin.min_rain) {
-          client.say(channel, settings.messages.rain_too_small.expand({from: from, amount: amount}));
-          return;
-        }
-
         coin.getBalance(from.toLowerCase(), settings.coin.min_confirmations, function(err, balance) {
           if(err) {
             winston.error('Error in !tip command.', err);
@@ -220,6 +217,12 @@ client.addListener('message', function(from, channel, message) {
               if(max == 0) return;
               names = names.slice(0, max);
 
+
+              if(amount / max < settings.coin.min_rain) {
+                client.say(channel, settings.messages.rain_too_small.expand({from: from, amount: amount}));
+                return;
+              }
+
               for (var i = 0; i < names.length; i++) {
                 coin.move(from.toLowerCase(), names[i].toLowerCase(), amount / max, function(err, reply) {
                   if(err || !reply) {
@@ -229,7 +232,7 @@ client.addListener('message', function(from, channel, message) {
                 });
               }
 
-              client.say(channel, settings.messages.rain.expand({name: from, amount: (amount / max).toFixed(3), list: names.join(', ')}));
+              client.say(channel, settings.messages.rain.expand({name: from, amount: amount / max, list: names.join(', ')}));
             });
           } else {
             winston.info('%s tried to tip %s %d, but has only %d', from, to, amount, balance);

config/config.sample.yml

@@ -23,7 +23,7 @@ coin:
   min_withdraw: 5
   min_confirmations: 3
   min_tip: 10
-  min_rain: 100
+  min_rain: 1
   short_name: Đ
   full_name: dogecoin
 webadmin: