logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 4cdfe4235d0dcb0b6ce0df9eb9cdb603d15d6821
parent: 0c5e4f89e304b80ec1279f18f05809503132de24
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Sun, 12 Jul 2020 10:46:52 +0000

Merge branch 'feat/add-you-to-last-message' into 'develop'

fix #894 add simple You: to chat list last message

Closes #894

See merge request pleroma/pleroma-fe!1181

Diffstat:

Msrc/components/chat_list_item/chat_list_item.js10++++++----
Msrc/i18n/en.json1+
2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js @@ -37,12 +37,14 @@ const ChatListItem = { } }, messageForStatusContent () { - const content = this.chat.lastMessage ? (this.attachmentInfo || this.chat.lastMessage.content) : '' - + const message = this.chat.lastMessage + const isYou = message && message.account_id === this.currentUser.id + const content = message ? (this.attachmentInfo || message.content) : '' + const messagePreview = isYou ? `<i>${this.$t('chats.you')}</i> ${content}` : content return { summary: '', - statusnet_html: content, - text: content, + statusnet_html: messagePreview, + text: messagePreview, attachments: [] } } diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -786,6 +786,7 @@ "password_reset_required_but_mailer_is_disabled": "You must reset your password, but password reset is disabled. Please contact your instance administrator." }, "chats": { + "you": "You:", "message_user": "Message {nickname}", "delete": "Delete", "chats": "Chats",