* (plugins/unicode) '//ignore' strikes back; partially reverting [929]

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / keywords.rb

diff --git a/data/rbot/plugins/keywords.rb b/data/rbot/plugins/keywords.rb
index 855bfe6aa4e25bb4472ed839be7621a923fde5b1..6ace2016bf0e55c2da3020f0c5c5c74633a88788 100644 (file)
--- a/data/rbot/plugins/keywords.rb
+++ b/data/rbot/plugins/keywords.rb
@@ -117,13 +117,6 @@ class Keywords < Plugin
     end
   end
 
-  # drop static keywords and reload them from files, picking up any new
-  # keyword files that have been added
-  def rescan
-    @statickeywords = Hash.new
-    scan
-  end
-
   # load static keywords from files, picking up any new keyword files that
   # have been added
   def scan
@@ -490,11 +483,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