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

diff --git a/data/rbot/plugins/markov.rb b/data/rbot/plugins/markov.rb
index de33136e..dcf3b776 100644
--- a/data/rbot/plugins/markov.rb
+++ b/data/rbot/plugins/markov.rb
@@ -1,9 +1,37 @@
+#-- vim:sw=2:et
+#++
+#
+# :title: Markov plugin
+#
+# Author:: Tom Gilbert <tom@linuxbrit.co.uk>
+# Copyright:: (C) 2005 Tom Gilbert
+#
+# Contribute to chat with random phrases built from word sequences learned
+# by listening to chat
+
 class MarkovPlugin < Plugin
+  Config.register Config::BooleanValue.new('markov.enabled',
+    :default => false,
+    :desc => "Enable and disable the plugin")
+  Config.register Config::IntegerValue.new('markov.probability',
+    :default => 25,
+    :validate => Proc.new { |v| (0..100).include? v },
+    :desc => "Percentage chance of markov plugin chipping in")
+  Config.register Config::ArrayValue.new('markov.ignore_users',
+    :default => [],
+    :desc => "Hostmasks of users to be ignored")
+
   def initialize
     super
     @registry.set_default([])
-    @registry['enabled'] = false unless @registry.has_key?('enabled')
-    @lastline = false
+    if @registry.has_key?('enabled')
+      @bot.config['markov.enabled'] = @registry['enabled']
+      @registry.delete('enabled')
+    end
+    if @registry.has_key?('probability')
+      @bot.config['markov.probability'] = @registry['probability']
+      @registry.delete('probability')
+    end
   end
 
   def generate_string(word1, word2)
@@ -31,7 +59,7 @@ class MarkovPlugin < Plugin
   end
 
   def help(plugin, topic="")
-    "markov plugin: listens to chat to build a markov chain, with which it can (perhaps) attempt to (inanely) contribute to 'discussion'. Sort of.. Will get a *lot* better after listening to a lot of chat. usage: 'markov' to attempt to say something relevant to the last line of chat, if it can.  other options to markov: 'ignore' => ignore a hostmask (accept no input), 'status' => show current status, 'probability' => set the % chance of rbot responding to input, 'chat' => try and say something intelligent, 'chat about <foo> <bar>' => riff on a word pair (if possible)"
+    "markov plugin: listens to chat to build a markov chain, with which it can (perhaps) attempt to (inanely) contribute to 'discussion'. Sort of.. Will get a *lot* better after listening to a lot of chat. usage: 'markov' to attempt to say something relevant to the last line of chat, if it can.  other options to markov: 'ignore' => ignore a hostmask (accept no input), 'status' => show current status, 'probability [<chance>]' => set the % chance of rbot responding to input, or display the current probability, 'chat' => try and say something intelligent, 'chat about <foo> <bar>' => riff on a word pair (if possible)"
   end
 
   def clean_str(s)
@@ -42,16 +70,11 @@ class MarkovPlugin < Plugin
   end
 
   def probability?
-    prob = @registry['probability']
-    prob = 25 if prob.kind_of? Array;
-    prob = 0 if prob < 0
-    prob = 100 if prob > 100
-    return prob
+    return @bot.config['markov.probability']
   end
 
   def status(m,params)
-    enabled = @registry['enabled']
-    if (enabled)
+    if @bot.config['markov.enabled']
       m.reply "markov is currently enabled, #{probability?}% chance of chipping in"
     else
       m.reply "markov is currently disabled"
@@ -60,63 +83,64 @@ class MarkovPlugin < Plugin
 
   def ignore?(user=nil)
     return false unless user
-    @registry['ignore_users'].each do |mask|
+    @bot.config['markov.ignore_users'].each do |mask|
       return true if user.matches?(mask)
     end
     return false
   end
 
   def ignore(m, params)
-    if @registry['ignore_users'].nil?
-      @registry['ignore_users'] = []
-    end
     action = params[:action]
     user = params[:option]
     case action
     when 'remove':
-      if @registry['ignore_users'].include? user
-        s = @registry['ignore_users']
+      if @bot.config['markov.ignore_users'].include? user
+        s = @bot.config['markov.ignore_users']
         s.delete user
-        @registry['ignore_users'] = s
+        @bot.config['ignore_users'] = s
         m.reply "#{user} removed"
       else
         m.reply "not found in list"
       end
     when 'add':
       if user
-        if @registry['ignore_users'].include?(user)
+        if @bot.config['markov.ignore_users'].include?(user)
           m.reply "#{user} already in list"
         else
-          @registry['ignore_users'] = @registry['ignore_users'].push user 
+          @bot.config['markov.ignore_users'] = @bot.config['markov.ignore_users'].push user
           m.reply "#{user} added to markov ignore list"
         end
       else
         m.reply "give the name of a person to ignore"
       end
     when 'list':
-      m.reply "I'm ignoring #{@registry['ignore_users'].join(", ")}"
+      m.reply "I'm ignoring #{@bot.config['markov.ignore_users'].join(", ")}"
     else
       m.reply "have markov ignore the input from a hostmask.  usage: markov ignore add <mask>; markov ignore remove <mask>; markov ignore list"
     end
   end
 
   def enable(m, params)
-    @registry['enabled'] = true
+    @bot.config['markov.enabled'] = true
     m.okay
   end
 
   def probability(m, params)
-    @registry['probability'] = params[:probability].to_i
-    m.okay
+    if params[:probability]
+      @bot.config['markov.probability'] = params[:probability].to_i
+      m.okay
+    else
+      m.reply _("markov has a %{prob}% chance of chipping in") % { :prob => probability? }
+    end
   end
 
   def disable(m, params)
-    @registry['enabled'] = false
+    @bot.config['markov.enabled'] = false
     m.okay
   end
 
   def should_talk
-    return false unless @registry['enabled']
+    return false unless @bot.config['markov.enabled']
     prob = probability?
     return true if prob > rand(100)
     return false
@@ -133,7 +157,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
@@ -166,8 +190,8 @@ class MarkovPlugin < Plugin
     end
   end
   
-  def listen(m)
-    return unless m.kind_of?(PrivMessage) && m.public?
+  def message(m)
+    return unless m.public?
     return if m.address?
     return if ignore? m.source
 
@@ -180,16 +204,18 @@ class MarkovPlugin < Plugin
     
     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)
-      word1, word2 = word2, word3
-    end
-    @registry["#{word1} #{word2}"] = @registry["#{word1} #{word2}"].push(:nonword)
+    Thread.new do
+      word1, word2 = :nonword, :nonword
+      wordlist.each do |word3|
+        k = "#{word1} #{word2}"
+        @registry[k] = @registry[k].push(word3)
+        word1, word2 = word2, word3
+      end
+      k = "#{word1} #{word2}"
+      @registry[k] = @registry[k].push(:nonword)
 
-    return if m.replied?
-    random_markov(m, message)
+      random_markov(m, message) unless m.replied?
+    end
   end
 end
 
@@ -202,5 +228,5 @@ plugin.map 'markov disable', :action => "disable"
 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",
+plugin.map 'markov probability [:probability]', :action => "probability",
            :requirements => {:probability => /^\d+%?$/}