moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '790-unable-to-filter' into 'develop' 

Settings: Keep a local version of the mutedWordsString

Closes #790

See merge request pleroma/pleroma-fe!1130
This commit is contained in:
HJ 2020-06-05 12:03:46 +00:00
parent 585bb5727a c4c5568b98
commit 0bf2b372d0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/settings/settings.js
View File

@ -30,7 +30,8 @@ const settings = {
Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'), Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
backendVersion: instance.backendVersion, backendVersion: instance.backendVersion,
frontendVersion: instance.frontendVersion frontendVersion: instance.frontendVersion,
muteWordsStringLocal: this.$store.getters.mergedConfig.muteWords.join('\n')
} }
}, },
components: { components: {
@ -86,8 +87,11 @@ const settings = {
.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}), .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
// Special cases (need to transform values or perform actions first) // Special cases (need to transform values or perform actions first)
muteWordsString: { muteWordsString: {
get () { return this.$store.getters.mergedConfig.muteWords.join('\n') }, get () {
return this.muteWordsStringLocal
},
set (value) { set (value) {
this.muteWordsStringLocal = value
this.$store.dispatch('setOption', { this.$store.dispatch('setOption', {
name: 'muteWords', name: 'muteWords',
value: filter(value.split('\n'), (word) => trim(word).length > 0) value: filter(value.split('\n'), (word) => trim(word).length > 0)