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

Merge remote-tracking branch 'upstream/develop' into shigusegubu

Browse source 
* upstream/develop:
  hotfix
  entity normalizer: provide summary_html property
This commit is contained in:
Henry Jameson 2019-01-25 16:34:11 +03:00
commit 773866fc20
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/conversation/conversation.js
View file

@ -1,9 +1,9 @@
import { reduce, filter, sortBy } from 'lodash'
import { reduce, filter } from 'lodash'
import Status from '../status/status.vue'
const sortById = (a, b) => {
const seqA = Number(a.action.id)
const seqB = Number(b.action.id)
const seqA = Number(a.id)
const seqB = Number(b.id)
const isSeqA = !Number.isNaN(seqA)
const isSeqB = !Number.isNaN(seqB)
if (isSeqA && isSeqB) {
@ -13,13 +13,13 @@ const sortById = (a, b) => {
} else if (!isSeqA && isSeqB) {
return -1
} else {
return a.action.id > b.action.id ? -1 : 1
return a.id > b.id ? -1 : 1
}
}
const sortAndFilterConversation = (conversation) => {
conversation = filter(conversation, (status) => status.type !== 'retweet')
return sortBy(conversation, sortById)
return conversation.filter(_ => _).sort(sortById)
}
const conversation = {

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

@ -164,6 +164,7 @@ export const parseStatus = (data) => {
}
output.summary = data.spoiler_text
output.summary_html = data.spoiler_text
output.external_url = data.url
// FIXME missing!!
@ -203,6 +204,7 @@ export const parseStatus = (data) => {
}
output.summary = data.summary
output.summary_html = data.summary_html
output.external_url = data.external_url
output.is_local = data.is_local
}