diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-07-12 15:13:35 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-07-12 15:13:35 +0900 |
| commit | 5ecaf5095ecd4678dd3e05abcc5b0781f6fddb93 (patch) | |
| tree | f4cfde51470eab18fa7356f831c807a7e26621f8 /packages/frontend/src/composables/use-uploader.ts | |
| parent | New Crowdin updates (#16258) (diff) | |
| download | misskey-5ecaf5095ecd4678dd3e05abcc5b0781f6fddb93.tar.gz misskey-5ecaf5095ecd4678dd3e05abcc5b0781f6fddb93.tar.bz2 misskey-5ecaf5095ecd4678dd3e05abcc5b0781f6fddb93.zip | |
enhance: ウォーターマーク機能をロールで制御可能に
Diffstat (limited to 'packages/frontend/src/composables/use-uploader.ts')
| -rw-r--r-- | packages/frontend/src/composables/use-uploader.ts | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/frontend/src/composables/use-uploader.ts b/packages/frontend/src/composables/use-uploader.ts index 6f4ed81f82..826d8c5203 100644 --- a/packages/frontend/src/composables/use-uploader.ts +++ b/packages/frontend/src/composables/use-uploader.ts @@ -104,6 +104,8 @@ export function useUploader(options: { multiple?: boolean; features?: UploaderFeatures; } = {}) { + const $i = ensureSignin(); + const events = new EventEmitter<{ 'itemUploaded': (ctx: { item: UploaderItem; }) => void; }>(); @@ -132,7 +134,7 @@ export function useUploader(options: { uploaded: null, uploadFailed: false, compressionLevel: prefer.s.defaultImageCompressionLevel, - watermarkPresetId: uploaderFeatures.value.watermark ? prefer.s.defaultWatermarkPresetId : null, + watermarkPresetId: uploaderFeatures.value.watermark && $i.policies.watermarkAvailable ? prefer.s.defaultWatermarkPresetId : null, file: markRaw(file), }); const reactiveItem = items.value.at(-1)!; @@ -264,6 +266,7 @@ export function useUploader(options: { if ( uploaderFeatures.value.watermark && + $i.policies.watermarkAvailable && WATERMARK_SUPPORTED_TYPES.includes(item.file.type) && !item.preprocessing && !item.uploading && @@ -500,7 +503,7 @@ export function useUploader(options: { let preprocessedFile: Blob | File = item.file; - const needsWatermark = item.watermarkPresetId != null && WATERMARK_SUPPORTED_TYPES.includes(preprocessedFile.type); + const needsWatermark = item.watermarkPresetId != null && WATERMARK_SUPPORTED_TYPES.includes(preprocessedFile.type) && $i.policies.watermarkAvailable; const preset = prefer.s.watermarkPresets.find(p => p.id === item.watermarkPresetId); if (needsWatermark && preset != null) { const canvas = window.document.createElement('canvas'); |