diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-09 06:47:29 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-09 06:47:29 +0000 |
| commit | 531f150dd31ffc11b6f67145f4245b20457544aa (patch) | |
| tree | bfc192e315668dee33a6a4b87c091b7e0b0c9bfb /src/components/status | |
| parent | 9768558e7c65f6a4a343d4a78b2297e4888cf77b (diff) | |
| parent | 7818d6786b8489ddc18a5cd0d63e894450ec5ead (diff) | |
Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'
#254 Add option to hide filtered statuses
See merge request pleroma/pleroma-fe!539
Diffstat (limited to 'src/components/status')
| -rw-r--r-- | src/components/status/status.js | 8 | ||||
| -rw-r--r-- | src/components/status/status.vue | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index 65ddcb9f..8181b0db 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -110,6 +110,14 @@ const Status = { return hits }, muted () { return !this.unmuted && (this.status.user.muted || this.muteWordHits.length > 0) }, + hideFilteredStatuses () { + return typeof this.$store.state.config.hideFilteredStatuses === 'undefined' + ? this.$store.state.instance.hideFilteredStatuses + : this.$store.state.config.hideFilteredStatuses + }, + hideStatus () { + return (this.hideReply || this.deleted) || (this.muted && this.hideFilteredStatuses) + }, isFocused () { // retweet or root of an expanded conversation if (this.focused) { diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 21eb4d56..5bc7c664 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -1,5 +1,5 @@ <template> - <div class="status-el" v-if="!hideReply && !deleted" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]"> + <div class="status-el" v-if="!hideStatus" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]"> <template v-if="muted && !noReplyLinks"> <div class="media status container muted"> <small> |