aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2012-08-01 01:36:16 +0500
committerWaqas Hussain <waqas20@gmail.com>2012-08-01 01:36:16 +0500
commit333dd0e428ab1c7ff75cf6ceba1cc8117d490f17 (patch)
tree540c7d9ca85d20a292f43edd46511b373fc7da81 /plugins
parentc204694247ccaeffb4842d260f5e1a5fe0b9fe1e (diff)
downloadprosody-333dd0e428ab1c7ff75cf6ceba1cc8117d490f17.tar.gz
prosody-333dd0e428ab1c7ff75cf6ceba1cc8117d490f17.zip
mod_presence, rostermanager: Bring outbound subscription cancellation in line with RFC6121.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_presence.lua17
1 files changed, 12 insertions, 5 deletions
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index dac86ae6..077bc31f 100644
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -198,12 +198,19 @@ function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_
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