reywechat 1.0.55__py3-none-any.whl → 1.0.57__py3-none-any.whl

reywechat/rdb.py

@@ -318,8 +318,8 @@ class WeChatDatabase(WeChatBase):
                             '50 is voice call or video call invitation message, '
                             '51 is system synchronize data message, '
                             '56 is real time position data message, '
-                            '1000 is system message, '
-                            '1002 is pat or recall message, '
+                            '10000 is system message, '
+                            '10002 is pat or recall message, '
                             'other omit.'
                         )
                     },

reywechat/rreceive.py

@@ -185,7 +185,8 @@ class WeChatMessage(WeChatBase):
         self._is_call_next: bool | None = None
         self._is_last_call: bool | None = None
         self._is_pat: bool | None = None
-        self.pat_text: str | None = None
+        self._is_pat_me: bool | None = None
+        self._pat_text: str | None = None
         self._is_recall: bool | None = None
         self._is_new_user: bool | None = None
         self._is_new_room: bool | None = None
@@ -377,7 +378,7 @@ class WeChatMessage(WeChatBase):
 
                 ### File uploaded.
                 elif self.is_file_uploaded:
-                    self._text = f'[文件"{self.file['name']}"完成上传]'
+                    self._text = f'[文件"{self.file['name']}"发送完成]'
 
                 ### Initiate real time location.
                 elif self.share_type == 17:
@@ -420,7 +421,7 @@ class WeChatMessage(WeChatBase):
 
                 ### File uploading.
                 elif self.is_file_uploading:
-                    self._text = f'[文件"{self.file_name_uploading}"开始上传]'
+                    self._text = f'[文件"{self.file_name_uploading}"发送中]'
 
                 ### Transfer money.
                 elif self.is_money:
@@ -461,19 +462,16 @@ class WeChatMessage(WeChatBase):
                 self._text = '[实时地图位置分享中]'
 
             ## System.
-            case 1000:
+            case 10000:
                 self._text = '[系统信息]'
 
-            ## Recall.
-            case 1002:
-
-                ### Pat.
-                if self.is_pat:
-                    self._text = f'[{self.pat_text}]'
+            ## Pat.
+            case 10002 if self.is_pat:
+                self._text = f'[{self.pat_text}]'
 
-                ### Recall.
-                elif self.is_recall:
-                    self._text = '[撤回了一条消息]'
+            ## Recall.
+            case 10002 if self.is_recall:
+                self._text = '[撤回了一条消息]'
 
             case _:
                 self._text = '[消息]'
@@ -992,7 +990,7 @@ class WeChatMessage(WeChatBase):
             return self._is_call
 
         # Text.
-        if self.type in (1, 3, 34, 42, 43, 47, 48, 49, 50, 56, 1002):
+        if self.type in (1, 3, 34, 42, 43, 47, 48, 49, 50, 56, 10002):
             text = self.text
             text = text.strip()
         else:
@@ -1027,6 +1025,9 @@ class WeChatMessage(WeChatBase):
             ## Private chat.
             or self.room is None
 
+            ## Pat me.
+            or self.is_pat_me
+
             ## At self.
             or is_at_me
 
@@ -1152,6 +1153,30 @@ class WeChatMessage(WeChatBase):
         return self._is_pat
 
 
+    @property
+    def is_pat_me(self) -> bool:
+        """
+        Whether if is message of pat me.
+
+        Returns
+        -------
+        Judge result.
+        """
+
+        # Cache.
+        if self._is_pat_me is not None:
+            return self._is_pat_me
+
+        # Judge.
+        pattern = r'<template><!\[CDATA\["\$\{[\da-z_]+\}" 拍了拍我\]\]></template>'
+        self._is_pat_me = (
+            self.is_pat
+            and search(pattern, self.data) is not None
+        )
+
+        return self._is_pat_me
+
+
     @property
     def pat_text(self) -> str:
         """
@@ -1177,7 +1202,7 @@ class WeChatMessage(WeChatBase):
         text: str = search(pattern, self.data)
 
         ## User name.
-        pattern = r'"\$\{([a-z_\d]+)\}"'
+        pattern = r'"\$\{([\da-z_]+)\}"'
         users_id: list[str] = findall(pattern, text)
         for user_id in users_id:
             user_name = self.receiver.wechat.client.get_contact_name(user_id)

reywechat/rsend.py

@@ -194,6 +194,72 @@ class WeChatSendParameter(WeChatBase):
         self.exc_reports: list[str] = []
         self.status: WeChatSendStatusEnum
 
+        ## Cache.
+        self._text: str | None = None
+
+
+    @property
+    def text(self) -> str:
+        """
+        Text description of parameter content.
+
+        Returns
+        -------
+        Text.
+        """
+
+        # Cache.
+        if self._text is not None:
+            return self._text
+
+        # Get.
+        match self.send_type:
+
+            ## Text.
+            case WeChatSendTypeEnum.TEXT:
+                self._text = self.params['text']
+
+            ## Text with '@'.
+            case WeChatSendTypeEnum.TEXT_AT:
+                self._text = self.params['text']
+
+            ## File.
+            case WeChatSendTypeEnum.FILE:
+                self._text = f'[文件"{self.params['file_name']}"发送]'
+
+            ## Image.
+            case WeChatSendTypeEnum.IMAGE:
+                self._text = f'[图片"{self.params['file_name']}"发送]'
+
+            ## Emotion.
+            case WeChatSendTypeEnum.EMOTION:
+                self._text = f'[动画表情"{self.params['file_name']}"发送]'
+
+            ## Pat.
+            case WeChatSendTypeEnum.PAT:
+                user_name = self.sender.wechat.client.get_contact_name(self.params['user_id'])
+                self._text = f'[我拍了拍"{user_name}"]'
+
+            ## Public account.
+            case WeChatSendTypeEnum.PUBLIC:
+                self._text = f'[公众号"{self.params['title']}"分享]'
+                public_name = self.params.get('public_name')
+                text = self.params.get('public_name')
+                if public_name is not None:
+                    self._text += f' {public_name}'
+                if text is not None:
+                    self._text += f' {text}'
+
+            ## Forward.
+            case WeChatSendTypeEnum.FORWARD:
+                self._text = '[转发了一条消息]'
+
+            ## Throw exception.
+            case send_type:
+                throw(ValueError, send_type)
+
+        return self._text
+
 
 class WeChatSender(WeChatBase):
     """

{reywechat-1.0.55.dist-info → reywechat-1.0.57.dist-info}/METADATA

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

{reywechat-1.0.55.dist-info → reywechat-1.0.57.dist-info}/RECORD

@@ -3,14 +3,14 @@ reywechat/rall.py,sha256=5J_X-XMOyb1Vp1jyS9-oRFXGOtp2vRPX1g3tJot_Eck,371
 reywechat/rbase.py,sha256=hbxn5spvcl_C_Bw8A9teulOXT9GMlxUw145_YbXIOzc,1124
 reywechat/rcache.py,sha256=7UsHHfgFOgxuSqlTSAO6CprgUUOeBCXYus0kxmRBQxk,908
 reywechat/rclient.py,sha256=lc1CPle9h08mwP8NlJN0ybzcNJxtpV0ma6q6cz1RIxk,22518
-reywechat/rdb.py,sha256=SVW_tWaMDUaQH2nmD9Dyq-6QB2GV_ECKYbwwyGAwH3g,48349
+reywechat/rdb.py,sha256=4or5HV_U4mZwRSiK1fa1wZkhh_KfdtkYoWkEdBDov_Q,48351
 reywechat/rlog.py,sha256=4EsTgrgC05JvWeKAucUaWGga638CRRJISJN6qncBCAw,5249
-reywechat/rreceive.py,sha256=53U262MdMoDcJfJ08CBW2c2SRGghNnjergF9ZNXFshM,50993
-reywechat/rsend.py,sha256=aTmc1ycL8bon4KXoX7VpRWQKTsVER6f6bRLKWWvPspY,18049
+reywechat/rreceive.py,sha256=nNSBDfCwFUK2eiDRgLey1o6uQ4GaaQLGpwrsHjB6nbU,51581
+reywechat/rsend.py,sha256=yrJf9GzWVCDptUHHazhWSVW0nm2LCIbb0sz2EII63bY,20049
 reywechat/rtrigger.py,sha256=WdOQwobPdGPyyE9J-qtQFPd60713T0aWqKk02PLdCRE,4966
 reywechat/rwechat.py,sha256=g0pbprMPv_qWb_lGFrPDAWsJO4vPSIgFLkw0Y28CZUo,4751
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.55.dist-info/METADATA,sha256=reH-YZ5i9VYDO--neT_f2oSWj6RoG5nPWFd3JKF30Fs,1551
-reywechat-1.0.55.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.55.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.55.dist-info/RECORD,,
+reywechat-1.0.57.dist-info/METADATA,sha256=9lWZLh4_IdPQ6gTZNmnN0SSBpioFASdjwpmpEjHLO4E,1551
+reywechat-1.0.57.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.57.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.57.dist-info/RECORD,,