X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=data%2Frbot%2Fplugins%2Furban.rb;h=70d451af7788d5848dbfca074367a0e350859d61;hb=90656f4203a0a989b6fb110d4a07598dd186b84c;hp=6f052fcf9d92d907f066ad942a0cc869993d760d;hpb=7f244f32d974cafa74f449853f940f194d08d6d2;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git
diff --git a/data/rbot/plugins/urban.rb b/data/rbot/plugins/urban.rb
index 6f052fcf..70d451af 100644
--- a/data/rbot/plugins/urban.rb
+++ b/data/rbot/plugins/urban.rb
@@ -19,20 +19,24 @@ class UrbanPlugin < Plugin
s = @bot.httputil.get(u)
return m.reply("Couldn't get the urban dictionary definition for #{word}") if s.nil?
- notfound = s.match %r{
.*? isn't defined}
+ notfound = s.match %r{
.*? isn't defined}
- numpages = s[%r{
.*?
}m].scan(/\d+/).collect {|x| x.to_i}.max || 1
+ numpages = if s[%r{}m]
+ $&.scan(/>(\d+)).collect {|x| x[0].to_i}.max || 1
+ else 1 end
rv = Array.new
- s.scan(%r{
]*>.*?(\d+)\..*? | .*?
(?:)?([^>]+)(?:)? | .*?
(.+?)
.*?
(.+?)
}m) do |num, wrd, desc, ex|
- rv << [num.to_i, wrd.strip, desc.strip, ex.strip]
+ num = 1
+ s.scan(%r{
]* href="\/define[^>]*>([^<]+).*?
(.+?)
.*?
(.+?)
}m) do |wrd, desc, ex|
+ rv << [num, wrd.strip, desc.strip, ex.strip]
+ num += 1
end
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 ', '
+ suggestions = rv.map { |str| Underline + str[1] + Underline }.uniq.join ', '
m.reply "#{Bold}#{word}#{Bold} not found. maybe you mean #{suggestions}?"
return
end