diff --git a/frontend/src/app.html b/frontend/src/app.html index f273cc5..e73d6fb 100644 --- a/frontend/src/app.html +++ b/frontend/src/app.html @@ -3,6 +3,8 @@ + + Immich Watcher %sveltekit.head% diff --git a/frontend/src/routes/template-configs/+page.svelte b/frontend/src/routes/template-configs/+page.svelte index a527b65..4d37a3c 100644 --- a/frontend/src/routes/template-configs/+page.svelte +++ b/frontend/src/routes/template-configs/+page.svelte @@ -189,6 +189,8 @@
+ {#if varsRef[slot.key]} @@ -204,13 +206,10 @@

✕ {t('common.syntaxError')}: {slotErrors[slot.key]}{slotErrorLines[slot.key] ? ` (${t('common.line')} ${slotErrorLines[slot.key]})` : ''}

{/if} {/if} - {#if slotPreview[slot.key] && !slotErrors[slot.key]} -
- {t('templateConfig.preview')} -
-
{slotPreview[slot.key]}
-
-
+ {#if slotPreview[slot.key]} +
+
{slotPreview[slot.key]}
+
{/if} {:else} + + + + + + + diff --git a/packages/server/src/immich_watcher_server/api/template_configs.py b/packages/server/src/immich_watcher_server/api/template_configs.py index 9a4d479..4bb66f9 100644 --- a/packages/server/src/immich_watcher_server/api/template_configs.py +++ b/packages/server/src/immich_watcher_server/api/template_configs.py @@ -67,7 +67,7 @@ _SAMPLE_CONTEXT = { "removed_assets": ["asset-id-1", "asset-id-2"], "people": ["Alice", "Bob"], "shared": True, - "video_warning": "\n\n⚠️ Note: Videos may not be sent due to Telegram's 50 MB file size limit.", + "video_warning": "⚠️ Note: Videos may not be sent due to Telegram's 50 MB file size limit.", # Rename fields (always present, empty for non-rename events) "old_name": "Old Album", "new_name": "New Album", diff --git a/packages/server/src/immich_watcher_server/database/models.py b/packages/server/src/immich_watcher_server/database/models.py index e0e1abe..38ff0d9 100644 --- a/packages/server/src/immich_watcher_server/database/models.py +++ b/packages/server/src/immich_watcher_server/database/models.py @@ -136,7 +136,7 @@ class TemplateConfig(SQLModel, table=True): # Settings date_format: str = Field(default="%d.%m.%Y, %H:%M UTC") video_warning: str = Field( - default="\n\n⚠️ Note: Videos may not be sent due to Telegram's 50 MB file size limit." + default="⚠️ Note: Videos may not be sent due to Telegram's 50 MB file size limit." ) created_at: datetime = Field(default_factory=_utcnow) @@ -204,7 +204,7 @@ _INLINE_TEMPLATES_REMOVED = { '{%- if asset.is_favorite %} ❤️{% endif %}\n' '{%- endfor %}' '{%- endif %}' - '{{ video_warning }}' + '{%- if video_warning %}\n\n{{ video_warning }}{%- endif %}' ), "message_assets_removed": '🗑️ {{ removed_count }} photo(s) removed from album "{{ album_name }}".', @@ -254,7 +254,7 @@ DEFAULT_TEMPLATE_RU = { '{%- if asset.is_favorite %} ❤️{% endif %}\n' '{%- endfor %}' '{%- endif %}' - '{{ video_warning }}' + '{%- if video_warning %}\n\n{{ video_warning }}{%- endif %}' ), "message_assets_removed": '🗑️ {{ removed_count }} фото удалено из альбома "{{ album_name }}".', diff --git a/packages/server/src/immich_watcher_server/templates/en/assets_added.jinja2 b/packages/server/src/immich_watcher_server/templates/en/assets_added.jinja2 index c3ef232..a3786a6 100644 --- a/packages/server/src/immich_watcher_server/templates/en/assets_added.jinja2 +++ b/packages/server/src/immich_watcher_server/templates/en/assets_added.jinja2 @@ -9,4 +9,7 @@ {%- if asset.is_favorite %} ❤️{% endif %} {%- endfor %} {%- endif %} +{%- if video_warning %} + {{ video_warning }} +{%- endif %} diff --git a/packages/server/src/immich_watcher_server/templates/ru/assets_added.jinja2 b/packages/server/src/immich_watcher_server/templates/ru/assets_added.jinja2 index 41b633b..d10f195 100644 --- a/packages/server/src/immich_watcher_server/templates/ru/assets_added.jinja2 +++ b/packages/server/src/immich_watcher_server/templates/ru/assets_added.jinja2 @@ -9,4 +9,7 @@ {%- if asset.is_favorite %} ❤️{% endif %} {%- endfor %} {%- endif %} +{%- if video_warning %} + {{ video_warning }} +{%- endif %}