From d36dcc5352ccb038c14a9d95bfd85c661e825bb1 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Wed, 20 Nov 2013 10:14:39 -0600
Subject: [PATCH] Exclude mods from chat throttle, add extra description to
 options

---
 lib/channel.js          | 8 +-------
 www/channeloptions.html | 6 +++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/channel.js b/lib/channel.js
index 792b0e30..fa0fec9e 100644
--- a/lib/channel.js
+++ b/lib/channel.js
@@ -2243,15 +2243,9 @@ Channel.prototype.tryChat = function(user, data) {
         msg = msg.substring(0, 240);
     }
 
-    if (this.opts.chat_antiflood &&
+    if (user.rank < 2 && this.opts.chat_antiflood &&
         user.chatLimiter.throttle(this.opts.chat_antiflood_params)) {
         user.socket.emit("chatCooldown", 1000/this.opts.chat_antiflood_params.sustained);
-        /*
-        user.socket.emit("noflood", {
-            action: "chat",
-            msg: "sending messages too quickly!"
-        });
-        */
         return;
     }
 
diff --git a/www/channeloptions.html b/www/channeloptions.html
index 41d984da..a01d456f 100644
--- a/www/channeloptions.html
+++ b/www/channeloptions.html
@@ -31,21 +31,21 @@
         </div>
         <!-- chat flood burst -->
         <div class="control-group">
-            <label class="control-label" for="opt_chat_antiflood_burst"># of messages allowed before throttling</label>
+            <label class="control-label" for="opt_chat_antiflood_burst" title="The number of messages someone can send with no restriction before the rate limit is applied"># of messages allowed before throttling</label>
             <div class="controls">
                 <input type="text" id="opt_chat_antiflood_burst">
             </div>
         </div>
         <!-- chat flood sustained -->
         <div class="control-group">
-            <label class="control-label" for="opt_chat_antiflood_sustained"># of messages allowed per second (sustained)</label>
+            <label class="control-label" for="opt_chat_antiflood_sustained" title="The number of messages (after the burst is exceeded) per second a non-moderator can send"># of messages allowed per second (sustained)</label>
             <div class="controls">
                 <input type="text" id="opt_chat_antiflood_sustained">
             </div>
         </div>
         <!-- chat flood cooldown -->
         <div class="control-group">
-            <label class="control-label" for="opt_chat_antiflood_cooldown">Cooldown time after being throttled (seconds)</label>
+            <label class="control-label" for="opt_chat_antiflood_cooldown" title="The number of seconds since the last message before someone can burst again">Cooldown time after being throttled (seconds)</label>
             <div class="controls">
                 <input type="text" id="opt_chat_antiflood_cooldown">
             </div>