aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbadlop <badlop@process-one.net>2021-03-29 15:52:04 +0200
committerGitHub <noreply@github.com>2021-03-29 15:52:04 +0200
commitc0dafc074ddd5043941d5cc7c0491f5a1a474a0a (patch)
tree17336662b0a940c87bf2e609d0878dae1e79c214
parentRecompile man page with "ejabberdctl man" (diff)
parentfix gen_pubsub_node:get_state return value (diff)
Merge pull request #3558 from fdie/fix_node_get_state_return_value
fix gen_pubsub_node:get_state return value
-rw-r--r--src/mod_pubsub.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index f9ab71650..fecb35341 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -705,8 +705,7 @@ remove_user(User, Server) ->
case node_action(Host, PType,
get_state,
[Nidx, jid:tolower(Entity)]) of
- {result, State} ->
- ItemIds = State#pubsub_state.items,
+ {result, #pubsub_state{items = ItemIds}} ->
node_action(Host, PType,
remove_extra_items,
[Nidx, 0, ItemIds]),
@@ -3822,6 +3821,8 @@ node_call(Host, Type, Function, Args) ->
case apply(Module, Function, Args) of
{result, Result} ->
{result, Result};
+ #pubsub_state{} = Result ->
+ {result, Result};
{error, #stanza_error{}} = Err ->
Err;
{error, _} ->