diff --git a/pkg/qqbot/filter.py b/pkg/qqbot/filter.py index 6ed83329..7166d8b4 100644 --- a/pkg/qqbot/filter.py +++ b/pkg/qqbot/filter.py @@ -7,6 +7,7 @@ import logging class ReplyFilter: sensitive_words = [] + mask = "*" # 默认值( 兼容性考虑 ) baidu_check = False @@ -14,8 +15,9 @@ class ReplyFilter: baidu_secret_key = "" inappropriate_message_tips = "[百度云]请珍惜机器人,当前返回内容不合规" - def __init__(self, sensitive_words: list): + def __init__(self, sensitive_words: list, mask: str = "*"): self.sensitive_words = sensitive_words + self.mask = mask import config if hasattr(config, 'baidu_check') and hasattr(config, 'baidu_api_key') and hasattr(config, 'baidu_secret_key'): self.baidu_check = config.baidu_check @@ -36,7 +38,7 @@ class ReplyFilter: match = re.findall(word, message) if len(match) > 0: for i in range(len(match)): - message = message.replace(match[i], "*" * len(match[i])) + message = message.replace(match[i], self.mask * len(match[i])) # 百度云审核 if self.baidu_check: diff --git a/pkg/qqbot/manager.py b/pkg/qqbot/manager.py index a2973d5f..6535cac3 100644 --- a/pkg/qqbot/manager.py +++ b/pkg/qqbot/manager.py @@ -82,7 +82,11 @@ class QQBotManager: and config.sensitive_word_filter is not None \ and config.sensitive_word_filter: with open("sensitive.json", "r", encoding="utf-8") as f: - self.reply_filter = pkg.qqbot.filter.ReplyFilter(json.load(f)['words']) + sensitive_json = json.load(f) + self.reply_filter = pkg.qqbot.filter.ReplyFilter( + sensitive_words=sensitive_json['words'], + mask=sensitive_json['mask'] if 'mask' in sensitive_json else '*' + ) else: self.reply_filter = pkg.qqbot.filter.ReplyFilter([]) diff --git a/sensitive-template.json b/sensitive-template.json index 5ee7ee77..11e85353 100644 --- a/sensitive-template.json +++ b/sensitive-template.json @@ -1,4 +1,5 @@ { + "mask": "*", "words": [ "习近平", "胡锦涛",