From 8b1aa593a46869ac1ea26de8a1f31d9fa2f44e56 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Mon, 27 Apr 2020 10:06:17 +0300 Subject: [PATCH] fix status mutes --- src/components/status/status.js | 2 +- src/modules/users.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index a36de028..890f4b91 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -119,7 +119,7 @@ const Status = { return hits }, muted () { - const relationship = this.$store.getters.relationship(this.userId) + const relationship = this.$store.getters.relationship(this.status.user.id) return !this.unmuted && ( (!(this.inProfile && this.status.user.id === this.profileUserId) && relationship.muting) || (!this.inConversation && this.status.thread_muted) || diff --git a/src/modules/users.js b/src/modules/users.js index fb04ebd3..1d1b415c 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -238,7 +238,8 @@ export const getters = { return result }, relationship: state => id => { - return state.relationships[id] || { id, loading: true } + const rel = id && state.relationships[id] + return rel || { id, loading: true } } }