GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-05 07:27:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
jxxghp
2024-07-14 18:50:31 +08:00
parent b0874f56c9
commit 97fdfe789e
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/chain/__init__.py
+3 -3
View File
@@ -487,7 +487,7 @@ class ChainBase(metaclass=ABCMeta):
self.eventmanager.send_event(etype=EventType.NoticeMessage, data=message.dict()) self.eventmanager.send_event(etype=EventType.NoticeMessage, data=message.dict())
# 保存消息 # 保存消息
self.messagehelper.put(message, role="user") self.messagehelper.put(message, role="user")
self.messageoper.add(**message.dict(), action=1) self.messageoper.add(**message.dict())
# 发送 # 发送
self.run_module("post_message", message=message) self.run_module("post_message", message=message)
@@ -500,7 +500,7 @@ class ChainBase(metaclass=ABCMeta):
""" """
note_list = [media.to_dict() for media in medias] note_list = [media.to_dict() for media in medias]
self.messagehelper.put(message, role="user", note=note_list) self.messagehelper.put(message, role="user", note=note_list)
self.messageoper.add(**message.dict(), action=1, note=note_list) self.messageoper.add(**message.dict(), note=note_list)
return self.run_module("post_medias_message", message=message, medias=medias) return self.run_module("post_medias_message", message=message, medias=medias)
def post_torrents_message(self, message: Notification, torrents: List[Context]) -> None: def post_torrents_message(self, message: Notification, torrents: List[Context]) -> None:
@@ -512,7 +512,7 @@ class ChainBase(metaclass=ABCMeta):
""" """
note_list = [torrent.torrent_info.to_dict() for torrent in torrents] note_list = [torrent.torrent_info.to_dict() for torrent in torrents]
self.messagehelper.put(message, role="user", note=note_list) self.messagehelper.put(message, role="user", note=note_list)
self.messageoper.add(**message.dict(), action=1, note=note_list) self.messageoper.add(**message.dict(), note=note_list)
return self.run_module("post_torrents_message", message=message, torrents=torrents) return self.run_module("post_torrents_message", message=message, torrents=torrents)
def metadata_img(self, mediainfo: MediaInfo, season: int = None) -> Optional[dict]: def metadata_img(self, mediainfo: MediaInfo, season: int = None) -> Optional[dict]:
app/db/message_oper.py
+6
View File
@@ -54,6 +54,12 @@ class MessageOper(DbOper):
"reg_time": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()), "reg_time": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
"note": note "note": note
}) })
# 从kwargs中去掉Message中没有的字段
for k in list(kwargs.keys()):
if k not in Message.__table__.columns.keys():
kwargs.pop(k)
Message(**kwargs).create(self._db) Message(**kwargs).create(self._db)
def list_by_page(self, page: int = 1, count: int = 30) -> Optional[str]: def list_by_page(self, page: int = 1, count: int = 30) -> Optional[str]: