reywechat 1.0.68__py3-none-any.whl → 1.0.70__py3-none-any.whl

reywechat/rcache.py

@@ -9,7 +9,7 @@
 """
 
 
-from reykit.ros import FileCache, join_path
+from reykit.ros import FileStore, join_path
 
 from .rbase import WeChatBase
 from .rwechat import WeChat
@@ -20,7 +20,7 @@ __all__ = (
 )
 
 
-class WeChatCache(WeChatBase, FileCache):
+class WeChatCache(WeChatBase, FileStore):
     """
     WeChat file cache type.
     """
@@ -41,7 +41,7 @@ class WeChatCache(WeChatBase, FileCache):
         # Set attribute.
         self.wechat = wechat
         path = join_path(self.wechat.project_dir, 'cache')
-        self.cache = FileCache(path)
+        self.cache = FileStore(path)
         self.folder = self.cache.folder
         self.index = self.cache.index
         self.store = self.cache.store

reywechat/rreceive.py

@@ -212,15 +212,15 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_user_name'] is not None:
-            return self._cache['_user_name']
+        if 'user_name' in self._cache:
+            return self._cache['user_name']
 
         # Set.
-        self._cache['_user_name'] = self.receiver.wechat.client.get_contact_name(
+        self._cache['user_name'] = self.receiver.wechat.client.get_contact_name(
             self.user
         )
 
-        return self._cache['_user_name']
+        return self._cache['user_name']
 
 
     @property
@@ -238,15 +238,15 @@ class WeChatMessage(WeChatBase):
             return
 
         # Cache.
-        if self._cache['_room_name'] is not None:
-            return self._cache['_room_name']
+        if 'room_name' in self._cache:
+            return self._cache['room_name']
 
         # Set.
-        self._cache['_room_name'] = self.receiver.wechat.client.get_contact_name(
+        self._cache['room_name'] = self.receiver.wechat.client.get_contact_name(
             self.room
         )
 
-        return self._cache['_room_name']
+        return self._cache['room_name']
 
 
     @property
@@ -260,16 +260,16 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_window_name'] is not None:
-            return self._cache['_window_name']
+        if 'window_name' in self._cache:
+            return self._cache['window_name']
 
         # Set.
         if self.room is None:
-            self._cache['_window_name'] = self.user_name
+            self._cache['window_name'] = self.user_name
         else:
-            self._cache['_window_name'] = self.room_name
+            self._cache['window_name'] = self.room_name
 
-        return self._cache['_window_name']
+        return self._cache['window_name']
 
 
     @property
@@ -283,111 +283,111 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_text'] is not None:
-            return self._cache['_text']
+        if 'text' in self._cache:
+            return self._cache['text']
 
         # Get.
         match self.type:
 
             ## Text.
             case 1:
-                self._cache['_text'] = self.data
+                self._cache['text'] = self.data
 
             ## Image.
             case 3:
-                self._cache['_text'] = '[图片]'
+                self._cache['text'] = '[图片]'
 
             ## Voice.
             case 34:
                 voice_len = round(self.voice_len, 1)
-                self._cache['_text'] = f'[{voice_len}秒的语音]'
+                self._cache['text'] = f'[{voice_len}秒的语音]'
 
             ## New firend invitation.
             case 37:
-                self._cache['_text'] = '[新好友邀请]'
+                self._cache['text'] = '[新好友邀请]'
 
             ## Business card.
             case 42:
-                self._cache['_text'] = f'[分享名片"{self.business_card_name}"]'
+                self._cache['text'] = f'[分享名片"{self.business_card_name}"]'
 
             ## Video.
             case 43:
-                self._cache['_text'] = f'[{self.video_len}秒的视频]'
+                self._cache['text'] = f'[{self.video_len}秒的视频]'
 
             ## Emoticon.
             case 47:
-                self._cache['_text'] = f'[动画表情]'
+                self._cache['text'] = f'[动画表情]'
 
             ## Position.
             case 48:
-                self._cache['_text'] = '[地图位置分享]'
+                self._cache['text'] = '[地图位置分享]'
 
             ## Share.
             case 49:
 
                 ### Pure URL text.
                 if self.share_type == 1:
-                    self._cache['_text'] = '[网址]'
+                    self._cache['text'] = '[网址]'
                     if self.share_params['title'] is not None:
                         self._text += f' {self.share_params['title']}'
 
                 ### File uploaded.
                 elif self.is_file_uploaded:
-                    self._cache['_text'] = f'[文件"{self.file['name']}"发送完成]'
+                    self._cache['text'] = f'[文件"{self.file['name']}"发送完成]'
 
                 ### Initiate real time location.
                 elif self.share_type == 17:
-                    self._cache['_text'] = '[开始实时地图位置分享]'
+                    self._cache['text'] = '[开始实时地图位置分享]'
 
                 ### Forword messages.
                 elif self.is_forword:
                     if self.share_params['title'] is None:
-                        self._cache['_text'] = '[转发聊天记录]'
+                        self._cache['text'] = '[转发聊天记录]'
                     else:
-                        self._cache['_text'] = f'[转发"{self.share_params['title']}"]'
+                        self._cache['text'] = f'[转发"{self.share_params['title']}"]'
                     if self.share_params['desc'] is not None:
                         self._text += f' {self.share_params['desc']}'
 
                 ### Mini program.
                 elif self.is_mini_program:
                     if self.share_params['name'] is None:
-                        self._cache['_text'] = '[小程序分享]'
+                        self._cache['text'] = '[小程序分享]'
                     else:
-                        self._cache['_text'] = f'[小程序"{self.share_params['name']}"分享]'
+                        self._cache['text'] = f'[小程序"{self.share_params['name']}"分享]'
                     if self.share_params['title'] is not None:
                         self._text += f' {self.share_params['title']}'
 
                 ### Video channel.
                 elif self.share_type == 51:
                     if self.share_params['name'] is None:
-                        self._cache['_text'] = '[视频号分享]'
+                        self._cache['text'] = '[视频号分享]'
                     else:
-                        self._cache['_text'] = f'[视频号"{self.share_params['name']}"分享]'
+                        self._cache['text'] = f'[视频号"{self.share_params['name']}"分享]'
                     if self.share_params['title'] is not None:
                         self._text += f' {self.share_params['title']}'
 
                 ### Quote.
                 elif self.is_quote:
-                    self._cache['_text'] = f'[引用了"{self.quote_params['quote_user_name']}"的消息并发言] {self.quote_params['text']}'
+                    self._cache['text'] = f'[引用了"{self.quote_params['quote_user_name']}"的消息并发言] {self.quote_params['text']}'
 
                 ### Quote me.
                 elif self.is_quote_me:
-                    self._cache['_text'] = f'[引用了你的消息并发言] {self.quote_params['text']}'
+                    self._cache['text'] = f'[引用了你的消息并发言] {self.quote_params['text']}'
 
                 ### File uploading.
                 elif self.is_file_uploading:
-                    self._cache['_text'] = f'[文件"{self.file_name_uploading}"发送中]'
+                    self._cache['text'] = f'[文件"{self.file_name_uploading}"发送中]'
 
                 ### Transfer money.
                 elif self.is_money:
-                    self._cache['_text'] = f'[转账{self.money_amount}￥]'
+                    self._cache['text'] = f'[转账{self.money_amount}￥]'
 
                 ### App.
                 elif self.is_app:
                     if self.share_params['name'] is None:
-                        self._cache['_text'] = '[APP分享]'
+                        self._cache['text'] = '[APP分享]'
                     else:
-                        self._cache['_text'] = f'[APP"{self.share_params['name']}"分享]'
+                        self._cache['text'] = f'[APP"{self.share_params['name']}"分享]'
                     if self.share_params["title"] is not None:
                         self._text += f' {self.share_params["title"]}'
                     if self.share_params["desc"] is not None:
@@ -396,9 +396,9 @@ class WeChatMessage(WeChatBase):
                 ### Other.
                 else:
                     if self.share_params['name'] is None:
-                        self._cache['_text'] = '[分享]'
+                        self._cache['text'] = '[分享]'
                     else:
-                        self._cache['_text'] = f'["{self.share_params['name']}"分享]'
+                        self._cache['text'] = f'["{self.share_params['name']}"分享]'
                     if self.share_params["title"] is not None:
                         self._text += f' {self.share_params["title"]}'
                     if self.share_params["desc"] is not None:
@@ -406,32 +406,32 @@ class WeChatMessage(WeChatBase):
 
             ## Voice call or video call.
             case 50:
-                self._cache['_text'] = '[视频或语音通话]'
+                self._cache['text'] = '[视频或语音通话]'
 
             ## System sync.
             case 51:
-                self._cache['_text'] = '[系统同步]'
+                self._cache['text'] = '[系统同步]'
 
             ## Real time position.
             case 56:
-                self._cache['_text'] = '[实时地图位置分享中]'
+                self._cache['text'] = '[实时地图位置分享中]'
 
             ## System.
             case 10000:
-                self._cache['_text'] = '[系统信息]'
+                self._cache['text'] = '[系统信息]'
 
             ## Pat.
             case 10002 if self.is_pat:
-                self._cache['_text'] = f'[{self.pat_text}]'
+                self._cache['text'] = f'[{self.pat_text}]'
 
             ## Recall.
             case 10002 if self.is_recall:
-                self._cache['_text'] = '[撤回了一条消息]'
+                self._cache['text'] = '[撤回了一条消息]'
 
             case _:
-                self._cache['_text'] = '[消息]'
+                self._cache['text'] = '[消息]'
 
-        return self._cache['_text']
+        return self._cache['text']
 
 
     @property
@@ -445,8 +445,8 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_voice_len'] is not None:
-            return self._cache['_voice_len']
+        if 'voice_len' in self._cache:
+            return self._cache['voice_len']
 
         # Check.
         if self.type != 34:
@@ -455,9 +455,9 @@ class WeChatMessage(WeChatBase):
         # Get.
         pattern = r'voicelength="(\d+)"'
         voice_len_us_str = search(pattern, self.data)
-        self._cache['_voice_len'] = int(voice_len_us_str) / 1000
+        self._cache['voice_len'] = int(voice_len_us_str) / 1000
 
-        return self._cache['_voice_len']
+        return self._cache['voice_len']
 
 
     @property
@@ -471,8 +471,8 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_video_len'] is not None:
-            return self._cache['_video_len']
+        if 'video_len' in self._cache:
+            return self._cache['video_len']
 
         # Check.
         if self.type != 43:
@@ -481,9 +481,9 @@ class WeChatMessage(WeChatBase):
         # Get.
         pattern = r'playlength="(\d+)"'
         video_len_s_str = search(pattern, self.data)
-        self._cache['_video_len'] = int(video_len_s_str)
+        self._cache['video_len'] = int(video_len_s_str)
 
-        return self._cache['_video_len']
+        return self._cache['video_len']
 
 
     @property
@@ -497,8 +497,8 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_business_card_name'] is not None:
-            return self._cache['_business_card_name']
+        if 'business_card_name' in self._cache:
+            return self._cache['business_card_name']
 
         # Check.
         if self.type != 42:
@@ -506,9 +506,9 @@ class WeChatMessage(WeChatBase):
 
         # Get.
         pattern = r'nickname="([^"]+)"'
-        self._cache['_business_card_name'] = search(pattern, self.data)
+        self._cache['business_card_name'] = search(pattern, self.data)
 
-        return self._cache['_business_card_name']
+        return self._cache['business_card_name']
 
 
     @property
@@ -522,8 +522,8 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_share_type'] is not None:
-            return self._cache['_share_type']
+        if 'share_type' in self._cache:
+            return self._cache['share_type']
 
         # Check.
         if self.type != 49:
@@ -532,9 +532,9 @@ class WeChatMessage(WeChatBase):
         # Get.
         pattern = r'<type>(\d+)</type>'
         share_type_str: str = search(pattern, self.data)
-        self._cache['_share_type'] = int(share_type_str)
+        self._cache['share_type'] = int(share_type_str)
 
-        return self._cache['_share_type']
+        return self._cache['share_type']
 
 
     @property
@@ -548,8 +548,8 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_share_params'] is not None:
-            return self._cache['_share_params']
+        if 'share_params' in self._cache:
+            return self._cache['share_params']
 
         # Check.
         if self.type != 49:
@@ -573,7 +573,7 @@ class WeChatMessage(WeChatBase):
             'url': url
         }
 
-        return self._cache['_share_params']
+        return self._cache['share_params']
 
 
     @property
@@ -587,16 +587,16 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_file_uploading'] is not None:
-            return self._cache['_is_file_uploading']
+        if 'is_file_uploading' in self._cache:
+            return self._cache['is_file_uploading']
 
         # Judge.
-        self._cache['_is_file_uploading'] = (
+        self._cache['is_file_uploading'] = (
             self.type == 49
             and self.share_type == 74
         )
 
-        return self._cache['_is_file_uploading']
+        return self._cache['is_file_uploading']
 
 
     @property
@@ -610,17 +610,17 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_file_name_uploading'] is not None:
-            return self._cache['_file_name_uploading']
+        if 'file_name_uploading' in self._cache:
+            return self._cache['file_name_uploading']
 
         # Check.
         if not self.is_file_uploading:
-            throw(AssertionError, self._is_file_uploading)
+            throw(AssertionError, self._cache['is_file_uploading'])
 
         # Get.
-        self._file_name_uploading: str = search(r'<title><!\[CDATA\[([^<>]+)\]\]></title>', self.data)
+        self._cache['file_name_uploading'] = search(r'<title><!\[CDATA\[([^<>]+)\]\]></title>', self.data)
 
-        return self._cache['_file_name_uploading']
+        return self._cache['file_name_uploading']
 
 
     @property
@@ -634,16 +634,16 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_file_uploaded'] is not None:
-            return self._cache['_is_file_uploaded']
+        if 'is_file_uploaded' in self._cache:
+            return self._cache['is_file_uploaded']
 
         # Judge.
-        self._cache['_is_file_uploading'] = (
+        self._cache['is_file_uploading'] = (
             self.type == 49
             and self.share_type == 6
         )
 
-        return self._cache['_is_file_uploaded']
+        return self._cache['is_file_uploaded']
 
 
     @property
@@ -657,16 +657,16 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_forward'] is not None:
-            return self._cache['_is_forward']
+        if 'is_forward' in self._cache:
+            return self._cache['is_forward']
 
         # Judge.
-        self._cache['_is_forward'] = (
+        self._cache['is_forward'] = (
             self.type == 49
             and self.share_type in (19, 40)
         )
 
-        return self._cache['_is_forward']
+        return self._cache['is_forward']
 
 
     @property
@@ -680,16 +680,16 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_mini_program'] is not None:
-            return self._cache['_is_mini_program']
+        if 'is_mini_program' in self._cache:
+            return self._cache['is_mini_program']
 
         # Judge.
-        self._cache['_is_mini_program'] = (
+        self._cache['is_mini_program'] = (
             self.type == 49
             and self.type == 33
         )
 
-        return self._cache['_is_mini_program']
+        return self._cache['is_mini_program']
 
 
     @property
@@ -703,16 +703,16 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_quote'] is not None:
-            return self._cache['_is_quote']
+        if 'is_quote' in self._cache:
+            return self._cache['is_quote']
 
         # Judge.
-        self._cache['_is_quote'] = (
+        self._cache['is_quote'] = (
             self.type == 49
             and self.share_type == 57
         )
 
-        return self._cache['_is_quote']
+        return self._cache['is_quote']
 
 
     @property
@@ -756,12 +756,12 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_quote_params'] is not None:
-            return self._cache['_quote_params']
+        if 'quote_params' in self._cache:
+            return self._cache['quote_params']
 
         # Check.
         if not self.is_quote:
-            throw(AssertionError, self._is_quote)
+            throw(AssertionError, self._cache['is_quote'])
 
         # Extract.
         pattern = '<title>([^<>]+)</title>'
@@ -791,7 +791,7 @@ class WeChatMessage(WeChatBase):
             'quote_data': quote_data
         }
 
-        return self._cache['_quote_params']
+        return self._cache['quote_params']
 
 
     @property
@@ -805,16 +805,16 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_money'] is not None:
-            return self._cache['_is_money']
+        if 'is_money' in self._cache:
+            return self._cache['is_money']
 
         # Judge.
-        self._cache['_is_money'] = (
+        self._cache['is_money'] = (
             self.type == 49
             and self.share_type == 2000
         )
 
-        return self._cache['_is_money']
+        return self._cache['is_money']
 
 
     @property
@@ -828,18 +828,18 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_money_amount'] is not None:
-            return self._cache['_money_amount']
+        if 'money_amount' in self._cache:
+            return self._cache['money_amount']
 
         # Check.
         if not self.is_money:
-            throw(AssertionError, self._is_money)
+            throw(AssertionError, self._cache['is_money'])
 
         # Judge.
         amount_str: str = search(r'<feedesc><!\[CDATA\[￥([\d.,]+)\]\]></feedesc>', self.data)
-        self._cache['_money_amount'] = float(amount_str)
+        self._cache['money_amount'] = float(amount_str)
 
-        return self._cache['_money_amount']
+        return self._cache['money_amount']
 
 
     @property
@@ -853,16 +853,16 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_app'] is not None:
-            return self._cache['_is_app']
+        if 'is_app' in self._cache:
+            return self._cache['is_app']
 
         # Judge.
-        self._cache['_is_app'] = (
+        self._cache['is_app'] = (
             self.type == 49
             and search('<appname>[^<>]+</appname>', self.data) is not None
         )
 
-        return self._cache['_is_app']
+        return self._cache['is_app']
 
 
     @property
@@ -876,8 +876,8 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_at_names'] is not None:
-            return self._cache['_at_names']
+        if 'at_names' in self._cache:
+            return self._cache['at_names']
 
         # Get.
         if self.type == 1:
@@ -885,9 +885,9 @@ class WeChatMessage(WeChatBase):
         elif self.is_quote:
             text = self.quote_params['text']
         pattern = r'@(\w+)\u2005'
-        self._cache['_at_names'] = findall(pattern, text)
+        self._cache['at_names'] = findall(pattern, text)
 
-        return self._cache['_at_names']
+        return self._cache['at_names']
 
 
     @property
@@ -901,13 +901,13 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_at'] is not None:
-            return self._cache['_is_at']
+        if 'is_at' in self._cache:
+            return self._cache['is_at']
 
         # Judge.
-        self._cache['_is_at'] = self.at_names != []
+        self._cache['is_at'] = self.at_names != []
 
-        return self._cache['_is_at']
+        return self._cache['is_at']
 
 
     @property
@@ -921,13 +921,13 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_at_me'] is not None:
-            return self._cache['_is_at_me']
+        if 'is_at_me' in self._cache:
+            return self._cache['is_at_me']
 
         # Judge.
-        self._cache['_is_at_me'] = self.receiver.wechat.client.login_info['name'] in self.at_names
+        self._cache['is_at_me'] = self.receiver.wechat.client.login_info['name'] in self.at_names
 
-        return self._cache['_is_at_me']
+        return self._cache['is_at_me']
 
 
     @property
@@ -941,11 +941,11 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_call'] is not None:
-            return self._cache['_is_call']
+        if 'is_call' in self._cache:
+            return self._cache['is_call']
 
         # Judge.
-        self._cache['_is_call'] = (
+        self._cache['is_call'] = (
 
             ## Last call.
             self.is_last_call
@@ -970,7 +970,7 @@ class WeChatMessage(WeChatBase):
 
         )
 
-        return self._cache['_is_call']
+        return self._cache['is_call']
 
 
     @property
@@ -984,12 +984,12 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_call_text'] is not None:
-            return self._cache['_call_text']
+        if 'call_text' in self._cache:
+            return self._cache['call_text']
 
         # Check.
         if not self.is_call:
-            throw(AssertionError, self._is_call)
+            throw(AssertionError, self._cache['is_call'])
 
         # Get.
         text = self.text
@@ -1006,9 +1006,9 @@ class WeChatMessage(WeChatBase):
         if result is not None:
             text = result
 
-        self._cache['_call_text'] = text.strip()
+        self._cache['call_text'] = text.strip()
 
-        return self._cache['_call_text']
+        return self._cache['call_text']
 
 
     @property
@@ -1022,22 +1022,22 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_call_next'] is not None:
-            return self._cache['_is_call_next']
+        if 'is_call_next' in self._cache:
+            return self._cache['is_call_next']
 
         # Judge.
-        self._cache['_is_call_next'] = (
+        self._cache['is_call_next'] = (
             self.room is not None
             and self.is_call
             and self.call_text == ''
         )
 
         ### Mark.
-        if self._is_call_next:
+        if self._cache['is_call_next']:
             call_next_mark_value = f'{self.user}_{self.room}'
             self.receiver.mark(call_next_mark_value, 'is_call_next')
 
-        return self._cache['_is_call_next']
+        return self._cache['is_call_next']
 
 
     @property
@@ -1051,15 +1051,15 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_last_call'] is not None:
-            return self._cache['_is_last_call']
+        if 'is_last_call' in self._cache:
+            return self._cache['is_last_call']
 
         # Judge.
         call_next_mark_value = f'{self.user}_{self.room}'
-        self._cache['_is_last_call'] = self.receiver.mark.is_marked(call_next_mark_value, 'is_call_next')
+        self._cache['is_last_call'] = self.receiver.mark.is_marked(call_next_mark_value, 'is_call_next')
 
         # Mark.
-        if self._is_last_call:
+        if self._cache['is_last_call']:
             call_next_mark_value = f'{self.user}_{self.room}'
             self.receiver.mark.remove(call_next_mark_value, 'is_call_next')
 
@@ -1077,16 +1077,16 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_pat'] is not None:
-            return self._cache['_is_pat']
+        if 'is_pat' in self._cache:
+            return self._cache['is_pat']
 
         # Judge.
-        self._cache['_is_pat'] = (
+        self._cache['is_pat'] = (
             self.type == 10002
             and self.data.startswith('<sysmsg type="pat">')
         )
 
-        return self._cache['_is_pat']
+        return self._cache['is_pat']
 
 
     @property
@@ -1100,17 +1100,17 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_pat_me'] is not None:
-            return self._cache['_is_pat_me']
+        if 'is_pat_me' in self._cache:
+            return self._cache['is_pat_me']
 
         # Judge.
         pattern = r'<template><!\[CDATA\["\$\{[\da-z_]+\}" 拍了拍我\]\]></template>'
-        self._cache['_is_pat_me'] = (
+        self._cache['is_pat_me'] = (
             self.is_pat
             and search(pattern, self.data) is not None
         )
 
-        return self._cache['_is_pat_me']
+        return self._cache['is_pat_me']
 
 
     @property
@@ -1124,12 +1124,12 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_pat_text'] is not None:
-            return self._cache['_pat_text']
+        if 'pat_text' in self._cache:
+            return self._cache['pat_text']
 
         # Check.
         if not self.is_pat:
-            throw(AssertionError, self._is_pat)
+            throw(AssertionError, self._cache['is_pat'])
 
         # Get.
 
@@ -1145,9 +1145,9 @@ class WeChatMessage(WeChatBase):
             old_text = '${%s}' % user_id
             text = text.replace(old_text, user_name)
 
-        self._cache['_pat_text'] = text
+        self._cache['pat_text'] = text
 
-        return self._cache['_pat_text']
+        return self._cache['pat_text']
 
 
     @property
@@ -1161,16 +1161,16 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_recall'] is not None:
-            return self._cache['_is_recall']
+        if 'is_recall' in self._cache:
+            return self._cache['is_recall']
 
         # Judge.
-        self._cache['_is_recall'] = (
+        self._cache['is_recall'] = (
             self.type == 10002
             and self.data.startswith('<sysmsg type="revokemsg">')
         )
 
-        return self._cache['_is_recall']
+        return self._cache['is_recall']
 
 
     @property
@@ -1184,11 +1184,11 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_new_user'] is not None:
-            return self._cache['_is_new_user']
+        if 'is_new_user' in self._cache:
+            return self._cache['is_new_user']
 
         # Judge.
-        self._cache['_is_new_user'] = (
+        self._cache['is_new_user'] = (
             self.type == 10000
             and (
                 self.data == '以上是打招呼的内容'
@@ -1197,7 +1197,7 @@ class WeChatMessage(WeChatBase):
             )
         )
 
-        return self._cache['_is_new_user']
+        return self._cache['is_new_user']
 
 
     @property
@@ -1211,11 +1211,11 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_new_room'] is not None:
-            return self._cache['_is_new_room']
+        if 'is_new_room' in self._cache:
+            return self._cache['is_new_room']
 
         # Judge.
-        self._cache['_is_new_room'] = (
+        self._cache['is_new_room'] = (
             self.type == 10000
             and (
                 '邀请你和' in self.data[:38]
@@ -1223,7 +1223,7 @@ class WeChatMessage(WeChatBase):
             )
         )
 
-        return self._cache['_is_new_room']
+        return self._cache['is_new_room']
 
 
     @property
@@ -1237,17 +1237,17 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_new_room_user'] is not None:
-            return self._cache['_is_new_room_user']
+        if 'is_new_room_user' in self._cache:
+            return self._cache['is_new_room_user']
 
         # Judge.
-        self._cache['_is_new_room_user'] = (
+        self._cache['is_new_room_user'] = (
             self.type == 10000
             and '邀请"' in self.data[:37]
             and self.data.endswith('"加入了群聊')
         )
 
-        return self._cache['_is_new_room_user']
+        return self._cache['is_new_room_user']
 
 
     @property
@@ -1261,13 +1261,13 @@ class WeChatMessage(WeChatBase):
         """
 
         # Extracted.
-        if self._cache['_new_room_user_name'] is not None:
-            return self._cache['_new_room_user_name']
+        if 'new_room_user_name' in self._cache:
+            return self._cache['new_room_user_name']
 
         # Extract.
         pattern = '邀请"(.+?)"加入了群聊'
         result: str = search(pattern, self.data)
-        self._cache['_new_room_user_name'] = result
+        self._cache['new_room_user_name'] = result
 
         return result
 
@@ -1283,16 +1283,16 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_change_room_name'] is not None:
-            return self._cache['_is_change_room_name']
+        if 'is_change_room_name' in self._cache:
+            return self._cache['is_change_room_name']
 
         # Judge.
-        self._cache['_is_change_room_name'] = (
+        self._cache['is_change_room_name'] = (
             self.type == 10000
             and '修改群名为“' in self.data[:40]
         )
 
-        return self._cache['_is_change_room_name']
+        return self._cache['is_change_room_name']
 
 
     @property
@@ -1306,15 +1306,15 @@ class WeChatMessage(WeChatBase):
         """
 
         # Extracted.
-        if self._cache['_change_room_name'] is not None:
-            return self._cache['_change_room_name']
+        if 'change_room_name' in self._cache:
+            return self._cache['change_room_name']
 
         # Extract.
         pattern = '修改群名为“(.+?)”'
         result: str = search(pattern, self.data)
-        self._cache['_change_room_name'] = result
+        self._cache['change_room_name'] = result
 
-        return self._cache['_change_room_name']
+        return self._cache['change_room_name']
 
 
     @property
@@ -1328,17 +1328,17 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_kick_out_room'] is not None:
-            return self._cache['_is_kick_out_room']
+        if 'is_kick_out_room' in self._cache:
+            return self._cache['is_kick_out_room']
 
         # Judge.
-        self._cache['_is_kick_out_room'] = (
+        self._cache['is_kick_out_room'] = (
             self.type == 10000
             and self.data.startswith('你被')
             and self.data.endswith('移出群聊')
         )
 
-        return self._cache['_is_kick_out_room']
+        return self._cache['is_kick_out_room']
 
 
     @property
@@ -1352,17 +1352,17 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_dissolve_room'] is not None:
-            return self._cache['_is_dissolve_room']
+        if 'is_dissolve_room' in self._cache:
+            return self._cache['is_dissolve_room']
 
         # Judge.
-        self._cache['_is_dissolve_room'] = (
+        self._cache['is_dissolve_room'] = (
             self.type == 10000
             and self.data.startswith('群主')
             and self.data.endswith('已解散该群聊')
         )
 
-        return self._cache['_is_dissolve_room']
+        return self._cache['is_dissolve_room']
 
 
     @property
@@ -1376,17 +1376,17 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_image_qrcodes'] is not None:
-            return self._cache['_image_qrcodes']
+        if 'image_qrcodes' in self._cache:
+            return self._cache['image_qrcodes']
 
         # Check.
         if self.type != 3:
             throw(AssertionError, self.type)
 
         # Extract.
-        self._cache['_image_qrcodes'] = decode_qrcode(self.file['path'])
+        self._cache['image_qrcodes'] = decode_qrcode(self.file['path'])
 
-        return self._cache['_image_qrcodes']
+        return self._cache['image_qrcodes']
 
 
     @property
@@ -1400,16 +1400,16 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_html'] is not None:
-            return self._cache['_is_html']
+        if 'is_html' in self._cache:
+            return self._cache['is_html']
 
         # Judge.
-        self._cache['_is_html'] = (
+        self._cache['is_html'] = (
             self.type != 1
             and search(r'^<(\S+)[ >].*</\1>\s*', self.data) is not None
         )
 
-        return self._cache['_is_html']
+        return self._cache['is_html']
 
 
     @property
@@ -1423,17 +1423,17 @@ class WeChatMessage(WeChatBase):
         """
 
         # Cache.
-        if self._cache['_is_xml'] is not None:
-            return self._cache['_is_xml']
+        if 'is_xml' in self._cache:
+            return self._cache['is_xml']
 
         # Judge.
-        self._cache['_is_xml'] = (
+        self._cache['is_xml'] = (
             self.type != 1
             and self.data.startswith('<?xml ')
             and self.data.rstrip().endswith('</msg>')
         )
 
-        return self._cache['_is_xml']
+        return self._cache['is_xml']
 
 
     @property
@@ -1449,13 +1449,13 @@ class WeChatMessage(WeChatBase):
         """
 
         # Extracted.
-        if self._cache['_valid'] is not None:
-            return self._cache['_valid']
+        if 'valid' in self._cache:
+            return self._cache['valid']
 
         # Judge.
-        self._cache['_valid'] = self.receiver.wechat.database.is_valid(self)
+        self._cache['valid'] = self.receiver.wechat.database.is_valid(self)
 
-        return self._cache['_valid']
+        return self._cache['valid']
 
 
     def check_call(self) -> None:

{reywechat-1.0.68.dist-info → reywechat-1.0.70.dist-info}/METADATA

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

{reywechat-1.0.68.dist-info → reywechat-1.0.70.dist-info}/RECORD

@@ -1,16 +1,16 @@
 reywechat/__init__.py,sha256=FXc3XSiPLLmz9bgZdiYKxeWX-7VT9RqPc_EkXp3Kk0I,476
 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/rcache.py,sha256=5FIa8UB3VsLHT_EXHHmFP62a5AeS22anJCJXC8t4tWw,908
 reywechat/rclient.py,sha256=lc1CPle9h08mwP8NlJN0ybzcNJxtpV0ma6q6cz1RIxk,22518
 reywechat/rdb.py,sha256=R3ZySPsLM5g0hChFBMxtG9MRZCZ433aMYa_LuggKK90,51010
 reywechat/rlog.py,sha256=TSA-_5pwlq0sUND2cnLDqXvdmAdMAkC7tXIz3WfJ7Xw,5259
-reywechat/rreceive.py,sha256=wIzxcKrt1apGG-qlc4otrTfTz8AG6V2RmCWW4ADQ-74,51109
+reywechat/rreceive.py,sha256=zT5mhXolmpaSkBuG-jL-Jt5ATVMwpyrSF3U5FamdyzU,50561
 reywechat/rsend.py,sha256=BB42r24x37V1tb27HLhnB_2tILv-DW26F9QbhqiNes8,20101
 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.68.dist-info/METADATA,sha256=e0wI7pWszpHxEiTwWUs9mwMZxez7Dg2wkBc4tTWK9Aw,1551
-reywechat-1.0.68.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.68.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.68.dist-info/RECORD,,
+reywechat-1.0.70.dist-info/METADATA,sha256=sr5yfSW75aD1S2oqSoWTUGEbmfUy_mg1mWDW1UfF8rI,1551
+reywechat-1.0.70.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.70.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.70.dist-info/RECORD,,