diff --git a/app/chain/__init__.py b/app/chain/__init__.py index 3198684f..c1c77c1f 100644 --- a/app/chain/__init__.py +++ b/app/chain/__init__.py @@ -501,6 +501,7 @@ class ChainBase(metaclass=ABCMeta): actions = notify_action.split(",") # 是否已发送管理员标志 admin_sended = False + send_orignal = False for action in actions: send_message = copy.deepcopy(message) if action == "admin": @@ -528,12 +529,14 @@ class ChainBase(metaclass=ABCMeta): continue else: # 按原消息发送全体 + send_orignal = True break # 按设定发送 self.eventmanager.send_event(etype=EventType.NoticeMessage, data={**send_message.dict(), "type": send_message.mtype}) self.run_module("post_message", message=send_message) - return + if not send_orignal: + return # 发送消息事件 self.eventmanager.send_event(etype=EventType.NoticeMessage, data={**message.dict(), "type": message.mtype}) # 按原消息发送 diff --git a/version.py b/version.py index a0d171fe..9e411b57 100644 --- a/version.py +++ b/version.py @@ -1,2 +1,2 @@ -APP_VERSION = 'v2.1.9' +APP_VERSION = 'v2.1.9-1' FRONTEND_VERSION = 'v2.1.9'