quiz: stop quizzes and timers on cleanup

[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 0b8412f7c8974b9a9611e6e861e4d528c814c84d..21c4d63172996f6dde039132941a13f6ab97a03e 100755 (executable)
--- a/data/rbot/plugins/markov.rb
+++ b/data/rbot/plugins/markov.rb
@@ -32,7 +32,7 @@ class MarkovPlugin < Plugin
     :validate => Proc.new { |v| v >= 0 },
     :desc => "Time the learning thread spends sleeping after learning a line. If set to zero, learning from files can be very CPU intensive, but also faster.")
    Config.register Config::IntegerValue.new('markov.delay',
-    :default => true,
+    :default => 5,
     :validate => Proc.new { |v| v >= 0 },
     :desc => "Wait short time before contributing to conversation.")
    Config.register Config::IntegerValue.new('markov.answer_addressed',
@@ -296,15 +296,15 @@ class MarkovPlugin < Plugin
       output = word1
       keys = []
       @chains.each_key(output) do |key|
-       if key.downcase.include? output
-               keys << key
-       else
-               break
-       end
+        if key.downcase.include? output
+          keys << key
+        else
+          break
+        end
       end
       return nil if keys.empty?
       output = keys[rand(keys.size)].split(/ /)
-     end
+    end
     output = output.split(/ /) unless output.is_a? Array
     input = [word1, word2]
     while output.length < @bot.config['markov.max_words'] and (output.first != MARKER or output.last != MARKER) do
@@ -319,8 +319,8 @@ class MarkovPlugin < Plugin
     if output == input
       nil
     else
-          output.join(" ")
-        end
+      output.join(" ")
+    end
   end
 
   def help(plugin, topic="")
@@ -367,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
@@ -492,9 +495,9 @@ class MarkovPlugin < Plugin
     m.okay
   end
 
-  def should_talk
+  def should_talk(m)
     return false unless @bot.config['markov.enabled']
-    prob = probability?
+    prob = m.address? ? @bot.config['markov.answer_addressed'] : probability?
     return true if prob > rand(100)
     return false
   end
@@ -524,7 +527,7 @@ class MarkovPlugin < Plugin
   def reply_delay(m, line)
     m.replied = true
     if @bot.config['markov.delay'] > 0
-      @bot.timer.add_once(@bot.config['markov.delay']) {
+      @bot.timer.add_once(1 + rand(@bot.config['markov.delay'])) {
         m.reply line, :nick => false, :to => :public
       }
     else
@@ -533,9 +536,9 @@ class MarkovPlugin < Plugin
   end
 
   def random_markov(m, message)
-    return unless (should_talk or (m.address? and  @bot.config['markov.answer_addressed'] > rand(100)))
+    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
 
@@ -603,7 +606,7 @@ class MarkovPlugin < Plugin
     end
 
     random_markov(m, message) unless readonly? m or m.replied?
-    learn message
+    learn clean_message(m)
   end
 
 
@@ -640,7 +643,7 @@ class MarkovPlugin < Plugin
 
   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