Remove now() - part 1

1 files changed, 9 insertions, 14 deletions

diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
index cb85f296..38fed6ea 100644
--- a/src/mod_muc_room.erl
+++ b/src/mod_muc_room.erl
@@ -149,7 +149,7 @@ normal_state({route, From, <<"">>,
 	  case xml:get_attr_s(<<"type">>, Attrs) of
 	    <<"groupchat">> ->
 		Activity = get_user_activity(From, StateData),
-		Now = now_to_usec(now()),
+		Now = p1_time_compat:system_time(micro_seconds),
 		MinMessageInterval =
 		    trunc(gen_mod:get_module_opt(StateData#state.server_host,
 						 mod_muc, min_message_interval, fun(MMI) when is_number(MMI) -> MMI end, 0)
@@ -288,7 +288,7 @@ normal_state({route, From, <<"">>,
 						(StateData#state.config)#config.voice_request_min_interval,
 					    BareFrom =
 						jid:remove_resource(jid:tolower(From)),
-					    NowPriority = -now_to_usec(now()),
+					    NowPriority = -p1_time_compat:system_time(micro_seconds),
 					    CleanPriority = NowPriority +
 							      MinInterval *
 								1000000,
@@ -472,7 +472,7 @@ normal_state({route, From, Nick,
 	      #xmlel{name = <<"presence">>} = Packet},
 	     StateData) ->
     Activity = get_user_activity(From, StateData),
-    Now = now_to_usec(now()),
+    Now = p1_time_compat:system_time(micro_seconds),
     MinPresenceInterval =
 	trunc(gen_mod:get_module_opt(StateData#state.server_host,
 				     mod_muc, min_presence_interval,
@@ -1526,7 +1526,7 @@ store_user_activity(JID, UserActivity, StateData) ->
 				     0)
 	      * 1000),
     Key = jid:tolower(JID),
-    Now = now_to_usec(now()),
+    Now = p1_time_compat:system_time(micro_seconds),
     Activity1 = clean_treap(StateData#state.activity,
 			    {1, -Now}),
     Activity = case treap:lookup(Key, Activity1) of
@@ -1997,9 +1997,8 @@ count_stanza_shift(Nick, Els, StateData) ->
     Shift1 = case Seconds of
 	       false -> 0;
 	       _ ->
-		   Sec =
-		       calendar:datetime_to_gregorian_seconds(calendar:now_to_universal_time(now()))
-			 - Seconds,
+		   Sec = calendar:datetime_to_gregorian_seconds(calendar:universal_time())
+                         - Seconds,
 		   count_seconds_shift(Sec, HL)
 	     end,
     MaxStanzas = extract_history(Els, <<"maxstanzas">>),
@@ -2284,9 +2283,6 @@ send_existing_presences1(ToJID, StateData) ->
 		  end,
 		  (?DICT):to_list(StateData#state.nicks)).
 
-now_to_usec({MSec, Sec, USec}) ->
-    (MSec * 1000000 + Sec) * 1000000 + USec.
-
 change_nick(JID, Nick, StateData) ->
     LJID = jid:tolower(JID),
     {ok, #user{nick = OldNick}} = (?DICT):find(LJID,
@@ -2454,7 +2450,7 @@ add_message_to_history(FromNick, FromJID, Packet, StateData) ->
 		    false -> false;
 		    _ -> true
 		  end,
-    TimeStamp = now(),
+    TimeStamp = p1_time_compat:timestamp(),
     AddrPacket = case (StateData#state.config)#config.anonymous of
 		   true -> Packet;
 		   false ->
@@ -4518,7 +4514,7 @@ handle_roommessage_from_nonparticipant(Packet, Lang,
 
 %% Check in the packet is a decline.
 %% If so, also returns the splitted packet.
-%% This function must be catched, 
+%% This function must be catched,
 %% because it crashes when the packet is not a decline message.
 check_decline_invitation(Packet) ->
     #xmlel{name = <<"message">>} = Packet,
@@ -4546,7 +4542,7 @@ send_decline_invitation({Packet, XEl, DEl, ToJID},
     Packet2 = replace_subelement(Packet, XEl2),
     ejabberd_router:route(RoomJID, ToJID, Packet2).
 
-%% Given an element and a new subelement, 
+%% Given an element and a new subelement,
 %% replace the instance of the subelement in element with the new subelement.
 replace_subelement(#xmlel{name = Name, attrs = Attrs,
 			  children = SubEls},
@@ -4630,4 +4626,3 @@ has_body_or_subject(Packet) ->
 	(#xmlel{name = <<"subject">>}) -> false;
 	(_) -> true
     end, Packet#xmlel.children).
-