diff options
| author | Matthew Wild <mwild1@gmail.com> | 2019-02-04 09:28:02 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2019-02-04 09:28:02 +0000 |
| commit | 8fd3178bb049bf2fb8bc5ea50baece16296d0513 (patch) | |
| tree | 6c7c3f7af460e86e4e39613bb6f955dfcd98a1c6 | |
| parent | 428da9fe8a8af9170f3cd5578767d0a17503fe95 (diff) | |
| parent | da3f688d798fc25ed43085ba2fa1d54bb1978eb1 (diff) | |
| download | prosody-8fd3178bb049bf2fb8bc5ea50baece16296d0513.tar.gz prosody-8fd3178bb049bf2fb8bc5ea50baece16296d0513.zip | |
Merge 0.11->trunk
| -rw-r--r-- | plugins/muc/muc.lib.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 7259dde2..9b168e93 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -721,7 +721,7 @@ function room_mt:handle_iq_to_occupant(origin, stanza) else -- Type is "get" or "set" local current_nick = self:get_occupant_jid(from); if not current_nick then - origin.send(st.error_reply(stanza, "cancel", "not-acceptable")); + origin.send(st.error_reply(stanza, "cancel", "not-acceptable", "You are not currently connected to this chat")); return true; end if not occupant then -- recipient not in room @@ -754,7 +754,7 @@ function room_mt:handle_message_to_occupant(origin, stanza) local type = stanza.attr.type; if not current_nick then -- not in room if type ~= "error" then - origin.send(st.error_reply(stanza, "cancel", "not-acceptable")); + origin.send(st.error_reply(stanza, "cancel", "not-acceptable", "You are not currently connected to this chat")); end return true; end @@ -1054,7 +1054,7 @@ end module:hook("muc-occupant-groupchat", function(event) local role_rank = valid_roles[event.occupant and event.occupant.role or "none"]; if role_rank <= valid_roles.none then - event.origin.send(st.error_reply(event.stanza, "cancel", "not-acceptable")); + event.origin.send(st.error_reply(event.stanza, "cancel", "not-acceptable", "You are not currently connected to this chat")); return true; elseif role_rank <= valid_roles.visitor then event.origin.send(st.error_reply(event.stanza, "auth", "forbidden")); |