feat(notification): 增加用户单独通知功能

app/models/MAA.py

@@ -608,13 +608,14 @@ class MaaManager(QObject):
                             Config.app_path
                             / f"history/{curdate}/{user_data["Info"]["Name"]}/{start_time.strftime("%H-%M-%S")}.json",
                         )
-
+                        if if_six_star:
-                        if Config.get(Config.notify_IfSendSixStar) and if_six_star:
-
                             self.push_notification(
                                 "公招六星",
                                 f"喜报：用户 {user[0]} 公招出六星啦！",
-                                {"user_name": user_data["Info"]["Name"]},
+                                {
+                                    "user_name": user_data["Info"]["Name"],
+                                    "user_index": user[2],
+                                },
                             )
 
                         # 执行MAA解压更新动作
@@ -643,6 +644,7 @@ class MaaManager(QObject):
                 if Config.get(Config.notify_IfSendStatistic):
 
                     statistics = Config.merge_maa_logs("指定项", user_logs_list)
+                    statistics["user_index"] = user[2]
                     statistics["user_info"] = user[0]
                     statistics["start_time"] = user_start_time.strftime(
                         "%Y-%m-%d %H:%M:%S"
@@ -1772,26 +1774,30 @@ class MaaManager(QObject):
             message_html = template.render(message)
 
             # 发送全局通知
-            Notify.send_mail("网页", title, message_html,Config.get(Config.notify_ToAddress))
+            if Config.get(Config.notify_IfSendMail):
+                Notify.send_mail(
+                    "网页", title, message_html, Config.get(Config.notify_ToAddress)
+                )
             serverchan_message = message_text.replace("\n", "\n\n")
-            Notify.ServerChanPush(title, f"{serverchan_message}\n\nAUTO_MAA 敬上",Config.get(Config.notify_ServerChanKey),Config.get(Config.notify_ServerChanTag),Config.get(Config.notify_ServerChanChannel))
+            if Config.get(Config.notify_IfServerChan):
-            Notify.CompanyWebHookBotPush(title, f"{message_text}\n\nAUTO_MAA 敬上",Config.get(Config.notify_CompanyWebHookBotUrl))
+                Notify.ServerChanPush(
-
+                    title,
-            # # 发送用户单独通知
+                    f"{serverchan_message}\n\nAUTO_MAA 敬上",
-            # for user_name in message["failed_user"].split("、") + message["waiting_user"].split("、"):
+                    Config.get(Config.notify_ServerChanKey),
-            #     if not user_name:  # 跳过空字符串
+                    Config.get(Config.notify_ServerChanTag),
-            #         continue
+                    Config.get(Config.notify_ServerChanChannel),
-            #     user_config = Config.member_dict.get(user_name)
+                )
-            #     if user_config and user_config.get(user_config.Notify_Enable):
+            if Config.get(Config.notify_IfCompanyWebHookBot):
-            #         user_notify = UserNotification(user_config)
+                Notify.CompanyWebHookBotPush(
-            #         user_notify.send_notification(
+                    title,
-            #             f"{self.mode[2:4]}任务未完成通知",
+                    f"{message_text}\n\nAUTO_MAA 敬上",
-            #             f"您的{self.mode[2:4]}任务未完成,请检查相关设置。\n\n{message_text}"
+                    Config.get(Config.notify_CompanyWebHookBotUrl),
-            #         )
+                )
 
             return message_text
 
         elif mode == "统计信息":
+            user_index = message.get("user_index")
             # 生成文本通知内容
             formatted = []
             for stage, items in message["drop_statistics"].items():
@@ -1818,40 +1824,166 @@ class MaaManager(QObject):
             message_html = template.render(message)
 
             # 发送全局通知
-            Notify.send_mail("网页", title, message_html,Config.get(Config.notify_ToAddress))
+            if Config.get(Config.notify_IfSendMail):
+                Notify.send_mail(
+                    "网页", title, message_html, Config.get(Config.notify_ToAddress)
+                )
             # ServerChan的换行是两个换行符。故而将\n替换为\n\n
             serverchan_message = message_text.replace("\n", "\n\n")
-            Notify.ServerChanPush(title, f"{serverchan_message}\n\nAUTO_MAA 敬上",Config.get(Config.notify_ServerChanKey),Config.get(Config.notify_ServerChanTag),Config.get(Config.notify_ServerChanChannel))
+            if Config.get(Config.notify_IfServerChan):
-            Notify.CompanyWebHookBotPush(title, f"{message_text}\n\nAUTO_MAA 敬上",Config.get(Config.notify_CompanyWebHookBotUrl))
+                Notify.ServerChanPush(
+                    title,
+                    f"{serverchan_message}\n\nAUTO_MAA 敬上",
+                    Config.get(Config.notify_ServerChanKey),
+                    Config.get(Config.notify_ServerChanTag),
+                    Config.get(Config.notify_ServerChanChannel),
+                )
+            if Config.get(Config.notify_IfCompanyWebHookBot):
+                Notify.CompanyWebHookBotPush(
+                    title,
+                    f"{message_text}\n\nAUTO_MAA 敬上",
+                    Config.get(Config.notify_CompanyWebHookBotUrl),
+                )
 
-            # # 发送用户单独通知
+            # 发送用户单独通知
-            # user_name = message.get("user_info")
+            user_data = self.data.get(user_index, {}).get("Config", {})
-            # if user_name:
+            if user_data["Notify"].get("IfSendStatistic", False):
-            #     user_config = Config.member_dict.get(user_name)
+                if user_data.get("Notify") and user_data["Notify"].get(
-            #     if user_config and user_config.get(user_config.Notify_Enable):
+                    "Enabled", False
-            #         user_notify = UserNotification(user_config)
+                ):
-            #         user_notify.send_notification(
+                    # 发送邮件通知
-            #             f"{self.mode[2:4]}任务统计报告",
+                    if user_data.get("Notify", {}).get("IfSendMail", False):
-            #             f"您的{self.mode[2:4]}任务统计报告如下:\n\n{message_text}"
+                        userToAddress = user_data.get("Notify", {}).get("ToAddress")
-            #         )
+                        if userToAddress:
+                            Notify.send_mail("网页", title, message_text, userToAddress)
+                        else:
+                            logger.error(
+                                f"{self.name} | 用户邮箱地址为空，无法发送用户单独的邮件通知"
+                            )
+
+                    # 发送ServerChan通知
+                    if user_data.get("Notify", {}).get("IfServerChan", False):
+                        userServerChanKey = user_data.get("Notify", {}).get(
+                            "ServerChanKey"
+                        )
+                        userServerChanTag = user_data.get("Notify", {}).get(
+                            "ServerChanTag"
+                        )
+                        userServerChanChannel = user_data.get("Notify", {}).get(
+                            "ServerChanChannel"
+                        )
+                        if userServerChanKey:
+                            Notify.ServerChanPush(
+                                title,
+                                f"{serverchan_message}\n\nAUTO_MAA 敬上",
+                                userServerChanKey,
+                                userServerChanTag,
+                                userServerChanChannel,
+                            )
+                        else:
+                            logger.error(
+                                f"{self.name} |用户ServerChan密钥为空，无法发送用户单独的ServerChan通知"
+                            )
+
+                    # 推送CompanyWebHookBot通知
+                    if user_data.get("Notify", {}).get("IfCompanyWebHookBot", False):
+                        userCompanyWebHookBotUrl = user_data.get("Notify", {}).get(
+                            "CompanyWebHookBotUrl"
+                        )
+                        if userCompanyWebHookBotUrl:
+                            Notify.CompanyWebHookBotPush(
+                                title,
+                                f"{message_text}\n\nAUTO_MAA 敬上",
+                                userCompanyWebHookBotUrl,
+                            )
+                        else:
+                            logger.error(
+                                f"{self.name} |用户CompanyWebHookBot密钥为空，无法发送用户单独的CompanyWebHookBot通知"
+                            )
 
         elif mode == "公招六星":
+            user_index = message.get("user_index")
             # 生成HTML通知内容
             template = env.get_template("MAA_six_star.html")
+
+            # 这里需要看一下，我给message加了个user_index
             message_html = template.render(message)
 
+            if Config.get(Config.notify_IfSendSixStar):
                 # 发送全局通知
-            Notify.send_mail("网页", title, message_html,Config.get(Config.notify_ToAddress))
+                if Config.get(Config.notify_IfSendMail):
-            Notify.ServerChanPush(title, "好羡慕~\n\nAUTO_MAA 敬上",Config.get(Config.notify_ServerChanKey),Config.get(Config.notify_ServerChanTag),Config.get(Config.notify_ServerChanChannel))
+                    Notify.send_mail(
-            Notify.CompanyWebHookBotPush(title, "好羡慕~\n\nAUTO_MAA 敬上",Config.get(Config.notify_CompanyWebHookBotUrl))
+                        "网页", title, message_html, Config.get(Config.notify_ToAddress)
+                    )
+                if Config.get(Config.notify_IfServerChan):
+                    Notify.ServerChanPush(
+                        title,
+                        "好羡慕~\n\nAUTO_MAA 敬上",
+                        Config.get(Config.notify_ServerChanKey),
+                        Config.get(Config.notify_ServerChanTag),
+                        Config.get(Config.notify_ServerChanChannel),
+                    )
+                if Config.get(Config.notify_IfCompanyWebHookBot):
+                    Notify.CompanyWebHookBotPush(
+                        title,
+                        "好羡慕~\n\nAUTO_MAA 敬上",
+                        Config.get(Config.notify_CompanyWebHookBotUrl),
+                    )
+            # 发送用户单独通知
+            user_data = self.data.get(user_index, {}).get("Config", {})
 
-            # # 发送用户单独通知
+            # 判断是否单独发送六星
-            # user_name = message.get("user_name")
+            if user_data["Notify"].get("IfSendSixStar", False):
-            # if user_name:
+                if user_data.get("Notify") and user_data["Notify"].get(
-            #     user_config = Config.member_dict.get(user_name)
+                    "Enabled", False
-            #     if user_config and user_config.get(user_config.Notify_Enable):
+                ):
-            #         user_notify = UserNotification(user_config)
+                    # 发送邮件通知
-            #         user_notify.send_notification(
+                    if user_data.get("Notify", {}).get("IfSendMail", False):
-            #             "公招六星通知",
+                        userToAddress = user_data.get("Notify", {}).get("ToAddress")
-            #             "恭喜您在公招中获得了六星干员!"
+                        if userToAddress:
-            #         )
+                            Notify.send_mail("网页", title, message_html, userToAddress)
+                        else:
+                            logger.error(
+                                f"{self.name} | 用户邮箱地址为空，无法发送用户单独的邮件通知"
+                            )
+
+                    # 发送ServerChan通知
+                    if user_data.get("Notify", {}).get("IfServerChan", False):
+                        userServerChanKey = user_data.get("Notify", {}).get(
+                            "ServerChanKey"
+                        )
+                        userServerChanTag = user_data.get("Notify", {}).get(
+                            "ServerChanTag"
+                        )
+                        userServerChanChannel = user_data.get("Notify", {}).get(
+                            "ServerChanChannel"
+                        )
+                        if userServerChanKey:
+                            Notify.ServerChanPush(
+                                title,
+                                "好羡慕~\n\nAUTO_MAA 敬上",
+                                userServerChanKey,
+                                userServerChanTag,
+                                userServerChanChannel,
+                            )
+                        else:
+                            logger.error(
+                                f"{self.name} |用户ServerChan密钥为空，无法发送用户单独的ServerChan通知"
+                            )
+
+                    # 推送CompanyWebHookBot通知
+                    if user_data.get("Notify", {}).get("IfCompanyWebHookBot", False):
+                        userCompanyWebHookBotUrl = user_data.get("Notify", {}).get(
+                            "CompanyWebHookBotUrl"
+                        )
+                        if userCompanyWebHookBotUrl:
+                            Notify.CompanyWebHookBotPush(
+                                title,
+                                "好羡慕~\n\nAUTO_MAA 敬上",
+                                userCompanyWebHookBotUrl,
+                            )
+                        else:
+                            logger.error(
+                                f"{self.name} |用户CompanyWebHookBot密钥为空，无法发送用户单独的CompanyWebHookBot通知"
+                            )
+        return None

app/services/notification.py

@@ -69,9 +69,6 @@ class Notification(QWidget):
 
     def send_mail(self, mode, title, content, to_address) -> None:
         """推送邮件通知"""
-
-        if Config.get(Config.notify_IfSendMail):
-
         if (
             Config.get(Config.notify_SMTPServerAddress) == ""
             or Config.get(Config.notify_AuthorizationCode) == ""
@@ -146,7 +143,6 @@ class Notification(QWidget):
 
     def ServerChanPush(self, title, content, send_key, tag, channel):
         """使用Server酱推送通知"""
-        if Config.get(Config.notify_IfServerChan):
         if not send_key:
             logger.error("请正确设置Server酱的SendKey")
             self.push_info_bar.emit(
@@ -172,14 +168,8 @@ class Notification(QWidget):
                     and (s.count("|") == 0 or all(s.split("|")))
                 )
 
-                tags = "|".join(
+            tags = "|".join(_.strip() for _ in tag.split("|"))
-                    _.strip()
+            channels = "|".join(_.strip() for _ in channel.split("|"))
-                    for _ in tag.split("|")
-                )
-                channels = "|".join(
-                    _.strip()
-                    for _ in channel.split("|")
-                )
 
             options = {}
             if is_valid(tags):
@@ -225,15 +215,15 @@ class Notification(QWidget):
         except Exception as e:
             logger.exception("Server酱通知推送异常")
             self.push_info_bar.emit(
-                    "error", "Server酱通知推送异常", f"请检查相关设置，如还有问题可联系开发者", -1
+                "error",
+                "Server酱通知推送异常",
+                "请检查相关设置和网络连接。如全部配置正确，请稍后再试。",
+                -1,
             )
             return f"Server酱通知推送异常：{str(e)}"
-        return None
 
     def CompanyWebHookBotPush(self, title, content, webhook_url):
         """使用企业微信群机器人推送通知"""
-        if Config.get(Config.notify_IfCompanyWebHookBot):
-
         if webhook_url == "":
             logger.error("请正确设置企业微信群机器人的WebHook地址")
             self.push_info_bar.emit(
@@ -281,7 +271,6 @@ class Notification(QWidget):
                 -1,
             )
             return f'使用企业微信群机器人推送通知时出错：{info["errmsg"]}'
-        return None
 
     def send_test_notification(self):
         """发送测试通知到所有已启用的通知渠道"""