reywechat 1.0.72__py3-none-any.whl → 1.0.74__py3-none-any.whl

reywechat/rreceive.py

@@ -133,10 +133,10 @@ class WeChatMessage(WeChatBase):
         self.data = data
         self.window = window
         self.file: MessageParametersFile | None = None
-        self.trigger_rule: TriggerRule | None = None
+        self.triggering_rule: TriggerRule | None = None
+        self.replied_rule: TriggerRule | None = None
         self.trigger_continue = self.receiver.trigger.continue_
         self.trigger_break = self.receiver.trigger.break_
-        self.replied: bool = False
         self.exc_reports: list[str] = []
         self.is_test: bool = False
 
@@ -1108,7 +1108,7 @@ class WeChatMessage(WeChatBase):
             return self._cache['is_pat_me']
 
         # Judge.
-        pattern = r'<template><!\[CDATA\["\$\{[\da-z_]+\}" 拍了拍我\]\]></template>'
+        pattern = fr'<template><!\[CDATA\["\$\{{[\da-z_]+\}}" 拍了拍(?:我| "\$\{{{self.receiver.wechat.client.login_info['id']}\}}")\]\]></template>'
         self._cache['is_pat_me'] = (
             self.is_pat
             and search(pattern, self.data) is not None
@@ -1584,11 +1584,11 @@ class WeChatMessage(WeChatBase):
 
         # Check.
         if (
-            self.trigger_rule is None
-            or not self.trigger_rule['is_reply']
+            self.triggering_rule is None
+            or not self.triggering_rule['is_reply']
         ):
             text = 'can only be used by reply trigger'
-            throw(WeChatTriggerError, self.trigger_rule, text=text)
+            throw(WeChatTriggerError, self.triggering_rule, text=text)
 
         # Test.
         if (
@@ -1606,7 +1606,7 @@ class WeChatMessage(WeChatBase):
             params['is_test'] = True
 
         # Status.
-        self.replied = True
+        self.replied_rule = self.triggering_rule
 
         # Send.
         self.receiver.wechat.sender.send(

reywechat/rtrigger.py

@@ -76,11 +76,11 @@ class WeChatTrigger(WeChatBase):
 
             # Loop.
             for rule in self.rules:
-                message.trigger_rule = rule
+                message.triggering_rule = rule
 
                 # Replied.
                 if (
-                    message.replied
+                    message.replied_rule is not None
                     and rule['is_reply']
                 ):
                     continue
@@ -107,7 +107,7 @@ class WeChatTrigger(WeChatBase):
                     message.exc_reports.append(exc_text)
 
                 finally:
-                    message.trigger_rule = None
+                    message.triggering_rule = None
 
 
         # Add handler.

{reywechat-1.0.72.dist-info → reywechat-1.0.74.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reywechat
-Version: 1.0.72
+Version: 1.0.74
 Summary: WeChat method set.
 Project-URL: homepage, https://github.com/reyxbo/reywechat/
 Author-email: Rey <reyxbo@163.com>

{reywechat-1.0.72.dist-info → reywechat-1.0.74.dist-info}/RECORD

@@ -5,12 +5,12 @@ reywechat/rcache.py,sha256=5FIa8UB3VsLHT_EXHHmFP62a5AeS22anJCJXC8t4tWw,908
 reywechat/rclient.py,sha256=ayOtQ0CaF8ydXjirLdVed8FbpfdQVTKVSd0x4grs-pQ,22712
 reywechat/rdb.py,sha256=R3ZySPsLM5g0hChFBMxtG9MRZCZ433aMYa_LuggKK90,51010
 reywechat/rlog.py,sha256=TSA-_5pwlq0sUND2cnLDqXvdmAdMAkC7tXIz3WfJ7Xw,5259
-reywechat/rreceive.py,sha256=ndRLm9Y8hhOJUepa4PSURFhxfYCmgx23_zAZIQ0yCxg,50681
+reywechat/rreceive.py,sha256=0CdNyk1FWPAUOPRAfw4owGYl0mI4CXGxsp5BlCR-lYI,50797
 reywechat/rsend.py,sha256=BB42r24x37V1tb27HLhnB_2tILv-DW26F9QbhqiNes8,20101
-reywechat/rtrigger.py,sha256=WdOQwobPdGPyyE9J-qtQFPd60713T0aWqKk02PLdCRE,4966
+reywechat/rtrigger.py,sha256=c0peI208K2k2sOxtuszD8UMrhMrTGp0LMi_XE5ksJKg,4989
 reywechat/rwechat.py,sha256=g0pbprMPv_qWb_lGFrPDAWsJO4vPSIgFLkw0Y28CZUo,4751
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.72.dist-info/METADATA,sha256=0BdkgMmH9rlg5rHX9xovbm9zlHOIfsuVH1Ls-xvDzUc,1551
-reywechat-1.0.72.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.72.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.72.dist-info/RECORD,,
+reywechat-1.0.74.dist-info/METADATA,sha256=7iiyXDIO5bskYV72KY3Mth6De47honWfTQHTBFSqekc,1551
+reywechat-1.0.74.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.74.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.74.dist-info/RECORD,,