Skip to content

PEP Native Bookmarks #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacekwegr merged 2 commits into from
Jul 15, 2025
Merged

PEP Native Bookmarks #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5df1f99
Support PEP Native Bookmarks xmlns
chrzaszcz Jul 3, 2025
3f656f4
Support additional attributes in pubsub item retraction
chrzaszcz Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/escalus_xmlns.hrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,9 @@
% Defined by XEP-0333: Chat Markers
-define(NS_CHAT_MARKERS, <<"urn:xmpp:chat-markers:0">>).

% Defined by XEP-0402: PEP Native Bookmarks
-define(NS_PEP_BOOKMARKS, <<"urn:xmpp:bookmarks:1">>).

% Defined by XHTML 1.0.
-define(NS_XHTML, <<"http://www.w3.org/1999/xhtml">>).

Expand Down
13 changes: 7 additions & 6 deletions src/escalus_pubsub_stanza.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
publish/3, publish/4, publish/5,
publish_with_options/4, publish_with_options/5, publish_with_options/6,

retract/4,
retract/5,
get_items/4,
get_all_items/3,
get_item/4,
Expand Down Expand Up @@ -253,9 +253,10 @@ publish_with_options(User, ItemId, ContentElement, Id, {NodeAddr, NodeName}, Pub
Elements = [publish_element(NodeName, ItemElement), PublishOptionsElement],
pubsub_iq(<<"set">>, User, Id, NodeAddr, Elements).

-spec retract(escalus_utils:jid_spec(), binary(), pubsub_node_id(), binary()) -> exml:element().
retract(User, Id, {NodeAddr, NodeName}, ItemId) ->
Elements = [retract_item(NodeName, ItemId)],
-spec retract(escalus_utils:jid_spec(), binary(), pubsub_node_id(), binary(), exml:attrs()) ->
exml:element().
retract(User, Id, {NodeAddr, NodeName}, ItemId, Attrs) ->
Elements = [retract_item(NodeName, ItemId, Attrs)],
pubsub_iq(<<"set">>, User, Id, NodeAddr, Elements).

-spec get_items(escalus_utils:jid_spec(), binary(), pubsub_node_id(), pos_integer()) -> exml:element().
Expand Down Expand Up @@ -392,9 +393,9 @@ item_element(ItemId, ContentElement) ->
attrs = #{<<"id">> => ItemId},
children = maybe_children([ContentElement])}.

retract_item(NodeName, ItemId) ->
retract_item(NodeName, ItemId, Attrs) ->
#xmlel{name = <<"retract">>,
attrs = #{<<"node">> => NodeName},
attrs = Attrs#{<<"node">> => NodeName},
children = [#xmlel{name = <<"item">>,
attrs = #{<<"id">> => ItemId} }]}.

Expand Down