X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ffactoids.rb;h=452efb98fef3fb8b7ff3eb2a3a69fc27f56d3383;hb=90656f4203a0a989b6fb110d4a07598dd186b84c;hp=0279b90abe6925e05daa526e09ec48612e20fed4;hpb=27ee4fabaebdb1f78b1eb6cfb31c43f1dc5a7f49;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/factoids.rb b/data/rbot/plugins/factoids.rb
index 0279b90a..452efb98 100644
--- 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)
@@ -91,9 +91,27 @@ class FactoidsPlugin < Plugin
     ],
     :on_change => Proc.new { |bot, v| bot.plugins['factoids'].reset_triggers },
     :desc => "A list of regular expressions matching factoids where keywords can be identified. append ':n' if the keyword is defined by the n-th group instead of the first. if the list is empty, any word will be considered a keyword")
+  Config.register Config::ArrayValue.new('factoids.not_triggers',
+    :default => [
+      "this","that","the","a","right","who","what","why"
+    ],
+    :on_change => Proc.new { |bot, v| bot.plugins['factoids'].reset_triggers },
+    :desc => "A list of words that won't be set as keywords")
   Config.register Config::BooleanValue.new('factoids.address',
     :default => true,
     :desc => "Should the bot reply with relevant factoids only when addressed with a direct question? If not, the bot will attempt to lookup foo if someone says 'foo?' in channel")
+  Config.register Config::ArrayValue.new('factoids.learn_pattern',
+    :default => [
+      ".*\\s+(is|are|has|have)\\s+.*"
+    ],
+    :on_change => Proc.new { |bot, v| bot.plugins['factoids'].reset_learn_patterns },
+    :desc => "A list of regular expressions matching factoids that the bot can learn. append ':n' if the factoid is defined by the n-th group instead of the whole match.")
+  Config.register Config::BooleanValue.new('factoids.listen_and_learn',
+    :default => false,
+    :desc => "Should the bot learn factoids from what is being said in chat? if true, phrases matching patterns in factoids.learn_pattern will tell the bot when a phrase can be learned")
+  Config.register Config::BooleanValue.new('factoids.silent_listen_and_learn',
+    :default => true,
+    :desc => "Should the bot be silent about the factoids he learns from the chat? If true, the bot will not declare what he learned every time he learns something from factoids.listen_and_learn being true")
   Config.register Config::IntegerValue.new('factoids.search_results',
     :default => 5,
     :desc => "How many factoids to display at a time")
@@ -102,10 +120,12 @@ class FactoidsPlugin < Plugin
     super
 
     # TODO config
-    @dir = File.join(@bot.botclass,"factoids")
+    @dir = datafile
     @filename = "factoids.rbot"
     @factoids = FactoidList.new
     @triggers = Set.new
+    @learn_patterns = []
+    reset_learn_patterns
     begin
       read_factfile
     rescue
@@ -183,6 +203,20 @@ class FactoidsPlugin < Plugin
     }
   end
 
+  def learn_patterns_to_rx
+    return [] if @bot.config['factoids.learn_pattern'].empty?
+    @bot.config['factoids.learn_pattern'].inject([]) { |list, str|
+      s = str.dup
+      if s =~ /:(\d+)$/
+        idx = $1.to_i
+        s.sub!(/:\d+$/,'')
+      else
+        idx = 0
+      end
+      list << [/^#{s}$/iu, idx]
+    }
+  end
+
   def parse_for_trigger(f, rx=nil)
     if !rx
       regs = trigger_patterns_to_rx
@@ -218,11 +252,22 @@ class FactoidsPlugin < Plugin
       end
     }
     debug "Triggers done in #{Time.now - start_time}"
-    @triggers.replace(triggers)
+    @triggers.replace(triggers - @bot.config['factoids.not_triggers'])
+  end
+
+  def reset_learn_patterns
+    @learn_patterns.replace(learn_patterns_to_rx)
   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)
@@ -236,12 +281,13 @@ class FactoidsPlugin < Plugin
       m.reply _("I already know that %{factoid} [#%{idx}]" % {
         :factoid => factoid,
         :idx => idx
-      })
+      }) unless params[:silent]
     else
       @factoids << factoid
       @changed = true
-      m.reply _("okay, learned fact #%{num}: %{fact}" % { :num => @factoids.length, :fact => @factoids.last}) 
-      parse_for_trigger(factoid)
+      m.reply _("okay, learned fact #%{num}: %{fact}" % { :num => @factoids.length, :fact => @factoids.last}) unless params[:silent]
+      trigs = parse_for_trigger(factoid)
+      @triggers |= trigs unless trigs.empty?
     end
   end
 
@@ -292,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)
@@ -300,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])
@@ -308,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
@@ -327,18 +379,34 @@ 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
 
   def unreplied(m)
-    return if @bot.config['factoids.address'] and !m.address?
-    return if @factoids.empty?
-    return if @triggers.empty?
-    return unless m.message =~ /^(.*)\?\s*$/
-    query = $1.strip.downcase
-    if @triggers.include?(query)
-      facts(m, :words => query.split)
+    if m.message =~ /^(.*)\?\s*$/
+      return if @bot.config['factoids.address'] and !m.address?
+      return if @factoids.empty?
+      return if @triggers.empty?
+      query = $1.strip.downcase
+      if @triggers.include?(query)
+        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
+      return if !@bot.config['factoids.listen_and_learn'] or @learn_patterns.empty?
+      @learn_patterns.each do |pat, i|
+        g = pat.match(m.message)
+        if g and g[i]
+          learn(m, :stuff => g[i], :silent => @bot.config['factoids.silent_listen_and_learn'])
+          break
+        end
+      end
     end
   end