Fix critical keyerror bug in rate limiting

sopel-irc · Apr 16, 2016 · b00b22c · b00b22c
1 parent 56d6b58
commit b00b22c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/sopel/bot.py b/sopel/bot.py
@@ -425,6 +425,8 @@ def call(self, func, sopel, trigger):
             self._times[nick] = dict()
         if self.nick not in self._times:
             self._times[self.nick] = dict()
+        if not trigger.is_privmsg and trigger.sender not in self._times:
+            self._times[trigger.sender] = dict()
 
         if not trigger.admin and not func.unblockable:
             usertimediff = current_time - self._times[nick][func]
@@ -450,11 +452,9 @@ def call(self, func, sopel, trigger):
 
             if not trigger.is_privmsg:
                 chan = trigger.sender
-                if chan not in self._times:
-                    self._times[chan] = dict()
-                chantimediff = current_time - self._times[chan][func]
                 if func.channel_rate > 0 and chantimediff < func.channel_rate and \
                             func in self._times[chan]:
+                        chantimediff = current_time - self._times[chan][func]
                         self._times[chan][func] = current_time
                         LOGGER.info(
                             "%s prevented from using %s in %s due to channel limit: %d < %d",