reywechat 1.0.50__py3-none-any.whl → 1.0.52__py3-none-any.whl

reywechat/rreceive.py

@@ -524,7 +524,7 @@ class WeChatMessage(WeChatBase):
         ### Mark.
         if is_call_next:
             call_next_mark_value = f'{self.user}_{self.room}'
-            self.receiver.call_next_mark(call_next_mark_value)
+            self.receiver.mark(call_next_mark_value, 'is_call_next')
 
         self._is_call = is_call
         self._call_text = call_text
@@ -590,12 +590,12 @@ class WeChatMessage(WeChatBase):
 
         # Judge.
         call_next_mark_value = f'{self.user}_{self.room}'
-        self._is_last_call = call_next_mark_value in self.receiver.call_next_mark
+        self._is_last_call = self.receiver.mark.is_marked(call_next_mark_value, 'is_call_next')
 
         # Mark.
         if self._is_last_call:
             call_next_mark_value = f'{self.user}_{self.room}'
-            self.receiver.call_next_mark.remove(call_next_mark_value)
+            self.receiver.mark.remove(call_next_mark_value, 'is_call_next')
 
         return self.is_last_call
 
@@ -1125,7 +1125,7 @@ class WechatReceiver(WeChatBase):
         self.queue: Queue[WeChatMessage] = Queue()
         self.handlers: list[Callable[[WeChatMessage], Any]] = []
         self.started: bool | None = False
-        self.call_next_mark = Mark()
+        self.mark = Mark()
         self.trigger = WeChatTrigger(self)
 
         # Start.
@@ -1238,7 +1238,7 @@ class WechatReceiver(WeChatBase):
                 handler(message)
 
             # Log.
-            self.wechat.log.log_receive(message)
+            self.wechat.error.log_receive(message)
 
 
         # Thread pool.

reywechat/rsend.py

@@ -276,7 +276,7 @@ class WeChatSender(WeChatBase):
                 handler(send_param)
 
             ## Log.
-            self.wechat.log.log_send(send_param)
+            self.wechat.error.log_send(send_param)
 
 
     def __send(

reywechat/rwechat.py

@@ -77,7 +77,7 @@ class WeChat(WeChatBase):
         ## Instance.
         self.client = WeChatClient(self)
         self.cache = WeChatCache(self)
-        self.log = WeChatLog(self)
+        self.error = WeChatLog(self)
         self.receiver = WechatReceiver(self, max_receiver, call_name)
         self.trigger = self.receiver.trigger
         self.sender = WeChatSender(self)
@@ -145,7 +145,7 @@ class WeChat(WeChatBase):
         """
 
         # Handle parameter.
-        result = self.log.rrlog.print_colour
+        result = self.error.rrlog.print_colour
 
         return result
 
@@ -161,6 +161,6 @@ class WeChat(WeChatBase):
         """
 
         # Set.
-        self.log.rrlog.print_colour = value
-        self.log.rrlog_print.print_colour = value
-        self.log.rrlog_file.print_colour = value
+        self.error.rrlog.print_colour = value
+        self.error.rrlog_print.print_colour = value
+        self.error.rrlog_file.print_colour = value

{reywechat-1.0.50.dist-info → reywechat-1.0.52.dist-info}/METADATA

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

{reywechat-1.0.50.dist-info → reywechat-1.0.52.dist-info}/RECORD

@@ -5,12 +5,12 @@ reywechat/rcache.py,sha256=7UsHHfgFOgxuSqlTSAO6CprgUUOeBCXYus0kxmRBQxk,908
 reywechat/rclient.py,sha256=lc1CPle9h08mwP8NlJN0ybzcNJxtpV0ma6q6cz1RIxk,22518
 reywechat/rdb.py,sha256=YHkW81RZIdHCt2vvjgFKOZxU-EHyVf9F_XT_nOc7jxg,47354
 reywechat/rlog.py,sha256=4EsTgrgC05JvWeKAucUaWGga638CRRJISJN6qncBCAw,5249
-reywechat/rreceive.py,sha256=ezz6-RVKWmll-TuKXaAnmQRRQdn91v6DJlfpWcTuG20,36213
-reywechat/rsend.py,sha256=TiSjHMccbjM2U6na3xPGKq3RhoaW23-BsgLdRyJSGEw,18047
+reywechat/rreceive.py,sha256=REeHY4MiiZDcQx9j0SbDYPRqqyJVfLtQUBDwhkQOPBs,36231
+reywechat/rsend.py,sha256=aTmc1ycL8bon4KXoX7VpRWQKTsVER6f6bRLKWWvPspY,18049
 reywechat/rtrigger.py,sha256=WdOQwobPdGPyyE9J-qtQFPd60713T0aWqKk02PLdCRE,4966
-reywechat/rwechat.py,sha256=nIyrf3hB3n03picxV1f1hWNFzhFOXcV201ZuS97P3N4,4741
+reywechat/rwechat.py,sha256=g0pbprMPv_qWb_lGFrPDAWsJO4vPSIgFLkw0Y28CZUo,4751
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.50.dist-info/METADATA,sha256=AlBjYWk7HvQsccQ_YggBO5OpES7JFw8YwpgEtRNZGww,1551
-reywechat-1.0.50.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.50.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.50.dist-info/RECORD,,
+reywechat-1.0.52.dist-info/METADATA,sha256=ThSWIXwyuEA6nuOow9T1wKZRmXKQENSGOqjbU3AtdMk,1551
+reywechat-1.0.52.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.52.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.52.dist-info/RECORD,,