X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fgrouphug.rb;h=55e9a34503b694976a34cf49c09c231a26d8fe80;hb=1e841175468b3e0357ab278a226a237fe4d7687e;hp=75093665067f7036d237e9f2d77ca01467d3adf0;hpb=edd1cf77be07ae507014574141e920ad23eb164d;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/grouphug.rb b/data/rbot/plugins/grouphug.rb index 75093665..55e9a345 100644 --- a/data/rbot/plugins/grouphug.rb +++ b/data/rbot/plugins/grouphug.rb @@ -13,12 +13,18 @@ class GrouphugPlugin < Plugin end def confess(m, params) + opts = { :cache => false } path = "random" - path = "confessions/#{params[:num]}" if params[:num] + if params[:num] + path = "confessions/#{params[:num]}" + opts.delete(:cache) + end + begin - data = @bot.httputil.get_cached(URI.parse("http://grouphug.us/#{path}")) + data = @bot.httputil.get("http://grouphug.us/#{path}", opts) - reg = Regexp.new( '()(.*?)(

)', Regexp::MULTILINE ) + reg = Regexp.new('(
)(.*?)(

)', + Regexp::MULTILINE) confession = reg.match( data )[4].ircify_html confession = "no confession ##{params[:num]} found" if confession.empty? and params[:num] @@ -32,6 +38,8 @@ end plugin = GrouphugPlugin.new -plugin.map "grouphug [:num]", :action => :confess, :requirements => { :num => /\d+/ } -plugin.map "confess [:num]", :action => :confess, :requirements => { :num => /\d+/ } +plugin.map "grouphug [:num]", + :thread => true, :action => :confess, :requirements => { :num => /\d+/ } +plugin.map "confess [:num]", + :thread => true, :action => :confess, :requirements => { :num => /\d+/ }