Mercurial > prosody-hg
diff core/rostermanager.lua @ 6662:5ef319efedba
rostermanager: Variable rename for clarity and to avoid name clash [luacheck]
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 06 May 2015 19:17:59 +0100 |
| parents | 7f9b49f2758a |
| children | 6236668da30a |
line wrap: on
line diff
--- a/core/rostermanager.lua Wed May 06 19:16:16 2015 +0100 +++ b/core/rostermanager.lua Wed May 06 19:17:59 2015 +0100 @@ -213,10 +213,10 @@ function is_contact_subscribed(username, host, jid) do local selfjid = username.."@"..host; - local subscription = _get_online_roster_subscription(selfjid, jid); - if subscription then return (subscription == "both" or subscription == "from"); end - local subscription = _get_online_roster_subscription(jid, selfjid); - if subscription then return (subscription == "both" or subscription == "to"); end + local user_subscription = _get_online_roster_subscription(selfjid, jid); + if user_subscription then return (user_subscription == "both" or user_subscription == "from"); end + local contact_subscription = _get_online_roster_subscription(jid, selfjid); + if contact_subscription then return (contact_subscription == "both" or contact_subscription == "to"); end end local roster, err = load_roster(username, host); local item = roster[jid];