diff options
Diffstat (limited to 'src/mod_offline.erl')
| -rw-r--r-- | src/mod_offline.erl | 78 |
1 files changed, 21 insertions, 57 deletions
diff --git a/src/mod_offline.erl b/src/mod_offline.erl index 91d31a75d..4ac3f18f8 100644 --- a/src/mod_offline.erl +++ b/src/mod_offline.erl @@ -215,26 +215,15 @@ store_offline_msg(Host, {User, _Server}, Msgs, Len, MaxOfflineMsgs, odbc) -> ejabberd_odbc:escape((M#offline_msg.to)#jid.luser), From = M#offline_msg.from, To = M#offline_msg.to, - #xmlel{name = Name, attrs = Attrs, - children = Els} = - M#offline_msg.packet, - Attrs2 = - jlib:replace_from_to_attrs(jlib:jid_to_string(From), - jlib:jid_to_string(To), - Attrs), - Packet = #xmlel{name = Name, - attrs = Attrs2, - children = - Els ++ - [jlib:timestamp_to_xml(calendar:now_to_universal_time(M#offline_msg.timestamp), - utc, - jlib:make_jid(<<"">>, - Host, - <<"">>), - <<"Offline Storage">>), - jlib:timestamp_to_xml(calendar:now_to_universal_time(M#offline_msg.timestamp))]}, + Packet = + jlib:replace_from_to(From, To, + M#offline_msg.packet), + NewPacket = + jlib:add_delay_info(Packet, Host, + M#offline_msg.timestamp, + <<"Offline Storage">>), XML = - ejabberd_odbc:escape(xml:element_to_binary(Packet)), + ejabberd_odbc:escape(xml:element_to_binary(NewPacket)), odbc_queries:add_spool_sql(Username, XML) end, Msgs), @@ -432,15 +421,12 @@ resend_offline_messages(User, Server) -> case mnesia:transaction(F) of {atomic, Rs} -> lists:foreach(fun (R) -> - #xmlel{name = Name, attrs = Attrs, - children = Els} = - R#offline_msg.packet, ejabberd_sm ! {route, R#offline_msg.from, R#offline_msg.to, - #xmlel{name = Name, attrs = Attrs, - children = - Els ++ - [jlib:timestamp_to_xml(calendar:now_to_universal_time(R#offline_msg.timestamp))]}} + jlib:add_delay_info(R#offline_msg.packet, + LServer, + R#offline_msg.timestamp, + <<"Offline Storage">>)} end, lists:keysort(#offline_msg.timestamp, Rs)); _ -> ok @@ -686,19 +672,9 @@ get_offline_els(LUser, LServer, odbc) -> end. offline_msg_to_route(LServer, #offline_msg{} = R) -> - El = #xmlel{children = Els} = R#offline_msg.packet, {route, R#offline_msg.from, R#offline_msg.to, - El#xmlel{children = - Els ++ - [jlib:timestamp_to_xml( - calendar:now_to_universal_time( - R#offline_msg.timestamp), - utc, - jlib:make_jid(<<"">>, LServer, <<"">>), - <<"Offline Storage">>), - jlib:timestamp_to_xml( - calendar:now_to_universal_time( - R#offline_msg.timestamp))]}}; + jlib:add_delay_info(R#offline_msg.packet, LServer, R#offline_msg.timestamp, + <<"Offline Storage">>)}; offline_msg_to_route(_LServer, #xmlel{} = El) -> To = jlib:string_to_jid(xml:get_tag_attr_s(<<"to">>, El)), From = jlib:string_to_jid(xml:get_tag_attr_s(<<"from">>, El)), @@ -1109,26 +1085,14 @@ export(_Server) -> packet = Packet}) when LServer == Host -> Username = ejabberd_odbc:escape(LUser), - #xmlel{name = Name, attrs = Attrs, children = Els} = - Packet, - Attrs2 = - jlib:replace_from_to_attrs(jlib:jid_to_string(From), - jlib:jid_to_string(To), - Attrs), - NewPacket = #xmlel{name = Name, attrs = Attrs2, - children = - Els ++ - [jlib:timestamp_to_xml( - calendar:now_to_universal_time(TimeStamp), - utc, - jlib:make_jid(<<"">>, - LServer, - <<"">>), - <<"Offline Storage">>), - jlib:timestamp_to_xml( - calendar:now_to_universal_time(TimeStamp))]}, + Packet1 = + jlib:replace_from_to(jlib:jid_to_string(From), + jlib:jid_to_string(To), Packet), + Packet2 = + jlib:add_delay_info(Packet1, LServer, TimeStamp, + <<"Offline Storage">>), XML = - ejabberd_odbc:escape(xml:element_to_binary(NewPacket)), + ejabberd_odbc:escape(xml:element_to_binary(Packet2)), [[<<"delete from spool where username='">>, Username, <<"';">>], [<<"insert into spool(username, xml) values ('">>, Username, <<"', '">>, XML, <<"');">>]]; |