25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00

Merge pull request #3558 from fdie/fix_node_get_state_return_value

fix gen_pubsub_node:get_state return value
This commit is contained in:
badlop 2021-03-29 15:52:04 +02:00 committed by GitHub
commit c0dafc074d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -705,8 +705,7 @@ remove_user(User, Server) ->
case node_action(Host, PType, case node_action(Host, PType,
get_state, get_state,
[Nidx, jid:tolower(Entity)]) of [Nidx, jid:tolower(Entity)]) of
{result, State} -> {result, #pubsub_state{items = ItemIds}} ->
ItemIds = State#pubsub_state.items,
node_action(Host, PType, node_action(Host, PType,
remove_extra_items, remove_extra_items,
[Nidx, 0, ItemIds]), [Nidx, 0, ItemIds]),
@ -3822,6 +3821,8 @@ node_call(Host, Type, Function, Args) ->
case apply(Module, Function, Args) of case apply(Module, Function, Args) of
{result, Result} -> {result, Result} ->
{result, Result}; {result, Result};
#pubsub_state{} = Result ->
{result, Result};
{error, #stanza_error{}} = Err -> {error, #stanza_error{}} = Err ->
Err; Err;
{error, _} -> {error, _} ->