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

Send last PEP items to owner on initial presence

Browse Source 
Closes #2112.
This commit is contained in:
Holger Weiss 2017-12-13 18:59:06 +01:00
parent a65a78ebfe
commit 5968bc9318
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod_caps.erl
View File

@ -206,8 +206,10 @@ c2s_presence_in(C2SState,
{Subscription, _} = ejabberd_hooks:run_fold( {Subscription, _} = ejabberd_hooks:run_fold(
roster_get_jid_info, To#jid.lserver, roster_get_jid_info, To#jid.lserver,
{none, []}, [To#jid.luser, To#jid.lserver, From]), {none, []}, [To#jid.luser, To#jid.lserver, From]),
ToSelf = (From#jid.luser == To#jid.luser)
and (From#jid.lserver == To#jid.lserver),
Insert = (Type == available) Insert = (Type == available)
and ((Subscription == both) or (Subscription == to)), and ((Subscription == both) or (Subscription == to) or ToSelf),
Delete = (Type == unavailable) or (Type == error), Delete = (Type == unavailable) or (Type == error),
if Insert or Delete -> if Insert or Delete ->
LFrom = jid:tolower(From), LFrom = jid:tolower(From),

3
src/mod_pubsub.erl
View File

@ -550,6 +550,9 @@ disco_items(Host, Node, From) ->
%% %%
-spec caps_add(jid(), jid(), [binary()]) -> ok. -spec caps_add(jid(), jid(), [binary()]) -> ok.
caps_add(JID, JID, _Features) ->
%% Send the owner his last PEP items.
send_last_pep(JID, JID);
caps_add(#jid{lserver = S1} = From, #jid{lserver = S2} = To, _Features) caps_add(#jid{lserver = S1} = From, #jid{lserver = S2} = To, _Features)
when S1 =/= S2 -> when S1 =/= S2 ->
%% When a remote contact goes online while the local user is offline, the %% When a remote contact goes online while the local user is offline, the