From c1cb5357e1df4b4d3c6cd8ca19813c46bd9bb9b9 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Mon, 3 Apr 2023 15:48:33 +0200
Subject: [PATCH 1/3] fix: enable schema check

---
 apps/emqx_modules/src/emqx_delayed_api.erl | 2 +-
 apps/emqx_modules/src/emqx_modules.app.src | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_modules/src/emqx_delayed_api.erl b/apps/emqx_modules/src/emqx_delayed_api.erl
index d4e7e5b90..3499d83ca 100644
--- a/apps/emqx_modules/src/emqx_delayed_api.erl
+++ b/apps/emqx_modules/src/emqx_delayed_api.erl
@@ -52,7 +52,7 @@
 -define(INVALID_NODE, 'INVALID_NODE').
 
 api_spec() ->
-    emqx_dashboard_swagger:spec(?MODULE).
+    emqx_dashboard_swagger:spec(?MODULE, #{check_schema => true}).
 
 paths() ->
     [
diff --git a/apps/emqx_modules/src/emqx_modules.app.src b/apps/emqx_modules/src/emqx_modules.app.src
index 4a9cb6723..fdc13f354 100644
--- a/apps/emqx_modules/src/emqx_modules.app.src
+++ b/apps/emqx_modules/src/emqx_modules.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_modules, [
     {description, "EMQX Modules"},
-    {vsn, "5.0.11"},
+    {vsn, "5.0.12"},
     {modules, []},
     {applications, [kernel, stdlib, emqx, emqx_ctl]},
     {mod, {emqx_modules_app, []}},

From 0efa9c7a110ba2fede4b3abeea784bf058e1fb35 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Mon, 3 Apr 2023 15:48:52 +0200
Subject: [PATCH 2/3] fix: pretty format error responses

---
 apps/emqx_modules/src/emqx_delayed_api.erl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/emqx_modules/src/emqx_delayed_api.erl b/apps/emqx_modules/src/emqx_delayed_api.erl
index 3499d83ca..766d23d6b 100644
--- a/apps/emqx_modules/src/emqx_delayed_api.erl
+++ b/apps/emqx_modules/src/emqx_delayed_api.erl
@@ -202,9 +202,9 @@ delayed_message(get, #{bindings := #{node := NodeBin, msgid := HexId}}) ->
                             {200, Message#{payload => base64:encode(Payload)}}
                     end;
                 {error, not_found} ->
-                    {404, generate_http_code_map(not_found, Id)};
+                    {404, generate_http_code_map(not_found, HexId)};
                 {badrpc, _} ->
-                    {400, generate_http_code_map(invalid_node, Id)}
+                    {400, generate_http_code_map(invalid_node, NodeBin)}
             end
         end
     );
@@ -271,19 +271,19 @@ generate_http_code_map(id_schema_error, Id) ->
     #{
         code => ?MESSAGE_ID_SCHEMA_ERROR,
         message =>
-            iolist_to_binary(io_lib:format("Message ID ~p schema error", [Id]))
+            iolist_to_binary(io_lib:format("Message ID ~s schema error", [Id]))
     };
 generate_http_code_map(not_found, Id) ->
     #{
         code => ?MESSAGE_ID_NOT_FOUND,
         message =>
-            iolist_to_binary(io_lib:format("Message ID ~p not found", [Id]))
+            iolist_to_binary(io_lib:format("Message ID ~s not found", [Id]))
     };
 generate_http_code_map(invalid_node, Node) ->
     #{
         code => ?INVALID_NODE,
         message =>
-            iolist_to_binary(io_lib:format("The node name ~p is invalid", [Node]))
+            iolist_to_binary(io_lib:format("The node name ~s is invalid", [Node]))
     }.
 
 make_maybe(X, Error, Fun) ->

From 5d722f8d465178a6fdcc60816458868cfa0da529 Mon Sep 17 00:00:00 2001
From: Stefan Strigler <stefan.strigler@emqx.io>
Date: Mon, 3 Apr 2023 15:55:25 +0200
Subject: [PATCH 3/3] style: add changelog

---
 changes/ce/fix-10315.en.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/ce/fix-10315.en.md

diff --git a/changes/ce/fix-10315.en.md b/changes/ce/fix-10315.en.md
new file mode 100644
index 000000000..67445252d
--- /dev/null
+++ b/changes/ce/fix-10315.en.md
@@ -0,0 +1 @@
+Fix crash checking `limit` and `page` parameters in `/mqtt/delayed/messages` API call.