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

reywechat/rdb.py

@@ -319,7 +319,7 @@ class WeChatDatabase(WeChatBase):
                             '51 is system synchronize data message, '
                             '56 is real time position data message, '
                             '1000 is system message, '
-                            '1002 is recall message, '
+                            '1002 is pat or recall message, '
                             'other omit.'
                         )
                     },

reywechat/rreceive.py

@@ -145,6 +145,8 @@ class WeChatMessage(WeChatBase):
             self.room = self.window
             if ':\n' in self.data:
                 self.user, self.data = self.data.split(':\n', 1)
+                if self.user == self.room:
+                    self.user = None
             else:
                 self.user = None
         else:
@@ -164,6 +166,7 @@ class WeChatMessage(WeChatBase):
         self._share_type: int | None = None
         self._share_params: MessageShareParameter | None = None
         self._is_file_uploading: bool | None = None
+        self._file_name_uploading: str | None = None
         self._is_file_uploaded: bool | None = None
         self._is_forward: bool | None = None
         self._is_mini_program: bool | None = None
@@ -181,6 +184,9 @@ class WeChatMessage(WeChatBase):
         self._call_text: str | None = None
         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_recall: bool | 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,8 +420,7 @@ class WeChatMessage(WeChatBase):
 
                 ### File uploading.
                 elif self.is_file_uploading:
-                    file_name: str = search('<title><![CDATA[([^<>]+)]]></title>', self.data)
-                    self._text = f'[文件"{file_name}"开始上传]'
+                    self._text = f'[文件"{self.file_name_uploading}"开始上传]'
 
                 ### Transfer money.
                 elif self.is_money:
@@ -461,7 +466,14 @@ class WeChatMessage(WeChatBase):
 
             ## Recall.
             case 1002:
-                self._text = '[撤回了一条消息]'
+
+                ### Pat.
+                if self.is_pat:
+                    self._text = f'[{self.pat_text}]'
+
+                ### Recall.
+                elif self.is_recall:
+                    self._text = '[撤回了一条消息]'
 
             case _:
                 self._text = '[消息]'
@@ -634,6 +646,30 @@ class WeChatMessage(WeChatBase):
         return self._is_file_uploading
 
 
+    @property
+    def file_name_uploading(self) -> str:
+        """
+        Name of file uploading.
+
+        Returns
+        -------
+        Text
+        """
+
+        # Cache.
+        if self._file_name_uploading is not None:
+            return self._file_name_uploading
+
+        # Check.
+        if not self.is_file_uploading:
+            throw(AssertionError, self._is_file_uploading)
+
+        # Get.
+        self._file_name_uploading: str = search(r'<title><!\[CDATA\[([^<>]+)\]\]></title>', self.data)
+
+        return self._file_name_uploading
+
+
     @property
     def is_file_uploaded(self) -> bool:
         """
@@ -847,7 +883,7 @@ class WeChatMessage(WeChatBase):
             throw(AssertionError, self._is_money)
 
         # Judge.
-        amount_str: str = search(r'<feedesc><![CDATA[￥([\d.,]+)]]></feedesc>', self.data)
+        amount_str: str = search(r'<feedesc><!\[CDATA\[￥([\d.,]+)\]\]></feedesc>', self.data)
         self._money_amount = float(amount_str)
 
         return self._money_amount
@@ -956,10 +992,9 @@ class WeChatMessage(WeChatBase):
             return self._is_call
 
         # Text.
-        if self.type == 1:
-            text = self.data
-        elif self.is_quote:
-            text = self.quote_params['text']
+        if self.type in (1, 3, 34, 42, 43, 47, 48, 49, 50, 56, 1002):
+            text = self.text
+            text = text.strip()
         else:
             self._is_call = False
             self._call_text = None
@@ -1094,6 +1129,89 @@ class WeChatMessage(WeChatBase):
         return self.is_last_call
 
 
+    @property
+    def is_pat(self) -> bool:
+        """
+        Whether if is message of pat.
+
+        Returns
+        -------
+        Judge result.
+        """
+
+        # Cache.
+        if self._is_pat is not None:
+            return self._is_pat
+
+        # Judge.
+        self._is_pat = (
+            self.type == 10002
+            and self.data.startswith('<sysmsg type="pat">')
+        )
+
+        return self._is_pat
+
+
+    @property
+    def pat_text(self) -> str:
+        """
+        Text of pat message.
+
+        Returns
+        -------
+        Text
+        """
+
+        # Cache.
+        if self._pat_text is not None:
+            return self._pat_text
+
+        # Check.
+        if not self.is_pat:
+            throw(AssertionError, self._is_pat)
+
+        # Get.
+
+        ## Text.
+        pattern = r'<template><!\[CDATA\[([^<>]+)\]\]></template>'
+        text: str = search(pattern, self.data)
+
+        ## User name.
+        pattern = r'"\$\{([a-z_\d]+)\}"'
+        users_id: list[str] = findall(pattern, text)
+        for user_id in users_id:
+            user_name = self.receiver.wechat.client.get_contact_name(user_id)
+            old_text = '${%s}' % user_id
+            text = text.replace(old_text, user_name)
+
+        self._pat_text = text
+
+        return self._pat_text
+
+
+    @property
+    def is_recall(self) -> bool:
+        """
+        Whether if is message of recall.
+
+        Returns
+        -------
+        Judge result.
+        """
+
+        # Cache.
+        if self._is_recall is not None:
+            return self._is_recall
+
+        # Judge.
+        self._is_recall = (
+            self.type == 10002
+            and self.data.startswith('<sysmsg type="revokemsg">')
+        )
+
+        return self._is_recall
+
+
     @property
     def is_new_user(self) -> bool:
         """

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

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

{reywechat-1.0.53.dist-info → reywechat-1.0.55.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=KfGo6OlTwh4p78VCGqw8lI6cNFGM2CSlpp1OpF7sqSI,48342
+reywechat/rdb.py,sha256=SVW_tWaMDUaQH2nmD9Dyq-6QB2GV_ECKYbwwyGAwH3g,48349
 reywechat/rlog.py,sha256=4EsTgrgC05JvWeKAucUaWGga638CRRJISJN6qncBCAw,5249
-reywechat/rreceive.py,sha256=WoDKU_1BT3KdOD9y7M0sdfJFkzre6eTUMNCvWnyjYR8,48224
+reywechat/rreceive.py,sha256=53U262MdMoDcJfJ08CBW2c2SRGghNnjergF9ZNXFshM,50993
 reywechat/rsend.py,sha256=aTmc1ycL8bon4KXoX7VpRWQKTsVER6f6bRLKWWvPspY,18049
 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.53.dist-info/METADATA,sha256=zzKQxHhpq4J4VZWdp2rDIuaJQXC8k6CAjhbAJpGuxoI,1551
-reywechat-1.0.53.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.53.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.53.dist-info/RECORD,,
+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,,