Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-02 21:17:12 +02:00
Code Releases Activity

Rename MUC/Sub's namespace

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2016-07-07 16:42:41 +03:00
parent 368b202144
commit 661b041302
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ns.hrl
View File

@ -165,7 +165,7 @@
-define(NS_MIX_NODES_SUBJECT, <<"urn:xmpp:mix:nodes:subject">>). -define(NS_MIX_NODES_SUBJECT, <<"urn:xmpp:mix:nodes:subject">>).
-define(NS_MIX_NODES_CONFIG, <<"urn:xmpp:mix:nodes:config">>). -define(NS_MIX_NODES_CONFIG, <<"urn:xmpp:mix:nodes:config">>).
-define(NS_MUCSUB, <<"urn:xmpp:mucsub:0">>). -define(NS_MUCSUB, <<"urn:xmpp:mucsub:0">>).
-define(NS_MUCSUB_NODES_PRESENCES, <<"urn:xmpp:mucsub:nodes:presences">>). -define(NS_MUCSUB_NODES_PRESENCE, <<"urn:xmpp:mucsub:nodes:presence">>).
-define(NS_MUCSUB_NODES_MESSAGES, <<"urn:xmpp:mucsub:nodes:messages">>). -define(NS_MUCSUB_NODES_MESSAGES, <<"urn:xmpp:mucsub:nodes:messages">>).
-define(NS_MUCSUB_NODES_PARTICIPANTS, <<"urn:xmpp:mucsub:nodes:participants">>). -define(NS_MUCSUB_NODES_PARTICIPANTS, <<"urn:xmpp:mucsub:nodes:participants">>).
-define(NS_MUCSUB_NODES_AFFILIATIONS, <<"urn:xmpp:mucsub:nodes:affiliations">>). -define(NS_MUCSUB_NODES_AFFILIATIONS, <<"urn:xmpp:mucsub:nodes:affiliations">>).

10
src/mod_muc_room.erl
View File

@ -2367,7 +2367,7 @@ send_new_presence1(NJID, Reason, IsInitialPresence, StateData, OldStateData) ->
| StatusEls]}]), | StatusEls]}]),
Node1 = case is_ra_changed(NJID, IsInitialPresence, StateData, OldStateData) of Node1 = case is_ra_changed(NJID, IsInitialPresence, StateData, OldStateData) of
true -> ?NS_MUCSUB_NODES_AFFILIATIONS; true -> ?NS_MUCSUB_NODES_AFFILIATIONS;
false -> ?NS_MUCSUB_NODES_PRESENCES false -> ?NS_MUCSUB_NODES_PRESENCE
end, end,
send_wrapped(jid:replace_resource(StateData#state.jid, Nick), send_wrapped(jid:replace_resource(StateData#state.jid, Nick),
Info#user.jid, Packet, Node1, StateData), Info#user.jid, Packet, Node1, StateData),
@ -2445,7 +2445,7 @@ send_existing_presences1(ToJID, StateData) ->
= =
[]}]}]), []}]}]),
send_wrapped(jid:replace_resource(StateData#state.jid, FromNick), send_wrapped(jid:replace_resource(StateData#state.jid, FromNick),
RealToJID, Packet, ?NS_MUCSUB_NODES_PRESENCES, StateData) RealToJID, Packet, ?NS_MUCSUB_NODES_PRESENCE, StateData)
end end
end, end,
(?DICT):to_list(StateData#state.nicks)). (?DICT):to_list(StateData#state.nicks)).
@ -2581,7 +2581,7 @@ send_nick_changing(JID, OldNick, StateData,
send_wrapped(jid:replace_resource(StateData#state.jid, send_wrapped(jid:replace_resource(StateData#state.jid,
OldNick), OldNick),
Info#user.jid, Packet1, Info#user.jid, Packet1,
?NS_MUCSUB_NODES_PRESENCES, ?NS_MUCSUB_NODES_PRESENCE,
StateData); StateData);
true -> ok true -> ok
end, end,
@ -2589,7 +2589,7 @@ send_nick_changing(JID, OldNick, StateData,
send_wrapped(jid:replace_resource(StateData#state.jid, send_wrapped(jid:replace_resource(StateData#state.jid,
Nick), Nick),
Info#user.jid, Packet2, Info#user.jid, Packet2,
?NS_MUCSUB_NODES_PRESENCES, ?NS_MUCSUB_NODES_PRESENCE,
StateData); StateData);
true -> ok true -> ok
end; end;
@ -4642,7 +4642,7 @@ get_subscription_nodes(#xmlel{name = <<"iq">>} = Packet) ->
lists:flatmap( lists:flatmap(
fun(#xmlel{name = <<"event">>, attrs = Attrs}) -> fun(#xmlel{name = <<"event">>, attrs = Attrs}) ->
Node = fxml:get_attr_s(<<"node">>, Attrs), Node = fxml:get_attr_s(<<"node">>, Attrs),
case lists:member(Node, [?NS_MUCSUB_NODES_PRESENCES, case lists:member(Node, [?NS_MUCSUB_NODES_PRESENCE,
?NS_MUCSUB_NODES_MESSAGES, ?NS_MUCSUB_NODES_MESSAGES,
?NS_MUCSUB_NODES_AFFILIATIONS, ?NS_MUCSUB_NODES_AFFILIATIONS,
?NS_MUCSUB_NODES_SUBJECT, ?NS_MUCSUB_NODES_SUBJECT,