From 3ef9c5ea2cb84eae7edd06108e03e7336ce8b7b3 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sat, 9 Mar 2024 17:34:49 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/chain/site.py      |  6 +++---
 app/chain/subscribe.py | 45 +++++++++++++++++++++++++++---------------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/app/chain/site.py b/app/chain/site.py
index ef3afc60..a6ef86fc 100644
--- a/app/chain/site.py
+++ b/app/chain/site.py
@@ -370,11 +370,11 @@ class SiteChain(ChainBase):
             if site.render:
                 render_str = "🧭"
             else:
-                render_str = ""
+                render_str = "⚠️"
             if site.is_active:
-                messages.append(f"{site.id}. [{site.name}]({site.url}){render_str}")
+                messages.append(f"{site.id}. {site.name} {render_str}")
             else:
-                messages.append(f"{site.id}. {site.name}")
+                messages.append(f"{site.id}. {site.name} ")
         # 发送列表
         self.post_message(Notification(
             channel=channel,
diff --git a/app/chain/subscribe.py b/app/chain/subscribe.py
index 962d3ec9..74f52734 100644
--- a/app/chain/subscribe.py
+++ b/app/chain/subscribe.py
@@ -856,26 +856,39 @@ class SubscribeChain(ChainBase):
                 f"\n- 删除订阅：/subscribe_delete [id]" \
                 f"\n- 搜索订阅：/subscribe_search [id]" \
                 f"\n- 刷新订阅：/subscribe_refresh"
-        messages = []
+        medias = []
         for subscribe in subscribes:
+            media = MediaInfo()
             if subscribe.type == MediaType.MOVIE.value:
-                if subscribe.tmdbid:
-                    link = f"https://www.themoviedb.org/movie/{subscribe.tmdbid}"
-                else:
-                    link = f"https://movie.douban.com/subject/{subscribe.doubanid}"
-                messages.append(f"{subscribe.id}. [{subscribe.name}（{subscribe.year}）]({link})")
+                media.from_dict({
+                    "type": subscribe.type,
+                    "title": subscribe.name,
+                    "year": subscribe.year,
+                    "tmdb_id": subscribe.tmdbid,
+                    "backdrop_path": subscribe.backdrop,
+                    "poster_path": subscribe.poster,
+                    "vote_average": subscribe.vote,
+                    "overview": subscribe.description,
+                })
             else:
-                if subscribe.tmdbid:
-                    link = f"https://www.themoviedb.org/tv/{subscribe.tmdbid}"
-                else:
-                    link = f"https://movie.douban.com/subject/{subscribe.doubanid}"
-                messages.append(f"{subscribe.id}. [{subscribe.name}（{subscribe.year}）]({link}) "
-                                f"第{subscribe.season}季 "
-                                f"_{subscribe.total_episode - (subscribe.lack_episode or subscribe.total_episode)}"
-                                f"/{subscribe.total_episode}_")
+                media.from_dict({
+                    "type": subscribe.type,
+                    "name": subscribe.name,
+                    "year": subscribe.year,
+                    "tmdb_id": subscribe.tmdbid,
+                    "backdrop_path": subscribe.backdrop,
+                    "poster_path": subscribe.poster,
+                    "vote_average": f"{subscribe.total_episode - (subscribe.lack_episode or subscribe.total_episode)}"
+                                    f"/{subscribe.total_episode}",
+                    "overview": subscribe.description,
+                    "season": subscribe.season
+                })
+            medias.append(media)
         # 发送列表
-        self.post_message(Notification(channel=channel,
-                                       title=title, text='\n'.join(messages), userid=userid))
+        self.post_medias_message(
+            message=Notification(channel=channel, title=title, userid=userid),
+            medias=medias
+        )
 
     def remote_delete(self, arg_str: str, channel: MessageChannel, userid: Union[str, int] = None):
         """