diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-12-13 09:42:30 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-12-13 09:42:30 +0300 |
| commit | df88d9f2e52ffa11b14ee58f4e16214d3d77cf26 (patch) | |
| tree | d421c0f9db98593ec49a99115b06de68f2563df4 /src/mod_muc_room.erl | |
| parent | include static versions of deps in rebar.config/script (thanks to Holger WeiĆ... (diff) | |
| parent | Let jlib use "B" instead of "w" to format integers (diff) | |
Merge pull request #377 from weiss/new-timestamps
Add timestamps to stanzas resent from stream management queue
Diffstat (limited to 'src/mod_muc_room.erl')
| -rw-r--r-- | src/mod_muc_room.erl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index 0974950b7..95d437bfc 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -2438,24 +2438,21 @@ add_message_to_history(FromNick, FromJID, Packet, StateData) -> false -> false; _ -> true end, - TimeStamp = calendar:now_to_universal_time(now()), + TimeStamp = now(), SenderJid = case (StateData#state.config)#config.anonymous of true -> StateData#state.jid; false -> FromJID end, - TSPacket = xml:append_subtags(Packet, - [jlib:timestamp_to_xml(TimeStamp, utc, - SenderJid, <<"">>), - jlib:timestamp_to_xml(TimeStamp)]), + TSPacket = jlib:add_delay_info(Packet, SenderJid, TimeStamp), SPacket = jlib:replace_from_to(jlib:jid_replace_resource(StateData#state.jid, FromNick), StateData#state.jid, TSPacket), Size = element_size(SPacket), Q1 = lqueue_in({FromNick, TSPacket, HaveSubject, - TimeStamp, Size}, + calendar:now_to_universal_time(TimeStamp), Size}, StateData#state.history), add_to_log(text, {FromNick, Packet}, StateData), StateData#state{history = Q1}. |