From 6dfc7d0cbc411423b34d3e33765c2fbea37d6a0e Mon Sep 17 00:00:00 2001 From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Mon, 11 May 2026 13:22:50 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix(backend):=20=E3=83=AD=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=83=9D=E3=83=AA=E3=82=B7=E3=83=BC=E3=81=AE=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=82=B5=E3=82=A4=E3=82=BA=E5=88=B6=E9=99=90?= =?UTF-8?q?=E3=81=AE=E4=B8=8A=E9=99=90=E5=80=A4=E3=82=92=E3=82=B5=E3=83=BC?= =?UTF-8?q?=E3=83=90=E3=83=BC=E5=85=A8=E4=BD=93=E3=81=AE=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=82=B5=E3=82=A4=E3=82=BA=E5=88=B6=E9=99=90?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/core/RoleService.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts index a57449157b4..9b6b1ccc349 100644 --- a/packages/backend/src/core/RoleService.ts +++ b/packages/backend/src/core/RoleService.ts @@ -17,6 +17,7 @@ import type { } from '@/models/_.js'; import { MemoryKVCache, MemorySingleCache } from '@/misc/cache.js'; import type { MiUser } from '@/models/User.js'; +import type { Config } from '@/config.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import { CacheService } from '@/core/CacheService.js'; @@ -134,6 +135,9 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit { constructor( private moduleRef: ModuleRef, + @Inject(DI.config) + private config: Config, + @Inject(DI.meta) private meta: MiMeta, @@ -397,6 +401,8 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit { return 'unavailable'; } + const serverMaxFileSizeMb = Math.floor(this.config.maxFileSize / (1024 * 1024)); + return { gtlAvailable: calc('gtlAvailable', vs => vs.some(v => v === true)), ltlAvailable: calc('ltlAvailable', vs => vs.some(v => v === true)), @@ -414,7 +420,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit { canHideAds: calc('canHideAds', vs => vs.some(v => v === true)), canCreateChannel: calc('canCreateChannel', vs => vs.some(v => v === true)), driveCapacityMb: calc('driveCapacityMb', vs => Math.max(...vs)), - maxFileSizeMb: calc('maxFileSizeMb', vs => Math.max(...vs)), + maxFileSizeMb: calc('maxFileSizeMb', vs => Math.min(serverMaxFileSizeMb, Math.max(...vs))), alwaysMarkNsfw: calc('alwaysMarkNsfw', vs => vs.some(v => v === true)), canUpdateBioMedia: calc('canUpdateBioMedia', vs => vs.some(v => v === true)), pinLimit: calc('pinLimit', vs => Math.max(...vs)), From 65b750e51a3ff55dd2cef6b4b893d1d55b20d1a7 Mon Sep 17 00:00:00 2001 From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Mon, 11 May 2026 13:28:47 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix(frontend):=20=E3=82=B5=E3=83=BC?= =?UTF-8?q?=E3=83=90=E3=83=BC=E5=85=A8=E4=BD=93=E3=81=AE=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=82=B5=E3=82=A4=E3=82=BA=E5=88=B6=E9=99=90?= =?UTF-8?q?=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E8=AA=AC=E6=98=8E=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 1 + packages/frontend/src/pages/admin/roles.policy-editor.vue | 2 ++ packages/i18n/src/autogen/locale.ts | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index b100bae66b5..3fbc01fad13 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -2108,6 +2108,7 @@ _role: driveCapacity: "ドライブ容量" maxFileSize: "アップロード可能な最大ファイルサイズ" maxFileSize_caption: "リバースプロキシやCDNなど、前段で別の設定値が存在する場合があります。" + maxFileSize_caption2: "サーバー全体の最大ファイルサイズ設定は {max} です。これより大きいファイルをアップロードできるようにするには、Misskeyの設定ファイルからこの設定を緩和してください。" alwaysMarkNsfw: "ファイルにNSFWを常に付与" canUpdateBioMedia: "アイコンとバナーの更新を許可" pinMax: "ノートのピン留めの最大数" diff --git a/packages/frontend/src/pages/admin/roles.policy-editor.vue b/packages/frontend/src/pages/admin/roles.policy-editor.vue index e1fa616df74..7c754c22365 100644 --- a/packages/frontend/src/pages/admin/roles.policy-editor.vue +++ b/packages/frontend/src/pages/admin/roles.policy-editor.vue @@ -188,6 +188,7 @@ SPDX-License-Identifier: AGPL-3.0-only @@ -401,6 +402,7 @@ SPDX-License-Identifier: AGPL-3.0-only