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

reywechat/rreceive.py

@@ -79,9 +79,7 @@ class WeChatMessage(BaseWeChat):
         type_: int,
         display: str,
         data: str,
-        user: str | None = None,
-        room: str | None = None,
-        file: MessageParameterFile | None = None
+        window: str
     ) -> None:
         """
         Build instance attributes.
@@ -95,19 +93,7 @@ class WeChatMessage(BaseWeChat):
         type : Message type.
         display : Message description text.
         data : Message source data.
-        user : Message sender user ID.
-            - `None`: System message.
-            - `str`: User messages.
-        room : Message chat room ID.
-            - `None`: Private chat.
-            - `str`: Chat room chat.
-        file : Message file information.
-            - `None`: Non file message.
-            - `dict`: File message.
-                `Key 'path'`: File path.
-                `Key 'name'`: File name.
-                `Key 'md5'`: File MD5.
-                `Key 'size'`: File byte size.
+        window : Message sende window ID.
         """
 
         # Import.
@@ -121,9 +107,26 @@ class WeChatMessage(BaseWeChat):
         self.type = type_
         self.display = display
         self.data = data
-        self.user = user
-        self.room = room
-        self.file = file
+        self.window = window
+        self.file: MessageParameterFile | None = None
+        self.trigger_rule: TriggerRule | None = None
+        self.trigger_continue = self.receiver.trigger.continue_
+        self.trigger_break = self.receiver.trigger.break_
+        self.replied: bool = False
+        self.exc_reports: list[str] = []
+
+        ## Room and user.
+        if self.window.endswith('chatroom'):
+            self.room = self.window
+            if ':\n' in self.data:
+                self.user, self.data = self.data.split(':\n', 1)
+            else:
+                self.user = None
+        else:
+            self.room = None
+            self.user = self.window
+
+        ## Cache.
         self._window: str | None = None
         self._user_name: str | None = None
         self._room_name: str | None = None
@@ -136,6 +139,8 @@ class WeChatMessage(BaseWeChat):
         self._is_at_self: bool | None = None
         self._is_call: bool | None = None
         self._call_text: str | None = None
+        self._is_call_next: bool | None = None
+        self._is_last_call: bool | None = None
         self._is_new_user: bool | None = None
         self._is_new_room: bool | None = None
         self._is_new_room_user: bool | None = None
@@ -150,11 +155,9 @@ class WeChatMessage(BaseWeChat):
         self._is_app: bool | None = None
         self._app_params: dict | None = None
         self._valid: bool | None = None
-        self.trigger_rule: TriggerRule | None = None
-        self.trigger_continue = self.receiver.trigger.continue_
-        self.trigger_break = self.receiver.trigger.break_
-        self.replied: bool = False
-        self.exc_reports: list[str] = []
+
+        ## Update call.
+        self.is_call
 
 
     @property
@@ -198,29 +201,6 @@ class WeChatMessage(BaseWeChat):
         return params_str
 
 
-    @property
-    def window(self) -> str:
-        """
-        Message sender window ID.
-
-        Returns
-        -------
-        Window ID.
-        """
-
-        # Cache.
-        if self._window is not None:
-            return self._window
-
-        # Set.
-        if self.room is None:
-            self._window = self.user
-        else:
-            self._window = self.room
-
-        return self._window
-
-
     @property
     def user_name(self) -> str:
         """
@@ -507,8 +487,11 @@ class WeChatMessage(BaseWeChat):
         # Judge.
         if (
 
+            ## Last call.
+            self.is_last_call
+
             ## Private chat.
-            self.room is None
+            or self.room is None
 
             ## At self.
             or is_at_self
@@ -522,31 +505,25 @@ 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
+        ## Call next.
+        is_call_next = (
+            self.room is not None
+            and 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)
+        )
+
+        ### Mark.
+        if is_call_next:
+            call_next_mark_value = f'{self.user}_{self.room}'
+            self.receiver.call_next_mark(call_next_mark_value)
 
         self._is_call = is_call
         self._call_text = call_text
+        self._is_call_next = is_call_next
 
         return self._is_call
 
@@ -572,6 +549,52 @@ class WeChatMessage(BaseWeChat):
         return self._call_text
 
 
+    @property
+    def is_call_next(self) -> str:
+        """
+        Whether if is message of call next message.
+
+        Returns
+        -------
+        Judge result.
+        """
+
+        # Cache.
+        if self._is_call_next is not None:
+            return self._is_call_next
+
+        # Judge.
+        self.is_call
+
+        return self._is_call_next
+
+
+    @property
+    def is_last_call(self) -> str:
+        """
+        Whether if is message of last message call this time.
+
+        Returns
+        -------
+        Judge result.
+        """
+
+        # Cache.
+        if self._is_last_call is not None:
+            return self._is_last_call
+
+        # Judge.
+        call_next_mark_value = f'{self.user}_{self.room}'
+        self._is_last_call = call_next_mark_value in self.receiver.call_next_mark
+
+        # 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)
+
+        return self.is_last_call
+
+
     @property
     def is_new_user(self) -> bool:
         """
@@ -1171,7 +1194,6 @@ class WechatReceiver(BaseWeChat):
 
             # Set parameter.
             handlers = [
-                self.__receiver_handler_room,
                 self.__receiver_handler_file,
                 *self.handlers
             ]
@@ -1241,31 +1263,6 @@ class WechatReceiver(BaseWeChat):
         self.handlers.append(handler)
 
 
-    def __receiver_handler_room(
-        self,
-        message: WeChatMessage
-    ) -> None:
-        """
-        Handle room message.
-        """
-
-        # Break.
-        if (
-            type(message.user) != str
-            or not message.user.endswith('chatroom')
-        ):
-            return
-
-        # Set attribute.
-        message.room = message.user
-        if ':\n' in message.data:
-            user, data = message.data.split(':\n', 1)
-            message.user = user
-            message.data = data
-        else:
-            message.user = None
-
-
     def __receiver_handler_file(
         self,
         message: WeChatMessage

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

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

{reywechat-1.0.45.dist-info → reywechat-1.0.46.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=KviaL3yODlCxc7muCoosk5N0V5_aJYEGQQJNZeOvbYI,35627
+reywechat/rreceive.py,sha256=zANspJOxn2sQLW0CdA-vFsIeqG1OuVwDyytGM5LxQvQ,35483
 reywechat/rschedule.py,sha256=X9kreXdClTeItJHmNPJNqb_lct-BiLCyusMQxsj5hWU,1865
 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.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,,
+reywechat-1.0.46.dist-info/METADATA,sha256=R7vaJAjsObdA7VXgbOaB-Sj4k8kasY9i5EJhSg564JQ,1551
+reywechat-1.0.46.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.46.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.46.dist-info/RECORD,,