From 265fe630dd90aea224e11286c2159a10e07f5597 Mon Sep 17 00:00:00 2001
From: amtoaer <amtoaer@gmail.com>
Date: Tue, 14 Jan 2025 00:07:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20UP=20=E4=B8=BB?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E7=9A=84=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crates/bili_sync/src/adapter/submission.rs     | 2 +-
 crates/bili_sync/src/bilibili/favorite_list.rs | 4 ++--
 crates/bili_sync/src/bilibili/mod.rs           | 6 +++---
 crates/bili_sync/src/bilibili/submission.rs    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

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<T> {
+    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<i64>,
         #[serde(with = "ts_seconds")]
         ctime: DateTime<Utc>,
         #[serde(rename = "pubdate", with = "ts_seconds")]
@@ -87,7 +87,7 @@ pub enum VideoInfo {
         bvid: String,
         intro: String,
         cover: String,
-        upper: Upper,
+        upper: Upper<i64>,
         #[serde(with = "ts_seconds")]
         ctime: DateTime<Utc>,
         #[serde(with = "ts_seconds")]
@@ -105,7 +105,7 @@ pub enum VideoInfo {
         #[serde(rename = "pic")]
         cover: String,
         #[serde(rename = "owner")]
-        upper: Upper,
+        upper: Upper<i64>,
         #[serde(with = "ts_seconds")]
         ctime: DateTime<Utc>,
         #[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<Upper> {
+    pub async fn get_info(&self) -> Result<Upper<String>> {
         let mut res = self
             .client
             .request(Method::GET, "https://api.bilibili.com/x/web-interface/card")