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

fix status mutes

This commit is contained in:
Shpuld Shpuldson 2020-04-27 10:06:17 +03:00
parent af9492977a
commit 8b1aa593a4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@ const Status = {
return hits return hits
}, },
muted () { muted () {
const relationship = this.$store.getters.relationship(this.userId) const relationship = this.$store.getters.relationship(this.status.user.id)
return !this.unmuted && ( return !this.unmuted && (
(!(this.inProfile && this.status.user.id === this.profileUserId) && relationship.muting) || (!(this.inProfile && this.status.user.id === this.profileUserId) && relationship.muting) ||
(!this.inConversation && this.status.thread_muted) || (!this.inConversation && this.status.thread_muted) ||

3
src/modules/users.js
View File

@ -238,7 +238,8 @@ export const getters = {
return result return result
}, },
relationship: state => id => { relationship: state => id => {
return state.relationships[id] || { id, loading: true } const rel = id && state.relationships[id]
return rel || { id, loading: true }
} }
} }