diff options
| author | Badlop <badlop@process-one.net> | 2017-08-04 12:26:07 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2017-08-04 12:29:15 +0200 |
| commit | 0516a3dc0ebddb72726b0408c83a0e73b3896fb4 (patch) | |
| tree | ebf9586a0031014fabd434a3d0c7a939f86945b4 | |
| parent | Fix missing validation from 633b68db1 (#1900) (diff) | |
Remove unused 'managers' option, related to the deferred XEP-0321 (#1443)
| -rw-r--r-- | src/mod_roster.erl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mod_roster.erl b/src/mod_roster.erl index 28bc06171..cb9b0f7bf 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -35,7 +35,6 @@ -module(mod_roster). -protocol({xep, 237, '1.3'}). --protocol({xep, 321, '0.1'}). -author('alexey@process-one.net'). @@ -444,11 +443,10 @@ decode_item(Item, R, Managed) -> process_iq_set(#iq{from = From, to = To, sub_els = [#roster_query{items = [QueryItem]}]} = IQ) -> #jid{user = User, luser = LUser, lserver = LServer} = To, - Managed = {From#jid.luser, From#jid.lserver} /= {LUser, LServer}, LJID = jid:tolower(QueryItem#roster_item.jid), F = fun () -> Item = get_roster_item(LUser, LServer, LJID), - Item2 = decode_item(QueryItem, Item, Managed), + Item2 = decode_item(QueryItem, Item, false), Item3 = ejabberd_hooks:run_fold(roster_process_item, LServer, Item2, [LServer]), @@ -1200,8 +1198,6 @@ mod_opt_type(access) -> fun acl:access_rules_validator/1; mod_opt_type(db_type) -> fun(T) -> ejabberd_config:v_db(?MODULE, T) end; mod_opt_type(iqdisc) -> fun gen_iq_handler:check_type/1; -mod_opt_type(managers) -> - fun (B) when is_list(B) -> B end; mod_opt_type(store_current_id) -> fun (B) when is_boolean(B) -> B end; mod_opt_type(versioning) -> @@ -1213,5 +1209,5 @@ mod_opt_type(O) when O == cache_life_time; O == cache_size -> mod_opt_type(O) when O == use_cache; O == cache_missed -> fun (B) when is_boolean(B) -> B end; mod_opt_type(_) -> - [access, db_type, iqdisc, managers, store_current_id, + [access, db_type, iqdisc, store_current_id, versioning, cache_life_time, cache_size, use_cache, cache_missed]. |