reywechat 1.0.41__py3-none-any.whl → 1.0.43__py3-none-any.whl

reywechat/rdb.py

@@ -941,8 +941,8 @@ class WeChatDatabase(BaseWeChat):
             """
 
             # Check.
-            if send_param.status == send_param.StatusEnum.AFTER:
-                throw(TypeError, send_param.send_id)
+            if send_param.status != send_param.StatusEnum.SENT:
+                return
 
             # Handle parameter.
             if send_param.exc_reports == []:
@@ -1054,7 +1054,7 @@ class WeChatDatabase(BaseWeChat):
             # Send.
             for row in table:
                 send_id, type_, receive_id, parameter, file_id = row.values()
-                send_type = WeChatSendTypeEnum[type_]
+                send_type = WeChatSendTypeEnum(type_)
                 parameter: dict = json_loads(parameter)
 
                 ## File.
@@ -1070,6 +1070,7 @@ class WeChatDatabase(BaseWeChat):
                     send_id,
                     **parameter
                 )
+                send_param.status = send_param.StatusEnum.WAIT
                 self.wechat.sender.queue.put(send_param)
 
             # Commit.
@@ -1117,6 +1118,16 @@ class WeChatDatabase(BaseWeChat):
             )
 
         ## Room.
+        elif message.user is None:
+            result = message.receiver.wechat.database.database_wechat.execute_select(
+                (self.db_names['wechat'], self.db_names['wechat.contact_room']),
+                ['valid'],
+                '`room_id` = :room_id',
+                limit=1,
+                room_id=message.room
+            )
+
+        ## Room user.
         else:
             sql = (
             'SELECT (\n'
@@ -1145,7 +1156,7 @@ class WeChatDatabase(BaseWeChat):
         return judge
 
 
-    def insert_send(self, send_param: WeChatSendParameter) -> None:
+    def _insert_send(self, send_param: WeChatSendParameter) -> None:
         """
         Insert into `wechat.message_send` table of database, wait send.
 

reywechat/rsend.py

@@ -65,14 +65,14 @@ class WeChatSendStatusEnum(BaseWeChat, IntEnum):
 
     Attributes
     ----------
-    INIT : The moment initializing before insert database queue.
-    BEFORE : The moment before send.
-    AFTER : The moment after send.
+    INIT : After initialization, before inserting into database queue.
+    WAIT : After get from database queue, before sending.
+    SENT : After sending.
     """
 
     INIT = 0
-    BEFORE = 1
-    AFTER = 2
+    WAIT = 1
+    SENT = 2
 
 
 class WeChatSendParameter(BaseWeChat):
@@ -193,28 +193,7 @@ class WeChatSendParameter(BaseWeChat):
         self.send_id = send_id
         self.params = params
         self.exc_reports: list[str] = []
-        self.sent: bool = False
-
-
-    @property
-    def status(self) -> WeChatSendStatusEnum:
-        """
-        WeChat send status.
-
-        Returns
-        -------
-        WeChat send parameters status enumeration.
-        """
-
-        # Get.
-        if self.send_id is None:
-            status = WeChatSendStatusEnum.INIT
-        elif self.sent:
-            status = WeChatSendStatusEnum.AFTER
-        else:
-            status = WeChatSendStatusEnum.BEFORE
-
-        return status
+        self.status: WeChatSendStatusEnum
 
 
 class WeChatSender(BaseWeChat):
@@ -289,7 +268,7 @@ class WeChatSender(BaseWeChat):
                 # Save.
                 send_param.exc_reports.append(exc_report)
 
-            send_param.sent = True
+            send_param.status = send_param.StatusEnum.SENT
 
             ## Handler.
             for handler in self.handlers:
@@ -470,10 +449,11 @@ class WeChatSender(BaseWeChat):
         # Handle parameter.
         send_param = WeChatSendParameter(
             self,
-            WeChatSendTypeEnum[send_type],
+            send_type,
             receive_id,
             **params
         )
+        send_param.status = send_param.StatusEnum.INIT
         handle_handler_exception = lambda exc_report, *_: send_param.exc_reports.append(exc_report)
 
         # Handler.
@@ -482,7 +462,7 @@ class WeChatSender(BaseWeChat):
             handler(send_param)
 
         # Insert.
-        self.wechat.database.insert_send(send_param)
+        self.wechat.database._insert_send(send_param)
 
 
     def add_handler(
@@ -491,9 +471,9 @@ class WeChatSender(BaseWeChat):
     ) -> None:
         """
         Add send handler function.
-        Call at the moment initializing before insert database queue.
-        Call at the moment before sending.
-        Call at the moment after sending.
+        Call at the after initialization, before inserting into database queue.
+        Call at the after get from database queue, before sending.
+        Call at the after sending.
         Can be use `WeChatSendParameter.status` judge status.
 
         Parameters

reywechat/rwechat.py

@@ -103,13 +103,12 @@ class WeChat(BaseWeChat):
 
         ## Send.
         self.send_add_handler = self.sender.add_handler
-        self.send = self.database.insert_send
+        self.send = self.sender.send
         self.send_start = self.sender.start
         self.send_stop = self.sender.stop
         self.wrap_try_send = self.sender.wrap_try_send
 
         ## Database.
-        self.send = self.sender.send = self.database.insert_send
         self.database_build = self.database.build
 
         ## Schedule.

{reywechat-1.0.41.dist-info → reywechat-1.0.43.dist-info}/METADATA

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

{reywechat-1.0.41.dist-info → reywechat-1.0.43.dist-info}/RECORD

@@ -3,15 +3,15 @@ reywechat/rall.py,sha256=zEW-mLL2uP8aT2_foCMFGmMi_3RCrGl8qutnSVkmY1E,397
 reywechat/rbase.py,sha256=0NunIUIXra2ML2N6odwMk5oENTE0r6VSBHWXUvgI-lc,1124
 reywechat/rcache.py,sha256=Hh_HE-t_KUMlrz4gEFPh1AjmhnrSgH520IFJPumWb7A,908
 reywechat/rclient.py,sha256=MEvQB3pHb5ORukKbKntalRtFcKIOP9BGtDsMt5ihQfM,22524
-reywechat/rdb.py,sha256=7h6B9cWQ9dFDiFGEouAvcCAwXn1EBdGVlhxH-NLqhEI,39639
+reywechat/rdb.py,sha256=akIQsx4CZIt-H6kXWn2vpUYjo5MgD8MluzBMnSdmLaM,40051
 reywechat/rlog.py,sha256=IJL2WquiOYfB9iEai9xjojkuxPxiRHkdzZ5vCeaSA98,5261
 reywechat/rreceive.py,sha256=40l3n_d1BcT2EhxIYOlOnzrSQkJ8WDI_qPvJcU7CSQU,35018
 reywechat/rschedule.py,sha256=X9kreXdClTeItJHmNPJNqb_lct-BiLCyusMQxsj5hWU,1865
-reywechat/rsend.py,sha256=lkI3FMrQd-yG2rvx4SgxuJiZgjJCVcrr6G375PjXixQ,17984
+reywechat/rsend.py,sha256=iRxC7iURbF4UHbNkG2ITT1YUOCpAZ4amjeEkBQY1Bos,17624
 reywechat/rtrigger.py,sha256=n8kUNovh62r7crlXrp33uaKvbILT-wcfvUqeyGt7YhM,4956
-reywechat/rwechat.py,sha256=kKQnvNTddzaYh9C9v_ujETuMP3-eMhra90jxI2RduRI,4949
+reywechat/rwechat.py,sha256=OcElINAi9jM-eDb_OTtseBW3kyG_3jD4V4QmltR6MeE,4874
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.41.dist-info/METADATA,sha256=LoO8NvZIe4Ep8LbRoajePi_uGhtz-dsX6u07sVpw7pw,1551
-reywechat-1.0.41.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.41.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.41.dist-info/RECORD,,
+reywechat-1.0.43.dist-info/METADATA,sha256=vhJ7vHjnzo4fsufh05pCzdS3NCkw7P122ad3_JnOD70,1551
+reywechat-1.0.43.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.43.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.43.dist-info/RECORD,,