X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Furban.rb;h=cdef78eec1d853f61f13ae6c0272c98a17344528;hb=8ff8b7068c315d10f5a77fc7952e0ccadf7805bc;hp=9c55a06ededf18d110a8371029648cea0e423930;hpb=baee671df9879de90925425f7998904ce3b049fa;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/urban.rb b/data/rbot/plugins/urban.rb
index 9c55a06e..cdef78ee 100644
--- a/data/rbot/plugins/urban.rb
+++ b/data/rbot/plugins/urban.rb
@@ -17,11 +17,13 @@ class UrbanPlugin < Plugin
     u = URBAN + URI.escape(word)
     u += '&page=' + p.to_s if p > 1
     s = @bot.httputil.get(u)
-    return m.reply "Couldn't get the urban dictionary definition for #{word}" if s.nil?
+    return m.reply("Couldn't get the urban dictionary definition for #{word}") if s.nil?
 
-    notfound = s.match %r{<div style="color: #669FCE"><i>.*?</i> isn't defined}
+    notfound = s.match %r{<i>.*?</i> isn't defined}
 
-    numpages = s[%r{<div id='paginator'>.*?</div>}m].scan(/\d+/).collect {|x| x.to_i}.max || 1
+    numpages = if s[%r{<div id='paginator'>.*?</div>}m]
+      $&.scan(/\d+/).collect {|x| x.to_i}.max || 1
+    else 1 end
 
     rv = Array.new
     s.scan(%r{<td class='index'[^>]*>.*?(\d+)\..*?</td>.*?<td class='word'>(?:<a.*?>)?([^>]+)(?:</a>)?</td>.*?<div class='definition'>(.+?)</div>.*?<div class='example'>(.+?)</div>}m) do |num, wrd, desc, ex|
@@ -48,7 +50,7 @@ class UrbanPlugin < Plugin
       resp = @bot.httputil.head('http://www.urbandictionary.com/random.php',
                                :max_redir => -1,
                                :cache => false)
-      return m.reply "Couldn't get the urban dictionary word of the day" if resp.nil?
+      return m.reply("Couldn't get a random urban dictionary word") if resp.nil?
       if resp.code == "302" && (loc = resp['location'])
         words = URI.unescape(loc.match(/define.php\?term=(.*)$/)[1]) rescue nil
       end