cs2/simpleadmin-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Staff playtime figures on the staff panel only

Browse source 
Signed-in staff now see the public Playtime page and player drawers as
everyone else does; the staff panels, names, sessions and locations stay
on /admin#playtime and its drawers. The public API no longer sends them.
This commit is contained in:
Astra 2026-10-05 12:35:14 +01:00
parent ba61708bed
commit 9aeea45130
5 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/web/assets/admin.js
View file

@ -944,7 +944,7 @@ async function act(path, method, body) {
/* ---------- Routing & events ---------- */
const playtime = () => ptPage(state.me, () => state.page === "playtime");
const playtime = () => ptPage(state.me, () => state.page === "playtime", true);
const RENDER = { overview, players, bans, comms, playtime, staff, verify, settings, notifications };

14
internal/web/assets/playtime.js
View file

@ -1,6 +1,7 @@
// Playtime from PlaytimeHistory, shared by the public site and the staff panel: the Playtime page
// and the Playtime sections of a player's drawer. Staff with @css/generic (me.playtimeStaff) also
// get the staff-only figures, on either site. Needs common.js.
// and the Playtime sections of a player's drawer. On the staff panel, staff with @css/generic
// (me.playtimeStaff) also get the staff-only figures; the public site shows everyone the same.
// Needs common.js.
const PT_TZ = (() => { try { return Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC"; } catch { return "UTC"; } })();
const PT_PERIODS = [["7d", "Last 7 days"], ["30d", "Last 30 days"], ["all", "All time"]];
@ -266,11 +267,12 @@ function ptStaffPanels(a) {
/* ---------- Page ---------- */
// ptPage draws the Playtime page into #view: the staff panels first when this viewer may see them,
// then the public ones. isCurrent says whether the user is still on the page when data arrives.
async function ptPage(me, isCurrent) {
// ptPage draws the Playtime page into #view: with staff (the staff panel, for staff who may see
// them), the staff panels first, then the public ones. isCurrent says whether the user is still on
// the page when data arrives.
async function ptPage(me, isCurrent, staffPanels = false) {
const v = $("#view");
const staff = !!me?.playtimeStaff;
const staff = staffPanels && !!me?.playtimeStaff;
v.innerHTML = `
<div class="page-head"><div><h1>Playtime</h1></div></div>
${staff ? `<div id="pt-staff">${loading()}</div><h2 class="crew-sep">${me.playtime === "on" ? "On the public site" : ""}</h2>` : ""}

6
internal/web/assets/public.js
View file

@ -1,11 +1,11 @@
// Public, read-only site: the live server, bans, gags/mutes, staff with their rank changes, and
// playtime (playtime.js). The API leaves out who issued penalties and IPs; nothing here can change
// anything. Signed-in staff with @css/generic also see staff playtime figures here.
// anything. Signed-in staff see the same as everyone; their extras are on the staff panel.
const PAGES = [
{ id: "server", label: "Server" },
// Once PlaytimeHistory has recorded something, or for staff who see its staff figures.
{ id: "playtime", label: "Playtime", show: () => state.me?.playtime === "on" || !!state.me?.playtimeStaff },
// Once PlaytimeHistory has recorded something. Staff figures are on the staff panel only.
{ id: "playtime", label: "Playtime", show: () => state.me?.playtime === "on" },
{ id: "bans", label: "Bans" },
{ id: "comms", label: "Gags & Mutes" },
{ id: "staff", label: "Staff" },

10
internal/web/public.go
View file

@ -292,13 +292,9 @@ func (s *Server) publicPlayer(w http.ResponseWriter, r *http.Request) {
"steamid": steamid, "name": d.Name, "online": online, "rank": s.rankOf(x, steamid),
"bans": toPublic(bans), "comms": toPublic(comms),
}
// Signed-in staff get the staff playtime figures here too, as on the staff panel.
id, _, err := s.identity(r)
if err != nil {
internal(w, r, err)
return
}
if pt := s.playerPlaytime(r, steamid, s.ptStaff(r.Context(), id)); pt != nil {
// Everyone gets the public playtime here, signed-in staff included; the staff figures are on
// the staff panel only.
if pt := s.playerPlaytime(r, steamid, false); pt != nil {
resp["playtime"] = pt
}
writeJSON(w, http.StatusOK, resp)