From 381d1d85735a9fdae2468dfc6d1ddc1bee6b7d80 Mon Sep 17 00:00:00 2001
From: Bastiaan <17990055+bbassie@users.noreply.github.com>
Date: Wed, 11 Nov 2026 18:42:16 +0100
Subject: [PATCH] Show online player count on the instance list (#1196)

Counts users per instance from the shared users subscription, the same
data the instance page's online players list reads, so the table adds
no per-row requests. The column is sortable and hidden without
core.user.subscribe.

Fixes #1193

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../web_ui/src/components/InstanceList.tsx    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/web_ui/src/components/InstanceList.tsx b/packages/web_ui/src/components/InstanceList.tsx
index bd54f153..0dc5baee 100644
--- a/packages/web_ui/src/components/InstanceList.tsx
+++ b/packages/web_ui/src/components/InstanceList.tsx
@@ -7,6 +7,7 @@ import type { ColumnType } from "antd/es/table/interface";
 import { useAccount } from "../model/account";
 import { useSystems } from "../model/system";
 import { useHosts } from "../model/host";
+import { useUsers } from "../model/user";
 import { useDefaultModPack, useModPacks } from "../model/mod_pack";
 import { RestartRequired } from "./system_metrics";
 import InstanceStatusTag from "./InstanceStatusTag";
@@ -33,6 +34,17 @@ export default function InstanceList(props: InstanceListProps) {
 	const [systems] = useSystems();
 	const [modPacks] = useModPacks();
 	const defaultModPack = useDefaultModPack();
+	const [users] = useUsers();
+	const canUsers = account.hasPermission("core.user.subscribe");
+	const onlineCounts = React.useMemo(() => {
+		const counts = new Map<number, number>();
+		for (const user of users.values()) {
+			for (const instanceId of user.instances ?? []) {
+				counts.set(instanceId, (counts.get(instanceId) ?? 0) + 1);
+			}
+		}
+		return counts;
+	}, [users]);
 	const tableState = useTableQueryState<lib.InstanceDetails>({
 		namespace: "instance", defaultSortKey: "name",
 	});
@@ -146,6 +158,18 @@ export default function InstanceList(props: InstanceListProps) {
 		},
 	];
 
+	if (canUsers) {
+		const playerCount = (instance: lib.InstanceDetails) => onlineCounts.get(instance.id) ?? 0;
+		columns.push({
+			title: "Players",
+			key: "players",
+			render: (_, instance) => playerCount(instance),
+			sorter: (a, b) => playerCount(a) - playerCount(b),
+			sortOrder: tableState.sortOrder("players"),
+			responsive: ["md"],
+		});
+	}
+
 	if (account.hasAnyPermission(...InstanceControlButtonPermissions)) {
 		columns.push({
 			key: "action",