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

reywechat/rreceive.py

@@ -18,6 +18,7 @@ from bs4 import BeautifulSoup as BSBeautifulSoup
 from bs4.element import Tag as BSTag
 from reykit.rbase import throw
 from reykit.rimage import decode_qrcode
+from reykit.rlog import Mark
 from reykit.rnet import listen_socket
 from reykit.ros import File, os_exists
 from reykit.rre import search, search_batch, findall
@@ -499,7 +500,7 @@ class WeChatMessage(BaseWeChat):
         result: str | None = search(pattern, text)
         if result is not None:
             is_call_name = True
-            text = result
+            text = result or None
         else:
             is_call_name = False
 
@@ -521,10 +522,29 @@ class WeChatMessage(BaseWeChat):
         ):
             is_call = True
             call_text = text
+
+        ## Call next.
+        elif (
+            self.room is not None
+            and (value := f'{self.room}_{self.user}') in self.receiver.call_next_mark
+        ):
+            self.receiver.call_next_mark.remove(value)
+            is_call = True
+            call_text = text
+
         else:
             is_call = False
             call_text = None
 
+        # Call next.
+        if (
+            is_call
+            and call_text is None
+            and self.room is not None
+        ):
+            value = f'{self.room}_{self.user}'
+            self.receiver.call_next_mark(value)
+
         self._is_call = is_call
         self._call_text = call_text
 
@@ -1064,6 +1084,7 @@ class WechatReceiver(BaseWeChat):
         self.queue: Queue[WeChatMessage] = Queue()
         self.handlers: list[Callable[[WeChatMessage], Any]] = []
         self.started: bool | None = False
+        self.call_next_mark = Mark()
         self.trigger = WeChatTrigger(self)
 
         # Start.

reywechat/rsend.py

@@ -17,7 +17,6 @@ from functools import wraps as functools_wraps
 from queue import Queue
 from re import escape as re_escape
 from reykit.rbase import throw, catch_exc
-from reykit.ros import File
 from reykit.rre import sub
 from reykit.rtime import sleep
 from reykit.rwrap import wrap_thread, wrap_exc

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

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

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

@@ -5,13 +5,13 @@ reywechat/rcache.py,sha256=Hh_HE-t_KUMlrz4gEFPh1AjmhnrSgH520IFJPumWb7A,908
 reywechat/rclient.py,sha256=MEvQB3pHb5ORukKbKntalRtFcKIOP9BGtDsMt5ihQfM,22524
 reywechat/rdb.py,sha256=akIQsx4CZIt-H6kXWn2vpUYjo5MgD8MluzBMnSdmLaM,40051
 reywechat/rlog.py,sha256=IJL2WquiOYfB9iEai9xjojkuxPxiRHkdzZ5vCeaSA98,5261
-reywechat/rreceive.py,sha256=40l3n_d1BcT2EhxIYOlOnzrSQkJ8WDI_qPvJcU7CSQU,35018
+reywechat/rreceive.py,sha256=KviaL3yODlCxc7muCoosk5N0V5_aJYEGQQJNZeOvbYI,35627
 reywechat/rschedule.py,sha256=X9kreXdClTeItJHmNPJNqb_lct-BiLCyusMQxsj5hWU,1865
-reywechat/rsend.py,sha256=iRxC7iURbF4UHbNkG2ITT1YUOCpAZ4amjeEkBQY1Bos,17624
+reywechat/rsend.py,sha256=GfCv5O1-81r-o-RLzMMW_MQE99KwO9gZ3-93HaJ97W8,17595
 reywechat/rtrigger.py,sha256=n8kUNovh62r7crlXrp33uaKvbILT-wcfvUqeyGt7YhM,4956
 reywechat/rwechat.py,sha256=OcElINAi9jM-eDb_OTtseBW3kyG_3jD4V4QmltR6MeE,4874
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-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,,
+reywechat-1.0.45.dist-info/METADATA,sha256=yLokP8GcJTizmArK9zQ7n30AZ_2f2L6gffRnxa0x2aY,1551
+reywechat-1.0.45.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.45.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.45.dist-info/RECORD,,