From 4b630c3c36518853489009c27602bdae392b4c94 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 28 Mar 2022 17:37:26 +0300 Subject: [PATCH] fix warnings --- src/components/status/status.js | 4 ++-- src/components/status_content/status_content.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index 088ddcc5..ee0da4dc 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -69,7 +69,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => { const controlledName = `controlled${camelized}` const uncontrolledName = `uncontrolled${camelized}` res[name] = function () { - return this[toggle] ? this[controlledName] : this[uncontrolledName] + return (Object.getOwnPropertyDescriptor(this, toggle) && this[toggle]) ? this[controlledName] : this[uncontrolledName] } return res }, {}) @@ -311,7 +311,7 @@ const Status = { return this.mergedConfig.hideWordFilteredPosts }, hideStatus () { - return (this.virtualHidden || !this.shouldNotMute) && ( + return (!this.shouldNotMute) && ( (this.muted && this.hideFilteredStatuses) || (this.userIsMuted && this.hideMutedUsers) || (this.status.thread_muted && this.hideMutedThreads) || diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js index cf72ccb8..0200382b 100644 --- a/src/components/status_content/status_content.js +++ b/src/components/status_content/status_content.js @@ -31,7 +31,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => { const controlledName = `controlled${camelized}` const uncontrolledName = `uncontrolled${camelized}` res[name] = function () { - return this[toggle] ? this[controlledName] : this[uncontrolledName] + return (Object.getOwnPropertyDescriptor(this, toggle) && this[toggle]) ? this[controlledName] : this[uncontrolledName] } return res }, {})