Fix mod api urls

RedstoneWizard08 · Mar 10, 2023 · 4ecf4cf · 4ecf4cf
1 parent 3837704
commit 4ecf4cf
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/common/src/mods/spacedock/mod.rs b/common/src/mods/spacedock/mod.rs
@@ -5,6 +5,7 @@ use crate::models::latest::LatestSchema;
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct SpaceDockAPI {
     pub base: String,
+    pub api_base: String,
 }
 
 impl Default for SpaceDockAPI {
@@ -16,32 +17,37 @@ impl Default for SpaceDockAPI {
 impl SpaceDockAPI {
     pub fn new() -> Self {
         return Self {
-            base: SpaceDockAPI::get_default_api_url(),
+            base: SpaceDockAPI::get_default_url(),
+            api_base: SpaceDockAPI::get_default_api_url(),
         };
     }
 
     pub fn get_default_api_url() -> String {
         return "https://spacedock.info/api".to_string();
     }
 
+    pub fn get_default_url() -> String {
+        return "https://spacedock.info".to_string();
+    }
+
     pub async fn get_mod(&self, id: i32) -> ModInfo {
-        let uri = format!("{}/mod/{}", self.base, id);
+        let uri = format!("{}/mod/{}", self.api_base, id);
         let resp = reqwest::get(uri).await.unwrap();
         let data = resp.json::<ModInfo>().await.unwrap();
 
         return data.finish(false);
     }
 
     pub async fn get_mods(&self, page: i32, count: i32) -> BrowseResult {
-        let uri = format!("{}/browse?page={}&count={}", self.base, page, count);
+        let uri = format!("{}/browse?page={}&count={}", self.api_base, page, count);
         let resp = reqwest::get(uri).await.unwrap();
         let data = resp.json::<BrowseResult>().await.unwrap();
 
         return data.finish();
     }
 
     pub async fn get_mods_for_game(&self, game: i32, page: i32, count: i32) -> BrowseResult {
-        let uri = format!("{}/browse?page={}&count={}&game_id={}", self.base, page, count, game);
+        let uri = format!("{}/browse?page={}&count={}&game_id={}", self.api_base, page, count, game);
         let resp = reqwest::get(uri).await.unwrap();
         let text = resp.text().await.unwrap();
         let data = serde_json::from_str::<BrowseResult>(&text);
@@ -54,7 +60,7 @@ impl SpaceDockAPI {
     }
 
     pub async fn get_mod_download(&self, id: i32) -> String {
-        let uri = format!("{}/mod/{}/latest", self.base.clone(), id);
+        let uri = format!("{}/mod/{}/latest", self.api_base, id);
         let resp = reqwest::get(uri).await.unwrap();
         let text = resp.text().await.unwrap();
         let data = serde_json::from_str::<LatestSchema>(&text).unwrap();