diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2017-12-13 18:59:06 +0100 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2017-12-13 18:59:06 +0100 |
| commit | 5968bc9318bec80aef1c31d46d247c13bdbc4c0e (patch) | |
| tree | 572b4d0c6946ef3ef282f0385f24f587b75b9b67 /src/mod_caps.erl | |
| parent | Merge pull request #2158 from bowlofeggs/su-with-sh (diff) | |
Send last PEP items to owner on initial presence
Closes #2112.
Diffstat (limited to 'src/mod_caps.erl')
| -rw-r--r-- | src/mod_caps.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mod_caps.erl b/src/mod_caps.erl index edc93bbf1..6021da252 100644 --- a/src/mod_caps.erl +++ b/src/mod_caps.erl @@ -206,8 +206,10 @@ c2s_presence_in(C2SState, {Subscription, _} = ejabberd_hooks:run_fold( roster_get_jid_info, To#jid.lserver, {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) - and ((Subscription == both) or (Subscription == to)), + and ((Subscription == both) or (Subscription == to) or ToSelf), Delete = (Type == unavailable) or (Type == error), if Insert or Delete -> LFrom = jid:tolower(From), |