From 90a188f2c3c16b926c75bf4aa749633e6967e5a0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 12 Jun 2021 19:54:03 +0300
Subject: [PATCH] cleanup

---
 src/components/chat_list_item/chat_list_item.js          | 3 +--
 src/components/chat_message/chat_message.js              | 3 +--
 src/components/status_body/status_body.js                | 2 +-
 .../entity_normalizer/entity_normalizer.service.js       | 5 ++---
 .../services/entity_normalizer/entity_normalizer.spec.js | 9 ---------
 5 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js
index e01b9bd4..e5032176 100644
--- a/src/components/chat_list_item/chat_list_item.js
+++ b/src/components/chat_list_item/chat_list_item.js
@@ -40,12 +40,11 @@ const ChatListItem = {
       const message = this.chat.lastMessage
       const messageEmojis = message ? message.emojis : []
       const isYou = message && message.account_id === this.currentUser.id
-      const content = message ? (this.attachmentInfo || message.content_raw) : ''
+      const content = message ? (this.attachmentInfo || message.content) : ''
       const messagePreview = isYou ? `<i>${this.$t('chats.you')}</i> ${content}` : content
       return {
         summary: '',
         emojis: messageEmojis,
-        statusnet_html: messagePreview,
         raw_html: messagePreview,
         text: messagePreview,
         attachments: []
diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index d126d453..9a2d1e7d 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -58,8 +58,7 @@ const ChatMessage = {
       return {
         summary: '',
         emojis: this.message.emojis,
-        raw_html: this.message.content_raw,
-        statusnet_html: this.message.content,
+        raw_html: this.message.content,
         text: this.message.content,
         attachments: this.message.attachments
       }
diff --git a/src/components/status_body/status_body.js b/src/components/status_body/status_body.js
index 14558aca..26491e1b 100644
--- a/src/components/status_body/status_body.js
+++ b/src/components/status_body/status_body.js
@@ -53,7 +53,7 @@ const StatusContent = {
     // Using max-height + overflow: auto for status components resulted in false positives
     // very often with japanese characters, and it was very annoying.
     tallStatus () {
-      const lengthScore = this.status.statusnet_html.split(/<p|<br/).length + this.status.text.length / 80
+      const lengthScore = this.status.raw_html.split(/<p|<br/).length + this.status.text.length / 80
       return lengthScore > 20
     },
     longSubject () {
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 13162dcf..613ed566 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -267,7 +267,6 @@ export const parseStatus = (data) => {
     output.type = data.reblog ? 'retweet' : 'status'
     output.nsfw = data.sensitive
 
-    output.statusnet_html = addEmojis(data.content, data.emojis)
     output.raw_html = data.content
     output.emojis = data.emojis
 
@@ -329,7 +328,7 @@ export const parseStatus = (data) => {
       output.nsfw = data.nsfw
     }
 
-    output.statusnet_html = data.statusnet_html
+    output.raw_html = data.statusnet_html
     output.text = data.text
 
     output.in_reply_to_status_id = data.in_reply_to_status_id
@@ -449,7 +448,7 @@ export const parseChatMessage = (message) => {
   output.created_at = new Date(message.created_at)
   output.chat_id = message.chat_id
   output.emojis = message.emojis
-  output.content_raw = message.content
+  output.content = message.content
   if (message.content) {
     output.content = addEmojis(message.content, message.emojis)
   } else {
diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
index 759539e0..c8965785 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -23,7 +23,6 @@ const makeMockStatusQvitter = (overrides = {}) => {
     repeat_num: 0,
     repeated: false,
     statusnet_conversation_id: '16300488',
-    statusnet_html: '<p>haha benis</p>',
     summary: null,
     tags: [],
     text: 'haha benis',
@@ -233,14 +232,6 @@ describe('API Entities normalizer', () => {
         expect(parsedRepeat).to.have.deep.property('retweeted_status.id', 'deadbeef')
       })
 
-      it('adds emojis to post content', () => {
-        const post = makeMockStatusMasto({ emojis: makeMockEmojiMasto(), content: 'Makes you think :thinking:' })
-
-        const parsedPost = parseStatus(post)
-
-        expect(parsedPost).to.have.property('statusnet_html').that.contains('<img')
-      })
-
       it('adds emojis to subject line', () => {
         const post = makeMockStatusMasto({ emojis: makeMockEmojiMasto(), spoiler_text: 'CW: 300 IQ :thinking:' })