diff --git a/clients/pyauto/README.MD b/clients/pyauto/README.MD index cf129c3..eb50dcc 100644 --- a/clients/pyauto/README.MD +++ b/clients/pyauto/README.MD @@ -98,6 +98,7 @@ def main(): 撤回消息函数装饰器 """ print(msg) + print(msg.get_revoke_msg()) def judge(msg: WxMsg): """ diff --git a/clients/pyauto/demo.py b/clients/pyauto/demo.py index 2470cbf..7b0bccd 100644 --- a/clients/pyauto/demo.py +++ b/clients/pyauto/demo.py @@ -83,6 +83,7 @@ def main(): 撤回消息函数装饰器 """ print(msg) + print(msg.get_revoke_msg()) def judge(msg: WxMsg): """ diff --git a/clients/pyauto/wcfauto/auto_res/bot.py b/clients/pyauto/wcfauto/auto_res/bot.py index ee8d9d0..a06c83a 100644 --- a/clients/pyauto/wcfauto/auto_res/bot.py +++ b/clients/pyauto/wcfauto/auto_res/bot.py @@ -144,8 +144,6 @@ class Register(Event): raise NotImplementedError def group_changed_register(self, - isGroup: bool = False, - isDivision: bool = False, isPyq: bool = False, allow_other_receive: bool = True): """ diff --git a/clients/pyauto/wcfauto/auto_res/core.py b/clients/pyauto/wcfauto/auto_res/core.py index 63eb71a..9f971ee 100644 --- a/clients/pyauto/wcfauto/auto_res/core.py +++ b/clients/pyauto/wcfauto/auto_res/core.py @@ -79,7 +79,9 @@ def _processing_async_func(self, return await func(bot, message) except: traceback.print_exc() + return __async_func + return _async_func @@ -109,7 +111,9 @@ def _processing_universal_func(self, return func(bot, message) except: traceback.print_exc() + return universal_func + return _universal_func @@ -144,8 +148,6 @@ def revoke_message_register(self, def group_changed_register(self, - isGroup: bool = False, - isDivision: bool = False, isPyq: bool = False, allow_other_receive: bool = True): def judge_msg(msg): @@ -154,9 +156,9 @@ def group_changed_register(self, return True return False - return self._processing_async_func(isGroup, - isDivision, - isPyq, + return self._processing_async_func(isPyq=isPyq, + isGroup=True, + isDivision=True, register_name='groupChanged', allow_other_receive=allow_other_receive, judge_msg=judge_msg) diff --git a/clients/pyauto/wcfauto/msg_list.py b/clients/pyauto/wcfauto/msg_list.py index dc9257f..dbe21de 100644 --- a/clients/pyauto/wcfauto/msg_list.py +++ b/clients/pyauto/wcfauto/msg_list.py @@ -9,7 +9,7 @@ class messageList(list): super(messageList, self).__init__(*args, **kwargs) self.__isRunning = True self.__th = None - self.__time_step = 2*60 + self.__time_step = 3*60 self.__msg_queen = queue.Queue() self.start() diff --git a/clients/pyauto/wcfauto/wcf.py b/clients/pyauto/wcfauto/wcf.py index 5ec1dc5..aac36ab 100644 --- a/clients/pyauto/wcfauto/wcf.py +++ b/clients/pyauto/wcfauto/wcf.py @@ -40,6 +40,8 @@ class WxMsgV2(WxMsg): """ def __init__(self, msg: WxMsg) -> None: + self._is_group = msg._is_group + self._is_self = msg._is_self self._type = msg.type self._id = msg.id self._ts = msg.ts