[stable35] Use subscription count when support app is enabled

lib/StaticData.php

@@ -25,6 +25,7 @@ public function __construct(
 		private DatabaseStatistics $databaseStatistics,
 		private ShareStatistics $shareStatistics,
 		private SessionStatistics $sessionStatistics,
+		private SubscriptionStatistics $subscriptionStatistics,
 		private SystemStatistics $systemStatistics,
 		private IAppConfig $appConfig,
 	) {
@@ -66,6 +67,7 @@ public function getData(): array {
 			'fpm' => $this->fpmStatistics->getFpmStatistics(),
 			'database' => $this->databaseStatistics->getDatabaseStatistics(),
 			'activeUsers' => $this->sessionStatistics->getSessionStatistics(),
+			'subscriptionUsers' => $this->subscriptionStatistics->getSubscriptionUsers(),
 			'freeSpace' => $this->systemStatistics->getFreeSpace(),
 			'memTotal' => $memory->getMemTotal(),
 			'phpinfo' => $this->appConfig->getAppValueBool('phpinfo', false),

lib/SubscriptionStatistics.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\ServerInfo;
+
+use OCP\App\IAppManager;
+use OCP\IAppConfig;
+
+class SubscriptionStatistics {
+	/** @psalm-api */
+	public function __construct(
+		private IAppManager $appManager,
+		private IAppConfig $appConfig,
+	) {
+	}
+
+	/**
+	 * Number of users covered by the subscription registered in the support app,
+	 * or null when the support app is disabled or the subscription has no user limit.
+	 */
+	public function getSubscriptionUsers(): ?int {
+		if (!$this->appManager->isEnabledForAnyone('support')) {
+			return null;
+		}
+
+		// Last subscription info fetched by the support app, no public API exposes it
+		$subscriptionInfo = $this->appConfig->getValueArray('support', 'last_response', lazy: true);
+		$amountOfUsers = (int)($subscriptionInfo['amountOfUsers'] ?? 0);
+
+		return $amountOfUsers > 0 ? $amountOfUsers : null;
+	}
+}

src/components/ActiveUsersSection.vue

@@ -45,15 +45,21 @@ import SectionHeading from './SectionHeading.vue'
 const props = defineProps<{
 	activeUsers: { last1hour: number, last24hours: number, last7days: number, last1month: number, total: number }
 	numUsers: number
+	subscriptionUsers: number | null
 }>()
 
 /**
- * Format the active-user count as its share of all users, e.g. "3% of all users".
+ * Format the active-user count as its share of the subscription quota when one is known,
+ * otherwise of all users, e.g. "3% of all users".
  *
  * @param count number of active users in the period
  */
 function percentageOfAllUsers(count: number): string {
-	const percentage = props.numUsers === 0 ? 0 : Math.round(count * 1000 / props.numUsers) / 10
+	const total = props.subscriptionUsers ?? props.numUsers
+	const percentage = total === 0 ? 0 : Math.round(count * 1000 / total) / 10
+	if (props.subscriptionUsers !== null) {
+		return t('serverinfo', '{0}% of your subscription quota', [String(percentage)])
+	}
 	return t('serverinfo', '{0}% of all users', [String(percentage)])
 }
 </script>

src/composables/useStaticData.ts

@@ -50,6 +50,7 @@ export interface StaticData {
 	fpm: Record<string, string | number> | false
 	database: { type: string, version: string, size: number }
 	activeUsers: { last1hour: number, last24hours: number, last7days: number, last1month: number, total: number }
+	subscriptionUsers: number | null
 	freeSpace: number | null
 	memTotal: number
 	phpinfo: boolean

src/views/StatusView.vue

@@ -61,7 +61,7 @@
 			<NetworkSection :networkinfo="staticData.networkinfo" :interfaces="staticData.networkinterfaces" />
 
 			<!-- Active users -->
-			<ActiveUsersSection :activeUsers="staticData.activeUsers" :numUsers="staticData.storage.num_users" />
+			<ActiveUsersSection :activeUsers="staticData.activeUsers" :numUsers="staticData.storage.num_users" :subscriptionUsers="staticData.subscriptionUsers" />
 
 			<!-- Shares -->
 			<SharesSection v-if="staticData.shares.num_shares > 0" :shares="staticData.shares" />