From c1ca338fdb32b05fd047730be9ca6569d22c6806 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Mon, 20 Mar 2017 14:08:34 +0000
Subject: Updated gems to (roughly) jessie versions; removed XMPP support.

Also changed the postgres tests to "skip" if no postgres db is
available.
---
 lib/mauve/notifier.rb | 46 +---------------------------------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

(limited to 'lib/mauve/notifier.rb')

diff --git a/lib/mauve/notifier.rb b/lib/mauve/notifier.rb
index 35ac019..4939b03 100644
--- a/lib/mauve/notifier.rb
+++ b/lib/mauve/notifier.rb
@@ -1,6 +1,5 @@
 require 'mauve/mauve_thread'
 require 'mauve/notifiers'
-require 'mauve/notifiers/xmpp'
 
 module Mauve
 
@@ -15,8 +14,7 @@ module Mauve
     include Singleton
 
     # Stop the notifier thread.  This just makes sure that all the
-    # notifications in the buffer have been sent before closing the XMPP
-    # connection.
+    # notifications in the buffer have been sent.
     #
     def stop
       super
@@ -25,11 +23,6 @@ module Mauve
       # Flush the queue.
       #
       main_loop
-
-      if Configuration.current.notification_methods['xmpp']
-        Configuration.current.notification_methods['xmpp'].close
-      end
-
     end
     
     #
@@ -69,43 +62,6 @@ module Mauve
     #
     #
     def main_loop
-
-      #
-      # Make sure we're connected to the XMPP server if needed on every iteration.
-      #
-      xmpp = Configuration.current.notification_methods['xmpp']
-
-      if xmpp and !xmpp.ready?
-        #
-        # Connect to XMPP server
-        #
-        xmpp.connect 
-
-        #
-        # Join all chats and shit.  Unless the connection failed.
-        #
-        Configuration.current.people.each do |username, person|
-          # 
-          # Ignore people without XMPP stanzas.
-          #
-          next unless person.respond_to?(:xmpp) and person.xmpp 
-
-          #
-          # For each JID, either ensure they're on our roster, or that we're in
-          # that chat room.
-          #
-          jid = if xmpp.is_muc?(person.xmpp)
-            xmpp.join_muc(person.xmpp)
-          else
-            xmpp.ensure_roster_and_subscription!(person.xmpp)
-          end
-
-          Configuration.current.people[username].xmpp = jid unless jid.nil?
-
-        end if xmpp.ready?
-
-      end
-
       # 
       # Cycle through the buffer.
       #
-- 
cgit v1.2.1