+ + {t('Lotus on GitHub')} + + {' — '} + {t('BlossomSelfHostLotusHint')} +
) } diff --git a/src/pages/secondary/PostSettingsPage/MediaUploadServiceSetting.tsx b/src/pages/secondary/PostSettingsPage/MediaUploadServiceSetting.tsx index 676422bd..4dd6397d 100644 --- a/src/pages/secondary/PostSettingsPage/MediaUploadServiceSetting.tsx +++ b/src/pages/secondary/PostSettingsPage/MediaUploadServiceSetting.tsx @@ -6,8 +6,12 @@ import { SelectTrigger, SelectValue } from '@/components/ui/select' -import { DEFAULT_NIP_96_SERVICE, NIP_96_SERVICE } from '@/constants' -import { simplifyUrl } from '@/lib/url' +import { + BLOSSOM_PRESET_SELECT_PREFIX, + NIP_96_SERVICE, + STANDARD_BLOSSOM_UPLOAD_HOSTS +} from '@/constants' +import { simplifyUrl, normalizeHttpUrl } from '@/lib/url' import { useMediaUploadService } from '@/providers/MediaUploadServiceProvider' import { useMemo } from 'react' import { useTranslation } from 'react-i18next' @@ -15,6 +19,19 @@ import BlossomServerListSetting from './BlossomServerListSetting' const BLOSSOM = 'blossom' +function blossomPresetSelectValue(url: string): string { + return `${BLOSSOM_PRESET_SELECT_PREFIX}${encodeURIComponent(url)}` +} + +function tryParseBlossomPresetSelectValue(value: string): string | undefined { + if (!value.startsWith(BLOSSOM_PRESET_SELECT_PREFIX)) return undefined + try { + return decodeURIComponent(value.slice(BLOSSOM_PRESET_SELECT_PREFIX.length)) + } catch { + return undefined + } +} + export default function MediaUploadServiceSetting() { const { t } = useTranslation() const { serviceConfig, updateServiceConfig } = useMediaUploadService() @@ -22,6 +39,9 @@ export default function MediaUploadServiceSetting() { if (serviceConfig.type === 'blossom') { return BLOSSOM } + if (serviceConfig.type === 'blossom-preset') { + return blossomPresetSelectValue(serviceConfig.url) + } return serviceConfig.service }, [serviceConfig]) @@ -29,22 +49,48 @@ export default function MediaUploadServiceSetting() { if (value === BLOSSOM) { return updateServiceConfig({ type: 'blossom' }) } + if (value.startsWith(BLOSSOM_PRESET_SELECT_PREFIX)) { + const presetUrl = tryParseBlossomPresetSelectValue(value) + if (presetUrl !== undefined) { + const normalized = normalizeHttpUrl(presetUrl) + if (normalized) { + return updateServiceConfig({ type: 'blossom-preset', url: normalized }) + } + } + return + } return updateServiceConfig({ type: 'nip96', service: value }) } + const showBlossomServerList = selectedValue === BLOSSOM + const isBlossomPreset = serviceConfig.type === 'blossom-preset' + + /** Radix Select reads item text from the closed portal; items are often unmounted, so the trigger stays blank unless we set this explicitly. */ + const selectTriggerLabel = useMemo(() => { + if (serviceConfig.type === 'blossom') { + return t('BlossomUploadYourListOption') + } + if (serviceConfig.type === 'blossom-preset') { + const preset = STANDARD_BLOSSOM_UPLOAD_HOSTS.find((h) => h.url === serviceConfig.url) + return preset ? t(preset.labelKey) : `${simplifyUrl(serviceConfig.url)} (${t('Blossom')})` + } + return simplifyUrl(serviceConfig.service) + }, [serviceConfig, t]) + return (