Fixed a bug that cut off the query-part of the url, cleaned up the redirect url joining.

[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 57b43a6157d26a8b0f37b5e5f961ef1982951fb7..a4e963590c493f17cb34f3de80ee7422f889ba77 100644 (file)
--- a/data/rbot/plugins/url.rb
+++ b/data/rbot/plugins/url.rb
@@ -1,16 +1,17 @@
 require 'net/http'
 require 'uri'
-
+require 'cgi'
+\r
 Url = Struct.new("Url", :channel, :nick, :time, :url)
-TITLE_RE = /<\s*title\s*>(.+)<\s*\/title\s*>/im
+TITLE_RE = /<\s*?title\s*?>(.+?)<\s*?\/title\s*?>/im
 
 class UrlPlugin < Plugin
   BotConfig.register BotConfigIntegerValue.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 BotConfigBooleanValue.new('url.say_titles',
+  BotConfig.register BotConfigBooleanValue.new('url.display_link_info',
     :default => true, 
-    :desc => "Get the title of any links pasted to the channel and display it (Also, tells if the link is broken)")
+    :desc => "Get the title of any links pasted to the channel and display it (also tells if the link is broken or the site is down)")
   
   def initialize
     super
@@ -24,20 +25,21 @@ class UrlPlugin < Plugin
   def get_title_from_html(pagedata)
     return unless TITLE_RE.match(pagedata)
     title = $1.strip.gsub(/\s*\n+\s*/, " ")
-    title = title[0..255] if title.length > 255 
-    "[Title] #{title}"
+    title = CGI::unescapeHTML title
+    title = title[0..255] if title.length > 255
+    "[Link Info] title: #{title}"
   end
 
   def get_title_for_url(uri_str)
     # This god-awful mess is what the ruby http library has reduced me to.
-    # Python's is so much nicer. :~(
+    # Python's HTTP lib is so much nicer. :~(
     
     puts "+ Getting #{uri_str}"
     url = URI.parse(uri_str)
     return if url.scheme !~ /https?/
     
-    puts "+ connecting to #{url.host}:#{url.port}"
-    http = @bot.httputil.get_proxy(url)
+    puts "+ connecting to #{url.host}:#{url.port}"\r
+    http = @bot.httputil.get_proxy(url) 
     title = http.start do |http|
       url.path = '/' if url.path == ''
       head = http.request_head(url.path)
@@ -46,21 +48,15 @@ class UrlPlugin < Plugin
           # call self recursively if this is a redirect
           redirect_to = head['location']
           puts "+ redirect location: #{redirect_to}"
-          absolute_uris = URI.extract redirect_to
-          raise "wtf! redirect = #{redirect_to}" if absolute_uris.size > 1
-          if absolute_uris.size == 1
-            url = URI.parse absolute_uris[0]
-          else
-            url.path = redirect_to
-          end
-          puts "+ whee, redirect to #{url.to_s}!"
+          url = URI.join url.to_s, redirect_to
+          puts "+ whee, redirecting to #{url.to_s}!"
           title = get_title_for_url(url.to_s)
         when Net::HTTPSuccess then
           if head['content-type'] =~ /^text\//
             # content is 'text/*'
             # retrieve the title from the page
             puts "+ getting #{url.path}"
-            response = http.request_get(url.path)
+            response = http.request_get(url.request_uri)
             return get_title_from_html(response.body)
           else
             # content isn't 'text/*'... display info about the file.
@@ -69,13 +65,13 @@ class UrlPlugin < Plugin
             return "[Link Info] type: #{head['content-type']}#{size ? ", size: #{size} bytes" : ""}"
           end
         when Net::HTTPClientError then
-          return "[Title] Error getting link (#{response.code} - #{response.message})"
+          return "[Link Info] Error getting link (#{head.code} - #{head.message})"
         when Net::HTTPServerError then
-          return "[Title] Error getting link (#{response.code} - #{response.message})"
+          return "[Link Info] Error getting link (#{head.code} - #{head.message})"\r
       end
     end
   rescue SocketError => e
-    return "[Title] Error connecting to site (#{e.message})"
+    return "[Link Info] Error connecting to site (#{e.message})"
   end
 
   def listen(m)
@@ -163,7 +159,3 @@ plugin.map 'urls :channel :limit', :defaults => {:limit => 4},
 plugin.map 'urls :limit', :defaults => {:limit => 4},
                           :requirements => {:limit => /^\d+$/},
                           :private => false
-
-
-
-