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

diff --git a/data/rbot/plugins/grouphug.rb b/data/rbot/plugins/grouphug.rb
index 55e9a345..f08f5753 100644
--- a/data/rbot/plugins/grouphug.rb
+++ b/data/rbot/plugins/grouphug.rb
@@ -4,10 +4,18 @@
 # :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
@@ -15,20 +23,28 @@ class GrouphugPlugin < Plugin
   def confess(m, params)
     opts = { :cache => false }
     path = "random"
-    if params[:num]
-      path = "confessions/#{params[:num]}"
-      opts.delete(:cache)
-    end
-
     begin
-      data = @bot.httputil.get("http://grouphug.us/#{path}", opts)
-
-      reg = Regexp.new('(<div class="content")(.*?)(<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