hangman plugin: rudimentary stats tracking along with some other enhancements

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

diff --git a/data/rbot/plugins/url.rb b/data/rbot/plugins/url.rb
index 826af10defec3c53b241ff972da73c2404326d06..8d12f303f62cc8c3792fcffcf81879cd972e8544 100644 (file)
--- a/data/rbot/plugins/url.rb
+++ b/data/rbot/plugins/url.rb
@@ -122,8 +122,15 @@ class UrlPlugin < Plugin
     return extra.join(", ") if title or not @bot.config['url.titles_only']
   end
 
-  def handle_urls(m, urls, display_info=@bot.config['url.display_link_info'])
-    unless (channels = @bot.config['url.only_on_channels']).empty?
+  def handle_urls(m, params={})
+    opts = {
+      :display_info => @bot.config['url.display_link_info'],
+      :channels => @bot.config['url.only_on_channels']
+    }.merge params
+    urls = opts[:urls]
+    display_info= opts[:display_info]
+    channels = opts[:channels]
+    unless channels.empty?
       return unless channels.map { |c| c.downcase }.include?(m.channel.downcase)
     end
 
@@ -160,7 +167,7 @@ class UrlPlugin < Plugin
 
       if display_info > urls_displayed
         if reply
-          m.reply reply, :overlong => :truncate,
+          m.reply reply, :overlong => :truncate, :to => :public,
             :nick => (m.address? ? :auto : false)
           urls_displayed += 1
         end
@@ -184,7 +191,12 @@ class UrlPlugin < Plugin
   def info(m, params)
     escaped = URI.escape(params[:urls].to_s, OUR_UNSAFE)
     urls = URI.extract(escaped)
-    Thread.new { handle_urls(m, urls, params[:urls].length) }
+    Thread.new do
+      handle_urls(m,
+                  :urls => urls,
+                  :display_info => params[:urls].length,
+                  :channels => [])
+    end
   end
 
   def message(m)
@@ -193,7 +205,7 @@ class UrlPlugin < Plugin
     escaped = URI.escape(m.message, OUR_UNSAFE)
     urls = URI.extract(escaped, ['http', 'https'])
     return if urls.empty?
-    Thread.new { handle_urls(m, urls) }
+    Thread.new { handle_urls(m, :urls => urls) }
   end
 
   def reply_urls(opts={})