From 7ba793c09aa3b3ec3f9629c7fb60acae827b9cee Mon Sep 17 00:00:00 2001 From: mkrsym1 Date: Tue, 18 Jul 2023 16:58:17 +0300 Subject: [PATCH] feat: don't make requests to the Codeberg releases API unless absolutely necessary --- src/ui/main/mod.rs | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/src/ui/main/mod.rs b/src/ui/main/mod.rs index 47ec62f..71d3a87 100644 --- a/src/ui/main/mod.rs +++ b/src/ui/main/mod.rs @@ -771,30 +771,17 @@ impl SimpleComponent for App { tasks.push(std::thread::spawn(clone!(@strong sender => move || { // Get main patch status - sender.input(AppMsg::SetMainPatch(match jadeite::get_latest() { - Ok(latest) => match jadeite::get_metadata() { - Ok(metadata) => { - let status = GAME.get_version() - .map(|version| metadata.games.hsr.global.get_status(version)) - .unwrap_or(metadata.games.hsr.global.status); + sender.input(AppMsg::SetMainPatch(match jadeite::get_metadata() { + Ok(metadata) => { + let status = GAME.get_version() + .map(|version| metadata.games.hsr.global.get_status(version)) + .unwrap_or(metadata.games.hsr.global.status); - Some((latest.version, status)) - } - - Err(err) => { - tracing::error!("Failed to fetch patch metadata: {err}"); - - sender.input(AppMsg::Toast { - title: tr("patch-info-fetching-error"), - description: Some(err.to_string()) - }); - - None - } - }, + Some((metadata.jadeite.version, status)) + } Err(err) => { - tracing::error!("Failed to fetch latest patch version: {err}"); + tracing::error!("Failed to fetch patch metadata: {err}"); sender.input(AppMsg::Toast { title: tr("patch-info-fetching-error"),