Software / code / prosody
Diff
plugins/mod_presence.lua @ 5060:b0e36777f715
mod_presence, rostermanager: Bring outbound subscription cancellation in line with RFC6121.
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Wed, 01 Aug 2012 01:36:16 +0500 |
| parent | 5013:ab693eea0869 |
| child | 5171:b4b302fe415c |
line wrap: on
line diff
--- a/plugins/mod_presence.lua Wed Aug 01 01:36:13 2012 +0500 +++ b/plugins/mod_presence.lua Wed Aug 01 01:36:16 2012 +0500 @@ -198,12 +198,19 @@ core_post_stanza(origin, stanza); send_presence_of_available_resources(node, host, to_bare, origin); elseif stanza.attr.type == "unsubscribed" then - -- 1. route stanza - -- 2. roster push (subscription = none or to) - if rostermanager.unsubscribed(node, host, to_bare) then - rostermanager.roster_push(node, host, to_bare); + -- 1. send unavailable + -- 2. route stanza + -- 3. roster push (subscription = from or both) + local success, pending_in, subscribed = rostermanager.unsubscribed(node, host, to_bare); + if success then + if subscribed then + rostermanager.roster_push(node, host, to_bare); + end + core_post_stanza(origin, stanza); + if subscribed then + send_presence_of_available_resources(node, host, to_bare, origin, st.presence({ type = "unavailable" })); + end end - core_post_stanza(origin, stanza); else origin.send(st.error_reply(stanza, "modify", "bad-request", "Invalid presence type")); end
