Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-28 17:38:54 +01:00
Code Releases Activity

Preliminary support to store extra elements in subscription request (#840)

Browse Source
This commit is contained in:
Badlop 2022-06-06 18:37:40 +02:00
parent c4a2f8d64f
commit e2496562f9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod_roster.erl
View File

@ -567,24 +567,25 @@ transaction(LUser, LServer, LJIDs, F) ->
-spec in_subscription(boolean(), presence()) -> boolean(). -spec in_subscription(boolean(), presence()) -> boolean().
in_subscription(_, #presence{from = JID, to = To, in_subscription(_, #presence{from = JID, to = To,
sub_els = SubEls,
type = Type, status = Status}) -> type = Type, status = Status}) ->
#jid{user = User, server = Server} = To, #jid{user = User, server = Server} = To,
Reason = if Type == subscribe -> xmpp:get_text(Status); Reason = if Type == subscribe -> xmpp:get_text(Status);
true -> <<"">> true -> <<"">>
end, end,
process_subscription(in, User, Server, JID, Type, process_subscription(in, User, Server, JID, Type,
Reason). Reason, SubEls).
-spec out_subscription(presence()) -> boolean(). -spec out_subscription(presence()) -> boolean().
out_subscription(#presence{from = From, to = JID, type = Type}) -> out_subscription(#presence{from = From, to = JID, type = Type}) ->
#jid{user = User, server = Server} = From, #jid{user = User, server = Server} = From,
process_subscription(out, User, Server, JID, Type, <<"">>). process_subscription(out, User, Server, JID, Type, <<"">>, []).
-spec process_subscription(in | out, binary(), binary(), jid(), -spec process_subscription(in | out, binary(), binary(), jid(),
subscribe | subscribed | unsubscribe | unsubscribed, subscribe | subscribed | unsubscribe | unsubscribed,
binary()) -> boolean(). binary(), [fxml:xmlel()]) -> boolean().
process_subscription(Direction, User, Server, JID1, process_subscription(Direction, User, Server, JID1,
Type, Reason) -> Type, Reason, SubEls) ->
LUser = jid:nodeprep(User), LUser = jid:nodeprep(User),
LServer = jid:nameprep(Server), LServer = jid:nameprep(Server),
LJID = jid:tolower(jid:remove_resource(JID1)), LJID = jid:tolower(jid:remove_resource(JID1)),
@ -618,6 +619,7 @@ process_subscription(Direction, User, Server, JID1,
{Subscription, Pending} -> {Subscription, Pending} ->
NewItem = Item#roster{subscription = Subscription, NewItem = Item#roster{subscription = Subscription,
ask = Pending, ask = Pending,
xs = SubEls,
askmessage = AskMessage}, askmessage = AskMessage},
roster_subscribe_t(LUser, LServer, LJID, NewItem), roster_subscribe_t(LUser, LServer, LJID, NewItem),
case mod_roster_opt:store_current_id(LServer) of case mod_roster_opt:store_current_id(LServer) of
@ -983,6 +985,7 @@ resend_pending_subscriptions(#{jid := JID} = State) ->
Sub = #presence{from = jid:make(R#roster.jid), Sub = #presence{from = jid:make(R#roster.jid),
to = BareJID, to = BareJID,
type = subscribe, type = subscribe,
sub_els = R#roster.xs,
status = xmpp:mk_text(Status)}, status = xmpp:mk_text(Status)},
ejabberd_c2s:send(AccState, Sub); ejabberd_c2s:send(AccState, Sub);
(_, AccState) -> (_, AccState) ->