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

reywechat/rreceive.py

@@ -133,6 +133,8 @@ class WeChatMessage(BaseWeChat):
         self._at_names: list[str] = None
         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
@@ -413,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
@@ -454,12 +456,102 @@ 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
 
 
+    @property
+    def is_call(self) -> bool:
+        """
+        Whether if is message of call self name.
+
+        Returns
+        -------
+        Judge result.
+        """
+
+        # Cache.
+        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.
+        if (
+
+            ## Private chat.
+            self.room is None
+
+            ## At self.
+            or is_at_self
+
+            ## Call self.
+            or is_call_name
+
+            ## Quote self.
+            or self.is_quote_self
+
+        ):
+            is_call = True
+            call_text = text
+        else:
+            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:
         """
@@ -797,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,
@@ -907,7 +1010,8 @@ class WechatReceiver(BaseWeChat):
     def __init__(
         self,
         wechat: WeChat,
-        max_receiver: int
+        max_receiver: int,
+        call_name: str | None
     ) -> None:
         """
         Build instance attributes.
@@ -916,6 +1020,8 @@ class WechatReceiver(BaseWeChat):
         ----------
         wechat : `WeChatClient` instance.
         max_receiver : Maximum number of receivers.
+        call_name : Trigger call name.
+            - `None`: Use account nickname.
         """
 
         # Import.
@@ -924,6 +1030,9 @@ class WechatReceiver(BaseWeChat):
         # Set attribute.
         self.wechat = wechat
         self.max_receiver = max_receiver
+        if call_name is None:
+            call_name = self.wechat.client.login_info['name']
+        self.call_name = call_name
         self.queue: Queue[WeChatMessage] = Queue()
         self.handlers: list[Callable[[WeChatMessage], Any]] = []
         self.started: bool | None = False

reywechat/rwechat.py

@@ -42,6 +42,7 @@ class WeChat(BaseWeChat):
         self,
         rrdatabase: Database | dict[Literal['wechat', 'file'], Database] | None,
         max_receiver: int = 2,
+        call_name: str | None = None,
         project_dir: str | None = None
     ) -> None:
         """
@@ -55,6 +56,8 @@ class WeChat(BaseWeChat):
                 `Key 'wechat'`: `WeChatDatabase` instance used in WeChat methods.
                 `Key 'file'`: `WeChatDatabase` instance used in file methods.
         max_receiver : Maximum number of receivers.
+        call_name : Trigger call name.
+            - `None`: Use account nickname.
         project_dir: Project directory, will create sub folders.
             - `None`: Use working directory.
             - `str`: Use this directory.
@@ -76,7 +79,7 @@ class WeChat(BaseWeChat):
         self.client = WeChatClient(self)
         self.cache = WeChatCache(self)
         self.log = WeChatLog(self)
-        self.receiver = WechatReceiver(self, max_receiver)
+        self.receiver = WechatReceiver(self, max_receiver, call_name)
         self.trigger = self.receiver.trigger
         self.sender = WeChatSender(self)
         self.database = WeChatDatabase(self, rrdatabase)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reywechat
-Version: 1.0.29
+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.29.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=5emlgnIChYL60yx6PoQc1h5aGHFXNuFJ71a585gamEg,31550
+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=K9fwje_Sos3Pvke8tFexDNZsRD7FsLtH3Jktg9xREpk,4788
+reywechat/rwechat.py,sha256=igeG0XhfBN1BRQ9RDmYrPZIKdnIK2tmS05wb-eMdlzs,4923
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.29.dist-info/METADATA,sha256=GQNNn2iqWueYDLoZuKQGnmmQqMgEJlBPAtqQeFY3U3s,1551
-reywechat-1.0.29.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.29.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.29.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,,