Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

Fix rooms list in WebAdmin (#1753)

Browse Source
This commit is contained in:
Badlop 2017-06-01 19:27:28 +02:00
parent de10a7a8ce
commit f6767ed061
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod_muc_admin.erl
View File

@ -398,7 +398,7 @@ web_page_host(_, Host,
q = Q, q = Q,
lang = Lang} = _Request) -> lang = Lang} = _Request) ->
Sort_query = get_sort_query(Q), Sort_query = get_sort_query(Q),
Res = make_rooms_page(find_host(Host), Lang, Sort_query), Res = make_rooms_page(Host, Lang, Sort_query),
{stop, Res}; {stop, Res};
web_page_host(Acc, _, _) -> Acc. web_page_host(Acc, _, _) -> Acc.
@ -482,11 +482,11 @@ build_info_room({Name, Host, Pid}) ->
History = (S#state.history)#lqueue.queue, History = (S#state.history)#lqueue.queue,
Ts_last_message = Ts_last_message =
case queue:is_empty(History) of case p1_queue:is_empty(History) of
true -> true ->
<<"A long time ago">>; <<"A long time ago">>;
false -> false ->
Last_message1 = queue:last(History), Last_message1 = get_queue_last(History),
{_, _, _, Ts_last, _} = Last_message1, {_, _, _, Ts_last, _} = Last_message1,
xmpp_util:encode_timestamp(Ts_last) xmpp_util:encode_timestamp(Ts_last)
end, end,
@ -500,6 +500,10 @@ build_info_room({Name, Host, Pid}) ->
Just_created, Just_created,
Title}. Title}.
get_queue_last(Queue) ->
List = p1_queue:to_list(Queue),
lists:last(List).
prepare_rooms_infos(Rooms) -> prepare_rooms_infos(Rooms) ->
[prepare_room_info(Room) || Room <- Rooms]. [prepare_room_info(Room) || Room <- Rooms].
prepare_room_info(Room_info) -> prepare_room_info(Room_info) ->
@ -736,11 +740,11 @@ decide_room({_Room_name, _Host, Room_pid}, Last_allowed) ->
History = (S#state.history)#lqueue.queue, History = (S#state.history)#lqueue.queue,
Ts_now = calendar:universal_time(), Ts_now = calendar:universal_time(),
Ts_uptime = uptime_seconds(), Ts_uptime = uptime_seconds(),
{Has_hist, Last} = case queue:is_empty(History) of {Has_hist, Last} = case p1_queue:is_empty(History) of
true -> true ->
{false, Ts_uptime}; {false, Ts_uptime};
false -> false ->
Last_message = queue:last(History), Last_message = get_queue_last(History),
{_, _, _, Ts_last, _} = Last_message, {_, _, _, Ts_last, _} = Last_message,
Ts_diff = Ts_diff =
calendar:datetime_to_gregorian_seconds(Ts_now) calendar:datetime_to_gregorian_seconds(Ts_now)