Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

fix(settings): allow saved uploaded avatars in general settings form

Ahmet Ömera99eead430a6
diff --git a/app/components/setting/SettingAvatar.vue b/app/components/setting/SettingAvatar.vue
index bee8ba81..e6b87624 100644
--- a/app/components/setting/SettingAvatar.vue
+++ b/app/components/setting/SettingAvatar.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { settingsFieldCommitKey } from '~/composables/useSettingsForm'
+import { getAvatarInputType } from '~/utils/avatar'
import {
AVATAR_ALLOWED_MIME_TYPES,
AVATAR_MAX_INPUT_BYTES,
@@ -186,7 +187,7 @@ const removeAvatar = async () => {
<UInput
v-model="urlValue"
- type="url"
+ :type="getAvatarInputType(urlValue)"
icon="tabler:link"
class="w-full"
:placeholder="placeholder"
diff --git a/app/utils/avatar.ts b/app/utils/avatar.ts
index 731e5f87..7bd08756 100644
--- a/app/utils/avatar.ts
+++ b/app/utils/avatar.ts
@@ -1,5 +1,14 @@
export const DEFAULT_AVATAR_URL = '/web-app-manifest-192x192.png'
+/** Uploaded avatars use a relative route, which HTML URL inputs reject. */
+export function getAvatarInputType(
+ value: string | null | undefined,
+): 'text' | 'url' {
+ return /^\/avatar\/avatar-[a-f0-9]{16}\.webp$/.test(value ?? '')
+ ? 'text'
+ : 'url'
+}
+
/**
* `<img>` error handler that swaps a broken avatar for the default image.
* Guarded so a broken fallback cannot loop.
diff --git a/tests/avatar-input.test.ts b/tests/avatar-input.test.ts
new file mode 100644
index 00000000..39bd856a
--- /dev/null
+++ b/tests/avatar-input.test.ts
@@ -0,0 +1,17 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import { getAvatarInputType } from '../app/utils/avatar.ts'
+
+test('saved uploaded avatar paths do not require an absolute URL', () => {
+ assert.equal(
+ getAvatarInputType('/avatar/avatar-0123456789abcdef.webp'),
+ 'text',
+ )
+})
+
+test('external avatars and other paths still use URL input validation', () => {
+ assert.equal(getAvatarInputType('https://example.com/avatar.jpg'), 'url')
+ assert.equal(getAvatarInputType('/another/image.webp'), 'url')
+ assert.equal(getAvatarInputType('/avatar/other.webp'), 'url')
+ assert.equal(getAvatarInputType(''), 'url')
+})