From b034c73c72619a13ff39c78c1fc893f89f777423 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Fri, 1 Jul 2022 16:25:18 -0400 Subject: [PATCH] Change to `api.grasscutter.io` --- src-tauri/src/main.rs | 3 ++- src-tauri/tauri.conf.json | 3 ++- src/ui/App.tsx | 2 +- src/ui/components/news/NewsSection.tsx | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 19fe467..fcd6c9d 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -186,9 +186,10 @@ async fn get_theme_list(data_dir: String) -> Vec> { } #[tauri::command] +// TODO: Replace with downloading the background file & saving it. async fn get_bg_file(bg_path: String, appdata: String) -> String { let copy_loc = appdata; - let query = web::query("https://api.grasscutters.xyz/cultivation/query").await; + let query = web::query("https://api.grasscutter.io/cultivation/query").await; let response_data: APIQuery = match serde_json::from_str(&query) { Ok(data) => data, Err(e) => { diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f10e151..b3498ab 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -75,7 +75,8 @@ "active": true, "dialog": true, "endpoints": [ - "https://api.grasscutters.xyz/cultivation/update?version={{current_version}}" + "https://api.grasscutter.io/cultivation/updater?version={{current_version}}", + "https://api.grasscutters.xyz/cultivation/updater?version={{current_version}}" ], "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEIyM0MzMzk0NkM4OTQzNQpSV1ExbE1oR09jTWpDNFJ4NURsaS9mdHpDWmpBM3JNVHkrdER4bS9KdHFCQnNVSWs0ZjZTU295WAo=" }, diff --git a/src/ui/App.tsx b/src/ui/App.tsx index 13a812a..02d143e 100644 --- a/src/ui/App.tsx +++ b/src/ui/App.tsx @@ -36,7 +36,7 @@ interface IState { bgFile: string; } -const DEFAULT_BG = 'https://api.grasscutters.xyz/content/bgfile' +const DEFAULT_BG = 'https://api.grasscutter.io/cultivation/bgfile' const downloadHandler = new DownloadHandler() diff --git a/src/ui/components/news/NewsSection.tsx b/src/ui/components/news/NewsSection.tsx index 49e67c4..25a41de 100644 --- a/src/ui/components/news/NewsSection.tsx +++ b/src/ui/components/news/NewsSection.tsx @@ -42,7 +42,7 @@ export default class NewsSection extends React.Component { async showLatestCommits() { if (!this.state.commitList) { - const commits: string = await invoke('req_get', { url: 'https://api.grasscutters.xyz/cultivation/query' }) + const commits: string = await invoke('req_get', { url: 'https://api.grasscutter.io/cultivation/query' }) let obj try {