fix: 正确处理“我追的合集 / 收藏夹”中的收藏夹条目，以及一些样式、文本调整 (#553)

2025-12-05 16:38:10 +08:00
parent f37d9af678
commit b5ef76b0ed
14 changed files with 277 additions and 242 deletions
--- a/crates/bili_sync/src/api/response.rs
+++ b/crates/bili_sync/src/api/response.rs
@@ -92,47 +92,48 @@ where
 }

 #[derive(Serialize)]
-pub struct FavoriteWithSubscriptionStatus {
-    pub title: String,
-    pub media_count: i64,
-    pub fid: i64,
-    pub mid: i64,
-    pub subscribed: bool,
-}
-
-#[derive(Serialize)]
-pub struct CollectionWithSubscriptionStatus {
-    pub title: String,
-    pub sid: i64,
-    pub mid: i64,
-    pub invalid: bool,
-    pub subscribed: bool,
-}
-
-#[derive(Serialize)]
-pub struct UpperWithSubscriptionStatus {
-    pub mid: i64,
-    pub uname: String,
-    pub face: String,
-    pub sign: String,
-    pub invalid: bool,
-    pub subscribed: bool,
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum Followed {
+    Favorite {
+        title: String,
+        media_count: i64,
+        fid: i64,
+        mid: i64,
+        invalid: bool,
+        subscribed: bool,
+    },
+    Collection {
+        title: String,
+        sid: i64,
+        mid: i64,
+        media_count: i64,
+        invalid: bool,
+        subscribed: bool,
+    },
+    Upper {
+        mid: i64,
+        uname: String,
+        face: String,
+        sign: String,
+        invalid: bool,
+        subscribed: bool,
+    },
 }

 #[derive(Serialize)]
 pub struct FavoritesResponse {
-    pub favorites: Vec<FavoriteWithSubscriptionStatus>,
+    pub favorites: Vec<Followed>,
 }

 #[derive(Serialize)]
 pub struct CollectionsResponse {
-    pub collections: Vec<CollectionWithSubscriptionStatus>,
+    pub collections: Vec<Followed>,
    pub total: i64,
 }

 #[derive(Serialize)]
 pub struct UppersResponse {
-    pub uppers: Vec<UpperWithSubscriptionStatus>,
+    pub uppers: Vec<Followed>,
    pub total: i64,
 }

--- a/crates/bili_sync/src/api/routes/me/mod.rs
+++ b/crates/bili_sync/src/api/routes/me/mod.rs
@@ -6,13 +6,11 @@ use axum::Router;
 use axum::extract::{Extension, Query};
 use axum::routing::get;
 use bili_sync_entity::*;
+use itertools::{Either, Itertools};
 use sea_orm::{ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, QuerySelect};

 use crate::api::request::{FollowedCollectionsRequest, FollowedUppersRequest};
-use crate::api::response::{
-    CollectionWithSubscriptionStatus, CollectionsResponse, FavoriteWithSubscriptionStatus, FavoritesResponse,
-    UpperWithSubscriptionStatus, UppersResponse,
-};
+use crate::api::response::{CollectionsResponse, FavoritesResponse, Followed, UppersResponse};
 use crate::api::wrapper::{ApiError, ApiResponse};
 use crate::bilibili::{BiliClient, Me};
 use crate::config::VersionedConfig;
@@ -36,25 +34,26 @@ pub async fn get_created_favorites(
    let favorites = if let Some(bili_favorites) = bili_favorites {
        // b 站收藏夹相关接口使用的所谓“fid”其实是该处的 id，即 fid + mid 后两位
        let bili_fids: Vec<_> = bili_favorites.iter().map(|fav| fav.id).collect();
-
-        let subscribed_fids: Vec<i64> = favorite::Entity::find()
+        let subscribed_fids: HashSet<i64> = favorite::Entity::find()
            .select_only()
            .column(favorite::Column::FId)
            .filter(favorite::Column::FId.is_in(bili_fids))
            .into_tuple()
            .all(&db)
-            .await?;
-        let subscribed_set: HashSet<i64> = subscribed_fids.into_iter().collect();
+            .await?
+            .into_iter()
+            .collect();

        bili_favorites
            .into_iter()
-            .map(|fav| FavoriteWithSubscriptionStatus {
+            .map(|fav| Followed::Favorite {
                title: fav.title,
                media_count: fav.media_count,
                // api 返回的 id 才是真实的 fid
                fid: fav.id,
                mid: fav.mid,
-                subscribed: subscribed_set.contains(&fav.id),
+                invalid: false,
+                subscribed: subscribed_fids.contains(&fav.id),
            })
            .collect()
    } else {
@@ -64,7 +63,7 @@ pub async fn get_created_favorites(
    Ok(ApiResponse::ok(FavoritesResponse { favorites }))
 }

-/// 获取当前用户收藏的合集
+/// 获取当前用户收藏的合集/收藏夹
 pub async fn get_followed_collections(
    Extension(db): Extension<DatabaseConnection>,
    Extension(bili_client): Extension<Arc<BiliClient>>,
@@ -76,25 +75,63 @@ pub async fn get_followed_collections(
    let bili_collections = me.get_followed_collections(page_num, page_size).await?;

    let collections = if let Some(collection_list) = bili_collections.list {
-        let bili_sids: Vec<_> = collection_list.iter().map(|col| col.id).collect();
-
-        let subscribed_ids: Vec<i64> = collection::Entity::find()
-            .select_only()
-            .column(collection::Column::SId)
-            .filter(collection::Column::SId.is_in(bili_sids))
-            .into_tuple()
-            .all(&db)
-            .await?;
-        let subscribed_set: HashSet<i64> = subscribed_ids.into_iter().collect();
-
+        // collection_list 中的条目可能是合集或者收藏夹，需要分类处理
+        // 目前看下来，最显著的区别是合集的 fid 是 0
+        let (bili_fids, bili_sids): (Vec<_>, Vec<_>) = collection_list.iter().partition_map(|col| {
+            if col.fid != 0 {
+                Either::Left(col.id)
+            } else {
+                Either::Right(col.id)
+            }
+        });
+        let (subscribed_fids, subscribed_sids): (HashSet<i64>, HashSet<i64>) = tokio::try_join!(
+            async {
+                Result::<_, anyhow::Error>::Ok(
+                    favorite::Entity::find()
+                        .select_only()
+                        .column(favorite::Column::FId)
+                        .filter(favorite::Column::FId.is_in(bili_fids))
+                        .into_tuple()
+                        .all(&db)
+                        .await?
+                        .into_iter()
+                        .collect(),
+                )
+            },
+            async {
+                Ok(collection::Entity::find()
+                    .select_only()
+                    .column(collection::Column::SId)
+                    .filter(collection::Column::SId.is_in(bili_sids))
+                    .into_tuple()
+                    .all(&db)
+                    .await?
+                    .into_iter()
+                    .collect())
+            }
+        )?;
        collection_list
            .into_iter()
-            .map(|col| CollectionWithSubscriptionStatus {
-                title: col.title,
-                sid: col.id,
-                mid: col.mid,
-                invalid: col.state == 1,
-                subscribed: subscribed_set.contains(&col.id),
+            .map(|col| {
+                if col.fid != 0 {
+                    Followed::Favorite {
+                        title: col.title,
+                        media_count: col.media_count,
+                        fid: col.id,
+                        mid: col.mid,
+                        invalid: col.state == 1,
+                        subscribed: subscribed_fids.contains(&col.id),
+                    }
+                } else {
+                    Followed::Collection {
+                        title: col.title,
+                        sid: col.id,
+                        mid: col.mid,
+                        media_count: col.media_count,
+                        invalid: col.state == 1,
+                        subscribed: subscribed_sids.contains(&col.id),
+                    }
+                }
            })
            .collect()
    } else {
@@ -132,7 +169,7 @@ pub async fn get_followed_uppers(
    let uppers = bili_uppers
        .list
        .into_iter()
-        .map(|upper| UpperWithSubscriptionStatus {
+        .map(|upper| Followed::Upper {
            mid: upper.mid,
            // 官方没有提供字段，但是可以使用这种方式简单判断下
            invalid: upper.uname == "账号已注销" && upper.face == "https://i0.hdslb.com/bfs/face/member/noface.jpg",
--- a/crates/bili_sync/src/bilibili/me.rs
+++ b/crates/bili_sync/src/bilibili/me.rs
@@ -100,9 +100,11 @@ pub struct FavoriteItem {
 #[derive(Debug, serde::Deserialize)]
 pub struct CollectionItem {
    pub id: i64,
+    pub fid: i64,
    pub mid: i64,
    pub state: i32,
    pub title: String,
+    pub media_count: i64,
 }

 #[derive(Debug, serde::Deserialize)]