aboutsummaryrefslogtreecommitdiff
path: root/src/mod_shared_roster_ldap.erl
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-01-23 13:51:05 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-01-23 13:51:05 +0300
commit435e5e62634b542c2a42673bea7f81e9cc2a5c04 (patch)
treeb927d972c426ca5ea4ce20343e4eb981848934e8 /src/mod_shared_roster_ldap.erl
parentMake a message is not bounced if it's archived (diff)
Make test suite working again
Diffstat (limited to 'src/mod_shared_roster_ldap.erl')
-rw-r--r--src/mod_shared_roster_ldap.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl
index e79bcc5c0..49a61a374 100644
--- a/src/mod_shared_roster_ldap.erl
+++ b/src/mod_shared_roster_ldap.erl
@@ -161,7 +161,7 @@ process_item(RosterItem, _Host) ->
_ -> RosterItem#roster{subscription = both, ask = none}
end.
-c2s_session_opened(#{jid := #jid{luser = LUser, lserver = LServer} = JID,
+c2s_session_opened(#{jid := #jid{luser = LUser, lserver = LServer},
pres_f := PresF, pres_t := PresT} = State) ->
US = {LUser, LServer},
DisplayedGroups = get_user_displayed_groups(US),
@@ -169,11 +169,12 @@ c2s_session_opened(#{jid := #jid{luser = LUser, lserver = LServer} = JID,
get_group_users(LServer, Group)
end,
DisplayedGroups),
- BareLJID = jid:tolower(jid:remove_resource(JID)),
PresBoth = lists:foldl(
- fun({U, S}, Acc) ->
+ fun({U, S, _}, Acc) ->
+ ?SETS:add_element({U, S, <<"">>}, Acc);
+ ({U, S}, Acc) ->
?SETS:add_element({U, S, <<"">>}, Acc)
- end, ?SETS:new(), [BareLJID|SRUsers]),
+ end, ?SETS:new(), SRUsers),
State#{pres_f => ?SETS:union(PresBoth, PresF),
pres_t => ?SETS:union(PresBoth, PresT)}.