diff options
| author | Shpuld Shpludson <shp@cock.li> | 2021-01-18 13:09:25 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2021-01-18 13:09:25 +0000 |
| commit | fe78ed78fdc95bb5dac4d11136673da4e5e57f4b (patch) | |
| tree | 0548a53dd93b76371403bb9a7697f8ece3c0ecfe | |
| parent | 8c82bb61f1a3fa2e8d9d57b00fa5bf66b0577f31 (diff) | |
| parent | cdb9b4aea287bb5437d31cf574cc66503c981ea9 (diff) | |
Merge branch 'feat/dont-filter-own-posts' into 'develop'
Don't filter own posts
See merge request pleroma/pleroma-fe!1323
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | src/components/status/status.js | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7164eb26..40c1d982 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Follows/Followers tabs on user profiles now display the content properly. - Handle punycode in screen names +### Changed +- Don't filter own posts when they hit your wordfilter + ## [2.2.2] - 2020-12-22 ### Added - Mouseover titles for emojis in reaction picker diff --git a/src/components/status/status.js b/src/components/status/status.js index f9c710ab..2bf93a9e 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -157,6 +157,7 @@ const Status = { return muteWordHits(this.status, this.muteWords) }, muted () { + if (this.statusoid.user.id === this.currentUser.id) return false const { status } = this const { reblog } = status const relationship = this.$store.getters.relationship(status.user.id) |