fix message

app/chain/__init__.py

@@ -16,11 +16,13 @@ from app.core.event import EventManager
 from app.core.meta import MetaBase
 from app.core.module import ModuleManager
 from app.db.message_oper import MessageOper
+from app.db.user_oper import UserOper
 from app.helper.message import MessageHelper
+from app.helper.notification import NotificationHelper
 from app.log import logger
 from app.schemas import TransferInfo, TransferTorrent, ExistMediaInfo, DownloadingTorrent, CommingMessage, Notification, \
     WebhookEventInfo, TmdbEpisode, MediaPerson, FileItem
-from app.schemas.types import TorrentStatus, MediaType, MediaImageType, EventType
+from app.schemas.types import TorrentStatus, MediaType, MediaImageType, EventType, NotificationType
 from app.utils.object import ObjectUtils
 
 
@@ -37,6 +39,8 @@ class ChainBase(metaclass=ABCMeta):
         self.eventmanager = EventManager()
         self.messageoper = MessageOper()
         self.messagehelper = MessageHelper()
+        self.notificationhelper = NotificationHelper()
+        self.useroper = UserOper()
 
     @staticmethod
     def load_cache(filename: str) -> Any:
@@ -454,12 +458,31 @@ class ChainBase(metaclass=ABCMeta):
         :param message:  消息体
         :return: 成功或失败
         """
-        # TODO 根据消息场景开关决定发给谁
         logger.info(f"发送消息：channel={message.channel}，"
                     f"source={message.source},"
                     f"title={message.title}, "
                     f"text={message.text}，"
                     f"userid={message.userid}")
+        if not message.userid and message.mtype:
+            # 没有指定用户ID时，按规则确定发送对象
+            # 默认发送全体
+            to_targets = {}
+            notify_action = self.notificationhelper.get_switch(message.mtype)
+            if notify_action == "admin":
+                # 仅发送管理员
+                logger.info(f"已设置 {message.mtype} 的消息只发送给管理员")
+                to_targets = self.useroper.get_settings(settings.SUPERUSER)
+            elif notify_action == "user":
+                # 发送对应用户
+                if message.username:
+                    logger.info(f"已设置 {message.mtype} 的消息只发送给用户 {message.username}")
+                    to_targets = self.useroper.get_settings(message.username)
+                if not message.username or to_targets is None:
+                    if message.username:
+                        logger.info(f"没有 {message.username} 这个用户，该消息将发送给管理员")
+                    # 回滚发送管理员
+                    to_targets = self.useroper.get_settings(settings.SUPERUSER)
+            message.targets = to_targets
         # 发送事件
         self.eventmanager.send_event(etype=EventType.NoticeMessage, data=message.dict())
         # 保存消息

app/chain/download.py

@@ -39,18 +39,18 @@ class DownloadChain(ChainBase):
         self.messagehelper = MessageHelper()
 
     def post_download_message(self, meta: MetaBase, mediainfo: MediaInfo, torrent: TorrentInfo,
-                              channel: MessageChannel = None, userid: str = None, username: str = None,
+                              channel: MessageChannel = None, username: str = None,
                               download_episodes: str = None):
         """
-        发送添加下载的消息
+        发送添加下载的消息，根据消息场景开关决定发给谁
         :param meta: 元数据
         :param mediainfo: 媒体信息
         :param torrent: 种子信息
         :param channel: 通知渠道
-        :param userid: 用户ID，指定时精确发送对应用户
         :param username: 通知显示的下载用户信息
         :param download_episodes: 下载的集数
         """
+        # 拼装消息内容
         msg_text = ""
         if username:
             msg_text = f"用户：{username}"
@@ -82,15 +82,16 @@ class DownloadChain(ChainBase):
             torrent.description = re.sub(r'<[^>]+>', '', description)
             msg_text = f"{msg_text}\n描述：{torrent.description}"
 
+        # 下载成功按规则发送消息
         self.post_message(Notification(
             channel=channel,
             mtype=NotificationType.Download,
-            userid=userid,
             title=f"{mediainfo.title_year} "
                   f"{'%s %s' % (meta.season, download_episodes) if download_episodes else meta.season_episode} 开始下载",
             text=msg_text,
             image=mediainfo.get_message_image(),
-            link=settings.MP_DOMAIN('/#/downloading')))
+            link=settings.MP_DOMAIN('/#/downloading'),
+            username=username))
 
     def download_torrent(self, torrent: TorrentInfo,
                          channel: MessageChannel = None,
@@ -339,7 +340,7 @@ class DownloadChain(ChainBase):
             if files_to_add:
                 self.downloadhis.add_files(files_to_add)
 
-            # 发送消息 TODO 根据消息场景开关决定发给谁
+            # 下载成功发送消息
             self.post_download_message(meta=_meta, mediainfo=_media, torrent=_torrent,
                                        username=username, download_episodes=download_episodes)
             # 下载成功后处理

app/chain/subscribe.py

@@ -163,7 +163,7 @@ class SubscribeChain(ChainBase):
         if not sid:
             logger.error(f'{mediainfo.title_year} {err_msg}')
             if not exist_ok and message:
-                # 发回原用户
+                # 失败发回原用户
                 self.post_message(Notification(channel=channel,
                                                source=source,
                                                mtype=NotificationType.Subscribe,
@@ -183,11 +183,13 @@ class SubscribeChain(ChainBase):
                 link = settings.MP_DOMAIN('#/subscribe-tv?tab=mysub')
             else:
                 link = settings.MP_DOMAIN('#/subscribe-movie?tab=mysub')
+            # 订阅成功按规则发送消息
             self.post_message(Notification(mtype=NotificationType.Subscribe,
                                            title=f"{mediainfo.title_year} {metainfo.season} 已添加订阅",
                                            text=text,
                                            image=mediainfo.get_message_image(),
-                                           link=link))
+                                           link=link,
+                                           username=username))
         # 发送事件
         EventManager().send_event(EventType.SubscribeAdded, {
             "subscribe_id": sid,
@@ -926,10 +928,12 @@ class SubscribeChain(ChainBase):
             link = settings.MP_DOMAIN('#/subscribe-tv?tab=mysub')
         else:
             link = settings.MP_DOMAIN('#/subscribe-movie?tab=mysub')
+        # 完成订阅按规则发送消息
         self.post_message(Notification(mtype=NotificationType.Subscribe,
                                        title=f'{mediainfo.title_year} {meta.season} 已完成{msgstr}',
                                        image=mediainfo.get_message_image(),
-                                       link=link))
+                                       link=link,
+                                       username=subscribe.username))
         # 发送事件
         EventManager().send_event(EventType.SubscribeComplete, {
             "subscribe_id": subscribe.id,