+ (rss.rb) monkey-patch some basic common api over different rss item impls

[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 b048d3f09e7a944cfaa191f701e7ba83607a6a6e..e75224cff278b19261fac556c76fb4a184822030 100644 (file)
--- a/data/rbot/plugins/url.rb
+++ b/data/rbot/plugins/url.rb
@@ -28,7 +28,9 @@ class UrlPlugin < Plugin
     :default => ['localhost', '^192\.168\.', '^10\.', '^127\.', '^172\.(1[6-9]|2\d|31)\.'],
     :on_change => Proc.new { |bot, v| bot.plugins['url'].reset_no_info_hosts },
     :desc => "A list of regular expressions matching hosts for which no info should be provided")
-
+  Config.register Config::ArrayValue.new('url.only_on_channels',
+    :desc => "Show link info only on these channels",
+    :default => [])
 
   def initialize
     super
@@ -79,7 +81,7 @@ class UrlPlugin < Plugin
 
     begin
       debug "+ getting info for #{url.request_uri}"
-      info = Utils.get_html_info(url)
+      info = @bot.filter(:htmlinfo, url)
       debug info
       resp = info[:headers]
 
@@ -121,6 +123,10 @@ class UrlPlugin < Plugin
   end
 
   def handle_urls(m, urls, display_info=@bot.config['url.display_link_info'])
+    unless (channels = @bot.config['url.only_on_channels']).empty?
+      return unless channels.map { |c| c.downcase }.include?(m.channel.downcase)
+    end
+
     return if urls.empty?
     debug "found urls #{urls.inspect}"
     list = m.public? ? @registry[m.target] : nil
@@ -128,7 +134,7 @@ class UrlPlugin < Plugin
     urls_displayed = 0
     urls.each do |urlstr|
       debug "working on #{urlstr}"
-      next unless urlstr =~ /^https?:/
+      next unless urlstr =~ /^https?:\/\/./
       title = nil
       debug "Getting title for #{urlstr}..."
       reply = nil
@@ -154,7 +160,8 @@ class UrlPlugin < Plugin
 
       if display_info > urls_displayed
         if reply
-          m.plainreply(reply, :overlong => :truncate)
+          m.reply reply, :overlong => :truncate, :to => :public,
+            :nick => (m.address? ? :auto : false)
           urls_displayed += 1
         end
       end
@@ -180,8 +187,7 @@ class UrlPlugin < Plugin
     Thread.new { handle_urls(m, urls, params[:urls].length) }
   end
 
-  def listen(m)
-    return unless m.kind_of?(PrivMessage)
+  def message(m)
     return if m.address?
 
     escaped = URI.escape(m.message, OUR_UNSAFE)