X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Furban.rb;h=24c11dd7f3167272225e417ad3abcf88e4247bc6;hb=eec8d96e5c8f0c44148cc97a40b75a57e399cf6e;hp=5aae26c6d47cc10566c7a9fc5eb50f1fc387ad6b;hpb=1ff0b683756532ff07023a7c17529c6a32cd3e99;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/urban.rb b/data/rbot/plugins/urban.rb
index 5aae26c6..24c11dd7 100644
--- a/data/rbot/plugins/urban.rb
+++ b/data/rbot/plugins/urban.rb
@@ -13,26 +13,23 @@ class UrbanPlugin < Plugin
 
   def get_def(m, word, n = nil)
     n = n ? n.to_i : 1
+    p = (n-1)/7 + 1
     u = URBAN + URI.escape(word)
-    u += '&skip=' + n.to_s if n
+    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?
 
     notfound = s.match %r{<div style="color: #669FCE"><i>.*?</i> isn't defined}
 
-    total = nil
-    if s.sub!(%r{<div class="pager"><b>(\d+)</b>\s*definition.*$}m, '')
-      total = $1.to_i
-    end
+    numpages = s[%r{<div id='paginator'>.*?</div>}m].scan(/\d+/).collect {|x| x.to_i}.max || 1
 
     rv = Array.new
-
-    s.scan(%r{<td class="def_number"[^>]*>(\d+)\.</td>.*?<td class="def_word">(?:<a.*?>)?([^>]+)(?:</a>)?</td>.*?<div class="def_p">.*?<p>(.+?)</p>.*?<p style=".*?>(.+?)</p>}m) do |num, wrd, desc, ex|
-      rv << [num.to_i, wrd, desc, ex]
+    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|
+      rv << [num.to_i, wrd.strip, desc.strip, ex.strip]
     end
 
-    total ||= rv.size
-
-    return m.reply "#{Bold}#{word}#{Bold} not found" if rv.empty?
+    maxnum = rv.collect {|x| x[0]}.max || 0
+    return m.reply("#{Bold}#{word}#{Bold} not found") if rv.empty?
 
     if notfound
       suggestions = rv.map { |s| Underline + s[1] + Underline }.uniq.join ', '
@@ -41,8 +38,8 @@ class UrbanPlugin < Plugin
     end
 
     answer = rv.find { |a| a[0] == n }
-    answer ||= (n > total ? rv.last : rv.first)
-    m.reply format_definition(total, *answer)
+    answer ||= (n > maxnum ? rv.last : rv.first)
+    m.reply format_definition((p == numpages ? maxnum : "#{(numpages-1)*7 + 1}+"), *answer)
   end
 
   def urban(m, params)
@@ -51,6 +48,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 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