markov: refactor triplet learning

[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 022553182e763660d01f1916af448e6675ad40f3..e380f29b6d428a771a9361b4ee2d8af66d8b876c 100644 (file)
--- a/data/rbot/plugins/url.rb
+++ b/data/rbot/plugins/url.rb
@@ -71,7 +71,7 @@ class UrlPlugin < Plugin
     checks.flatten!
 
     unless checks.grep(@no_info_hosts).empty?
-      return "Sorry, info retrieval for #{url.host} (#{checks.first}) is disabled"
+      return ( opts[:always_reply] ? "Sorry, info retrieval for #{url.host} (#{checks.first}) is disabled" : false )
     end
 
     logopts = opts.dup
@@ -124,11 +124,13 @@ class UrlPlugin < Plugin
 
   def handle_urls(m, params={})
     opts = {
-      :display_info => @bot.config['url.display_link_info']
+      :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]
-    unless (channels = @bot.config['url.only_on_channels']).empty?
+    channels = opts[:channels]
+    unless channels.empty?
       return unless channels.map { |c| c.downcase }.include?(m.channel.downcase)
     end
 
@@ -145,6 +147,7 @@ class UrlPlugin < Plugin
       reply = nil
       begin
         title = get_title_for_url(urlstr,
+                                  :always_reply => m.address?,
                                   :nick => m.source.nick,
                                   :channel => m.channel,
                                   :ircline => m.message)
@@ -189,7 +192,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 => urls, :display_info => params[:urls].length) }
+    Thread.new do
+      handle_urls(m,
+                  :urls => urls,
+                  :display_info => params[:urls].length,
+                  :channels => [])
+    end
   end
 
   def message(m)