Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2025-12-25 03:10:08 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: regex pattern error when update manual blacklist (#9871)

Browse Source
This commit is contained in:
Konv Suu 2025-09-04 13:15:02 +08:00 committed by GitHub
parent 128b1fe9bc
commit 9ff4acf092
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/renderer/src/pages/settings/WebSearchSettings/BlacklistSettings.tsx
View File

@ -71,15 +71,27 @@ const BlacklistSettings: FC = () => {
function updateManualBlacklist(blacklist: string) {
const blacklistDomains = blacklist.split('\n').filter((url) => url.trim() !== '')
const validDomains: string[] = []
const hasError = blacklistDomains.some((domain) => {
const parsed = parseMatchPattern(domain.trim())
if (parsed === null) {
return true // 有错误
const trimmedDomain = domain.trim()
// 正则表达式
if (trimmedDomain.startsWith('/') && trimmedDomain.endsWith('/')) {
try {
const regexPattern = trimmedDomain.slice(1, -1)
new RegExp(regexPattern, 'i')
validDomains.push(trimmedDomain)
return false
} catch (error) {
return true
}
} else {
const parsed = parseMatchPattern(trimmedDomain)
if (parsed === null) {
return true
}
validDomains.push(trimmedDomain)
return false
}
validDomains.push(domain.trim())
return false
})
setErrFormat(hasError)
@ -237,7 +249,9 @@ const BlacklistSettings: FC = () => {
<Button onClick={() => updateManualBlacklist(blacklistInput)} style={{ marginTop: 10 }}>
{t('common.save')}
</Button>
{errFormat && <Alert message={t('settings.tool.websearch.blacklist_tooltip')} type="error" />}
{errFormat && (
<Alert style={{ marginTop: 10 }} message={t('settings.tool.websearch.blacklist_tooltip')} type="error" />
)}
</SettingGroup>
<SettingGroup theme={theme}>
<SettingTitle>