X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fgrouphug.rb;h=bf246b4c7f7fa23b3911dbf4169b4c01d59071a5;hb=de9ddb8a7eb436c0cb8db81289373dc169f484ba;hp=32a6e55ecd2b39293bd7f6824d0125d8f3b73049;hpb=0cc10dda002cdd1568aed585c38fa6cf63db77fd;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/grouphug.rb b/data/rbot/plugins/grouphug.rb
index 32a6e55e..bf246b4c 100644
--- a/data/rbot/plugins/grouphug.rb
+++ b/data/rbot/plugins/grouphug.rb
@@ -20,19 +20,17 @@ class GrouphugPlugin < Plugin
       opts.delete(:cache)
     end
 
-    Thread.start do
-      begin
-        data = @bot.httputil.get("http://grouphug.us/#{path}", opts)
-
-        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
-      rescue
-        m.reply "failed to connect to grouphug.us"
-      end
+    begin
+      data = @bot.httputil.get("http://grouphug.us/#{path}", opts)
+
+      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
+    rescue
+      m.reply "failed to connect to grouphug.us"
     end
   end
 end
@@ -40,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+/ }