]> granicus.if.org Git - ejabberd/commitdiff
Remove some leftovers of XEP-0018.
authorJanusz Dziemidowicz <rraptorr@nails.eu.org>
Mon, 10 Oct 2011 20:12:02 +0000 (22:12 +0200)
committerBadlop <badlop@process-one.net>
Thu, 17 Nov 2011 17:07:57 +0000 (18:07 +0100)
Support for XEP-0018 was dropped long ago, but there are some
leftovers. Remove them.

src/mod_caps.erl
src/mod_disco.erl

index 0c811e38ed5c2dab3c8bcdb4a3269044710c51c1..5f9c82908b81caacdaa67b4e6d0548e7699afefc 100644 (file)
@@ -227,7 +227,7 @@ c2s_presence_in(C2SState, {From, To, #xmlel{attrs = Attrs, children = Els}}) ->
     Subscription = ejabberd_c2s:get_subscription(From, C2SState),
     Insert = ((Type == <<>>) or (Type == <<"available">>))
        and ((Subscription == both) or (Subscription == to)),
-    Delete = (Type == <<"unavailable">>) or (Type == <<"error">>) or (Type == <<"invisible">>),
+    Delete = (Type == <<"unavailable">>) or (Type == <<"error">>),
     if Insert or Delete ->
            LFrom = exmpp_jid:to_lower(From),
            Rs = case ejabberd_c2s:get_aux_field(caps_resources, C2SState) of
index 54832b63a5081868de70f86183cfa95806b50dc2..7c0b28d5399fda48f5f66a367609f6812e16d561 100644 (file)
@@ -73,7 +73,6 @@ start(HostB, Opts) ->
     catch ets:new(disco_features, [named_table, ordered_set, public]),
     register_feature(HostB, "iq"),
     register_feature(HostB, "presence"),
-    register_feature(HostB, "presence-invisible"),
 
     catch ets:new(disco_extra_domains, [named_table, ordered_set, public]),
     ExtraDomains = gen_mod:get_opt(extra_domains, Opts, []),