hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'mastoapi/update-extension-support' into shigusegubu

Browse source 
* mastoapi/update-extension-support:
  revert, it's still missing
  add support for pleroma-specific fields
This commit is contained in:
Henry Jameson 2019-04-09 22:42:07 +03:00
commit 952c670b3b
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -189,8 +189,16 @@ export const parseStatus = (data) => {
output.statusnet_html = addEmojis(data.content, data.emojis) output.statusnet_html = addEmojis(data.content, data.emojis)
// Not exactly the same but works? if (data.pleroma) {
output.text = data.content const { pleroma } = data
output.text = pleroma.content ? data.pleroma.content['text/plain'] : data.content
output.summary = pleroma.spoiler_text ? data.pleroma.spoiler_text['text/plain'] : data.spoiler_text
output.statusnet_conversation_id = data.pleroma.conversation_id
output.is_local = pleroma.is_local
} else {
output.text = data.content
output.summary = data.spoiler_text
}
output.in_reply_to_status_id = data.in_reply_to_id output.in_reply_to_status_id = data.in_reply_to_id
output.in_reply_to_user_id = data.in_reply_to_account_id output.in_reply_to_user_id = data.in_reply_to_account_id
@ -198,18 +206,12 @@ export const parseStatus = (data) => {
// Missing!! fix in UI? // Missing!! fix in UI?
// output.in_reply_to_screen_name = ??? // output.in_reply_to_screen_name = ???
// It breaks the conversation when combined with notification
// output.statusnet_conversation_id = data.id
if (output.type === 'retweet') { if (output.type === 'retweet') {
output.retweeted_status = parseStatus(data.reblog) output.retweeted_status = parseStatus(data.reblog)
} }
output.summary = data.spoiler_text
output.summary_html = addEmojis(data.spoiler_text, data.emojis) output.summary_html = addEmojis(data.spoiler_text, data.emojis)
output.external_url = data.url output.external_url = data.url
output.is_local = data.pleroma.local
} else { } else {
output.favorited = data.favorited output.favorited = data.favorited
output.fave_num = data.fave_num output.fave_num = data.fave_num