kosmos/akkounts
kosmos/akkounts
8
1
Fork 0
Code Issues 19 Pull Requests 1 Actions Packages Releases 12 Activity

Add setting for contact roster name
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details

Browse Source 
And only exchange contacts when ejabberd integration is enabled
This commit is contained in:
Râu Cao 2023-03-15 15:48:27 +07:00 committed by Gitea
parent 8da297811b
commit 8d90847896
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/jobs/xmpp_exchange_contacts_job.rb
View File

@ -7,12 +7,12 @@ class XmppExchangeContactsJob < ApplicationJob
ejabberd.add_rosteritem({ ejabberd.add_rosteritem({
"localuser": username, "localhost": domain, "localuser": username, "localhost": domain,
"user": inviter.cn, "host": inviter.ou, "user": inviter.cn, "host": inviter.ou,
"nick": inviter.cn, "group": "Friends", "subs": "both" "nick": inviter.cn, "group": Setting.ejabberd_buddy_roster, "subs": "both"
}) })
ejabberd.add_rosteritem({ ejabberd.add_rosteritem({
"localuser": inviter.cn, "localhost": inviter.ou, "localuser": inviter.cn, "localhost": inviter.ou,
"user": username, "host": domain, "user": username, "host": domain,
"nick": username, "group": "Friends", "subs": "both" "nick": username, "group": Setting.ejabberd_buddy_roster, "subs": "both"
}) })
end end
end end

2
app/services/create_account.rb
View File

@ -15,7 +15,7 @@ class CreateAccount < ApplicationService
if @invitation.present? if @invitation.present?
update_invitation(user.id) update_invitation(user.id)
exchange_xmpp_contacts exchange_xmpp_contacts if Setting.ejabberd_enabled
end end
end end

8
app/views/admin/settings/services/_ejabberd.html.erb
View File

@ -18,5 +18,13 @@
value: Setting.ejabberd_admin_url, value: Setting.ejabberd_admin_url,
class: "w-full", disabled: true %> class: "w-full", disabled: true %>
<% end %> <% end %>
<%= render FormElements::FieldsetComponent.new(
title: "Contact roster name",
description: "Used when exchanging contacts after signup from invitation"
) do %>
<%= f.text_field :ejabberd_buddy_roster,
value: Setting.ejabberd_buddy_roster,
class: "w-full" %>
<% end %>
<% end %> <% end %>
</ul> </ul>

4
spec/jobs/xmpp_exchange_contacts_job_spec.rb
View File

@ -17,9 +17,9 @@ RSpec.describe XmppExchangeContactsJob, type: :job do
perform_enqueued_jobs { job } perform_enqueued_jobs { job }
expect(WebMock).to have_requested(:post, "http://xmpp.example.com/api/add_rosteritem") expect(WebMock).to have_requested(:post, "http://xmpp.example.com/api/add_rosteritem")
.with { |req| req.body == '{"localuser":"isaacnewton","localhost":"kosmos.org","user":"willherschel","host":"kosmos.org","nick":"willherschel","group":"Friends","subs":"both"}' } .with { |req| req.body == '{"localuser":"isaacnewton","localhost":"kosmos.org","user":"willherschel","host":"kosmos.org","nick":"willherschel","group":"Buddies","subs":"both"}' }
expect(WebMock).to have_requested(:post, "http://xmpp.example.com/api/add_rosteritem") expect(WebMock).to have_requested(:post, "http://xmpp.example.com/api/add_rosteritem")
.with { |req| req.body == '{"localuser":"willherschel","localhost":"kosmos.org","user":"isaacnewton","host":"kosmos.org","nick":"isaacnewton","group":"Friends","subs":"both"}' } .with { |req| req.body == '{"localuser":"willherschel","localhost":"kosmos.org","user":"isaacnewton","host":"kosmos.org","nick":"isaacnewton","group":"Buddies","subs":"both"}' }
end end
after do after do