reywechat 1.0.30__py3-none-any.whl → 1.0.31__py3-none-any.whl

reywechat/rreceive.py

@@ -134,6 +134,7 @@ class WeChatMessage(BaseWeChat):
         self._is_at: bool | None = None
         self._is_at_self: bool | None = None
         self._is_call: bool | None = None
+        self._call_text: str | None = None
         self._is_new_user: bool | None = None
         self._is_new_room: bool | None = None
         self._is_new_room_user: bool | None = None
@@ -414,7 +415,7 @@ class WeChatMessage(BaseWeChat):
             text = self.data
         elif self.is_quote:
             text = self.quote_params['text']
-        pattern = r'@\w+\u2005'
+        pattern = r'@(\w+)\u2005'
         self._at_names = findall(pattern, text)
 
         return self._at_names
@@ -455,8 +456,7 @@ class WeChatMessage(BaseWeChat):
             return self._is_at_self
 
         # Judge.
-        pattern = '@%s\u2005' % self.receiver.wechat.client.login_info['name']
-        self._is_at_self = pattern in self.at_names
+        self._is_at_self = self.receiver.wechat.client.login_info['name'] in self.at_names
 
         return self._is_at_self
 
@@ -464,7 +464,7 @@ class WeChatMessage(BaseWeChat):
     @property
     def is_call(self) -> bool:
         """
-        Whether if is message of call self.
+        Whether if is message of call self name.
 
         Returns
         -------
@@ -475,39 +475,83 @@ class WeChatMessage(BaseWeChat):
         if self._is_call is not None:
             return self._is_call
 
+        # Text.
+        if self.type == 1:
+            text = self.data
+        elif self.is_quote:
+            text = self.quote_params['text']
+        else:
+            self._is_call = False
+            self._call_text = None
+            return self._is_call
+        text = text.strip()
+
+        ## At self.
+        at_self_keyword = '@%s\u2005' % self.receiver.wechat.client.login_info['name']
+        if at_self_keyword in text:
+            is_at_self = True
+            text = text.replace(at_self_keyword, '')
+        else:
+            is_at_self = False
+
+        ## Call self.
+        pattern = fr'^{self.receiver.call_name}[\s,，]*(.*)$'
+        result: str | None = search(pattern, text)
+        if result is not None:
+            is_call_name = True
+            text = result
+        else:
+            is_call_name = False
+
         # Judge.
-        is_call = False
         if (
 
             ## Private chat.
             self.room is None
 
             ## At self.
-            or self.is_at_self
+            or is_at_self
+
+            ## Call self.
+            or is_call_name
 
             ## Quote self.
             or self.is_quote_self
+
         ):
             is_call = True
-
-        ## Call name.
-        if self.type == 1:
-            text = self.data
-        elif self.is_quote:
-            text = self.quote_params['text']
+            call_text = text
         else:
-            self._is_call = False
-            return self._is_call
-        pattern = fr'^\s*{self.receiver.call_name}[\s,，]*(.*?)\s*$'
-        result: str | None = search(pattern, text)
-        if result is not None:
-            is_call = True
+            is_call = False
+            call_text = None
 
         self._is_call = is_call
+        self._call_text = call_text
 
         return self._is_call
 
 
+    @property
+    def call_text(self) -> str:
+        """
+        Message call text of call self name.
+
+        Returns
+        -------
+        Call text.
+        """
+
+        # Cache.
+        if self._call_text is not None:
+            return self._call_text
+
+        # Check.
+        if not self.is_call:
+            throw(AssertionError, self.is_call)
+
+        return self._call_text
+
+
     @property
     def is_new_user(self) -> bool:
         """
@@ -845,6 +889,17 @@ class WeChatMessage(BaseWeChat):
         return self._valid
 
 
+    @property
+    def check_call(self) -> None:
+        """
+        Check if is call self name, if not, throw exception `WeChatTriggerContinueExit`.
+        """
+
+        # Check.
+        if not self.is_call:
+            self.trigger_continue()
+
+
     @overload
     def reply(
         self,

{reywechat-1.0.30.dist-info → reywechat-1.0.31.dist-info}/METADATA

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

{reywechat-1.0.30.dist-info → reywechat-1.0.31.dist-info}/RECORD

@@ -5,13 +5,13 @@ reywechat/rcache.py,sha256=Hh_HE-t_KUMlrz4gEFPh1AjmhnrSgH520IFJPumWb7A,908
 reywechat/rclient.py,sha256=gtTYaoqhgh9kRFslETKjBJiAAdzJfeOxIJbdCkGAFhM,22577
 reywechat/rdb.py,sha256=Gcj3d-uIospaacjHY8B4HHdru5OwiS9PO6cceAWvXqY,40333
 reywechat/rlog.py,sha256=d3S0eHMUZ92OLE7fjP3zzikIYANtnbAxhnE_DIV_1OY,5251
-reywechat/rreceive.py,sha256=VgDMNc_Lrnnm-eYinK-aCt1qXK1bEuyGYePSGrZtObk,32892
+reywechat/rreceive.py,sha256=0S7GZkLuUdLeccSQJT0-ASBqo_IFmNNQfwk_Qn-SC1E,34178
 reywechat/rschedule.py,sha256=fn11rH0HqxbnJYxARCBBiSdzBpYfQFhcjNmkvihVMTc,1854
 reywechat/rsend.py,sha256=s2sR6l74reDShBAu_MwpavVunz0g42pIga0zX4ElIuI,13717
 reywechat/rtrigger.py,sha256=GHfkhNrS8rV4uXWC3N54UTjak7nKGfqJWX6pe57Hsgg,4953
 reywechat/rwechat.py,sha256=igeG0XhfBN1BRQ9RDmYrPZIKdnIK2tmS05wb-eMdlzs,4923
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.30.dist-info/METADATA,sha256=ajAREqSPl0WJjajG78Ogwz7dftRrwy1-BtQykfUMqLg,1551
-reywechat-1.0.30.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.30.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.30.dist-info/RECORD,,
+reywechat-1.0.31.dist-info/METADATA,sha256=hx4R2CIjrn41MVLGtuLYKwrdiFZw97UQnzRxYfsc9Es,1551
+reywechat-1.0.31.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.31.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.31.dist-info/RECORD,,