]> git.netwichtig.de Git - user/henk/code/ruby/rbot.git/blobdiff - data/rbot/plugins/url.rb
lart plugin: replace "me" with sourcenick
[user/henk/code/ruby/rbot.git] / data / rbot / plugins / url.rb
index 7a752ec6c19b6e2ede3f55a29457d2089d0b975a..e1c9b47396e3bd2a782f47197c4fa64d38af54a9 100644 (file)
@@ -57,8 +57,19 @@ class UrlPlugin < Plugin
     url = uri_str.kind_of?(URI) ? uri_str : URI.parse(uri_str)
     return if url.scheme !~ /https?/
 
-    if url.host =~ @no_info_hosts
-      return "Sorry, info retrieval for #{url.host} is disabled"
+    # also check the ip, the canonical name and the aliases
+    begin
+      checks = TCPSocket.gethostbyname(url.host)
+      checks.delete_at(-2)
+    rescue => e
+      return "Unable to retrieve info for #{url.host}: #{e.message}"
+    end
+
+    checks << url.host
+    checks.flatten!
+
+    unless checks.grep(@no_info_hosts).empty?
+      return "Sorry, info retrieval for #{url.host} (#{checks.first}) is disabled"
     end
 
     logopts = opts.dup
@@ -83,13 +94,13 @@ class UrlPlugin < Plugin
         extra << "#{Bold}type#{Bold}: #{resp['content-type']}" unless title
         if enc = resp['content-encoding']
           logopts[:extra] << ", encoding: #{enc}"
-          extra << "#{Bold}encoding#{Bold}: #{enc}"
+          extra << "#{Bold}encoding#{Bold}: #{enc}" if @bot.config['url.first_par'] or not title
         end
 
         size = resp['content-length'].first.gsub(/(\d)(?=\d{3}+(?:\.|$))(\d{3}\..*)?/,'\1,\2') rescue nil
         if size
           logopts[:extra] << ", size: #{size} bytes"
-          extra << "#{Bold}size#{Bold}: #{size} bytes"
+          extra << "#{Bold}size#{Bold}: #{size} bytes" if @bot.config['url.first_par'] or not title
         end
       end
     rescue Exception => e
@@ -120,19 +131,26 @@ class UrlPlugin < Plugin
       next unless urlstr =~ /^https?:/
       title = nil
       debug "Getting title for #{urlstr}..."
+      reply = nil
       begin
         title = get_title_for_url(urlstr,
                                   :nick => m.source.nick,
                                   :channel => m.channel,
                                   :ircline => m.message)
         debug "Title #{title ? '' : 'not '} found"
+        reply = "#{LINK_INFO} #{title}" if title
       rescue => e
-        m.reply "Error #{e.message}"
+        if e.message =~ /\(404 - Not Found\)/i
+          # see if we failed to find the thing because of trailing punctuation
+          # but check that we still have 'something' in the URL
+          retry if urlstr.chop! and urlstr =~ /^https?:\/\/./
+        end
+        reply = "Error #{e.message}"
       end
 
       if display_info > urls_displayed
-        if title
-          m.reply("#{LINK_INFO} #{title}", :overlong => :truncate)
+        if reply
+          m.plainreply(reply, :overlong => :truncate)
           urls_displayed += 1
         end
       end
@@ -163,7 +181,8 @@ class UrlPlugin < Plugin
     return if m.address?
 
     escaped = URI.escape(m.message, OUR_UNSAFE)
-    urls = URI.extract(escaped)
+    urls = URI.extract(escaped, ['http', 'https'])
+    return if urls.empty?
     Thread.new { handle_urls(m, urls) }
   end