Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

Commands: set_presence: switch priority argument from string to integer

Browse Source
This commit is contained in:
Badlop 2023-11-24 17:07:21 +01:00
parent c5a5dd859e
commit d4113d9569
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mod_admin_extra.erl
View File

@ -423,6 +423,22 @@ get_commands_spec() ->
"Show: `away`, `chat`, `dnd`, `xa`.", "Status text", "Show: `away`, `chat`, `dnd`, `xa`.", "Status text",
"Priority, provide this value as an integer"], "Priority, provide this value as an integer"],
result = {res, rescode}}, 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], #ejabberd_commands{name = set_nickname, tags = [vcard],
desc = "Set nickname in a user's vCard", desc = "Set nickname in a user's vCard",
@ -1084,14 +1100,10 @@ get_presence(U, S) ->
{FullJID, Show, Status} {FullJID, Show, Status}
end. end.
set_presence(User, Host, Resource, Type, Show, Status, Priority) set_presence(User, Host, Resource, Type, Show, Status, Priority) when is_binary(Priority) ->
when is_integer(Priority) -> set_presence(User, Host, Resource, Type, Show, Status, binary_to_integer(Priority));
BPriority = integer_to_binary(Priority),
set_presence(User, Host, Resource, Type, Show, Status, BPriority); set_presence(User, Host, Resource, Type, Show, Status, Priority) ->
set_presence(User, Host, Resource, Type, Show, Status, Priority0) ->
Priority = if is_integer(Priority0) -> Priority0;
true -> binary_to_integer(Priority0)
end,
Pres = #presence{ Pres = #presence{
from = jid:make(User, Host, Resource), from = jid:make(User, Host, Resource),
to = jid:make(User, Host), to = jid:make(User, Host),