# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1549272482 0
# Node ID 87a1742f928d92cc8471ba978e276245af609e2f
# Parent  eb4724f20b1e24da3a36a8b0a1c7e5df3481c529# Parent  11671a2e07a90ce0536361d26b7b0549014fcf19
Merge 0.11->trunk

diff -r eb4724f20b1e -r 87a1742f928d plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Mon Jan 28 01:49:04 2019 +0100
+++ b/plugins/muc/muc.lib.lua	Mon Feb 04 09:28:02 2019 +0000
@@ -721,7 +721,7 @@
 	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 @@
 	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 @@
 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"));