aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-12-09 17:07:57 +0100
committerKim Alvefur <zash@zash.se>2016-12-09 17:07:57 +0100
commitbbaaaa99a4da333262792a211c46ec93ae0b270a (patch)
treeff719b97c8a64a18aa5c5ecd81350e8971332707 /plugins
parentf9869506eda3fd6248487a7033a40ca2a949e783 (diff)
parent1dbe1533ec336146aead43fca58952d06174e67c (diff)
downloadprosody-bbaaaa99a4da333262792a211c46ec93ae0b270a.tar.gz
prosody-bbaaaa99a4da333262792a211c46ec93ae0b270a.zip
Merge 0.9->0.10
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_presence.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index e4a317bc..2acc7db2 100644
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -178,7 +178,9 @@ function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_
end
core_post_stanza(origin, stanza);
send_presence_of_available_resources(node, host, to_bare, origin);
- core_post_stanza(origin, st.presence({ type = "probe", from = from_bare, to = to_bare }));
+ if rostermanager.is_user_subscribed(node, host, to_bare) then
+ core_post_stanza(origin, st.presence({ type = "probe", from = from_bare, to = to_bare }));
+ end
elseif stanza.attr.type == "unsubscribed" then
-- 1. send unavailable
-- 2. route stanza