diff options
Diffstat (limited to 'packages/client/src/scripts')
| -rw-r--r-- | packages/client/src/scripts/check-word-mute.ts | 6 | ||||
| -rw-r--r-- | packages/client/src/scripts/theme.ts | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/packages/client/src/scripts/check-word-mute.ts b/packages/client/src/scripts/check-word-mute.ts index 74e2581863..fa74c09939 100644 --- a/packages/client/src/scripts/check-word-mute.ts +++ b/packages/client/src/scripts/check-word-mute.ts @@ -7,7 +7,11 @@ export function checkWordMute(note: Record<string, any>, me: Record<string, any> const matched = mutedWords.some(filter => { if (Array.isArray(filter)) { - return filter.every(keyword => note.text!.includes(keyword)); + // Clean up + const filteredFilter = filter.filter(keyword => keyword !== ''); + if (filteredFilter.length === 0) return false; + + return filteredFilter.every(keyword => note.text!.includes(keyword)); } else { // represents RegExp const regexp = filter.match(/^\/(.+)\/(.*)$/); diff --git a/packages/client/src/scripts/theme.ts b/packages/client/src/scripts/theme.ts index 85c087331b..2001b135ca 100644 --- a/packages/client/src/scripts/theme.ts +++ b/packages/client/src/scripts/theme.ts @@ -20,6 +20,7 @@ export const builtinThemes = [ require('@/themes/l-apricot.json5'), require('@/themes/l-rainy.json5'), require('@/themes/l-vivid.json5'), + require('@/themes/l-cherry.json5'), require('@/themes/l-sushi.json5'), require('@/themes/d-dark.json5'), @@ -27,6 +28,7 @@ export const builtinThemes = [ require('@/themes/d-astro.json5'), require('@/themes/d-future.json5'), require('@/themes/d-botanical.json5'), + require('@/themes/d-cherry.json5'), require('@/themes/d-pumpkin.json5'), require('@/themes/d-black.json5'), ] as Theme[]; |