X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ffactoids.rb;h=3192aa00e450d211de79f7aa9a0cad1ca944a5ac;hb=f6ec4e09d5d309f297b4ff6fd6c65ca82c74b462;hp=ca95d00354751f02958501a2e6b6b620b23cdcbd;hpb=084dd243f8d92f683a0fc6c3f8e12fae3e7bd77a;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/factoids.rb b/data/rbot/plugins/factoids.rb
index ca95d003..3192aa00 100644
--- a/data/rbot/plugins/factoids.rb
+++ b/data/rbot/plugins/factoids.rb
@@ -84,13 +84,37 @@ class FactoidsPlugin < Plugin
   # TODO default should be language-specific
   Config.register Config::ArrayValue.new('factoids.trigger_pattern',
     :default => [
-      "(this|that|a|the|an|all|both)\\s+(.*)\\s+(is|are)\\s+.*:2",
-      "(this|that|a|the|an|all|both)\\s+(.*?)\\s+(is|are)\\s+.*:2",
-      "(.*)\\s+(is|are)\\s+.*",
-      "(.*?)\\s+(is|are)\\s+.*",
+      "(this|that|a|the|an|all|both)\\s+(.*)\\s+(is|are|has|have|does|do)\\s+.*:2",
+      "(this|that|a|the|an|all|both)\\s+(.*?)\\s+(is|are|has|have|does|do)\\s+.*:2",
+      "(.*)\\s+(is|are|has|have|does|do)\\s+.*",
+      "(.*?)\\s+(is|are|has|have|does|do)\\s+.*",
     ],
     :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")
+    :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")
 
   def initialize
     super
@@ -100,6 +124,8 @@ class FactoidsPlugin < Plugin
     @filename = "factoids.rbot"
     @factoids = FactoidList.new
     @triggers = Set.new
+    @learn_patterns = []
+    reset_learn_patterns
     begin
       read_factfile
     rescue
@@ -164,6 +190,7 @@ class FactoidsPlugin < Plugin
   end
 
   def trigger_patterns_to_rx
+    return [] if @bot.config['factoids.trigger_pattern'].empty?
     @bot.config['factoids.trigger_pattern'].inject([]) { |list, str|
       s = str.dup
       if s =~ /:(\d+)$/
@@ -176,25 +203,44 @@ 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
     else
       regs = rx
     end
-    regs.inject([]) { |list, a|
-      r = a.first
-      i = a.last
-      m = r.match(f.to_s)
-      if m
-        list << m[i]
-      else
-        list
-      end
-    }
+    if regs.empty?
+      f.to_s.scan(/\w+/u)
+    else
+      regs.inject([]) { |list, a|
+        r = a.first
+        i = a.last
+        m = r.match(f.to_s)
+        if m
+          list << m[i].downcase
+        else
+          list
+        end
+      }
+    end
   end
 
   def reset_triggers
+    return unless @factoids
     start_time = Time.now
     rx = trigger_patterns_to_rx
     triggers = @factoids.inject(Set.new) { |set, f|
@@ -206,7 +252,11 @@ 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="")
@@ -224,13 +274,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.okay
-      fact(m, :index => @factoids.length.to_s)
-      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
 
@@ -259,6 +309,15 @@ class FactoidsPlugin < Plugin
     end
   end
 
+  def short_fact(fact,index=nil,total=@factoids.length)
+    idx = index || @factoids.index(fact)+1
+    _("[%{idx}/%{total}] %{fact}" % {
+      :idx => idx,
+      :total => total,
+      :fact => fact.to_s(:meta => false)
+    })
+  end
+
   def long_fact(fact,index=nil,total=@factoids.length)
     idx = index || @factoids.index(fact)+1
     _("fact #%{idx} of %{total}: %{fact}" % {
@@ -268,19 +327,31 @@ class FactoidsPlugin < Plugin
     })
   end
 
+  def words2rx(words)
+    # When looking for words we separate them with
+    # arbitrary whitespace, not whatever they came with
+    pre = words.map { |w| Regexp.escape(w)}.join("\\s+")
+    pre << '\b' if pre.match(/\b$/)
+    pre = '\b' + pre if pre.match(/^\b/)
+    return Regexp.new(pre, true)
+  end
+
   def facts(m, params)
     total = @factoids.length
-    if params[:words].empty?
+    if params[:words].nil_or_empty? and params[:rx].nil_or_empty?
       m.reply _("I know %{total} facts" % { :total => total })
     else
-      rx = Regexp.new(params[:words].to_s, true)
+      if params[:words].empty?
+        rx = Regexp.new(params[:rx].to_s, true)
+      else
+        rx = words2rx(params[:words])
+      end
       known = @factoids.grep(rx)
       reply = []
       if known.empty?
         reply << _("I know nothing about %{words}" % params)
       else
-        # TODO config
-        max_facts = 5
+        max_facts = @bot.config['factoids.search_results']
         len = known.length
         if len > max_facts
           m.reply _("%{len} out of %{total} facts refer to %{words}, I'll only show %{max}" % {
@@ -294,10 +365,32 @@ class FactoidsPlugin < Plugin
           end
         end
         known.each { |f|
-          reply << long_fact(f)
+          reply << short_fact(f)
         }
       end
-      m.reply reply.join(" -- ")
+      m.reply reply.join(". "), :split_at => /\[\d+\/\d+\] /, :purge_split => false
+    end
+  end
+
+  def unreplied(m)
+    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)
+        facts(m, :words => query.split)
+      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
 
@@ -321,7 +414,7 @@ class FactoidsPlugin < Plugin
         end
         known = @factoids
       else
-        rx = Regexp.new(params[:words].to_s, true)
+        rx = words2rx(params[:words])
         known = @factoids.grep(rx)
         if known.empty?
           m.reply _("I know nothing about %{words}" % params)
@@ -402,6 +495,7 @@ plugin.map 'learn that *stuff'
 plugin.map 'forget that *stuff', :auth_path => 'edit'
 plugin.map 'forget fact :index', :requirements => { :index => /^#?\d+$/ }, :auth_path => 'edit'
 plugin.map 'facts [about *words]'
+plugin.map 'facts search *rx'
 plugin.map 'fact [about *words]'
 plugin.map 'fact :index', :requirements => { :index => /^#?\d+$/ }