shortenurls plugin: handle failing services by trying other services, and make return...

[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 0160f9039da6d8b9d2879790d6aa51682ba50e58..e3cecb6b0d5805654c4ff0fe831928dc5bba0566 100644 (file)
--- a/data/rbot/plugins/url.rb
+++ b/data/rbot/plugins/url.rb
@@ -13,23 +13,23 @@ class UrlPlugin < Plugin
   LINK_INFO = "[Link Info]"
   OUR_UNSAFE = Regexp.new("[^#{URI::PATTERN::UNRESERVED}#{URI::PATTERN::RESERVED}%# ]", false, 'N')
 
-  BotConfig.register BotConfigIntegerValue.new('url.max_urls',
+  Config.register Config::IntegerValue.new('url.max_urls',
     :default => 100, :validate => Proc.new{|v| v > 0},
     :desc => "Maximum number of urls to store. New urls replace oldest ones.")
-  BotConfig.register BotConfigIntegerValue.new('url.display_link_info',
+  Config.register Config::IntegerValue.new('url.display_link_info',
     :default => 0,
     :desc => "Get the title of links pasted to the channel and display it (also tells if the link is broken or the site is down). Do it for at most this many links per line (set to 0 to disable)")
-  BotConfig.register BotConfigBooleanValue.new('url.titles_only',
+  Config.register Config::BooleanValue.new('url.titles_only',
     :default => false,
     :desc => "Only show info for links that have <title> tags (in other words, don't display info for jpegs, mpegs, etc.)")
-  BotConfig.register BotConfigBooleanValue.new('url.first_par',
+  Config.register Config::BooleanValue.new('url.first_par',
     :default => false,
     :desc => "Also try to get the first paragraph of a web page")
-  BotConfig.register BotConfigBooleanValue.new('url.info_on_list',
+  Config.register Config::BooleanValue.new('url.info_on_list',
     :default => false,
     :desc => "Show link info when listing/searching for urls")
-  BotConfig.register BotConfigArrayValue.new('url.no_info_hosts',
-    :default => ['localhost', '^192\.168\.', '^10\.', '^127\.0\.0\.1', '^172\.(1[6-9]|2\d|31)\.'],
+  Config.register Config::ArrayValue.new('url.no_info_hosts',
+    :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")
 
@@ -152,22 +152,21 @@ class UrlPlugin < Plugin
     end
   end
 
-  def listen(m)
-    return unless m.kind_of?(PrivMessage)
-    return if m.address?
-
-    escaped = URI.escape(m.message, OUR_UNSAFE)
-    urls = URI.extract(escaped)
+  def handle_urls(m, urls, display_info=@bot.config['url.display_link_info'])
     return if urls.empty?
     debug "found urls #{urls.inspect}"
-    list = @registry[m.target]
+    if m.public?
+      list = @registry[m.target] 
+    else
+      list = nil
+    end
     urls_displayed = 0
     urls.each { |urlstr|
       debug "working on #{urlstr}"
       next unless urlstr =~ /^https?:/
       title = nil
-      debug "display link info: #{@bot.config['url.display_link_info']}"
-      if @bot.config['url.display_link_info'] > urls_displayed
+      debug "display link info: #{display_info}"
+      if display_info > urls_displayed
         urls_displayed += 1
         Thread.start do
           debug "Getting title for #{urlstr}..."
@@ -185,6 +184,8 @@ class UrlPlugin < Plugin
         end
       end
 
+      next unless list
+
       # check to see if this url is already listed
       next if list.find {|u| u.url == urlstr }
 
@@ -200,6 +201,21 @@ class UrlPlugin < Plugin
     @registry[m.target] = list
   end
 
+  def info(m, params)
+    escaped = URI.escape(params[:urls].to_s, OUR_UNSAFE)
+    urls = URI.extract(escaped)
+    handle_urls(m, urls, params[:urls].length)
+  end
+
+  def listen(m)
+    return unless m.kind_of?(PrivMessage)
+    return if m.address?
+
+    escaped = URI.escape(m.message, OUR_UNSAFE)
+    urls = URI.extract(escaped)
+    handle_urls(m, urls)
+  end
+
   def reply_urls(opts={})
     list = opts[:list]
     max = opts[:max]
@@ -258,6 +274,7 @@ class UrlPlugin < Plugin
 end
 
 plugin = UrlPlugin.new
+plugin.map 'urls info *urls', :action => 'info'
 plugin.map 'urls search :channel :limit :string', :action => 'search',
                           :defaults => {:limit => 4},
                           :requirements => {:limit => /^\d+$/},