X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fmarkov.rb;h=de33136e7c428cdb71811be7a8f8760495aa941c;hb=bfb9506b75a1cf8118364226bcb8945114e3771c;hp=0e5923efdbb16d92139ffbd1e5f9073845a79f57;hpb=e6f0ce016d6a016e04e6bae065c700113122c021;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/markov.rb b/data/rbot/plugins/markov.rb
index 0e5923ef..de33136e 100644
--- a/data/rbot/plugins/markov.rb
+++ b/data/rbot/plugins/markov.rb
@@ -2,16 +2,25 @@ class MarkovPlugin < Plugin
   def initialize
     super
     @registry.set_default([])
+    @registry['enabled'] = false unless @registry.has_key?('enabled')
     @lastline = false
   end
 
-  def generate_string(seedline)
+  def generate_string(word1, word2)
     # limit to max of 50 words
-    return unless seedline
-    word1, word2 = seedline.split(/\s+/)
     output = word1 + " " + word2
-    50.times do
-      wordlist = @registry["#{word1}/#{word2}"]
+
+    # try to avoid :nonword in the first iteration
+    wordlist = @registry["#{word1} #{word2}"]
+    wordlist.delete(:nonword)
+    if not wordlist.empty?
+      word3 = wordlist[rand(wordlist.length)]
+      output = output + " " + word3
+      word1, word2 = word2, word3
+    end
+
+    49.times do
+      wordlist = @registry["#{word1} #{word2}"]
       break if wordlist.empty?
       word3 = wordlist[rand(wordlist.length)]
       break if word3 == :nonword
@@ -50,8 +59,9 @@ class MarkovPlugin < Plugin
   end
 
   def ignore?(user=nil)
+    return false unless user
     @registry['ignore_users'].each do |mask|
-      return true if Irc.netmaskmatch mask, user
+      return true if user.matches?(mask)
     end
     return false
   end
@@ -112,9 +122,15 @@ class MarkovPlugin < Plugin
     return false
   end
 
+  def delay
+    1 + rand(5)
+  end
+
   def random_markov(m, message)
     return unless should_talk
-    line = generate_string(message)
+
+    word1, word2 = message.split(/\s+/)
+    line = generate_string(word1, word2)
     return unless line
     return if line == message
     @bot.timer.add_once(delay, m) {|m|
@@ -123,9 +139,8 @@ class MarkovPlugin < Plugin
   end
 
   def chat(m, params)
-    seed = "#{params[:seed1]} #{params[:seed2]}"
-    line = generate_string seed
-    if line != seed
+    line = generate_string(params[:seed1], params[:seed2])
+    if line != "#{params[:seed1]} #{params[:seed2]}"
       m.reply line 
     else
       m.reply "I can't :("
@@ -137,7 +152,7 @@ class MarkovPlugin < Plugin
     word1, word2 = :nonword, :nonword
     output = Array.new
     50.times do
-      wordlist = @registry["#{word1}/#{word2}"]
+      wordlist = @registry["#{word1} #{word2}"]
       break if wordlist.empty?
       word3 = wordlist[rand(wordlist.length)]
       break if word3 == :nonword
@@ -158,21 +173,26 @@ class MarkovPlugin < Plugin
 
     # in channel message, the kind we are interested in
     message = clean_str m.message
+
+    if m.action?
+      message = "#{m.sourcenick} #{message}"
+    end
     
     wordlist = message.split(/\s+/)
     return unless wordlist.length >= 2
     @lastline = message
     word1, word2 = :nonword, :nonword
     wordlist.each do |word3|
-      @registry["#{word1}/#{word2}"] = @registry["#{word1}/#{word2}"].push(word3)
+      @registry["#{word1} #{word2}"] = @registry["#{word1} #{word2}"].push(word3)
       word1, word2 = word2, word3
     end
-    @registry["#{word1}/#{word2}"] = [:nonword]
+    @registry["#{word1} #{word2}"] = @registry["#{word1} #{word2}"].push(:nonword)
 
     return if m.replied?
     random_markov(m, message)
   end
 end
+
 plugin = MarkovPlugin.new
 plugin.map 'markov ignore :action :option', :action => "ignore"
 plugin.map 'markov ignore :action', :action => "ignore"
@@ -183,4 +203,4 @@ plugin.map 'markov status', :action => "status"
 plugin.map 'chat about :seed1 :seed2', :action => "chat"
 plugin.map 'chat', :action => "rand_chat"
 plugin.map 'markov probability :probability', :action => "probability",
-           :requirements => {:probability => /^\d+$/}
+           :requirements => {:probability => /^\d+%?$/}