aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-06-26 16:27:07 +0200
committerKim Alvefur <zash@zash.se>2018-06-26 16:27:07 +0200
commit550549763f2af6869ffcc9d967652b440d60d6b6 (patch)
treeca42e33454960527977b2450d1cc1268b69dd014
parentb51f1a42248f81370df2d2cbb29da059eadf33d0 (diff)
downloadprosody-550549763f2af6869ffcc9d967652b440d60d6b6.tar.gz
prosody-550549763f2af6869ffcc9d967652b440d60d6b6.zip
MUC: Avoid sending error for unavailable presence in GC 1.0 check
-rw-r--r--plugins/muc/muc.lib.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 09cc237a..b48ee7db 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -472,7 +472,7 @@ function room_mt:handle_normal_presence(origin, stanza)
local orig_occupant = self:get_occupant_by_real_jid(real_jid);
local muc_x = stanza:get_child("x", "http://jabber.org/protocol/muc");
- if orig_occupant == nil and not muc_x then
+ if orig_occupant == nil and not muc_x and stanza.attr.type == nil then
module:log("debug", "Attempted join without <x>, possibly desynced");
origin.send(st.error_reply(stanza, "cancel", "item-not-found", "You must join the room before sending presence updates"));
return true;