Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/StaticData.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public function __construct(
private DatabaseStatistics $databaseStatistics,
private ShareStatistics $shareStatistics,
private SessionStatistics $sessionStatistics,
private SubscriptionStatistics $subscriptionStatistics,
private SystemStatistics $systemStatistics,
private IAppConfig $appConfig,
private OsStatusService $osStatus,
Expand Down Expand Up @@ -69,6 +70,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),
Expand Down
37 changes: 37 additions & 0 deletions lib/SubscriptionStatistics.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?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 {
public function __construct(

Check failure on line 16 in lib/SubscriptionStatistics.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

PossiblyUnusedMethod

lib/SubscriptionStatistics.php:16:18: PossiblyUnusedMethod: Cannot find any calls to method OCA\ServerInfo\SubscriptionStatistics::__construct (see https://psalm.dev/087)
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;
}
}
10 changes: 8 additions & 2 deletions src/components/ActiveUsersSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 1 addition & 0 deletions src/composables/useStaticData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,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
Expand Down
2 changes: 1 addition & 1 deletion src/views/StatusView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,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" />
Expand Down
Loading