From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Fri, 2 Feb 2007 15:48:47 +0000 (+0000)
Subject: In the new message mapper code, fail unconditionally when an entry doesn't match... 
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=7050ca90b1868a01e8c1a14b21a1001a125d925c;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

In the new message mapper code, fail unconditionally when an entry doesn't match its requirements. This is sub-optimal: the requirements should be included in the generated regular expression.
---

diff --git a/lib/rbot/messagemapper.rb b/lib/rbot/messagemapper.rb
index ec465e81..f074dd20 100644
--- a/lib/rbot/messagemapper.rb
+++ b/lib/rbot/messagemapper.rb
@@ -346,11 +346,11 @@ module Irc
           if matching[i]
             value = matching[i]
             unless passes_requirements?(item, value)
-              if @defaults.has_key?(item)
-                value == @defaults[item]
-              else
+              # if @defaults.has_key?(item)
+              #   value = @defaults[item]
+              # else
                 return nil, requirements_for(item)
-              end
+              # end
             end
           else
             value = @defaults[item]