Merge pull request #11301 from misskey-dev/develop

Release: 13.14.0

1 files changed, 19 insertions, 0 deletions

diff --git a/packages/backend/src/server/api/endpoints/server-info.ts b/packages/backend/src/server/api/endpoints/server-info.ts
index 1620e8ae52..552441e430 100644
--- a/packages/backend/src/server/api/endpoints/server-info.ts
+++ b/packages/backend/src/server/api/endpoints/server-info.ts
@@ -2,9 +2,12 @@ import * as os from 'node:os';
 import si from 'systeminformation';
 import { Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
+import { MetaService } from '@/core/MetaService.js';
 
 export const meta = {
 	requireCredential: false,
+	allowGet: true,
+	cacheSec: 60 * 1,
 
 	tags: ['meta'],
 } as const;
@@ -19,8 +22,24 @@ export const paramDef = {
 @Injectable()
 export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
+		private metaService: MetaService,
 	) {
 		super(meta, paramDef, async () => {
+			if (!(await this.metaService.fetch()).enableServerMachineStats) return {
+				machine: '?',
+				cpu: {
+					model: '?',
+					cores: 0,
+				},
+				mem: {
+					total: 0,
+				},
+				fs: {
+					total: 0,
+					used: 0,
+				},
+			};
+
 			const memStats = await si.mem();
 			const fsStats = await si.fsSize();