diff options
Diffstat (limited to 'src/mod_pubsub/mod_pubsub.erl')
| -rw-r--r-- | src/mod_pubsub/mod_pubsub.erl | 45 |
1 files changed, 28 insertions, 17 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index e83e0170..a993af71 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -226,8 +226,6 @@ terminate_plugins(Host, ServerHost, Plugins, TreePlugin) -> ok. init_nodes(Host, ServerHost) -> - create_node(Host, ServerHost, ["pubsub"], service_jid(Host), ?STDNODE), - create_node(Host, ServerHost, ["pubsub", "nodes"], service_jid(Host), ?STDNODE), create_node(Host, ServerHost, ["home"], service_jid(Host), ?STDNODE), create_node(Host, ServerHost, ["home", ServerHost], service_jid(Host), ?STDNODE), ok. @@ -416,7 +414,7 @@ remove_user(User, Server) -> LUser = jlib:nodeprep(User), LServer = jlib:nameprep(Server), Proc = gen_mod:get_module_proc(Server, ?PROCNAME), - gen_server:cast(Proc, {remove, LUser, LServer}). + gen_server:cast(Proc, {remove_user, LUser, LServer}). %%-------------------------------------------------------------------- %% Function: @@ -513,10 +511,27 @@ handle_cast({presence, JID, Pid}, State) -> end, {noreply, State}; -handle_cast({remove, User, Server}, State) -> - Owner = jlib:make_jid(User, Server, ""), - delete_nodes(Server, Owner), - {noreply, State}; +handle_cast({remove_user, User, Host}, State) -> + Owner = jlib:make_jid(User, Host, ""), + OwnerKey = jlib:jid_tolower(jlib:jid_remove_resource(Owner)), + %% remove user's subscriptions + lists:foreach(fun(Type) -> + {result, Subscriptions} = node_action(Type, get_entity_subscriptions, [Host, Owner]), + lists:foreach(fun + ({Node, subscribed}) -> + JID = jlib:jid_to_string(Owner), + unsubscribe_node(Host, Node, Owner, JID, all); + (_) -> + ok + end, Subscriptions) + end, State#state.plugins), + %% remove user's PEP nodes + lists:foreach(fun(#pubsub_node{nodeid={NodeKey, NodeName}}) -> + delete_node(NodeKey, NodeName, Owner) + end, tree_action(Host, get_nodes, [OwnerKey])), + %% remove user's nodes + delete_node(Host, ["home", Host, User], Owner), + {noreply, State}; handle_cast(_Msg, State) -> {noreply, State}. @@ -1295,12 +1310,6 @@ delete_node(Host, Node, Owner) -> {result, Result} -> {result, Result} end. -delete_nodes(Host, Owner) -> - %% This removes only PEP nodes when user is removed - OwnerKey = jlib:jid_tolower(jlib:jid_remove_resource(Owner)), - lists:foreach(fun(#pubsub_node{nodeid={NodeKey, NodeName}}) -> - delete_node(NodeKey, NodeName, Owner) - end, tree_action(Host, get_nodes, [OwnerKey])). %% @spec (Host, Node, From, JID) -> %% {error, Reason::stanzaError()} | @@ -1725,9 +1734,9 @@ send_last_item(Host, Node, LJID) -> send_items(Host, Node, LJID, Number) -> Items = get_items(Host, Node), ToSend = case Number of - last -> lists:sublist(Items, 1); + last -> hd(lists:reverse(Items)); all -> Items; - N when N > 0 -> lists:sublist(Items, N); + N when N > 0 -> lists:nthtail(length(Items)-N, Items); _ -> Items end, ItemsEls = lists:map( @@ -2414,9 +2423,11 @@ get_default(Host, _Node, _From, Lang) -> %% The result depend of the node type plugin system. get_option([], _) -> false; get_option(Options, Var) -> + get_option(Options, Var, false). +get_option(Options, Var, Def) -> case lists:keysearch(Var, 1, Options) of {value, {_Val, Ret}} -> Ret; - _ -> false + _ -> Def end. %% Get default options from the module plugin. @@ -2461,7 +2472,7 @@ max_items(Options) -> -define(STRING_CONFIG_FIELD(Label, Var), ?STRINGXFIELD(Label, "pubsub#" ++ atom_to_list(Var), - get_option(Options, Var))). + get_option(Options, Var, ""))). -define(INTEGER_CONFIG_FIELD(Label, Var), ?STRINGXFIELD(Label, "pubsub#" ++ atom_to_list(Var), |