diff --git a/src/module/notification/notification.py b/src/module/notification/notification.py index 22bde17a..d94841e0 100644 --- a/src/module/notification/notification.py +++ b/src/module/notification/notification.py @@ -32,7 +32,7 @@ class PostNotification: ) @staticmethod - def _gen_message(notify: Notification) -> str: + def _gen_message(notify: Notification) -> (str, str): with BangumiDatabase() as db: poster_path = db.match_poster(notify.official_title) if poster_path: @@ -44,12 +44,14 @@ class PostNotification: text = f""" 番剧名称:{notify.official_title}\n季度: 第{notify.season}季\n更新集数: 第{notify.episode}集\n """ - return text + + title = f"""{notify.official_title}S{notify.season}E{notify.episode}""" + return text, title def send_msg(self, notify: Notification) -> bool: - text = self._gen_message(notify) + text, title = self._gen_message(notify) try: - self.notifier.post_msg(text) + self.notifier.post_msg(text, title) logger.debug(f"Send notification: {notify.official_title}") except Exception as e: logger.warning(f"Failed to send notification: {e}") diff --git a/src/module/notification/plugin/bark.py b/src/module/notification/plugin/bark.py index f405ab4b..05e8b693 100644 --- a/src/module/notification/plugin/bark.py +++ b/src/module/notification/plugin/bark.py @@ -11,8 +11,8 @@ class BarkNotification(RequestContent): self.token = token self.notification_url = "https://api.day.app/push" - def post_msg(self, text) -> bool: - data = {"title": "AutoBangumi 番剧更新", "body": text, "device_key": self.token} + def post_msg(self, text, title: str) -> bool: + data = {"title": title, "body": text, "device_key": self.token} resp = self.post_data(self.notification_url, data) logger.debug(f"Bark notification: {resp.status_code}") return resp.status_code == 200 diff --git a/src/module/notification/plugin/server_chan.py b/src/module/notification/plugin/server_chan.py index 5b4b32d0..e2fed8ba 100644 --- a/src/module/notification/plugin/server_chan.py +++ b/src/module/notification/plugin/server_chan.py @@ -12,9 +12,9 @@ class ServerChanNotification(RequestContent): super().__init__() self.notification_url = f"https://sctapi.ftqq.com/{token}.send" - def post_msg(self, text: str) -> bool: + def post_msg(self, text: str, title: str) -> bool: data = { - "title": "AutoBangumi 番剧更新", + "title": title, "desp": text, } resp = self.post_data(self.notification_url, data) diff --git a/src/module/notification/plugin/slack.py b/src/module/notification/plugin/slack.py index 1773e85d..43097657 100644 --- a/src/module/notification/plugin/slack.py +++ b/src/module/notification/plugin/slack.py @@ -11,8 +11,8 @@ class SlackNotification(RequestContent): self.token = token self.notification_url = "https://api.day.app/push" - def post_msg(self, text) -> bool: - data = {"title": "AutoBangumi 番剧更新", "body": text, "device_key": self.token} + def post_msg(self, text: str, title: str) -> bool: + data = {"title": title, "body": text, "device_key": self.token} resp = self.post_data(self.notification_url, data) logger.debug(f"Bark notification: {resp.status_code}") return resp.status_code == 200 \ No newline at end of file diff --git a/src/module/notification/plugin/telegram.py b/src/module/notification/plugin/telegram.py index 71e90c16..94211f73 100644 --- a/src/module/notification/plugin/telegram.py +++ b/src/module/notification/plugin/telegram.py @@ -11,7 +11,7 @@ class TelegramNotification(RequestContent): self.notification_url = f"https://api.telegram.org/bot{token}/sendMessage" self.chat_id = chat_id - def post_msg(self, text: str) -> bool: + def post_msg(self, text: str, title: str) -> bool: data = { "chat_id": self.chat_id, "text": text, diff --git a/src/module/notification/plugin/wecom.py b/src/module/notification/plugin/wecom.py index c56e97e2..78bb6649 100644 --- a/src/module/notification/plugin/wecom.py +++ b/src/module/notification/plugin/wecom.py @@ -13,7 +13,7 @@ class WecomNotification(RequestContent): self.notification_url = f"{chat_id}" self.token = token - def post_msg(self, text: str) -> bool: + def post_msg(self, text: str, title: str) -> bool: ##Change message format to match Wecom push better info = text.split(":") print(info) @@ -24,10 +24,10 @@ class WecomNotification(RequestContent): if picurl == "": picurl = "https://article.biliimg.com/bfs/article/d8bcd0408bf32594fd82f27de7d2c685829d1b2e.png" data = { - "key":self.token, - "type": "news", - "title": title, - "msg": msg, + "key":self.token, + "type": "news", + "title": title, + "msg": msg, "picurl":picurl } resp = self.post_data(self.notification_url, data)