plugin(search): fix search and gcalc, closes #28, #29

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

diff --git a/data/rbot/plugins/factoids.rb b/data/rbot/plugins/factoids.rb
index aeb6557fc8d534d221f1fb2b90c2933c75bed0b0..452efb98fef3fb8b7ff3eb2a3a69fc27f56d3383 100644 (file)
--- a/data/rbot/plugins/factoids.rb
+++ b/data/rbot/plugins/factoids.rb
@@ -65,7 +65,7 @@ class FactoidsPlugin < Plugin
     def index(f)
       fact = f.to_s
       return if fact.empty?
-      self.map { |f| f[:fact] }.index(fact)
+      self.map { |fs| fs[:fact] }.index(fact)
     end
 
     def delete(f)
@@ -120,7 +120,7 @@ class FactoidsPlugin < Plugin
     super
 
     # TODO config
-    @dir = File.join(@bot.botclass,"factoids")
+    @dir = datafile
     @filename = "factoids.rbot"
     @factoids = FactoidList.new
     @triggers = Set.new
@@ -260,7 +260,14 @@ class FactoidsPlugin < Plugin
   end
 
   def help(plugin, topic="")
-    _("factoids plugin: learn that <factoid>, forget that <factoids>, facts about <words>")
+    case plugin
+    when 'learn'
+      _("learn that <factoid> => learn a factoid")
+    when 'forget'
+      _("forget fact <#num> => forget factoid number #num ; forget about <factoid> => forget a factoid")
+    else
+      _("factoids plugin: learn that <factoid>, forget that <factoid>, facts about <words>")
+    end
   end
 
   def learn(m, params)
@@ -331,7 +338,9 @@ class FactoidsPlugin < Plugin
     # When looking for words we separate them with
     # arbitrary whitespace, not whatever they came with
     pre = words.map { |w| Regexp.escape(w)}.join("\\s+")
-    return Regexp.new("\\b#{pre}\\b", true)
+    pre << '\b' if pre.match(/\b$/)
+    pre = '\b' + pre if pre.match(/^\b/)
+    return Regexp.new(pre, true)
   end
 
   def facts(m, params)
@@ -339,7 +348,7 @@ class FactoidsPlugin < Plugin
     if params[:words].nil_or_empty? and params[:rx].nil_or_empty?
       m.reply _("I know %{total} facts" % { :total => total })
     else
-      if params[:words].empty?
+      unless params.key? :words and not params[:words].empty?
         rx = Regexp.new(params[:rx].to_s, true)
       else
         rx = words2rx(params[:words])
@@ -347,7 +356,11 @@ class FactoidsPlugin < Plugin
       known = @factoids.grep(rx)
       reply = []
       if known.empty?
-        reply << _("I know nothing about %{words}" % params)
+        if params.key? :words
+          reply << _("I know nothing about %{words}" % params)
+        else params.key? :rx
+          reply << _("I know nothing matching %{rx}" % params)
+        end
       else
         max_facts = @bot.config['factoids.search_results']
         len = known.length
@@ -377,7 +390,12 @@ class FactoidsPlugin < Plugin
       return if @triggers.empty?
       query = $1.strip.downcase
       if @triggers.include?(query)
-        facts(m, :words => query.split)
+        words = query.split
+        words.instance_variable_set(:@string_value, query)
+        def words.to_s
+          @string_value
+        end
+        facts(m, :words => words)
       end
     else
       return if m.address? # we don't learn stuff directed at us which is not an explicit learn command