fix messages

app/modules/telegram/__init__.py

@@ -3,44 +3,95 @@ from typing import Optional, Union, List, Tuple, Any, Dict
 
 from app.core.context import MediaInfo, Context
 from app.core.config import settings
+from app.helper.notification import NotificationHelper
 from app.log import logger
-from app.modules import _ModuleBase, checkMessage
+from app.modules import _ModuleBase
 from app.modules.telegram.telegram import Telegram
-from app.schemas import MessageChannel, CommingMessage, Notification
+from app.schemas import MessageChannel, CommingMessage, Notification, NotificationConf
 
 
 class TelegramModule(_ModuleBase):
-    telegram: Telegram = None
+    _channel = MessageChannel.Telegram
+    _configs: Dict[str, NotificationConf] = {}
+    _clients: Dict[str, Telegram] = {}
 
     def init_module(self) -> None:
-        self.telegram = Telegram()
+        """
+        初始化模块
+        """
+        clients = NotificationHelper().get_notifications()
+        if not clients:
+            return
+        self._configs = {}
+        self._clients = {}
+        for client in clients:
+            if client.type == "telegram" and client.enabled:
+                self._configs[client.name] = client
+                self._clients[client.name] = Telegram(**client.config, name=client.name)
 
     @staticmethod
     def get_name() -> str:
         return "Telegram"
 
+    def get_client(self, name: str) -> Optional[Telegram]:
+        """
+        获取Telegram客户端
+        """
+        return self._clients.get(name)
+
+    def get_config(self, name: str) -> Optional[NotificationConf]:
+        """
+        获取Telegram配置
+        """
+        return self._configs.get(name)
+
     def stop(self):
-        self.telegram.stop()
+        """
+        停止模块
+        """
+        for client in self._clients.values():
+            client.stop()
 
     def test(self) -> Tuple[bool, str]:
         """
         测试模块连接性
         """
-        state = self.telegram.get_state()
-        if state:
-            return True, ""
-        return False, "Telegram未就续，请检查参数设置和网络连接"
+        for name, client in self._clients.items():
+            state = client.get_state()
+            if not state:
+                return False, f"Telegram {name} 未就续"
+        return True, ""
 
     def init_setting(self) -> Tuple[str, Union[str, bool]]:
-        return "MESSAGER", "telegram"
+        pass
 
-    def message_parser(self, body: Any, form: Any,
+    def checkMessage(self, message: Notification, source: str) -> bool:
+        """
+        检查消息渠道及消息类型，如不符合则不处理
+        """
+        # 检查消息渠道
+        if message.channel and message.channel != self._channel:
+            return False
+        # 检查消息来源
+        if message.source and message.source != source:
+            return False
+        # 检查消息类型开关
+        if message.mtype:
+            conf = self.get_config(source)
+            if conf:
+                switchs = conf.switchs or []
+                if message.mtype.value not in switchs:
+                    return False
+        return True
+
+    def message_parser(self, source: str, body: Any, form: Any,
                        args: Any) -> Optional[CommingMessage]:
         """
         解析消息内容，返回字典，注意以下约定值：
         userid: 用户ID
         username: 用户名
         text: 内容
+        :param source: 消息来源（渠道配置名称）
         :param body: 请求体
         :param form: 表单
         :param args: 参数
@@ -69,6 +120,14 @@ class TelegramModule(_ModuleBase):
                 }
             }
         """
+        # 获取渠道
+        client = self.get_client(source)
+        if not client:
+            return None
+        # 获取配置
+        config = self.get_config(source)
+        if not config:
+            return None
         # 校验token
         token = args.get("token")
         if not token or token != settings.API_TOKEN:
@@ -84,59 +143,75 @@ class TelegramModule(_ModuleBase):
             # 获取用户名
             user_name = message.get("from", {}).get("username")
             if text:
-                logger.info(f"收到Telegram消息：userid={user_id}, username={user_name}, text={text}")
+                logger.info(f"收到来自 {source} 的Telegram消息：userid={user_id}, username={user_name}, text={text}")
                 # 检查权限
+                admin_users = config.config.get("admins")
+                user_list = config.config.get("users")
+                chat_id = config.config.get("chat_id")
                 if text.startswith("/"):
-                    if settings.TELEGRAM_ADMINS \
-                            and str(user_id) not in settings.TELEGRAM_ADMINS.split(',') \
-                            and str(user_id) != settings.TELEGRAM_CHAT_ID:
-                        self.telegram.send_msg(title="只有管理员才有权限执行此命令", userid=user_id)
+                    if admin_users \
+                            and str(user_id) not in admin_users.split(',') \
+                            and str(user_id) != chat_id:
+                        client.send_msg(title="只有管理员才有权限执行此命令", userid=user_id)
                         return None
                 else:
-                    if settings.TELEGRAM_USERS \
-                            and not str(user_id) in settings.TELEGRAM_USERS.split(','):
+                    if user_list \
+                            and not str(user_id) in user_list.split(','):
                         logger.info(f"用户{user_id}不在用户白名单中，无法使用此机器人")
-                        self.telegram.send_msg(title="你不在用户白名单中，无法使用此机器人", userid=user_id)
+                        client.send_msg(title="你不在用户白名单中，无法使用此机器人", userid=user_id)
                         return None
-                return CommingMessage(channel=MessageChannel.Telegram,
+                return CommingMessage(channel=MessageChannel.Telegram, source=source,
                                       userid=user_id, username=user_name, text=text)
         return None
 
-    @checkMessage(MessageChannel.Telegram)
     def post_message(self, message: Notification) -> None:
         """
         发送消息
         :param message: 消息体
         :return: 成功或失败
         """
-        self.telegram.send_msg(title=message.title, text=message.text,
-                               image=message.image, userid=message.userid, link=message.link)
+        for conf in self._configs.values():
+            if not self.checkMessage(message, conf.name):
+                continue
+            client = self.get_client(conf.name)
+            if client:
+                client.send_msg(title=message.title, text=message.text,
+                                image=message.image, userid=message.userid, link=message.link)
 
-    @checkMessage(MessageChannel.Telegram)
-    def post_medias_message(self, message: Notification, medias: List[MediaInfo]) -> Optional[bool]:
+    def post_medias_message(self, message: Notification, medias: List[MediaInfo]) -> None:
         """
         发送媒体信息选择列表
         :param message: 消息体
         :param medias: 媒体列表
         :return: 成功或失败
         """
-        return self.telegram.send_meidas_msg(title=message.title, medias=medias,
-                                             userid=message.userid, link=message.link)
+        for conf in self._configs.values():
+            if not self.checkMessage(message, conf.name):
+                continue
+            client = self.get_client(conf.name)
+            if client:
+                client.send_meidas_msg(title=message.title, medias=medias,
+                                       userid=message.userid, link=message.link)
 
-    @checkMessage(MessageChannel.Telegram)
-    def post_torrents_message(self, message: Notification, torrents: List[Context]) -> Optional[bool]:
+    def post_torrents_message(self, message: Notification, torrents: List[Context]) -> None:
         """
         发送种子信息选择列表
         :param message: 消息体
         :param torrents: 种子列表
         :return: 成功或失败
         """
-        return self.telegram.send_torrents_msg(title=message.title, torrents=torrents,
-                                               userid=message.userid, link=message.link)
+        for conf in self._configs.values():
+            if not self.checkMessage(message, conf.name):
+                continue
+            client = self.get_client(conf.name)
+            if client:
+                client.send_torrents_msg(title=message.title, torrents=torrents,
+                                         userid=message.userid, link=message.link)
 
     def register_commands(self, commands: Dict[str, dict]):
         """
         注册命令，实现这个函数接收系统可用的命令菜单
         :param commands: 命令字典
         """
-        self.telegram.register_commands(commands)
+        for client in self._clients.values():
+            client.register_commands(commands)

app/modules/telegram/telegram.py

@@ -41,6 +41,9 @@ class Telegram:
             _bot = telebot.TeleBot(self._telegram_token, parse_mode="Markdown")
             # 记录句柄
             self._bot = _bot
+            # 标记渠道来源
+            if kwargs.get("name"):
+                self._ds_url = f"{self._ds_url}&source={kwargs.get('name')}"
 
             @_bot.message_handler(commands=['start', 'help'])
             def send_welcome(message):