feat 多通知渠道支持

app/modules/telegram/__init__.py

@@ -4,9 +4,9 @@ from typing import Optional, Union, List, Tuple, Any
 from app.core.context import MediaInfo, Context
 from app.core.config import settings
 from app.log import logger
-from app.modules import _ModuleBase
+from app.modules import _ModuleBase, checkMessage
 from app.modules.telegram.telegram import Telegram
-from app.schemas import MessageChannel, CommingMessage
+from app.schemas import MessageChannel, CommingMessage, Notification
 
 
 class TelegramModule(_ModuleBase):
@@ -91,42 +91,36 @@ class TelegramModule(_ModuleBase):
                                       userid=user_id, username=user_id, text=text)
         return None
 
-    def post_message(self, title: str,
-                     text: str = None, image: str = None, userid: Union[str, int] = None) -> Optional[bool]:
+    @checkMessage(MessageChannel.Telegram)
+    def post_message(self, message: Notification) -> Optional[bool]:
         """
         发送消息
-        :param title:  标题
-        :param text: 内容
-        :param image: 图片
-        :param userid:  用户ID
+        :param message: 消息体
         :return: 成功或失败
         """
-        return self.telegram.send_msg(title=title, text=text, image=image, userid=userid)
+        return self.telegram.send_msg(title=message.title, text=message.text,
+                                      image=message.image, userid=message.userid)
 
-    def post_medias_message(self, title: str, items: List[MediaInfo],
-                            userid: Union[str, int] = None) -> Optional[bool]:
+    @checkMessage(MessageChannel.Telegram)
+    def post_medias_message(self, message: Notification, medias: List[MediaInfo]) -> Optional[bool]:
         """
         发送媒体信息选择列表
-        :param title:  标题
-        :param items:  消息列表
-        :param userid:  用户ID
+        :param message: 消息体
+        :param medias: 媒体列表
         :return: 成功或失败
         """
-        return self.telegram.send_meidas_msg(title=title, medias=items, userid=userid)
+        return self.telegram.send_meidas_msg(title=message.title, medias=medias,
+                                             userid=message.userid)
 
-    def post_torrents_message(self, title: str, items: List[Context],
-                              mediainfo: MediaInfo = None,
-                              userid: Union[str, int] = None) -> Optional[bool]:
+    @checkMessage(MessageChannel.Telegram)
+    def post_torrents_message(self, message: Notification, torrents: List[Context]) -> Optional[bool]:
         """
         发送种子信息选择列表
-        :param title: 标题
-        :param items:  消息列表
-        :param mediainfo:  媒体信息
-        :param userid:  用户ID
+        :param message: 消息体
+        :param torrents: 种子列表
         :return: 成功或失败
         """
-        return self.telegram.send_torrents_msg(title=title, torrents=items,
-                                               mediainfo=mediainfo, userid=userid)
+        return self.telegram.send_torrents_msg(title=message.title, torrents=torrents, userid=message.userid)
 
     def register_commands(self, commands: dict):
         """

app/modules/telegram/telegram.py

@@ -133,7 +133,6 @@ class Telegram(metaclass=Singleton):
             return False
 
     def send_torrents_msg(self, torrents: List[Context],
-                          mediainfo: MediaInfo = None,
                           userid: str = "", title: str = "") -> Optional[bool]:
         """
         发送列表消息
@@ -141,8 +140,12 @@ class Telegram(metaclass=Singleton):
         if not self._telegram_token or not self._telegram_chat_id:
             return None
 
+        if not torrents:
+            return False
+
         try:
             index, caption = 1, "*%s*" % title
+            mediainfo = torrents[0].media_info
             for context in torrents:
                 torrent = context.torrent_info
                 site_name = torrent.site_name