diff options
| author | Badlop <badlop@process-one.net> | 2010-06-18 00:43:15 +0400 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2010-06-18 00:43:15 +0400 |
| commit | b6711e407e7cf509fcacad52ac46e653c32a9121 (patch) | |
| tree | 72ba6ec7ab87d96d5a67fa840e651944ca361752 /src/ejabberd_c2s.erl | |
| parent | 3bcc60066e4864ca3a08f0c6fe3651514052061e (diff) | |
Remove support for the rejected XEP-0018 Invisible Presence (EJAB-810)
Diffstat (limited to 'src/ejabberd_c2s.erl')
| -rw-r--r-- | src/ejabberd_c2s.erl | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 11a0a39ab..2cba77b15 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1142,10 +1142,6 @@ handle_info({route, From, To, Packet}, StateName, StateData) -> NewA = remove_element(LFrom, StateData#state.pres_a), {true, Attrs, StateData#state{pres_a = NewA}}; - 'invisible' -> - Attrs1 = exmpp_stanza:set_type_in_attrs(Attrs, - 'unavailable'), - {true, Attrs1, StateData}; 'subscribe' -> SRes = is_privacy_allow(From, To, Packet, StateData#state.privacy_list), {SRes, Attrs, StateData}; @@ -1653,32 +1649,6 @@ presence_update(From, Packet, StateData) -> pres_a = ?SETS:new(), pres_i = ?SETS:new(), pres_invis = false}; - 'invisible' -> - NewPriority = try - exmpp_presence:get_priority(Packet) - catch - _Exception -> 0 - end, - update_priority(NewPriority, Packet, StateData), - NewState = - if - not StateData#state.pres_invis -> - presence_broadcast(StateData, From, - StateData#state.pres_a, - Packet), - presence_broadcast(StateData, From, - StateData#state.pres_i, - Packet), - S1 = StateData#state{pres_last = undefined, - pres_timestamp = undefined, - pres_a = ?SETS:new(), - pres_i = ?SETS:new(), - pres_invis = true}, - presence_broadcast_first(From, S1, Packet); - true -> - StateData - end, - NewState; 'error' -> StateData; 'probe' -> @@ -1758,13 +1728,6 @@ presence_track(From, To, Packet, StateData) -> A = remove_element(LTo, StateData#state.pres_a), StateData#state{pres_i = I, pres_a = A}; - 'invisible' -> - ejabberd_router:route(From, To, Packet), - check_privacy_route(From, StateData, From, To, Packet), - I = ?SETS:add_element(LTo, StateData#state.pres_i), - A = remove_element(LTo, StateData#state.pres_a), - StateData#state{pres_i = I, - pres_a = A}; 'subscribe' -> ejabberd_hooks:run(roster_out_subscription, StateData#state.server, |