Skip to content
Snippets Groups Projects
Unverified Commit 9d7a46f5 authored by Tiago Evangelista Pinto's avatar Tiago Evangelista Pinto Committed by GitHub
Browse files

Regression: Attachment without title or description show "sent attachment" in...

Regression: Attachment without title or description show "sent attachment" in view mode extended  (#19443)
parent 30df229e
No related branches found
No related tags found
No related merge requests found
......@@ -82,7 +82,7 @@ export const Row = React.memo(({ data, index, style }) => {
return <SideBarItemTemplateWithData sidebarViewMode={sidebarViewMode} style={style} selected={item.rid === openedRoom} t={t} room={item} extended={extended} SideBarItemTemplate={SideBarItemTemplate} AvatarTemplate={AvatarTemplate} />;
}, areEqual);
export const normalizeSidebarMessage = ({ ...message }) => {
export const normalizeSidebarMessage = (message, t) => {
if (message.msg) {
return s.escapeHTML(filterMarkdown(message.msg));
}
......@@ -97,6 +97,8 @@ export const normalizeSidebarMessage = ({ ...message }) => {
if (attachment && attachment.title) {
return s.escapeHTML(attachment.title);
}
return t('Sent_an_attachment');
}
};
......@@ -147,15 +149,15 @@ const getMessage = (room, lastMessage, t) => {
return t('No_messages_yet');
}
if (!lastMessage.u) {
return normalizeSidebarMessage(lastMessage);
return normalizeSidebarMessage(lastMessage, t);
}
if (lastMessage.u?.username === room.u?.username) {
return `${ t('You') }: ${ normalizeSidebarMessage(lastMessage) }`;
return `${ t('You') }: ${ normalizeSidebarMessage(lastMessage, t) }`;
}
if (room.t === 'd' && room.uids.length <= 2) {
return normalizeSidebarMessage(lastMessage);
return normalizeSidebarMessage(lastMessage, t);
}
return `${ lastMessage.u.name || lastMessage.u.username }: ${ normalizeSidebarMessage(lastMessage) }`;
return `${ lastMessage.u.name || lastMessage.u.username }: ${ normalizeSidebarMessage(lastMessage, t) }`;
};
export const SideBarItemTemplateWithData = React.memo(function SideBarItemTemplateWithData({ room, id, extended, selected, SideBarItemTemplate, AvatarTemplate, t, style, sidebarViewMode, isAnonymous }) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment