hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

properly hide stuff

Browse source
This commit is contained in:
Henry Jameson 2025-03-25 19:52:58 +02:00
parent 34bef1074e
commit 10b334b033
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/settings_modal/tabs/filtering_tab.vue
View file

@ -95,7 +95,7 @@
:id="'filterHide' + filter[0]" :id="'filterHide' + filter[0]"
:model-value="filter[1].hide" :model-value="filter[1].hide"
:name="'filterHide' + filter[0]" :name="'filterHide' + filter[0]"
@update:model-value="updateFilter(filter[0], 'hide', $event.target.checked)" @update:model-value="updateFilter(filter[0], 'hide', $event)"
> >
{{ $t('settings.filter.hide') }} {{ $t('settings.filter.hide') }}
</Checkbox> </Checkbox>
@ -104,7 +104,7 @@
:id="'filterEnabled' + filter[0]" :id="'filterEnabled' + filter[0]"
:model-value="filter[1].enabled" :model-value="filter[1].enabled"
:name="'filterEnabled' + filter[0]" :name="'filterEnabled' + filter[0]"
@update:model-value="updateFilter(filter[0], 'enabled', $event.target.checked)" @update:model-value="updateFilter(filter[0], 'enabled', $event)"
> >
{{ $t('settings.enabled') }} {{ $t('settings.enabled') }}
</Checkbox> </Checkbox>

4
src/components/status/status.js
View file

@ -219,7 +219,6 @@ const Status = {
return !!this.currentUser return !!this.currentUser
}, },
muteFilterHits () { muteFilterHits () {
console.log(muteFilterHits(this.status))
return muteFilterHits(this.status) return muteFilterHits(this.status)
}, },
botStatus () { botStatus () {
@ -339,12 +338,13 @@ const Status = {
return this.mergedConfig.hideWordFilteredPosts return this.mergedConfig.hideWordFilteredPosts
}, },
hideStatus () { hideStatus () {
console.log(this.muteFilterHits[0])
return (!this.shouldNotMute) && ( return (!this.shouldNotMute) && (
(this.muted && this.hideFilteredStatuses) || (this.muted && this.hideFilteredStatuses) ||
(this.userIsMuted && this.hideMutedUsers) || (this.userIsMuted && this.hideMutedUsers) ||
(this.status.thread_muted && this.hideMutedThreads) || (this.status.thread_muted && this.hideMutedThreads) ||
(this.muteFilterHits.length > 0 && this.hideWordFilteredPosts) || (this.muteFilterHits.length > 0 && this.hideWordFilteredPosts) ||
(this.muteFilterHits[0]?.hide) (this.muteFilterHits.some(x => x.hide))
) )
}, },
isFocused () { isFocused () {