From: Badlop Date: Wed, 13 Jul 2011 15:12:51 +0000 (+0200) Subject: Use #roster record instead of direct tuple X-Git-Tag: v3.0.0-alpha-4~59 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0755c7cfbdaae681f51e7487108c3b8044ea5da;p=ejabberd Use #roster record instead of direct tuple --- diff --git a/src/mod_disco.erl b/src/mod_disco.erl index ab959896d..54832b63a 100644 --- a/src/mod_disco.erl +++ b/src/mod_disco.erl @@ -51,6 +51,7 @@ -include_lib("exmpp/include/exmpp.hrl"). -include("ejabberd.hrl"). +-include("mod_roster.hrl"). -include_lib("stdlib/include/ms_transform.hrl"). start(Host, Opts) when is_list(Host) -> @@ -316,7 +317,7 @@ is_presence_subscribed(From, To) -> Server = exmpp_jid:prep_domain(From), LUser = exmpp_jid:prep_node(To), LServer = exmpp_jid:prep_domain(To), - lists:any(fun({roster, _, _, {TUser, TServer, _}, _, S, _, _, _, _}) -> + lists:any(fun(#roster{jid = {TUser, TServer, _}, subscription = S}) -> if LUser == TUser, LServer == TServer, S/=none -> true;