aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_presence.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-12-10 02:55:38 +0100
committerKim Alvefur <zash@zash.se>2016-12-10 02:55:38 +0100
commit21a13c5bca4e9f3b87dff4edfb0a291da128b8a3 (patch)
tree0c45bcdafed730fb0e14edfd08a8f649bf100fa6 /plugins/mod_presence.lua
parentdec1fd604cc7dedef23b3885013fa821492ef86b (diff)
parentbbaaaa99a4da333262792a211c46ec93ae0b270a (diff)
downloadprosody-21a13c5bca4e9f3b87dff4edfb0a291da128b8a3.tar.gz
prosody-21a13c5bca4e9f3b87dff4edfb0a291da128b8a3.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_presence.lua')
-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