From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Fri, 16 Feb 2007 00:14:23 +0000 (+0000)
Subject: keywords plugin: more fixes to 'reply-on-question' code
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=dbb8a509f170a4b43f9db9755eb0f503d1b34f25;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

keywords plugin: more fixes to 'reply-on-question' code
---

diff --git a/data/rbot/plugins/keywords.rb b/data/rbot/plugins/keywords.rb
index 855bfe6a..255d7fe6 100644
--- a/data/rbot/plugins/keywords.rb
+++ b/data/rbot/plugins/keywords.rb
@@ -490,11 +490,9 @@ class Keywords < Plugin
   end
 
   def unreplied(m)
-    # return if m.address?
-    # in channel message, not to me
     # TODO option to do if(m.message =~ /^(.*)$/, ie try any line as a
     # keyword lookup.
-    if !@bot.config["keyword.address"] && m.message =~ /^(.*\S)\s*\?\s*$/
+    if m.message =~ /^(.*\S)\s*\?\s*$/ and (m.address? or not @bot.config["keyword.address"])
       keyword_lookup m, $1, true if @bot.auth.allow?("keyword", m.source)
     elsif @bot.config["keyword.listen"] && (m.message =~ /^(.*?)\s+(is|are)\s+(.*)$/)
       # TODO MUCH more selective on what's allowed here