poll: New plugin for having polls (votes, contests, etc) running.

[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 cba09b983696e4c02bbebb8eb8f21933457b180b..ba6e88453b7d40ac11018400fc1614b5c335227a 100644 (file)
--- a/data/rbot/plugins/factoids.rb
+++ b/data/rbot/plugins/factoids.rb
@@ -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
@@ -331,7 +331,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 +341,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 +349,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
@@ -366,7 +372,7 @@ class FactoidsPlugin < Plugin
           reply << short_fact(f)
         }
       end
-      m.reply reply.join(". "), :split_at => /\s+--\s+/
+      m.reply reply.join(". "), :split_at => /\[\d+\/\d+\] /, :purge_split => false
     end
   end
 
@@ -377,7 +383,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