Merge pull request 'Add user preferences and configurable notifications' (#113) from feature/user_preferences into master

Reviewed-on: #113
Reviewed-by: galfert <garret.alfert@gmail.com>

app/models/user.rb

@@ -1,6 +1,8 @@
 class User < ApplicationRecord
   include EmailValidatable
 
+  serialize :preferences, UserPreferences
+
   # Relations
   has_many :invitations, dependent: :destroy
   has_one  :invitation, inverse_of: :invitee, foreign_key: 'invited_user_id'
@@ -56,13 +58,16 @@ class User < ApplicationRecord
   end
 
   def devise_after_confirmation
-    enable_service %w[ discourse ejabberd gitea mediawiki ]
+    enable_service %w[ discourse gitea mediawiki xmpp ]
 
     #TODO enable in development when we have easy setup of ejabberd etc.
     return if Rails.env.development?
 
     if inviter.present?
-      exchange_xmpp_contact_with_inviter if Setting.ejabberd_enabled?
+      if Setting.ejabberd_enabled? &&
+          inviter.preferences[:xmpp_exchange_contacts_with_invitees]
+        exchange_xmpp_contact_with_inviter
+      end
     end
   end
 
@@ -135,8 +140,8 @@ class User < ApplicationRecord
   end
 
   def exchange_xmpp_contact_with_inviter
-    return unless inviter.services_enabled.include?("ejabberd") &&
-                  services_enabled.include?("ejabberd")
+    return unless inviter.services_enabled.include?("xmpp") &&
+                  services_enabled.include?("xmpp")
     XmppExchangeContactsJob.perform_later(inviter, self.cn, self.ou)
   end