From 727df4cdafe699feed363efe6b75e54b4c4491b6 Mon Sep 17 00:00:00 2001 From: Maksim Sukharev Date: Tue, 1 Sep 2026 18:34:00 +0200 Subject: [PATCH 1/4] fix(FilePreview): drop unused smallPreview prop - only used in SharedItems.vue together with rowLayout, so redundant Assisted-by: ClaudeCode:claude-sonnet-4-6 Signed-off-by: Maksim Sukharev --- .../Message/MessagePart/FilePreview.spec.js | 13 ++++---- .../Message/MessagePart/FilePreview.vue | 31 +++++++------------ .../RightSidebar/SharedItems/SharedItems.vue | 1 - 3 files changed, 19 insertions(+), 26 deletions(-) diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.spec.js b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.spec.js index 38726385ada..321ecf8f047 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.spec.js +++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.spec.js @@ -127,16 +127,17 @@ describe('FilePreview.vue', () => { expect(imageUrl.searchParams.get('y')).toBe('576') }) - test('renders small previews when requested', async () => { - props.smallPreview = true + test('renders a mime icon instead of a scaled preview in row layout', async () => { + props.rowLayout = true + OC.MimeType.getIconUrl.mockReturnValueOnce(imagePath('core', 'image/jpeg')) const wrapper = mountFilePreview() await wrapper.find('img').trigger('load') expect(wrapper.element.tagName).toBe('A') - const imageUrl = parseRelativeUrl(wrapper.find('img').attributes('src')) - expect(imageUrl.searchParams.get('y')).toBe('24') + const imageUrl = wrapper.find('img').attributes('src') + expect(imageUrl).toBe(imagePath('core', 'image/jpeg')) }) describe('uploading', () => { @@ -403,8 +404,8 @@ describe('FilePreview.vue', () => { await testPlayButtonVisible(true) }) - test('does not render play icon for small previews', async () => { - props.smallPreview = true + test('does not render play icon in row layout', async () => { + props.rowLayout = true await testPlayButtonVisible(false) }) diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue index 45771aa02b2..33ae82230b5 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue @@ -31,7 +31,7 @@ @load="onLoad" @error="onError"> @@ -25,6 +25,7 @@ import { encodePath } from '@nextcloud/paths' import { generateRemoteUrl } from '@nextcloud/router' import { EventBus } from '../../../../../services/EventBus.ts' import { useActorStore } from '../../../../../stores/actor.ts' +import { getFileExtension, sanitizeFileName } from '../../../../../utils/fileUpload.ts' export default { name: 'AudioPlayer', @@ -86,6 +87,18 @@ export default { }, computed: { + sanitizedFileName() { + return sanitizeFileName(this.name) + }, + + fileNameWithoutExtension() { + return this.name.slice(0, this.name.length - getFileExtension(this.name).length) + }, + + fileExtension() { + return getFileExtension(this.name) + }, + internalAbsolutePath() { if (this.path.startsWith('/')) { return this.path @@ -157,6 +170,10 @@ export default { font-weight: bold; } + &__basename { + unicode-bidi: isolate; + } + &__audio { display: block; } diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue index 33ae82230b5..974f124de4b 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue @@ -19,14 +19,14 @@ @click.exact="handleClick" @keydown.enter="handleClick"> @@ -65,7 +65,7 @@
- {{ fileDetail }} + {{ fileNameWithoutExtension }}{{ fileExtension }}
@@ -89,6 +89,7 @@ import { getTalkConfig } from '../../../../../services/CapabilitiesManager.ts' import { useActorStore } from '../../../../../stores/actor.ts' import { useSharedItemsStore } from '../../../../../stores/sharedItems.ts' import { useUploadStore } from '../../../../../stores/upload.ts' +import { getFileExtension, sanitizeFileName } from '../../../../../utils/fileUpload.ts' import { canPlayAudio } from '../../../../../utils/sounds.js' const PREVIEW_TYPE = { @@ -210,8 +211,18 @@ export default { ) }, - fileDetail() { - return this.file.name + // file.name with bidi control chars replaced by '_', for title/alt/aria-label text + sanitizedFileName() { + return sanitizeFileName(this.file.name) + }, + + fileNameWithoutExtension() { + return this.file.name.slice(0, this.file.name.length - getFileExtension(this.file.name).length) + }, + + // Dot included, original case + fileExtension() { + return getFileExtension(this.file.name) }, fallbackLocalUrl() { @@ -469,7 +480,7 @@ export default { }, removeAriaLabel() { - return t('spreed', 'Remove {fileName}', { fileName: this.file.name }) + return t('spreed', 'Remove {fileName}', { fileName: this.sanitizedFileName }) }, }, @@ -666,6 +677,10 @@ export default { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + + &__basename { + unicode-bidi: isolate; + } } &:not(.file-preview--viewer-available) { diff --git a/src/test-setup.js b/src/test-setup.js index e276be92839..a309d892d43 100644 --- a/src/test-setup.js +++ b/src/test-setup.js @@ -28,6 +28,7 @@ vi.mock('@nextcloud/dialogs', () => ({ vi.mock('@nextcloud/files', () => ({ validateFileName: vi.fn(), + formatFileSize: vi.fn((size) => `${size} B`), })) vi.mock('@nextcloud/files/dav', () => ({ diff --git a/src/utils/fileUpload.ts b/src/utils/fileUpload.ts index 00448c2a117..0fdf64f4c5d 100644 --- a/src/utils/fileUpload.ts +++ b/src/utils/fileUpload.ts @@ -8,6 +8,7 @@ import type { UploadEntry } from '../types/index.ts' const extensionRegex = /\.[0-9a-z]+$/i const suffixRegex = / \(\d+\)$/ +const bidiControlRegex = /[\u202A-\u202E\u2066-\u2069]/g /** * Returns the file extension for the given path @@ -19,6 +20,16 @@ export function getFileExtension(path: string): string { return path.match(extensionRegex)?.[0] ?? '' } +/** + * Returns name with bidi control characters replaced by '_' + * + * @param name file name + * @return sanitized file name + */ +export function sanitizeFileName(name: string): string { + return name.replace(bidiControlRegex, '_') +} + /** * Returns the file suffix for the given path * From 3eff7647b71a09f25b1da75ce77f7030065e0afa Mon Sep 17 00:00:00 2001 From: Maksim Sukharev Date: Wed, 2 Sep 2026 12:15:46 +0200 Subject: [PATCH 3/4] fix(FilePreview): ellipsize long filenames, highlight extensions Signed-off-by: Joas Schilling Signed-off-by: Maksim Sukharev --- .../Message/MessagePart/FilePreview.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue index 974f124de4b..24c8ad0bb83 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue @@ -65,7 +65,8 @@
- {{ fileNameWithoutExtension }}{{ fileExtension }} + {{ fileNameWithoutExtension }} + {{ fileExtension }}
@@ -676,10 +677,18 @@ export default { width: 100%; overflow: hidden; white-space: nowrap; - text-overflow: ellipsis; + display: inline-flex; &__basename { unicode-bidi: isolate; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + &__extension { + color: var(--color-text-maxcontrast); + overflow: visible; } } From 7d066d49ccd6f1fa2197de6f1685187effb2ef65 Mon Sep 17 00:00:00 2001 From: Maksim Sukharev Date: Wed, 2 Sep 2026 12:28:04 +0200 Subject: [PATCH 4/4] fix(conversation): sanitize file names in last message Signed-off-by: Maksim Sukharev --- src/utils/textParse.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils/textParse.ts b/src/utils/textParse.ts index 328251decfe..765af4d2114 100644 --- a/src/utils/textParse.ts +++ b/src/utils/textParse.ts @@ -8,6 +8,7 @@ import type { ChatMessage, Mention } from '../types/index.ts' import { getBaseUrl } from '@nextcloud/router' import { decodeHTML } from 'entities' import { MENTION } from '../constants.ts' +import { sanitizeFileName } from './fileUpload.ts' /** * Parse message text to return proper formatting for mentions @@ -62,7 +63,8 @@ function parseToSimpleMessage(text: string, parameters: ChatMessage['messagePara } Object.entries(parameters).forEach(([key, value]) => { - text = text.replaceAll('{' + key + '}', value.name) + const name = key === 'file' ? sanitizeFileName(value.name) : value.name + text = text.replaceAll('{' + key + '}', name) }) return text.trim() }