mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 14:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_admin_shell: Optionally group session listings by host when not included as column

Browse source 
Similar to the earlier view
This commit is contained in:
Kim Alvefur 2021-11-10 15:54:27 +01:00
parent 29535c322a
commit aef0454598
1 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

36
plugins/mod_admin_shell.lua
View file

@ -833,9 +833,24 @@ function def_env.c2s:show(match_jid, colspec)
return (not match_jid) or jid:match(match_jid)
end
print(row());
local group_by_host = true;
for _, col in ipairs(columns) do
if col.key == "full_jid" or col.key == "host" then
group_by_host = false;
break
end
end
if not group_by_host then print(row()); end
local currenthost = nil;
for _, session in ipairs(get_c2s():filter(match):sort(_sort_by_jid)) do
if group_by_host and session.host ~= currenthost then
currenthost = session.host;
print("#",prosody.hosts[currenthost] or "Unknown host");
print(row());
end
print(row(session));
end
return true;
@ -894,11 +909,26 @@ function def_env.s2s:show(match_jid, colspec)
return not match_jid or (host or ""):match(match_jid) or (remote or ""):match(match_jid);
end
local group_by_host = true;
local currenthost = nil;
for _, col in ipairs(columns) do
if col.key == "host" then
group_by_host = false;
break
end
end
if not group_by_host then print(row()); end
local s2s_sessions = array(iterators.values(module:shared"/*/s2s/sessions")):filter(match):sort(_sort_s2s);
print(row());
for _, session in ipairs(s2s_sessions) do
if group_by_host and currenthost ~= get_s2s_hosts(session) then
currenthost = get_s2s_hosts(session);
print("#",prosody.hosts[currenthost] or "Unknown host");
print(row());
end
print(row(session));
end
return true; -- TODO counts