plugins/keywords: add method that was missing from commit 7cac523563de6473d2f93fd2d05 ...

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / shortenurls.rb

diff --git a/data/rbot/plugins/shortenurls.rb b/data/rbot/plugins/shortenurls.rb
index 120d40d089f7f0e99463ab66732f74b7e779e7db..81682581ecf2b2a55cf527ac8508b87b581c0b26 100644 (file)
--- a/data/rbot/plugins/shortenurls.rb
+++ b/data/rbot/plugins/shortenurls.rb
@@ -15,7 +15,8 @@ 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'],
@@ -55,7 +56,7 @@ class ShortenURLs < Plugin
       return nil
     end
 
-    service = params[:service].to_sym || m.plugin.to_sym
+    service = (params[:service] || m.plugin).to_sym
     service = :rubyurl if service == :shorturl
 
     tried = []