reywechat 1.0.90__py3-none-any.whl → 1.0.92__py3-none-any.whl

reywechat/rdb.py

@@ -33,7 +33,7 @@ __all__ = (
 )
 
 
-class DatabaseORMTableContactUser(rorm.Model, table=True):
+class DatabaseORMTableContactUser(rorm.Table):
     """
     Database `contact_user` table ORM model.
     """
@@ -44,11 +44,11 @@ class DatabaseORMTableContactUser(rorm.Model, table=True):
     update_time: rorm.Datetime = rorm.Field(field_default=':update_time', index_n=True, comment='Record update time.')
     user_id: str = rorm.Field(rorm.types.VARCHAR(24), key=True, comment='User ID.')
     name: str = rorm.Field(rorm.types.VARCHAR(32), comment='User name.')
-    contact: int = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the contact, 0 is no contact, 1 is contact.')
-    valid: int = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the valid, 0 is invalid, 1 is valid.')
+    is_contact: bool = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the contact.')
+    is_valid: bool = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the valid.')
 
 
-class DatabaseORMTableContactRoom(rorm.Model, table=True):
+class DatabaseORMTableContactRoom(rorm.Table):
     """
     Database `contact_room` table ORM model.
     """
@@ -59,11 +59,11 @@ class DatabaseORMTableContactRoom(rorm.Model, table=True):
     update_time: rorm.Datetime = rorm.Field(field_default=':update_time', index_n=True, comment='Record update time.')
     room_id: str = rorm.Field(rorm.types.VARCHAR(31), key=True, comment='Chat room ID.')
     name: str = rorm.Field(rorm.types.VARCHAR(32), comment='Chat room name.')
-    contact: int = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the contact, 0 is no contact, 1 is contact.')
-    valid: int = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the valid, 0 is invalid, 1 is valid.')
+    is_contact: bool = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the contact.')
+    is_valid: bool = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the valid.')
 
 
-class DatabaseORMTableContactRoomUser(rorm.Model, table=True):
+class DatabaseORMTableContactRoomUser(rorm.Table):
     """
     Database `contact_room_user` table ORM model.
     """
@@ -75,11 +75,11 @@ class DatabaseORMTableContactRoomUser(rorm.Model, table=True):
     room_id: str = rorm.Field(rorm.types.VARCHAR(31), key=True, comment='Chat room ID.')
     user_id: str = rorm.Field(rorm.types.VARCHAR(24), key=True, comment='Chat room user ID.')
     name: str = rorm.Field(rorm.types.VARCHAR(32), comment='Chat room user name.')
-    contact: int = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the contact, 0 is no contact, 1 is contact.')
-    valid: int = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the valid, 0 is invalid, 1 is valid.')
+    is_contact: bool = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the contact.')
+    is_valid: bool = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the valid.')
 
 
-class DatabaseORMTableMessageReceive(rorm.Model, table=True):
+class DatabaseORMTableMessageReceive(rorm.Table):
     """
     Database `message_receive` table ORM model.
     """
@@ -136,7 +136,7 @@ class DatabaseORMTableMessageReceive(rorm.Model, table=True):
     file_id: int = rorm.Field(rorm.types_mysql.MEDIUMINT(unsigned=True), comment='Message file ID, from the file database.')
 
 
-class DatabaseORMTableMessageSend(rorm.Model, table=True):
+class DatabaseORMTableMessageSend(rorm.Table):
     """
     Database `message_send` table ORM model.
     """
@@ -499,12 +499,12 @@ class WeChatDatabase(WeChatBase):
         if user_ids == []:
             sql = (
                 f'UPDATE `{self.db_wechat.database}`.`contact_user`\n'
-                'SET `contact` = 0'
+                'SET `is_contact` = 0'
             )
         else:
             sql = (
                 f'UPDATE `{self.db_wechat.database}`.`contact_user`\n'
-                'SET `contact` = 0\n'
+                'SET `is_contact` = 0\n'
                 'WHERE `user_id` NOT IN :user_ids'
             )
         conn.execute(
@@ -554,12 +554,12 @@ class WeChatDatabase(WeChatBase):
         if room_ids == []:
             sql = (
                 f'UPDATE `{self.db_wechat.database}`.`contact_room`\n'
-                'SET `contact` = 0'
+                'SET `is_contact` = 0'
             )
         else:
             sql = (
                 f'UPDATE `{self.db_wechat.database}`.`contact_room`\n'
-                'SET `contact` = 0\n'
+                'SET `is_contact` = 0\n'
                 'WHERE `room_id` NOT IN :room_ids'
             )
         conn.execute(
@@ -631,18 +631,18 @@ class WeChatDatabase(WeChatBase):
         if room_user_ids == []:
             sql = (
                 f'UPDATE `{self.db_wechat.database}`.`contact_room_user`\n'
-                'SET `contact` = 0'
+                'SET `is_contact` = 0'
             )
         elif room_id is None:
             sql = (
                 f'UPDATE `{self.db_wechat.database}`.`contact_room_user`\n'
-                'SET `contact` = 0\n'
+                'SET `is_contact` = 0\n'
                 "WHERE CONCAT(`room_id`, ',', `user_id`) NOT IN :room_user_ids"
             )
         else:
             sql = (
                 f'UPDATE `{self.db_wechat.database}`.`contact_room_user`\n'
-                'SET `contact` = 0\n'
+                'SET `is_contact` = 0\n'
                 'WHERE (\n'
                 '    `room_id` = :room_id\n'
                 "    AND CONCAT(`room_id`, ',', `user_id`) NOT IN :room_user_ids\n"
@@ -765,7 +765,7 @@ class WeChatDatabase(WeChatBase):
                 ## Generate data.
                 data = {
                     'room_id': message.room,
-                    'contact': 0,
+                    'is_contact': 0,
                     'limit': 1
                 }
 
@@ -1036,7 +1036,7 @@ class WeChatDatabase(WeChatBase):
         if message.room is None:
             result = message.receiver.wechat.db.db_wechat.execute.select(
                 'message_send',
-                ['valid'],
+                ['is_valid'],
                 '`user_id` = :user_id',
                 limit=1,
                 user_id=message.user
@@ -1046,7 +1046,7 @@ class WeChatDatabase(WeChatBase):
         elif message.user is None:
             result = message.receiver.wechat.db.db_wechat.execute.select(
                 'message_send',
-                ['valid'],
+                ['is_valid'],
                 '`room_id` = :room_id',
                 limit=1,
                 room_id=message.room
@@ -1056,18 +1056,18 @@ class WeChatDatabase(WeChatBase):
         else:
             sql = (
             'SELECT (\n'
-            '    SELECT `valid`\n'
+            '    SELECT `is_valid`\n'
             f'    FROM `{self.db_wechat.database}`.`contact_room_user`\n'
             '    WHERE `room_id` = :room_id AND `user_id` = :user_id\n'
             '    LIMIT 1\n'
-            ') AS `valid`\n'
+            ') AS `is_valid`\n'
             'FROM (\n'
-            '    SELECT `valid`\n'
+            '    SELECT `is_valid`\n'
             f'    FROM `{self.db_wechat.database}`.`contact_room`\n'
             '    WHERE `room_id` = :room_id\n'
             '    LIMIT 1\n'
             ') AS `a`\n'
-            'WHERE `valid` = 1'
+            'WHERE `is_valid` = 1'
             )
             result = message.receiver.wechat.db.db_wechat.execute(
                 sql,
@@ -1075,8 +1075,8 @@ class WeChatDatabase(WeChatBase):
                 user_id=message.user
             )
 
-        valid = result.scalar()
-        judge = valid == 1
+        is_valid = result.scalar()
+        judge = is_valid == 1
 
         return judge
 

{reywechat-1.0.90.dist-info → reywechat-1.0.92.dist-info}/METADATA

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

{reywechat-1.0.90.dist-info → reywechat-1.0.92.dist-info}/RECORD

@@ -3,14 +3,14 @@ reywechat/rall.py,sha256=ReNbm_oZTrD8lW_deMEgUfAE8yRm4NjbBWmvZuPjEg8,362
 reywechat/rbase.py,sha256=BpjxxPhvUBTf7V7Q2qYU4rHzQh9OlZCbFtdav6rDaT8,1115
 reywechat/rcache.py,sha256=HxVOvXVsO1JjVGYBvF4YHSJGlcfgMcSYvT5JCmEuumM,899
 reywechat/rclient.py,sha256=9Xzy_XUu-b2kRzM7MpwefZ6pZsrn5EnrLv5fs7Yh2Ew,22570
-reywechat/rdb.py,sha256=4p7jkrHY2fN6IlKh3sV061g6prIg7mvsUG9MDEfLWdg,37936
+reywechat/rdb.py,sha256=R9kPcsooC7zmfNW6OIE0Oh3ssS5q_VmFtzNpCTS69xs,37777
 reywechat/rlog.py,sha256=IDtCmllHN6Wz33qeNZLXaK0s-s5dWIqIeQXc5u7lsnk,5235
 reywechat/rreceive.py,sha256=uUaJd3U8lu_wh3bSBoKo09pumbYnBszgsCKb5SbwrOI,50823
 reywechat/rsend.py,sha256=GwoM1iYFSXvsZ-q6etQhnYYW0W54os97kFJhWNnlpLs,19892
 reywechat/rtrigger.py,sha256=m1hfOA8rya4qk2Z02Ic9uvMO5ylwSaBJRYkcCLk60y0,4935
 reywechat/rwechat.py,sha256=wyYARNSCFE_VyB9WI1Hqq144gPl_FOFztx7krsRT4MY,4716
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.90.dist-info/METADATA,sha256=MCQ9dMEnVlQM9kImyYm9iw7ERJlqLjw_ZVFQ3wLnxOw,1596
-reywechat-1.0.90.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.90.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.90.dist-info/RECORD,,
+reywechat-1.0.92.dist-info/METADATA,sha256=OsrRHEVJteVlVmnz9HTxZ6KDbp4krYZ7pxqk_SUKue0,1596
+reywechat-1.0.92.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.92.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.92.dist-info/RECORD,,