moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '515' into 'develop' 

Fix broken filtering for replies in the timeline

Closes #515

See merge request pleroma/pleroma-fe!786
This commit is contained in:
Shpuld Shpludson 2019-05-07 17:33:56 +00:00
parent 081f9a926a 917e82e8ee
commit 58ef6258d6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/conversation/conversation.vue
View File

@ -11,7 +11,7 @@
@goto="setHighlight" @goto="setHighlight"
@toggleExpanded="toggleExpanded" @toggleExpanded="toggleExpanded"
:key="status.id" :key="status.id"
:inlineExpanded="collapsable" :inlineExpanded="collapsable && isExpanded"
:statusoid="status" :statusoid="status"
:expandable='!isExpanded' :expandable='!isExpanded'
:focused="focused(status.id)" :focused="focused(status.id)"

5
src/components/status/status.js
View File

@ -31,7 +31,6 @@ const Status = {
data () { data () {
return { return {
replying: false, replying: false,
expanded: false,
unmuted: false, unmuted: false,
userExpanded: false, userExpanded: false,
preview: null, preview: null,
@ -161,7 +160,7 @@ const Status = {
if (this.$store.state.config.replyVisibility === 'all') { if (this.$store.state.config.replyVisibility === 'all') {
return false return false
} }
if (this.inlineExpanded || this.expanded || this.inConversation || !this.isReply) { if (this.inConversation || !this.isReply) {
return false return false
} }
if (this.status.user.id === this.$store.state.users.currentUser.id) { if (this.status.user.id === this.$store.state.users.currentUser.id) {
@ -175,7 +174,7 @@ const Status = {
if (this.status.user.id === this.status.attentions[i].id) { if (this.status.user.id === this.status.attentions[i].id) {
continue continue
} }
if (checkFollowing && this.status.attentions[i].following) { if (checkFollowing && this.$store.getters.findUser(this.status.attentions[i].id).following) {
return false return false
} }
if (this.status.attentions[i].id === this.$store.state.users.currentUser.id) { if (this.status.attentions[i].id === this.$store.state.users.currentUser.id) {