translator.rb: use "help <translator>" instead of "help translator <translator>"...

[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 7408a43ecabc285f519f3798d36a8e10076c2738..14cd0f9930e1dc70e9558ff54fd13d76c91f87f7 100644 (file)
--- a/data/rbot/plugins/markov.rb
+++ b/data/rbot/plugins/markov.rb
@@ -59,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
@@ -132,7 +133,7 @@ class MarkovPlugin < Plugin
     line = generate_string(word1, word2)
     return unless line
     return if line == message
-    @bot.timer.add_once(delay, m) {|m|
+    @bot.timer.add_once(delay) {
       m.reply line
     }
   end
@@ -191,6 +192,7 @@ class MarkovPlugin < Plugin
     random_markov(m, message)
   end
 end
+
 plugin = MarkovPlugin.new
 plugin.map 'markov ignore :action :option', :action => "ignore"
 plugin.map 'markov ignore :action', :action => "ignore"