Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Remove now() calls that sneaked in in pull requests

This commit is contained in:
Paweł Chmielowski 2019-02-26 18:48:46 +01:00
parent 0c0862475f
commit 77ac0584ed
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mod_muc_room.hrl
View File

@ -113,7 +113,7 @@
history :: lqueue(), history :: lqueue(),
subject = [] :: [text()], subject = [] :: [text()],
subject_author = <<"">> :: binary(), subject_author = <<"">> :: binary(),
just_created = misc:now_to_usec(now()) :: true | integer(), just_created = p1_time_compat:os_system_time(micro_seconds) :: true | integer(),
activity = treap:empty() :: treap:treap(), activity = treap:empty() :: treap:treap(),
room_shaper = none :: shaper:shaper(), room_shaper = none :: shaper:shaper(),
room_queue :: p1_queue:queue() | undefined room_queue :: p1_queue:queue() | undefined

2
src/mod_muc_admin.erl
View File

@ -819,7 +819,7 @@ decide_room(unused, {_Room_name, _Host, Room_pid}, ServerHost, Last_allowed) ->
true when (HistorySize == 0) or (JustCreated == true) -> true when (HistorySize == 0) or (JustCreated == true) ->
{false, 0}; {false, 0};
true -> true ->
Ts_diff = (misc:now_to_usec(now()) Ts_diff = (p1_time_compat:os_system_time(micro_seconds)
- S#state.just_created) div 1000000, - S#state.just_created) div 1000000,
{false, Ts_diff}; {false, Ts_diff};
false -> false ->

2
src/mod_muc_room.erl
View File

@ -1960,7 +1960,7 @@ add_new_user(From, Nick, Packet, StateData) ->
ResultState = ResultState =
case NewStateData#state.just_created of case NewStateData#state.just_created of
true -> true ->
NewStateData#state{just_created = misc:now_to_usec(now())}; NewStateData#state{just_created = p1_time_compat:os_system_time(micro_seconds)};
_ -> _ ->
Robots = maps:remove(From, StateData#state.robots), Robots = maps:remove(From, StateData#state.robots),
NewStateData#state{robots = Robots} NewStateData#state{robots = Robots}