Add word-based muting to settings / statuses.
This commit is contained in:
parent
f3ca011fbe
commit
a53555254a
|
@ -5,7 +5,8 @@ const settings = {
|
||||||
return {
|
return {
|
||||||
hideAttachmentsLocal: this.$store.state.config.hideAttachments,
|
hideAttachmentsLocal: this.$store.state.config.hideAttachments,
|
||||||
hideAttachmentsInConvLocal: this.$store.state.config.hideAttachmentsInConv,
|
hideAttachmentsInConvLocal: this.$store.state.config.hideAttachmentsInConv,
|
||||||
hideNsfwLocal: this.$store.state.config.hideNsfw
|
hideNsfwLocal: this.$store.state.config.hideNsfw,
|
||||||
|
muteWordsString: this.$store.state.config.muteWords.join('\n')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
|
@ -20,6 +21,9 @@ const settings = {
|
||||||
},
|
},
|
||||||
hideNsfwLocal (value) {
|
hideNsfwLocal (value) {
|
||||||
this.$store.dispatch('setOption', { name: 'hideNsfw', value })
|
this.$store.dispatch('setOption', { name: 'hideNsfw', value })
|
||||||
|
},
|
||||||
|
muteWordsString (value) {
|
||||||
|
this.$store.dispatch('setOption', { name: 'muteWords', value: value.split('\n') })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,11 @@
|
||||||
<h2>Theme</h2>
|
<h2>Theme</h2>
|
||||||
<style-switcher></style-switcher>
|
<style-switcher></style-switcher>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="setting-item">
|
||||||
|
<h2>Filtering</h2>
|
||||||
|
<p>All notices containing these words will be muted, one per line</p>
|
||||||
|
<textarea id="muteWords" v-model="muteWordsString"></textarea>
|
||||||
|
</div>
|
||||||
<div class="setting-item">
|
<div class="setting-item">
|
||||||
<h2>Attachments</h2>
|
<h2>Attachments</h2>
|
||||||
<ul class="setting-list">
|
<ul class="setting-list">
|
||||||
|
@ -32,9 +37,13 @@
|
||||||
<script src="./settings.js">
|
<script src="./settings.js">
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style lang="scss">
|
||||||
.setting-item {
|
.setting-item {
|
||||||
margin: 1em 1em 1.4em;
|
margin: 1em 1em 1.4em;
|
||||||
|
textarea {
|
||||||
|
width: 100%;
|
||||||
|
height: 100px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.setting-list {
|
.setting-list {
|
||||||
list-style-type: none;
|
list-style-type: none;
|
||||||
|
|
|
@ -4,6 +4,7 @@ import RetweetButton from '../retweet_button/retweet_button.vue'
|
||||||
import DeleteButton from '../delete_button/delete_button.vue'
|
import DeleteButton from '../delete_button/delete_button.vue'
|
||||||
import PostStatusForm from '../post_status_form/post_status_form.vue'
|
import PostStatusForm from '../post_status_form/post_status_form.vue'
|
||||||
import UserCardContent from '../user_card_content/user_card_content.vue'
|
import UserCardContent from '../user_card_content/user_card_content.vue'
|
||||||
|
import { filter } from 'lodash'
|
||||||
|
|
||||||
const Status = {
|
const Status = {
|
||||||
props: [
|
props: [
|
||||||
|
@ -19,6 +20,9 @@ const Status = {
|
||||||
userExpanded: false
|
userExpanded: false
|
||||||
}),
|
}),
|
||||||
computed: {
|
computed: {
|
||||||
|
muteWords () {
|
||||||
|
return this.$store.state.config.muteWords
|
||||||
|
},
|
||||||
hideAttachments () {
|
hideAttachments () {
|
||||||
return (this.$store.state.config.hideAttachments && !this.inConversation) ||
|
return (this.$store.state.config.hideAttachments && !this.inConversation) ||
|
||||||
(this.$store.state.config.hideAttachmentsInConv && this.inConversation)
|
(this.$store.state.config.hideAttachmentsInConv && this.inConversation)
|
||||||
|
@ -35,7 +39,15 @@ const Status = {
|
||||||
loggedIn () {
|
loggedIn () {
|
||||||
return !!this.$store.state.users.currentUser
|
return !!this.$store.state.users.currentUser
|
||||||
},
|
},
|
||||||
muted () { return !this.unmuted && this.status.user.muted },
|
muteWordHits () {
|
||||||
|
const statusText = this.status.text.toLowerCase()
|
||||||
|
const hits = filter(this.muteWords, (muteWord) => {
|
||||||
|
return statusText.includes(muteWord.toLowerCase())
|
||||||
|
})
|
||||||
|
|
||||||
|
return hits
|
||||||
|
},
|
||||||
|
muted () { return !this.unmuted && (this.status.user.muted || this.muteWordHits.length > 0) },
|
||||||
isReply () { return !!this.status.in_reply_to_status_id },
|
isReply () { return !!this.status.in_reply_to_status_id },
|
||||||
borderColor () {
|
borderColor () {
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
<template v-if="muted">
|
<template v-if="muted">
|
||||||
<div class="media status container muted">
|
<div class="media status container muted">
|
||||||
<small><router-link :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link></small>
|
<small><router-link :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link></small>
|
||||||
|
<small class="muteWords">{{muteWordHits.join(', ')}}</small>
|
||||||
<a href="#" class="unmute" @click.prevent="toggleMute"><i class="icon-eye-off"></i></a>
|
<a href="#" class="unmute" @click.prevent="toggleMute"><i class="icon-eye-off"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -52,7 +53,7 @@
|
||||||
<small>
|
<small>
|
||||||
<a href="#" @click.prevent="toggleExpanded" ><i class="icon-plus-squared"></i></a>
|
<a href="#" @click.prevent="toggleExpanded" ><i class="icon-plus-squared"></i></a>
|
||||||
</small>
|
</small>
|
||||||
<small v-if="status.user.muted">
|
<small v-if="unmuted">
|
||||||
<a href="#" @click.prevent="toggleMute" ><i class="icon-eye-off"></i></a>
|
<a href="#" @click.prevent="toggleMute" ><i class="icon-eye-off"></i></a>
|
||||||
</small>
|
</small>
|
||||||
</template>
|
</template>
|
||||||
|
@ -167,6 +168,10 @@
|
||||||
button {
|
button {
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.muteWords {
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
a.unmute {
|
a.unmute {
|
||||||
|
|
|
@ -33,6 +33,7 @@ const persistedStateOptions = {
|
||||||
'config.hideAttachments',
|
'config.hideAttachments',
|
||||||
'config.hideAttachmentsInConv',
|
'config.hideAttachmentsInConv',
|
||||||
'config.hideNsfw',
|
'config.hideNsfw',
|
||||||
|
'config.muteWords',
|
||||||
'statuses.notifications',
|
'statuses.notifications',
|
||||||
'users.users'
|
'users.users'
|
||||||
]
|
]
|
||||||
|
|
|
@ -6,7 +6,8 @@ const defaultState = {
|
||||||
colors: {},
|
colors: {},
|
||||||
hideAttachments: false,
|
hideAttachments: false,
|
||||||
hideAttachmentsInConv: false,
|
hideAttachmentsInConv: false,
|
||||||
hideNsfw: true
|
hideNsfw: true,
|
||||||
|
muteWords: []
|
||||||
}
|
}
|
||||||
|
|
||||||
const config = {
|
const config = {
|
||||||
|
|
Loading…
Reference in New Issue