X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fgrouphug.rb;h=f08f57533829dfd3943615a2e881691dbf11870f;hb=aac060923bb64774d4a54a1dd8e5c1dfc2a70a4f;hp=87a7e32c1895e24c7ac8e173a16619cda2d7a99c;hpb=d29df50ddaf32536b105decefb135a0b86ee937f;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/grouphug.rb b/data/rbot/plugins/grouphug.rb
index 87a7e32c..f08f5753 100644
--- a/data/rbot/plugins/grouphug.rb
+++ b/data/rbot/plugins/grouphug.rb
@@ -1,26 +1,50 @@
-# Plugin for the Ruby IRC bot (http://linuxbrit.co.uk/rbot/)
-# (c) 2005 Mark Kretschmann <markey@web.de>
-# Licensed under GPL V2.
-
-require "net/http"
-
+#-- vim:sw=2:et
+#++
+#
+# :title: Grouphug Plugin for rbot
+#
+# Author:: Mark Kretschmann <markey@web.de>
+# Author:: Casey Link <unnamedrambler@gmail.com>
+# Copyright:: (C) 2005 Mark Kretschmann
+# Copyright:: (C) 2008 Casey Link
+# License:: GPL v2
 
 class GrouphugPlugin < Plugin
+  REG  = Regexp.new('<div class="content">\s*<p>(.*?)</p>\s+</div>', Regexp::MULTILINE)
+  def initialize
+    super
+    @confessions = Array.new
+  end
+
   def help( plugin, topic="" )
     return "Grouphug plugin. Confess! Usage: 'confess' for random confession, 'confess <number>' for specific one."
   end
 
   def confess(m, params)
+    opts = { :cache => false }
     path = "random"
-    path = "confessions/#{params[:num]}" if params[:num]
     begin
-      data = bot.httputil.get_cached(URI.parse("http://grouphug.us/#{path}"))
-
-      reg = Regexp.new( '(<td class="conf-text")(.*?)(<p>)(.*?)(</p>)', Regexp::MULTILINE )
-      confession = reg.match( data )[4].ircify_html
-      confession = "no confession ##{params[:num]} found" if confession.empty? and params[:num]
-
-      m.reply confession
+      # Fetch a specific question - separate from cache
+      if params[:num]
+        path = "confessions/#{params[:num]}"
+        opts.delete(:cache)
+        data = @bot.httputil.get("http://grouphug.us/#{path}", opts)
+
+        res = data.scan(REG)
+        confession = res[0][0].ircify_html
+        confession = "no confession ##{params[:num]} found" if confession.empty? and params[:num]
+        m.reply confession
+      else # Cache random confessions
+        if @confessions.empty?
+          data = @bot.httputil.get("http://grouphug.us/#{path}", opts)
+          res = data.scan(REG)
+          res.each do |quote|
+            @confessions << quote[0].ircify_html
+          end
+        end
+        confession = @confessions.pop
+        m.reply confession
+      end
     rescue
       m.reply "failed to connect to grouphug.us"
     end
@@ -30,6 +54,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+/ }