mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-22 17:28:25 +01:00
Add MAM (XEP-0313) v0.4 support
This commit is contained in:
parent
e57c1896f7
commit
70b1dc479c
@ -143,6 +143,7 @@
|
|||||||
-define(NS_BOB, <<"urn:xmpp:bob">>).
|
-define(NS_BOB, <<"urn:xmpp:bob">>).
|
||||||
-define(NS_MAM_TMP, <<"urn:xmpp:mam:tmp">>).
|
-define(NS_MAM_TMP, <<"urn:xmpp:mam:tmp">>).
|
||||||
-define(NS_MAM_0, <<"urn:xmpp:mam:0">>).
|
-define(NS_MAM_0, <<"urn:xmpp:mam:0">>).
|
||||||
|
-define(NS_MAM_1, <<"urn:xmpp:mam:1">>).
|
||||||
-define(NS_PING, <<"urn:xmpp:ping">>).
|
-define(NS_PING, <<"urn:xmpp:ping">>).
|
||||||
-define(NS_CARBONS_2, <<"urn:xmpp:carbons:2">>).
|
-define(NS_CARBONS_2, <<"urn:xmpp:carbons:2">>).
|
||||||
-define(NS_CARBONS_1, <<"urn:xmpp:carbons:1">>).
|
-define(NS_CARBONS_1, <<"urn:xmpp:carbons:1">>).
|
||||||
|
@ -75,6 +75,10 @@ start(Host, Opts) ->
|
|||||||
?NS_MAM_0, ?MODULE, process_iq_v0_3, IQDisc),
|
?NS_MAM_0, ?MODULE, process_iq_v0_3, IQDisc),
|
||||||
gen_iq_handler:add_iq_handler(ejabberd_sm, Host,
|
gen_iq_handler:add_iq_handler(ejabberd_sm, Host,
|
||||||
?NS_MAM_0, ?MODULE, process_iq_v0_3, IQDisc),
|
?NS_MAM_0, ?MODULE, process_iq_v0_3, IQDisc),
|
||||||
|
gen_iq_handler:add_iq_handler(ejabberd_local, Host,
|
||||||
|
?NS_MAM_1, ?MODULE, process_iq_v0_3, IQDisc),
|
||||||
|
gen_iq_handler:add_iq_handler(ejabberd_sm, Host,
|
||||||
|
?NS_MAM_1, ?MODULE, process_iq_v0_3, IQDisc),
|
||||||
ejabberd_hooks:add(user_receive_packet, Host, ?MODULE,
|
ejabberd_hooks:add(user_receive_packet, Host, ?MODULE,
|
||||||
user_receive_packet, 500),
|
user_receive_packet, 500),
|
||||||
ejabberd_hooks:add(user_send_packet, Host, ?MODULE,
|
ejabberd_hooks:add(user_send_packet, Host, ?MODULE,
|
||||||
@ -123,6 +127,8 @@ stop(Host) ->
|
|||||||
gen_iq_handler:remove_iq_handler(ejabberd_sm, Host, ?NS_MAM_TMP),
|
gen_iq_handler:remove_iq_handler(ejabberd_sm, Host, ?NS_MAM_TMP),
|
||||||
gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_MAM_0),
|
gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_MAM_0),
|
||||||
gen_iq_handler:remove_iq_handler(ejabberd_sm, Host, ?NS_MAM_0),
|
gen_iq_handler:remove_iq_handler(ejabberd_sm, Host, ?NS_MAM_0),
|
||||||
|
gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_MAM_1),
|
||||||
|
gen_iq_handler:remove_iq_handler(ejabberd_sm, Host, ?NS_MAM_1),
|
||||||
ejabberd_hooks:delete(remove_user, Host, ?MODULE,
|
ejabberd_hooks:delete(remove_user, Host, ?MODULE,
|
||||||
remove_user, 50),
|
remove_user, 50),
|
||||||
ejabberd_hooks:delete(anonymous_purge_hook, Host,
|
ejabberd_hooks:delete(anonymous_purge_hook, Host,
|
||||||
@ -716,7 +722,7 @@ send(From, To, Msgs, RSM, Count, IsComplete, #iq{sub_el = SubEl} = IQ) ->
|
|||||||
end,
|
end,
|
||||||
CompleteAttr = if NS == ?NS_MAM_TMP ->
|
CompleteAttr = if NS == ?NS_MAM_TMP ->
|
||||||
[];
|
[];
|
||||||
NS == ?NS_MAM_0 ->
|
NS == ?NS_MAM_0; NS == ?NS_MAM_1 ->
|
||||||
[{<<"complete">>, jlib:atom_to_binary(IsComplete)}]
|
[{<<"complete">>, jlib:atom_to_binary(IsComplete)}]
|
||||||
end,
|
end,
|
||||||
Els = lists:map(
|
Els = lists:map(
|
||||||
@ -728,14 +734,13 @@ send(From, To, Msgs, RSM, Count, IsComplete, #iq{sub_el = SubEl} = IQ) ->
|
|||||||
children = [El]}]}
|
children = [El]}]}
|
||||||
end, Msgs),
|
end, Msgs),
|
||||||
RSMOut = make_rsm_out(Msgs, RSM, Count, QIDAttr ++ CompleteAttr, NS),
|
RSMOut = make_rsm_out(Msgs, RSM, Count, QIDAttr ++ CompleteAttr, NS),
|
||||||
case NS of
|
if NS == ?NS_MAM_TMP; NS == ?NS_MAM_1 ->
|
||||||
?NS_MAM_TMP ->
|
|
||||||
lists:foreach(
|
lists:foreach(
|
||||||
fun(El) ->
|
fun(El) ->
|
||||||
ejabberd_router:route(To, From, El)
|
ejabberd_router:route(To, From, El)
|
||||||
end, Els),
|
end, Els),
|
||||||
IQ#iq{type = result, sub_el = RSMOut};
|
IQ#iq{type = result, sub_el = RSMOut};
|
||||||
?NS_MAM_0 ->
|
NS == ?NS_MAM_0 ->
|
||||||
ejabberd_router:route(
|
ejabberd_router:route(
|
||||||
To, From, jlib:iq_to_xml(IQ#iq{type = result, sub_el = []})),
|
To, From, jlib:iq_to_xml(IQ#iq{type = result, sub_el = []})),
|
||||||
lists:foreach(
|
lists:foreach(
|
||||||
|
Loading…
Reference in New Issue
Block a user