⬇️

liteyuki/message/event.py

@@ -10,6 +10,7 @@ Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
 """
 from typing import Any, Optional
 
+from liteyuki import Channel
 from liteyuki.comm.storage import shared_memory
 
 
@@ -24,7 +25,7 @@ class MessageEvent:
             session_id: str,
             user_id: str,
             session_type: str,
-            receive_channel: str,
+            receive_channel: Optional[Channel["MessageEvent"]] = None,
             data: Optional[dict[str, Any]] = None,
     ):
         """
@@ -78,7 +79,10 @@ class MessageEvent:
             },
             bot_id=self.bot_id,
             session_id=self.session_id,
+            user_id=self.user_id,
             session_type=self.session_type,
-            receive_channel="_"
+            receive_channel=None
         )
-        shared_memory.publish(self.receive_channel, reply_event)
+        # shared_memory.publish(self.receive_channel, reply_event)
+        if self.receive_channel:
+            self.receive_channel.send(reply_event)

liteyuki/message/on.py

@@ -23,6 +23,7 @@ _queue: Queue = Queue()
 
 @shared_memory.on_subscriber_receive("event_to_liteyuki")
 async def _(event: MessageEvent):
+    print("AA")
     current_priority = -1
     for i, matcher in enumerate(_matcher_list):
         logger.info(f"Running matcher {matcher} for event: {event}")
@@ -32,17 +33,24 @@ async def _(event: MessageEvent):
             current_priority = matcher.priority
             if matcher.block:
                 break
+    else:
+        logger.info(f"No matcher matched for event: {event}")
+    print("BB")
 
 
-def on_message(rule: Rule = empty_rule, priority: int = 0, block: bool = False) -> Matcher:
-    matcher = Matcher(rule, priority, block)
-    # 按照优先级插入
+def add_matcher(matcher: Matcher):
     for i, m in enumerate(_matcher_list):
         if m.priority < matcher.priority:
             _matcher_list.insert(i, matcher)
             break
     else:
         _matcher_list.append(matcher)
+
+
+def on_message(rule: Rule = empty_rule, priority: int = 0, block: bool = False) -> Matcher:
+    matcher = Matcher(rule, priority, block)
+    # 按照优先级插入
+    add_matcher(matcher)
     return matcher
 
 
@@ -50,4 +58,5 @@ def on_keywords(keywords: list[str], rule=empty_rule, priority: int = 0, block:
     @Rule
     async def on_keywords_rule(event: MessageEvent):
         return any(keyword in event.raw_message for keyword in keywords)
+
     return on_message(on_keywords_rule & rule, priority, block)