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

Try to fill xep-0402 bookmarks from private storage on first access

Browse Source
This commit is contained in:
Paweł Chmielowski 2023-10-02 14:39:30 +02:00
parent a63d3bf0d6
commit 86465c418d
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mod_private.erl
View File

@ -37,7 +37,7 @@
remove_user/2, get_data/2, get_data/3, export/1, mod_doc/0, remove_user/2, get_data/2, get_data/3, export/1, mod_doc/0,
import/5, import_start/2, mod_opt_type/1, set_data/2, import/5, import_start/2, mod_opt_type/1, set_data/2,
mod_options/1, depends/2, get_sm_features/5, pubsub_publish_item/6, mod_options/1, depends/2, get_sm_features/5, pubsub_publish_item/6,
pubsub_delete_item/5]). pubsub_delete_item/5, pubsub_tree_call/4]).
-export([get_commands_spec/0, bookmarks_to_pep/2]). -export([get_commands_spec/0, bookmarks_to_pep/2]).
@ -70,6 +70,7 @@ start(Host, Opts) ->
{hook, disco_sm_features, get_sm_features, 50}, {hook, disco_sm_features, get_sm_features, 50},
{hook, pubsub_publish_item, pubsub_publish_item, 50}, {hook, pubsub_publish_item, pubsub_publish_item, 50},
{hook, pubsub_delete_item, pubsub_delete_item, 50}, {hook, pubsub_delete_item, pubsub_delete_item, 50},
{hook, pubsub_tree_call, pubsub_tree_call, 50},
{iq_handler, ejabberd_sm, ?NS_PRIVATE, process_sm_iq}]}. {iq_handler, ejabberd_sm, ?NS_PRIVATE, process_sm_iq}]}.
stop(Host) -> stop(Host) ->
@ -442,6 +443,22 @@ pubsub_item_to_storage_bookmark(#pubsub_item{itemid = {Id, _}, payload = [#xmlel
pubsub_item_to_storage_bookmark(_) -> pubsub_item_to_storage_bookmark(_) ->
false. false.
-spec pubsub_tree_call(Res :: any(), _Tree::any(), atom(), any()) -> any().
pubsub_tree_call({error, #stanza_error{reason = 'item-not-found'}} = Res, Tree, get_node,
[{User, Server, _}, ?NS_PEP_BOOKMARKS] = Args) ->
case get(mod_private_in_pubsub_tree_call) of
undefined ->
put(mod_private_in_pubsub_tree_call, true),
bookmarks_to_pep(User, Server),
Res2 = apply(Tree, get_node, Args),
erase(mod_private_in_pubsub_tree_call),
Res2;
_ ->
Res
end;
pubsub_tree_call(Res, _Tree, _Function, _Args) ->
Res.
-spec storage_bookmark_to_xmpp_bookmark(bookmark_conference()) -> pep_bookmarks_conference(). -spec storage_bookmark_to_xmpp_bookmark(bookmark_conference()) -> pep_bookmarks_conference().
storage_bookmark_to_xmpp_bookmark(#bookmark_conference{name = Name, autojoin = AutoJoin, nick = Nick, storage_bookmark_to_xmpp_bookmark(#bookmark_conference{name = Name, autojoin = AutoJoin, nick = Nick,
password = Password}) -> password = Password}) ->

4
src/mod_pubsub.erl
View File

@ -3806,7 +3806,9 @@ tree_call({_User, Server, _Resource}, Function, Args) ->
tree_call(Host, Function, Args) -> tree_call(Host, Function, Args) ->
Tree = tree(Host), Tree = tree(Host),
?DEBUG("Tree_call apply(~ts, ~ts, ~p) @ ~ts", [Tree, Function, Args, Host]), ?DEBUG("Tree_call apply(~ts, ~ts, ~p) @ ~ts", [Tree, Function, Args, Host]),
case apply(Tree, Function, Args) of Res = apply(Tree, Function, Args),
Res2 = ejabberd_hooks:run_fold(pubsub_tree_call, Host, Res, [Tree, Function, Args]),
case Res2 of
{error, #stanza_error{}} = Err -> {error, #stanza_error{}} = Err ->
Err; Err;
{error, {virtual, _}} = Err -> {error, {virtual, _}} = Err ->