extern/fediwall
1
0
Fork 1
mirror of https://github.com/defnull/fediwall.git synced 2024-11-21 23:23:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Unnecessary restrictions on bad word filters

Browse Source 
Bad words can now contain almost any character and match domains, accounts or hashtags more precisely. For example: `example.com` is no longer split into `example` and `com` which would block more than intended. `#example` is no longer redurced to `example` which would also block the word, not only the hashtag.
This commit is contained in:
Marcel Hellkamp 2024-02-10 15:19:53 +01:00
parent 80af91f2d8
commit 0ac58525ec
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/ConfigModal.vue
View File

@ -32,9 +32,10 @@ const formTags = computed({
set: (value) => config.value.tags = arrayUnique([...(value || "").matchAll(tagPattern)].map(m => m[1])),
});
const badwordPattern = /([^, ]+)/igu
const formBadWords = computed({
get: () => config.value.badWords.join(" "),
set: (value) => config.value.badWords = arrayUnique([...(value || "").matchAll(tagPattern)].map(m => m[1])),
set: (value) => config.value.badWords = arrayUnique([...(value || "").matchAll(badwordPattern)].map(m => m[1])),
});
const accountPattern = /\b([a-z0-9_]+)(@([a-z0-9.-]+\.[a-z]{2,}))?\b/ig;
@ -239,7 +240,7 @@ const onSubmit = () => {
<label for="edit-server" class="form-label">Filter bad words:</label>
<div class="ms-5">
<input type="text" class="form-control" id="edit-server" v-model.lazy="formBadWords">
<div class="form-text">Hide posts containing certain words or hashtags. Only exact matches are
<div class="form-text">Hide posts containing certain words, domains or hashtags. Only full word matches are
filtered.</div>
</div>
</div>

2
src/config.ts
View File

@ -255,7 +255,7 @@ export function sanatizeConfig(config: any): Config {
result.loadTrends = boolOr(config.loadTrends, fallback.loadTrends)
result.languages = arrayUnique((Array.isArray(config.languages) ? [...config.languages] : [...fallback.languages]).filter(isLanguage));
result.badWords = arrayUnique((Array.isArray(config.badWords) ? [...config.badWords] : [...fallback.badWords]).filter(isTag));
result.badWords = arrayUnique((Array.isArray(config.badWords) ? [...config.badWords] : [...fallback.badWords]));
result.hideSensitive = boolOr(config.hideSensitive, fallback.hideSensitive)
result.hideBoosts = boolOr(config.hideBoosts, fallback.hideBoosts)
result.hideBots = boolOr(config.hideBots, fallback.hideBots)

4
src/sources.ts
View File

@ -199,12 +199,12 @@ const filterStatus = (cfg: Config, status: MastodonStatus) => {
if (cfg.hideReplies && status.in_reply_to_id) return false;
if (cfg.hideBots && status.account?.bot) return false;
if (cfg.badWords.length) {
const pattern = new RegExp(`\\b(${cfg.badWords.map(regexEscape).join("|")})\\b`, 'i');
const pattern = new RegExp(`(?:\\b|^)(${cfg.badWords.map(regexEscape).join("|")})(?:\\b|$)`, 'i');
if (status.account?.display_name?.match(pattern)
|| status.account?.acct?.match(pattern)
|| status.content.match(pattern)
|| status.spoiler_text?.match(pattern)
|| status.tags?.some(tag => tag.name?.match(pattern))
|| status.tags?.some(tag => `#${tag.name}`.match(pattern))
|| status.media_attachments?.some(media => media.description?.match(pattern)))
return false;
}