chore: remove mal_id var

AmanoTeam · Jan 2, 2025 · b0c98d7 · b0c98d7
1 parent 25629f8
commit b0c98d7
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 41 deletions.
diff --git a/queries/get_anime.graphql b/queries/get_anime.graphql
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: MIT
 # Copyright (c) 2022-2025 Andriel Ferreira <https://github.com/AndrielFR>
 
-query ($id: Int, $mal_id: Int) {
-  Media (id: $id, idMal: $mal_id, type: ANIME) {
+query ($id: Int) {
+  Media (id: $id, type: ANIME) {
     id
     idMal
     title {

diff --git a/queries/get_manga.graphql b/queries/get_manga.graphql
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: MIT
 # Copyright (c) 2022-2025 Andriel Ferreira <https://github.com/AndrielFR>
 
-query ($id: Int, $mal_id: Int) {
-  Media (id: $id, idMal: $mal_id, type: MANGA) {
+query ($id: Int) {
+  Media (id: $id, type: MANGA) {
     id
     idMal
     title {

diff --git a/src/client.rs b/src/client.rs
@@ -43,22 +43,18 @@ impl Client {
     ///
     /// ```
     /// # async fn f(client: rust_anilist::Client) -> rust_anilist::Result<()> {
-    /// let anime = client.get_anime(Some(1), None).await?;
+    /// let anime = client.get_anime(1).await?;
     ///
     /// # Ok(())
     /// # }
     /// ```
-    pub async fn get_anime(
-        &self,
-        id: Option<i64>,
-        mal_id: Option<i64>,
-    ) -> Result<crate::models::Anime> {
-        let variables = match id {
-            Some(id) => serde_json::json!({ "id": id }),
-            None => serde_json::json!({ "mal_id": mal_id.unwrap_or(0) }),
-        };
+    pub async fn get_anime(&self, id: i64) -> Result<crate::models::Anime> {
         let data = self
-            .request(MediaType::Anime, Action::Get, variables)
+            .request(
+                MediaType::Anime,
+                Action::Get,
+                serde_json::json!({ "id": id }),
+            )
             .await
             .unwrap();
 
@@ -87,22 +83,18 @@ impl Client {
     ///
     /// ```
     /// # async fn f(client: rust_anilist::Client) -> rust_anilist::Result<()> {
-    /// let manga = client.get_manga(Some(1), None).await?;
+    /// let manga = client.get_manga(1).await?;
     ///
     /// # Ok(())
     /// # }
     /// ```
-    pub async fn get_manga(
-        &self,
-        id: Option<i64>,
-        mal_id: Option<i64>,
-    ) -> Result<crate::models::Manga> {
-        let variables = match id {
-            Some(id) => serde_json::json!({ "id": id }),
-            None => serde_json::json!({ "mal_id": mal_id.unwrap_or(0) }),
-        };
+    pub async fn get_manga(&self, id: i64) -> Result<crate::models::Manga> {
         let data = self
-            .request(MediaType::Manga, Action::Get, variables)
+            .request(
+                MediaType::Manga,
+                Action::Get,
+                serde_json::json!({ "id": id }),
+            )
             .await
             .unwrap();
 
@@ -207,10 +199,6 @@ impl Client {
             .await
             .unwrap();
 
-        std::fs::File::create("user.json")
-            .unwrap()
-            .write_all(data["data"]["User"].to_string().as_bytes())
-            .unwrap();
         match serde_json::from_str::<User>(&data["data"]["User"].to_string()) {
             Ok(user) => Ok(user),
             Err(e) => Err(crate::Error::ApiError(e.to_string())),

diff --git a/src/models/anime.rs b/src/models/anime.rs
@@ -77,14 +77,11 @@ pub struct Anime {
 impl Anime {
     pub async fn load_full(self) -> Result<Self> {
         if !self.is_full_loaded {
-            let mut anime = Client::default()
-                .get_anime(Some(self.id), self.id_mal)
-                .await
-                .unwrap();
+            let mut anime = Client::default().get_anime(self.id).await.unwrap();
             anime.is_full_loaded = true;
             Ok(anime)
         } else {
-            panic!("This anime is already full loaded")
+            panic!("This anime is already full loaded!")
         }
     }
 }

diff --git a/src/models/manga.rs b/src/models/manga.rs
@@ -71,10 +71,7 @@ pub struct Manga {
 impl Manga {
     pub async fn load_full(self) -> Result<Self> {
         if !self.is_full_loaded {
-            let mut manga = Client::default()
-                .get_manga(Some(self.id), self.id_mal)
-                .await
-                .unwrap();
+            let mut manga = Client::default().get_manga(self.id).await.unwrap();
             manga.is_full_loaded = true;
 
             Ok(manga)

diff --git a/tests/anime.rs b/tests/anime.rs
@@ -2,6 +2,6 @@ use rust_anilist::Client;
 
 #[tokio::test]
 async fn get_anime() {
-    let anime = Client::default().get_anime(Some(20), None).await;
+    let anime = Client::default().get_anime(20).await;
     assert!(anime.is_ok())
 }
diff --git a/tests/manga.rs b/tests/manga.rs
@@ -2,6 +2,6 @@ use rust_anilist::Client;
 
 #[tokio::test]
 async fn get_manga() {
-    let manga = Client::default().get_manga(Some(30026), None).await;
+    let manga = Client::default().get_manga(30026).await;
     assert!(manga.is_ok())
 }