Mergan/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Packages Projects Releases Wiki Activity

accept status id instead of status obj as statusoid prop

Browse source
This commit is contained in:
taehoon 2019-08-30 11:47:15 -04:00
parent e75ac9ddbc
commit d7c68d408f
3 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/conversation-page/conversation-page.js
View file

@ -5,12 +5,8 @@ const conversationPage = {
Conversation Conversation
}, },
computed: { computed: {
statusoid () { statusId () {
const id = this.$route.params.id return this.$route.params.id
const statuses = this.$store.state.statuses.allStatusesObject
const status = statuses[id]
return status
} }
} }
} }

2
src/components/conversation-page/conversation-page.vue
View file

@ -2,7 +2,7 @@
<conversation <conversation
:collapsable="false" :collapsable="false"
is-page="true" is-page="true"
:statusoid="statusoid" :statusoid="statusId"
/> />
</template> </template>

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

@ -51,20 +51,20 @@ const conversation = {
}, },
computed: { computed: {
status () { status () {
return this.statusoid return this.$store.state.statuses.allStatusesObject[this.statusoid]
}, },
statusId () { statusId () {
if (this.statusoid.retweeted_status) { if (this.status.retweeted_status) {
return this.statusoid.retweeted_status.id return this.status.retweeted_status.id
} else { } else {
return this.statusoid.id return this.status.id
} }
}, },
conversationId () { conversationId () {
if (this.statusoid.retweeted_status) { if (this.status.retweeted_status) {
return this.statusoid.retweeted_status.statusnet_conversation_id return this.status.retweeted_status.statusnet_conversation_id
} else { } else {
return this.statusoid.statusnet_conversation_id return this.status.statusnet_conversation_id
} }
}, },
conversation () { conversation () {
@ -127,8 +127,7 @@ const conversation = {
}) })
.then(() => this.setHighlight(this.statusId)) .then(() => this.setHighlight(this.statusId))
} else { } else {
const id = this.$route.params.id this.$store.state.api.backendInteractor.fetchStatus({ id: this.statusoid })
this.$store.state.api.backendInteractor.fetchStatus({ id })
.then((status) => this.$store.dispatch('addNewStatuses', { statuses: [status] })) .then((status) => this.$store.dispatch('addNewStatuses', { statuses: [status] }))
.then(() => this.fetchConversation()) .then(() => this.fetchConversation())
} }