Improve <delay/> tag insertion

diff --git a/src/mod_offline.erl b/src/mod_offline.erl
index 75f16f5bf57668d03dba49c4fbd205b51be6b763..432214f2ed8609de6efaa91b09c10affc3de96b4 100644 (file)
--- a/src/mod_offline.erl
+++ b/src/mod_offline.erl
@@ -842,10 +842,12 @@ count_offline_messages(User, Server) ->
 
 -spec add_delay_info(message(), binary(),
                     undefined | erlang:timestamp()) -> message().
-add_delay_info(Packet, _LServer, undefined) ->
-    Packet;
-add_delay_info(Packet, LServer, {_, _, _} = TS) ->
-    xmpp_util:add_delay_info(Packet, jid:make(LServer), TS,
+add_delay_info(Packet, LServer, TS) ->
+    NewTS = case TS of
+               undefined -> p1_time_compat:timestamp();
+               _ -> TS
+           end,
+    xmpp_util:add_delay_info(Packet, jid:make(LServer), NewTS,
                             <<"Offline storage">>).
 
 export(LServer) ->