# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1676574939 -3600
# Node ID b8504b71735d10b63b0bd390c38100f026fe9a0c
# Parent  686c3cdd47757195ea767113d7b265640ee7dd55# Parent  68df46926c26c5831f11acc6eaf8aefa149f639f
Merge 0.12->trunk

diff -r 686c3cdd4775 -r b8504b71735d plugins/mod_admin_shell.lua
--- a/plugins/mod_admin_shell.lua	Thu Feb 16 16:00:07 2023 +0000
+++ b/plugins/mod_admin_shell.lua	Thu Feb 16 20:15:39 2023 +0100
@@ -210,6 +210,7 @@
 	if not ok then
 		event.origin.send(st.stanza("repl-result", { type = "error" }):text(err));
 	end
+	return true;
 end);
 
 -- Console commands --
diff -r 686c3cdd4775 -r b8504b71735d plugins/mod_admin_socket.lua
--- a/plugins/mod_admin_socket.lua	Thu Feb 16 16:00:07 2023 +0000
+++ b/plugins/mod_admin_socket.lua	Thu Feb 16 20:15:39 2023 +0100
@@ -19,6 +19,7 @@
 local server = require "net.server";
 
 local adminstream = require "util.adminstream";
+local st = require "util.stanza";
 
 local socket_path = module:get_option_path("admin_socket", "prosody.sock", "data");
 
@@ -35,7 +36,11 @@
 		event_name = "admin/"..stanza.name;
 	end
 	module:log("debug", "Firing %s", event_name);
-	return module:fire_event(event_name, event_data);
+	local ret = module:fire_event(event_name, event_data);
+	if ret == nil then
+		session.send(st.stanza("repl-result", { type = "error" }):text("No module handled this query. Is mod_admin_shell enabled?"));
+	end
+	return ret;
 end
 
 module:hook("server-stopping", function ()