Mirror/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2025-12-15 08:34:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

use cultivation API and fallback to github api

Browse Source
This commit is contained in:
SpikeHD
2022-05-14 18:59:51 -07:00
parent c0e24961bb
commit 4497d5c0e3
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src-tauri/src/main.rs
View File

@@ -51,7 +51,11 @@ fn disconnect() {
#[tauri::command] #[tauri::command]
fn run_program(path: String) { fn run_program(path: String) {
// Open the program from the specified path. // Open the program from the specified path.
match open::that(path) { // match open::that(path) {
// Ok(_) => (),
// Err(e) => println!("Failed to open program: {}", e),
// };
match open::with(format!("/c \"{}\"", &path), "C:\\Windows\\System32\\cmd.exe") {
Ok(_) => (), Ok(_) => (),
Err(e) => println!("Failed to open program: {}", e), Err(e) => println!("Failed to open program: {}", e),
}; };

10
src/ui/components/news/NewsSection.tsx
View File

@@ -42,8 +42,14 @@ export default class NewsSection extends React.Component<IProps, IState> {
async showLatestCommits() { async showLatestCommits() {
if (!this.state.commitList) { if (!this.state.commitList) {
const commits: string = await invoke('req_get', { url: 'https://api.github.com/repos/Grasscutters/Grasscutter/commits' }) const commits: string = await invoke('req_get', { url: 'https://api.grasscutters.xyz/cultivation/query' })
const obj = JSON.parse(commits) let obj = JSON.parse(commits)
// If it didn't work, use official API
if (!obj.commits) {
const commits: string = await invoke('req_get', { url: 'https://api.github.com/repos/Grasscutters/Grasscutter/commits' })
obj = JSON.parse(commits)
}
// Probably rate-limited // Probably rate-limited
if (!Array.isArray(obj)) return if (!Array.isArray(obj)) return