fix message api

This commit is contained in:
jxxghp 2024-05-11 12:53:32 +08:00
parent 0e9e626ab6
commit 8ff0f81f47

View File

@ -14,22 +14,34 @@ class MessageHelper(metaclass=Singleton):
self.sys_queue = queue.Queue() self.sys_queue = queue.Queue()
self.user_queue = queue.Queue() self.user_queue = queue.Queue()
def put(self, message: Any, role: str = "sys", note: Union[list, dict] = None): def put(self, message: Any, role: str = "system", note: Union[list, dict] = None):
""" """
存消息 存消息
:param message: 消息 :param message: 消息
:param role: 消息通道 sys/user :param role: 消息通道 systm系统消息plugin插件消息user用户消息
:param note: 附件json :param note: 附件json
""" """
if role == "sys": if role in ["system", "plugin"]:
self.sys_queue.put(message) # 系统通知,默认
self.sys_queue.put(json.dumps({
"type": role,
"title": message,
"date": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
"text": note
}))
else: else:
if isinstance(message, str): if isinstance(message, str):
self.user_queue.put(message) # 非系统的文本通知
self.user_queue.put(json.dumps({
"title": message,
"date": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
"note": note
}))
elif hasattr(message, "to_dict"): elif hasattr(message, "to_dict"):
# 非系统的复杂结构通知,如媒体信息/种子列表等。
content = message.to_dict() content = message.to_dict()
content['date'] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) content['date'] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
content['note'] = json.dumps(note) if note else None content['note'] = note
self.user_queue.put(json.dumps(content)) self.user_queue.put(json.dumps(content))
def get(self, role: str = "sys") -> Optional[str]: def get(self, role: str = "sys") -> Optional[str]: