summaryrefslogtreecommitdiff
path: root/data/rbot/plugins
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2008-03-10 23:09:09 +0100
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2008-03-10 23:09:09 +0100
commit1ae131c231c308f13eaed68a3564c19f7eb7f2f1 (patch)
tree682de84a0181f349accd20693dd1288c686a7f16 /data/rbot/plugins
parent7cac523563de6473d2f93fd2d053446cde701db1 (diff)
url plugin: retry with chops even on URI::InvalidURIError
Diffstat (limited to 'data/rbot/plugins')
-rw-r--r--data/rbot/plugins/url.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/data/rbot/plugins/url.rb b/data/rbot/plugins/url.rb
index e1c9b473..b048d3f0 100644
--- a/data/rbot/plugins/url.rb
+++ b/data/rbot/plugins/url.rb
@@ -140,9 +140,13 @@ class UrlPlugin < Plugin
debug "Title #{title ? '' : 'not '} found"
reply = "#{LINK_INFO} #{title}" if title
rescue => e
- 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
+ debug e
+ # we might get a 404 because of trailing punctuation, so we try again
+ # with the last character stripped. this might generate invalid URIs
+ # (e.g. because "some.url" gets chopped to some.url%2, so catch that too
+ if e.message =~ /\(404 - Not Found\)/i or e.kind_of?(URI::InvalidURIError)
+ # chop off last character, and retry if we still have enough string to
+ # look like a minimal URL
retry if urlstr.chop! and urlstr =~ /^https?:\/\/./
end
reply = "Error #{e.message}"