aboutsummaryrefslogtreecommitdiff
path: root/src/components/chat_message/chat_message.js
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2022-01-09 18:37:01 +0000
committerShpuld Shpludson <shp@cock.li>2022-01-09 18:37:01 +0000
commitb13d8f7e6339e877a38a28008630dc8ec64abcdf (patch)
tree56e2103fcb52640a17847cb97a726f9d6d3198ee /src/components/chat_message/chat_message.js
parent51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9 (diff)
parent756f7bf7c2ee1beb7b43227271942130fd03c7cb (diff)
Merge branch 'develop' into 'master'
Update MASTER for 2.4.2 See merge request pleroma/pleroma-fe!1421
Diffstat (limited to 'src/components/chat_message/chat_message.js')
-rw-r--r--src/components/chat_message/chat_message.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index bb380f87..eb195bc1 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -57,8 +57,9 @@ const ChatMessage = {
messageForStatusContent () {
return {
summary: '',
- statusnet_html: this.message.content,
- text: this.message.content,
+ emojis: this.message.emojis,
+ raw_html: this.message.content || '',
+ text: this.message.content || '',
attachments: this.message.attachments
}
},