X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fshortenurls.rb;h=81682581ecf2b2a55cf527ac8508b87b581c0b26;hb=1e841175468b3e0357ab278a226a237fe4d7687e;hp=743cad08e78ca5eebfe76cdc26e4d940f017edf2;hpb=edd1cf77be07ae507014574141e920ad23eb164d;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/shortenurls.rb b/data/rbot/plugins/shortenurls.rb
index 743cad08..81682581 100644
--- a/data/rbot/plugins/shortenurls.rb
+++ b/data/rbot/plugins/shortenurls.rb
@@ -15,13 +15,23 @@ require "shorturl"
 require "uri"
 
 class ShortenURLs < Plugin
-  include WWW
+  # starting from about shorturl 0.8.4, the WWW module is not defined 
+  include WWW rescue nil
+
+  Config.register Config::ArrayValue.new('shortenurls.services_blacklist',
+    :default => ['rubyurl', 'shorterlink'],
+    :requires_rescan => true,
+    :desc => "List of nonfunctioning shorturl services")
 
   attr_accessor :services
   def initialize
     super
+    @blacklist = @bot.config['shortenurls.services_blacklist'].map { |s| s.intern }
     # Instead of catering for all the services, we only pick the ones with 'link' or 'url' in the name
-    @services = ShortURL.valid_services.select { |service| service.to_s =~ /(?:link|url)/ } << :shorturl
+    @services = ShortURL.valid_services.select { |service| service.to_s =~ /(?:link|url)/ } - @blacklist
+    if @services.include?(:rubyurl)
+      @services << :shorturl
+    end
   end
 
   # return a help string when the bot is asked for help on this plugin
@@ -35,7 +45,7 @@ class ShortenURLs < Plugin
     url = params[:url]
     if url == "help"
       m.reply help(m.plugin) unless params[:called]
-      return
+      return nil
     end
     begin
       to_uri = URI.parse(url)
@@ -43,19 +53,34 @@ class ShortenURLs < Plugin
       raise URI::InvalidURIError if to_uri.class == URI::Generic
     rescue URI::InvalidURIError
       m.reply "#{url} doesn't look like an URL to me ..." unless params[:called]
-      return
+      return nil
     end
 
-    service = params[:service] || m.plugin.to_sym
+    service = (params[:service] || m.plugin).to_sym
     service = :rubyurl if service == :shorturl
 
-    short = WWW::ShortURL.shorten(url, service)
+    tried = []
+    short = nil
 
-    if params[:called]
-      return short
-    else
-      m.reply "#{url} shortened to #{short}"
+    begin
+      tried << service
+      raise WWW::InvalidService, "#{service} blacklisted" if @blacklist.include?(service)
+      short = WWW::ShortURL.shorten(url, service)
+      raise WWW::InvalidService, "#{service} returned an empty string for #{url}" unless short and not short.empty?
+    rescue WWW::InvalidService
+      pool = services - tried
+      if pool.empty?
+        m.reply "#{service} failed, and I don't know what else to try next" unless params[:called]
+        return nil
+      else
+        service = pool.pick_one
+        m.reply "#{tried.last} failed, I'll try #{service} instead" unless params[:called]
+        retry
+      end
     end
+
+    m.reply "#{url} shortened to #{short}" unless params[:called]
+    return short
   end
 
 end