Page MenuHomePhorge
Files F45708354

No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/components/conversation-page/conversation-page.js b/src/components/conversation-page/conversation-page.js
index 8f1ac3d90d..1da70ce95b 100644
--- a/src/components/conversation-page/conversation-page.js
+++ b/src/components/conversation-page/conversation-page.js
@@ -1,19 +1,18 @@
import Conversation from '../conversation/conversation.vue'
-import { find } from 'lodash'
const conversationPage = {
components: {
Conversation
},
computed: {
statusoid () {
const id = this.$route.params.id
- const statuses = this.$store.state.statuses.allStatuses
- const status = find(statuses, {id})
+ const statuses = this.$store.state.statuses.allStatusesObject
+ const status = statuses[id]
return status
}
}
}
export default conversationPage
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 32bab144e4..e543102a93 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,115 +1,124 @@
import { reduce, filter } from 'lodash'
import Status from '../status/status.vue'
const sortById = (a, b) => {
const seqA = Number(a.id)
const seqB = Number(b.id)
const isSeqA = !Number.isNaN(seqA)
const isSeqB = !Number.isNaN(seqB)
if (isSeqA && isSeqB) {
return seqA < seqB ? -1 : 1
} else if (isSeqA && !isSeqB) {
return -1
} else if (!isSeqA && isSeqB) {
return 1
} else {
return a.id < b.id ? -1 : 1
}
}
const sortAndFilterConversation = (conversation) => {
conversation = filter(conversation, (status) => status.type !== 'retweet')
return conversation.filter(_ => _).sort(sortById)
}
const conversation = {
data () {
return {
highlight: null,
relevantIds: []
}
},
props: [
'statusoid',
'collapsable'
],
computed: {
status () {
return this.statusoid
},
+ idsToShow () {
+ if (this.relevantIds.length > 0) {
+ return this.relevantIds
+ } else if (this.statusId) {
+ return [this.statusId]
+ } else {
+ return []
+ }
+ },
statusId () {
if (this.statusoid.retweeted_status) {
return this.statusoid.retweeted_status.id
} else {
return this.statusoid.id
}
},
conversation () {
if (!this.status) {
return []
}
const statusesObject = this.$store.state.statuses.allStatusesObject
- const conversation = this.relevantIds.reduce((acc, id) => {
+ const conversation = this.idsToShow.reduce((acc, id) => {
acc.push(statusesObject[id])
return acc
}, [])
return sortAndFilterConversation(conversation)
},
replies () {
let i = 1
return reduce(this.conversation, (result, {id, in_reply_to_status_id}) => {
/* eslint-disable camelcase */
const irid = in_reply_to_status_id
/* eslint-enable camelcase */
if (irid) {
result[irid] = result[irid] || []
result[irid].push({
name: `#${i}`,
id: id
})
}
i++
return result
}, {})
}
},
components: {
Status
},
created () {
this.fetchConversation()
},
watch: {
'$route': 'fetchConversation'
},
methods: {
fetchConversation () {
if (this.status) {
const conversationId = this.status.id
this.$store.state.api.backendInteractor.fetchConversation({id: conversationId})
.then((statuses) => {
this.$store.dispatch('addNewStatuses', { statuses })
statuses.forEach(status => this.relevantIds.push(status.id))
})
.then(() => this.setHighlight(this.statusId))
} else {
const id = this.$route.params.id
this.$store.state.api.backendInteractor.fetchStatus({id})
.then((status) => this.$store.dispatch('addNewStatuses', { statuses: [status] }))
.then(() => this.fetchConversation())
}
},
getReplies (id) {
return this.replies[id] || []
},
focused (id) {
return id === this.statusId
},
setHighlight (id) {
this.highlight = id
}
}
}
export default conversation

File Metadata

Mime Type
text/x-diff
Expires
Sat, Mar 7, 10:16 AM (1 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1165145
Default Alt Text
(4 KB)

Event Timeline