Merge branch 'master' into feature/default_chatrooms

2023-04-18 17:00:48 +02:00
parent ad90fcd539 7a50bd23d6
commit cb2197893c
44 changed files with 540 additions and 139 deletions
--- a/app/jobs/xmpp_exchange_contacts_job.rb
+++ b/app/jobs/xmpp_exchange_contacts_job.rb
@@ -2,8 +2,9 @@ class XmppExchangeContactsJob < ApplicationJob
  queue_as :default

  def perform(inviter, invitee)
-    return unless inviter.services_enabled.include?("ejabberd") &&
-                  invitee.services_enabled.include?("ejabberd")
+    return unless inviter.services_enabled.include?("xmpp") &&
+                  invitee.services_enabled.include?("xmpp") &&
+                  inviter.preferences[:xmpp_exchange_contacts_with_invitees]

    ejabberd = EjabberdApiClient.new