Skip to content

Pubsub fixes #290

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
prefiks merged 1 commit into from
Mar 17, 2022
Merged

Pubsub fixes #290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 21 additions & 1 deletion src/tsung/ts_jabber_common.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,9 @@ get_message(Jabber=#jabber{type = 'raw'}) ->
get_message(#jabber{type = 'pubsub:create', username=Username, node=Node, node_type=NodeType,
data = Data, pubsub_service = PubSubComponent, domain = Domain}) ->
create_pubsub_node(Domain, PubSubComponent, Username, Node, NodeType, Data);
get_message(#jabber{type = 'pubsub:delete', username=Username, node=Node,
pubsub_service = PubSubComponent, domain = Domain}) ->
delete_pubsub_node(Domain, PubSubComponent, Username, Node);
%% For node subscription, data contain the pubsub nodename (relative to user
%% hierarchy or absolute)
get_message(#jabber{type = 'pubsub:subscribe', id=Id, username=UserFrom, user_server=UserServer,
Expand Down Expand Up @@ -645,6 +648,23 @@ pubsub_node_type(undefined) ->
pubsub_node_type(Type) when is_list(Type) ->
[" type='", Type, "' "].

pubsub_subid(undefined) -> "";
pubsub_subid(SubId) when is_list(SubId) ->
[" subid='", SubId, "' "].

%%%----------------------------------------------------------------------
%%% Func: delete_pubsub_node/4
%%% Delete a pubsub node: Generate XML packet
%%% Nodenames are relative to the User pubsub hierarchy (ejabberd); they are
%%% absolute with leading slash.
%%%----------------------------------------------------------------------
delete_pubsub_node(Domain, PubSubComponent,Username, Node) ->
list_to_binary(["<iq to='", PubSubComponent, "' type='set' id='",
ts_msg_server:get_id(list),"'>"
"<pubsub xmlns='http://jabber.org/protocol/pubsub#owner'>"
"<delete", pubsub_node_attr(Node, Domain, Username),
"/></pubsub></iq>"]).

%%%----------------------------------------------------------------------
%%% Func: subscribe_pubsub_node/4
%%% Subscribe to a pubsub node: Generate XML packet
Expand Down Expand Up @@ -677,7 +697,7 @@ unsubscribe_pubsub_node(Domain, PubSubComponent, UserFrom, UserTo, Node, SubId)
"<unsubscribe",
pubsub_node_attr(Node, Domain, UserTo),
" jid='", UserFrom, "@", Domain, "'",
" subid='", SubId, "'",
pubsub_subid(SubId),
"/>",
"</pubsub>",
"</iq>"]).
Expand Down