imdb: restore 'character of' functionality

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

diff --git a/data/rbot/plugins/markov.rb b/data/rbot/plugins/markov.rb
index 864db4b8afa22ec893a16d1a3b6c0496b583d6cb..21c4d63172996f6dde039132941a13f6ab97a03e 100755 (executable)
--- a/data/rbot/plugins/markov.rb
+++ b/data/rbot/plugins/markov.rb
@@ -226,6 +226,8 @@ class MarkovPlugin < Plugin
     @chains.set_default([])
     @rchains = @registry.sub_registry('v2r')
     @rchains.set_default([])
+    @chains_mutex = Mutex.new
+    @rchains_mutex = Mutex.new
 
     @upgrade_queue = Queue.new
     @upgrade_thread = nil
@@ -365,9 +367,12 @@ class MarkovPlugin < Plugin
     end
   end
 
-  def clean_str(s)
-    str = s.dup
-    str.gsub!(/^\S+[:,;]/, "")
+  def clean_message(m)
+    str = m.plainmessage.dup
+    str =~ /^(\S+)([:,;])/
+    if $1 and m.target.is_a? Irc::Channel and m.target.user_nicks.include? $1.downcase
+      str.gsub!(/^(\S+)([:,;])\s+/, "")
+    end
     str.gsub!(/\s{2,}/, ' ') # fix for two or more spaces
     return str.strip
   end
@@ -533,7 +538,7 @@ class MarkovPlugin < Plugin
   def random_markov(m, message)
     return unless should_talk(m)
 
-    words = clean_str(message).split(/\s+/)
+    words = clean_message(m).split(/\s+/)
     if words.length < 2
       line = generate_string words.first, nil
 
@@ -601,40 +606,44 @@ class MarkovPlugin < Plugin
     end
 
     random_markov(m, message) unless readonly? m or m.replied?
-    learn message
+    learn clean_message(m)
   end
 
 
   def learn_triplet(word1, word2, word3)
       k = "#{word1} #{word2}"
       rk = "#{word2} #{word3}"
-      total = 0
-      hash = Hash.new(0)
-      if @chains.key? k
-        t2, h2 = @chains[k]
-        total += t2
-        hash.update h2
+      @chains_mutex.synchronize do
+        total = 0
+        hash = Hash.new(0)
+        if @chains.key? k
+          t2, h2 = @chains[k]
+          total += t2
+          hash.update h2
+        end
+        hash[word3] += 1
+        total += 1
+        @chains[k] = [total, hash]
       end
-      hash[word3] += 1
-      total += 1
-      @chains[k] = [total, hash]
-      # Reverse
-      total = 0
-      hash = Hash.new(0)
-      if @rchains.key? rk
-        t2, h2 = @rchains[rk]
-        total += t2
-        hash.update h2
+      @rchains_mutex.synchronize do
+        # Reverse
+        total = 0
+        hash = Hash.new(0)
+        if @rchains.key? rk
+          t2, h2 = @rchains[rk]
+          total += t2
+          hash.update h2
+        end
+        hash[word1] += 1
+        total += 1
+        @rchains[rk] = [total, hash]
       end
-      hash[word1] += 1
-      total += 1
-      @rchains[rk] = [total, hash]
   end
 
 
   def learn_line(message)
     # debug "learning #{message.inspect}"
-    wordlist = clean_str(message).split(/\s+/).reject do |w|
+    wordlist = message.strip.split(/\s+/).reject do |w|
       @bot.config['markov.ignore_patterns'].map do |pat|
         w =~ Regexp.new(pat.to_s)
       end.select{|v| v}.size != 0