reywechat 1.0.75__py3-none-any.whl → 1.0.77__py3-none-any.whl

reywechat/rdb.py

@@ -80,11 +80,6 @@ class WeChatDatabase(WeChatBase):
             'wechat.stats': 'stats'
         }
 
-        # Check.
-        if 'sqlite' in (self.database_wechat.backend, self.database_file.backend):
-            text = 'not suitable for SQLite databases'
-            throw(AssertionError, text=text)
-
         # Add handler.
         self.__add_receiver_handler_to_contact_user()
         self.__add_receiver_handler_to_contact_room()
@@ -763,7 +758,7 @@ class WeChatDatabase(WeChatBase):
 
         ## Insert.
         if contact_table != []:
-            conn.execute_insert(
+            conn.execute.insert(
                 (self.db_names['wechat'], self.db_names['wechat.contact_user']),
                 user_data,
                 'update'
@@ -819,7 +814,7 @@ class WeChatDatabase(WeChatBase):
 
         ## Insert.
         if contact_table != []:
-            conn.execute_insert(
+            conn.execute.insert(
                 (self.db_names['wechat'], self.db_names['wechat.contact_room']),
                 room_data,
                 'update'
@@ -897,7 +892,7 @@ class WeChatDatabase(WeChatBase):
 
         ## Insert.
         if room_user_data != []:
-            conn.execute_insert(
+            conn.execute.insert(
                 (self.db_names['wechat'], self.db_names['wechat.contact_room_user']),
                 room_user_data,
                 'update'
@@ -965,7 +960,7 @@ class WeChatDatabase(WeChatBase):
                 }
 
                 ## Insert.
-                self.database_wechat.execute_insert(
+                self.database_wechat.execute.insert(
                     (self.db_names['wechat'], self.db_names['wechat.contact_user']),
                     data,
                     'update'
@@ -1006,7 +1001,7 @@ class WeChatDatabase(WeChatBase):
                 ## Insert.
 
                 ### 'contact_room'.
-                self.database_wechat.execute_insert(
+                self.database_wechat.execute.insert(
                     (self.db_names['wechat'], self.db_names['wechat.contact_room']),
                     data,
                     'update'
@@ -1028,7 +1023,7 @@ class WeChatDatabase(WeChatBase):
                 }
 
                 ## Update.
-                self.database_wechat.execute_update(
+                self.database_wechat.execute.update(
                     (self.db_names['wechat'], self.db_names['wechat.contact_room']),
                     data
                 )
@@ -1050,7 +1045,7 @@ class WeChatDatabase(WeChatBase):
                 }
 
                 ## Update.
-                self.database_wechat.execute_update(
+                self.database_wechat.execute.update(
                     (self.db_names['wechat'], self.db_names['wechat.contact_room']),
                     data
                 )
@@ -1130,7 +1125,7 @@ class WeChatDatabase(WeChatBase):
             }
 
             # Insert.
-            self.database_wechat.execute_insert(
+            self.database_wechat.execute.insert(
                 (self.db_names['wechat'], self.db_names['wechat.message_receive']),
                 data,
                 'ignore'
@@ -1173,7 +1168,7 @@ class WeChatDatabase(WeChatBase):
             }
 
             # Update.
-            self.database_wechat.execute_update(
+            self.database_wechat.execute.update(
                 (self.db_names['wechat'], self.db_names['wechat.message_send']),
                 data
             )
@@ -1241,7 +1236,7 @@ class WeChatDatabase(WeChatBase):
                 '    )\n'
                 ')'
             )
-            result = conn.execute_select(
+            result = conn.execute.select(
                 (self.db_names['wechat'], self.db_names['wechat.message_send']),
                 ['send_id', 'type', 'receive_id', 'parameter', 'file_id'],
                 where,
@@ -1326,7 +1321,7 @@ class WeChatDatabase(WeChatBase):
 
         ## User.
         if message.room is None:
-            result = message.receiver.wechat.database.database_wechat.execute_select(
+            result = message.receiver.wechat.database.database_wechat.execute.select(
                 (self.db_names['wechat'], self.db_names['wechat.contact_user']),
                 ['valid'],
                 '`user_id` = :user_id',
@@ -1336,7 +1331,7 @@ class WeChatDatabase(WeChatBase):
 
         ## Room.
         elif message.user is None:
-            result = message.receiver.wechat.database.database_wechat.execute_select(
+            result = message.receiver.wechat.database.database_wechat.execute.select(
                 (self.db_names['wechat'], self.db_names['wechat.contact_room']),
                 ['valid'],
                 '`room_id` = :room_id',
@@ -1413,7 +1408,7 @@ class WeChatDatabase(WeChatBase):
         data['file_id'] = file_id
 
         # Insert.
-        self.database_wechat.execute_insert(
+        self.database_wechat.execute.insert(
             (self.db_names['wechat'], self.db_names['wechat.message_send']),
             data
         )

reywechat/rreceive.py

@@ -422,7 +422,7 @@ class WeChatMessage(WeChatBase):
 
             ## System.
             case 10000:
-                self._cache['text'] = '[系统信息]'
+                self._cache['text'] = f'[系统消息] {self.data}'
 
             ## Pat.
             case 10002 if self.is_pat:
@@ -958,6 +958,11 @@ class WeChatMessage(WeChatBase):
             or (
                 self.room is None
                 and self.user is not None
+                and (
+                    self.type in (1, 3, 34, 42, 43, 47, 48, 49, 50, 56, 10000)
+                    or self.is_pat
+                    or self.is_recall
+                )
             )
 
             ## Pat me.

{reywechat-1.0.75.dist-info → reywechat-1.0.77.dist-info}/METADATA

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

{reywechat-1.0.75.dist-info → reywechat-1.0.77.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=5FIa8UB3VsLHT_EXHHmFP62a5AeS22anJCJXC8t4tWw,908
 reywechat/rclient.py,sha256=ayOtQ0CaF8ydXjirLdVed8FbpfdQVTKVSd0x4grs-pQ,22712
-reywechat/rdb.py,sha256=R3ZySPsLM5g0hChFBMxtG9MRZCZ433aMYa_LuggKK90,51010
+reywechat/rdb.py,sha256=pu_8i_e0RRmyD6Oc1lHvgomipCyt5bfpMZQDA-7u9yQ,50804
 reywechat/rlog.py,sha256=TSA-_5pwlq0sUND2cnLDqXvdmAdMAkC7tXIz3WfJ7Xw,5259
-reywechat/rreceive.py,sha256=IiR6zDiEBKl_HHkpfZf0etwlNx_N4XOVX0V6ERjwh6A,50796
+reywechat/rreceive.py,sha256=YvjunkwL-cV9dMVaJPtOr1pM43N1zWOQeTOQkjSDzjw,51006
 reywechat/rsend.py,sha256=BB42r24x37V1tb27HLhnB_2tILv-DW26F9QbhqiNes8,20101
 reywechat/rtrigger.py,sha256=c0peI208K2k2sOxtuszD8UMrhMrTGp0LMi_XE5ksJKg,4989
 reywechat/rwechat.py,sha256=g0pbprMPv_qWb_lGFrPDAWsJO4vPSIgFLkw0Y28CZUo,4751
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.75.dist-info/METADATA,sha256=fTpCHq03R6pH68hRGE2PFI39Ipz8Dikj7ZAt5O6E9D0,1551
-reywechat-1.0.75.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.75.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.75.dist-info/RECORD,,
+reywechat-1.0.77.dist-info/METADATA,sha256=lx-pUWbbwtjC1FDxO-A4GzB8mJfwiGOXJ_G55W19vPQ,1551
+reywechat-1.0.77.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.77.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.77.dist-info/RECORD,,