diff --git a/crates/bili_sync/src/adapter/submission.rs b/crates/bili_sync/src/adapter/submission.rs index 0559073..8200b73 100644 --- a/crates/bili_sync/src/adapter/submission.rs +++ b/crates/bili_sync/src/adapter/submission.rs @@ -151,7 +151,7 @@ pub(super) async fn submission_from<'a>( let submission = Submission::new(bili_client, upper_id.to_owned()); let upper = submission.get_info().await?; submission::Entity::insert(submission::ActiveModel { - upper_id: Set(upper.mid), + upper_id: Set(upper.mid.parse()?), upper_name: Set(upper.name), path: Set(path.to_string_lossy().to_string()), ..Default::default() diff --git a/crates/bili_sync/src/bilibili/favorite_list.rs b/crates/bili_sync/src/bilibili/favorite_list.rs index 533a47e..1f4c723 100644 --- a/crates/bili_sync/src/bilibili/favorite_list.rs +++ b/crates/bili_sync/src/bilibili/favorite_list.rs @@ -16,8 +16,8 @@ pub struct FavoriteListInfo { } #[derive(Debug, serde::Deserialize)] -pub struct Upper { - pub mid: i64, +pub struct Upper { + pub mid: T, pub name: String, pub face: String, } diff --git a/crates/bili_sync/src/bilibili/mod.rs b/crates/bili_sync/src/bilibili/mod.rs index c5bcdc8..db8c2c1 100644 --- a/crates/bili_sync/src/bilibili/mod.rs +++ b/crates/bili_sync/src/bilibili/mod.rs @@ -71,7 +71,7 @@ pub enum VideoInfo { #[serde(rename = "pic")] cover: String, #[serde(rename = "owner")] - upper: Upper, + upper: Upper, #[serde(with = "ts_seconds")] ctime: DateTime, #[serde(rename = "pubdate", with = "ts_seconds")] @@ -87,7 +87,7 @@ pub enum VideoInfo { bvid: String, intro: String, cover: String, - upper: Upper, + upper: Upper, #[serde(with = "ts_seconds")] ctime: DateTime, #[serde(with = "ts_seconds")] @@ -105,7 +105,7 @@ pub enum VideoInfo { #[serde(rename = "pic")] cover: String, #[serde(rename = "owner")] - upper: Upper, + upper: Upper, #[serde(with = "ts_seconds")] ctime: DateTime, #[serde(rename = "add_at", with = "ts_seconds")] diff --git a/crates/bili_sync/src/bilibili/submission.rs b/crates/bili_sync/src/bilibili/submission.rs index 39aab4f..65103fd 100644 --- a/crates/bili_sync/src/bilibili/submission.rs +++ b/crates/bili_sync/src/bilibili/submission.rs @@ -18,7 +18,7 @@ impl<'a> Submission<'a> { Self { client, upper_id } } - pub async fn get_info(&self) -> Result { + pub async fn get_info(&self) -> Result> { let mut res = self .client .request(Method::GET, "https://api.bilibili.com/x/web-interface/card")