From 85f7ca97ee27eb50aeb3850fb588facd81b8a176 Mon Sep 17 00:00:00 2001 From: Tiago Evangelista Pinto Date: Tue, 3 Nov 2020 02:58:25 -0300 Subject: [PATCH 1/3] Return attachment message 'sent attachment' by default --- client/sidebar/RoomList.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/sidebar/RoomList.js b/client/sidebar/RoomList.js index 61b47f8847840..06d4e5a75c8ad 100644 --- a/client/sidebar/RoomList.js +++ b/client/sidebar/RoomList.js @@ -97,6 +97,8 @@ export const normalizeSidebarMessage = ({ ...message }) => { if (attachment && attachment.title) { return s.escapeHTML(attachment.title); } + + return 'sent atachment'; } }; From 1e475f4378df2550118c0dfe0a6acf60c4c43e86 Mon Sep 17 00:00:00 2001 From: Gabriel Henriques Date: Tue, 3 Nov 2020 13:02:12 -0300 Subject: [PATCH 2/3] Translate message --- client/sidebar/RoomList.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/client/sidebar/RoomList.js b/client/sidebar/RoomList.js index 06d4e5a75c8ad..48b3cbe9677b9 100644 --- a/client/sidebar/RoomList.js +++ b/client/sidebar/RoomList.js @@ -82,7 +82,7 @@ export const Row = React.memo(({ data, index, style }) => { return ; }, areEqual); -export const normalizeSidebarMessage = ({ ...message }) => { +export const normalizeSidebarMessage = (message, t) => { if (message.msg) { return s.escapeHTML(filterMarkdown(message.msg)); } @@ -90,6 +90,7 @@ export const normalizeSidebarMessage = ({ ...message }) => { if (message.attachments) { const attachment = message.attachments.find((attachment) => attachment.title || attachment.description); + console.log(attachment); if (attachment && attachment.description) { return s.escapeHTML(attachment.description); } @@ -98,7 +99,7 @@ export const normalizeSidebarMessage = ({ ...message }) => { return s.escapeHTML(attachment.title); } - return 'sent atachment'; + return t('Sent_an_attachment'); } }; @@ -149,15 +150,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 }) { From 0d80f3c2df909035447ff99633864918ff610831 Mon Sep 17 00:00:00 2001 From: Tiago Evangelista Pinto Date: Tue, 3 Nov 2020 14:36:16 -0300 Subject: [PATCH 3/3] Remove console.log() from code --- client/sidebar/RoomList.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/sidebar/RoomList.js b/client/sidebar/RoomList.js index 48b3cbe9677b9..87d466e0d1dc6 100644 --- a/client/sidebar/RoomList.js +++ b/client/sidebar/RoomList.js @@ -90,7 +90,6 @@ export const normalizeSidebarMessage = (message, t) => { if (message.attachments) { const attachment = message.attachments.find((attachment) => attachment.title || attachment.description); - console.log(attachment); if (attachment && attachment.description) { return s.escapeHTML(attachment.description); }