diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-03-21 19:04:21 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-03-21 19:04:21 +0000 |
| commit | 0ef58696bf6767f54083049f0c218816449d486d (patch) | |
| tree | c237c2e921be7c9222f61f6077f9d8561ddaddea /src/components/status | |
| parent | 66fb3987d613dd8758abe54bbacb95c939c805f7 (diff) | |
| parent | 9478a462a7e3e83af0c9580f016cdc9f3654e274 (diff) | |
Merge branch 'bot-indicator-fixes' into 'develop'
Bot indicator fixes
See merge request pleroma/pleroma-fe!1477
Diffstat (limited to 'src/components/status')
| -rw-r--r-- | src/components/status/status.js | 6 | ||||
| -rw-r--r-- | src/components/status/status.vue | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index 4c0ef3e0..e54be241 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -225,12 +225,18 @@ const Status = { muteWordHits () { return muteWordHits(this.status, this.muteWords) }, + rtBotStatus () { + return this.statusoid.user.bot + }, botStatus () { return this.status.user.bot }, botIndicator () { return this.botStatus && !this.hideBotIndication }, + rtBotIndicator () { + return this.rtBotStatus && !this.hideBotIndication + }, mentionsLine () { if (!this.headTailLinks) return [] const writtenSet = new Set(this.headTailLinks.writtenMentions.map(_ => _.url)) diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 1679834e..3de4c471 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -77,7 +77,7 @@ <UserAvatar v-if="retweet" class="left-side repeater-avatar" - :bot="botIndicator" + :bot="rtBotIndicator" :better-shadow="betterShadow" :user="statusoid.user" /> |
