From fbc51c6d504a219984774e5b1a055aca9c683844 Mon Sep 17 00:00:00 2001
From: risk <technoweenie@gmail.com>
Date: Wed, 29 Jun 2011 09:22:48 -0600
Subject: [PATCH] temporarily disable jabber muc hooks

---
 services/jabber.rb  | 12 +++++++++++-
 test/jabber_test.rb | 18 +++++++++---------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/services/jabber.rb b/services/jabber.rb
index 40a5b7623..ccb510e71 100644
--- a/services/jabber.rb
+++ b/services/jabber.rb
@@ -28,7 +28,7 @@ def join(jid, password=nil)
 end
 
 class Service::Jabber < Service
-  string :user, :muc
+  string :user
 
   def receive_push
     # Accept any friend request
@@ -42,9 +42,19 @@ def receive_push
     messages += commit_messages
     message = messages.join("\n")
 
+    deliver_messages(message, recipients)
+
+    # temporarily disabled
+    #deliver_muc(message, conferences) if !conferences.empty?
+  end
+
+  def deliver_messages(message, recipients)
     recipients.each do |recipient|
       im.deliver_deferred recipient, message, :chat
     end
+  end
+
+  def deliver_muc(message, conferences)
     conferences.each do |conference|
       muc = mucs[conference]
       muc ||= mucs[conference] = ::Jabber::MUC::MUCClient.new(im.client)
diff --git a/test/jabber_test.rb b/test/jabber_test.rb
index 4c5214546..e4cf4133a 100644
--- a/test/jabber_test.rb
+++ b/test/jabber_test.rb
@@ -45,17 +45,17 @@ def test_push
     assert_equal 'c', msg[0]
     assert_equal :chat, msg[2]
 
-    assert msg = svc.im.delivered.shift
-    assert_equal 'e', msg[0]
-    assert_equal :groupchat, msg[2]
+    #assert msg = svc.im.delivered.shift
+    #assert_equal 'e', msg[0]
+    #assert_equal :groupchat, msg[2]
 
-    assert msg = svc.im.delivered.shift
-    assert_equal 'f', msg[0]
-    assert_equal :groupchat, msg[2]
+    #assert msg = svc.im.delivered.shift
+    #assert_equal 'f', msg[0]
+    #assert_equal :groupchat, msg[2]
 
-    assert msg = svc.im.delivered.shift
-    assert_equal 'g', msg[0]
-    assert_equal :groupchat, msg[2]
+    #assert msg = svc.im.delivered.shift
+    #assert_equal 'g', msg[0]
+    #assert_equal :groupchat, msg[2]
 
     assert_nil svc.im.delivered.shift
   end