From d4113d956985957b122c60e4b8a4b048af4b5538 Mon Sep 17 00:00:00 2001 From: Badlop Date: Fri, 24 Nov 2023 17:07:21 +0100 Subject: [PATCH] Commands: set_presence: switch priority argument from string to integer --- src/mod_admin_extra.erl | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl index 152d481b8..70374aa44 100644 --- a/src/mod_admin_extra.erl +++ b/src/mod_admin_extra.erl @@ -423,6 +423,22 @@ get_commands_spec() -> "Show: `away`, `chat`, `dnd`, `xa`.", "Status text", "Priority, provide this value as an integer"], result = {res, rescode}}, + #ejabberd_commands{name = set_presence, + tags = [session], + desc = "Set presence of a session", + module = ?MODULE, function = set_presence, + version = 1, + args = [{user, binary}, {host, binary}, + {resource, binary}, {type, binary}, + {show, binary}, {status, binary}, + {priority, integer}], + args_example = [<<"user1">>,<<"myserver.com">>,<<"tka1">>, + <<"available">>,<<"away">>,<<"BB">>, 7], + args_desc = ["User name", "Server name", "Resource", + "Type: `available`, `error`, `probe`...", + "Show: `away`, `chat`, `dnd`, `xa`.", "Status text", + "Priority, provide this value as an integer"], + result = {res, rescode}}, #ejabberd_commands{name = set_nickname, tags = [vcard], desc = "Set nickname in a user's vCard", @@ -1084,14 +1100,10 @@ get_presence(U, S) -> {FullJID, Show, Status} end. -set_presence(User, Host, Resource, Type, Show, Status, Priority) - when is_integer(Priority) -> - BPriority = integer_to_binary(Priority), - set_presence(User, Host, Resource, Type, Show, Status, BPriority); -set_presence(User, Host, Resource, Type, Show, Status, Priority0) -> - Priority = if is_integer(Priority0) -> Priority0; - true -> binary_to_integer(Priority0) - end, +set_presence(User, Host, Resource, Type, Show, Status, Priority) when is_binary(Priority) -> + set_presence(User, Host, Resource, Type, Show, Status, binary_to_integer(Priority)); + +set_presence(User, Host, Resource, Type, Show, Status, Priority) -> Pres = #presence{ from = jid:make(User, Host, Resource), to = jid:make(User, Host),