Merge remote-tracking branch 'origin/master'

# Conflicts: # theseus/src/error.rs # theseus_gui/src/components/ui/AccountsCard.vue
DIDIRUS4 · Nov 17, 2023 · e80d231 · e80d231
2 parents 13613f2 + 908460b
commit e80d231
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/theseus/src/api/auth.rs b/theseus/src/api/auth.rs
@@ -4,7 +4,6 @@ use crate::{
     launcher::auth as inner,
     State,
 };
-use chrono::Utc;
 
 use crate::state::AuthTask;
 pub use inner::Credentials;
@@ -45,7 +44,7 @@ pub async fn refresh(user: uuid::Uuid) -> crate::Result<Credentials> {
         crate::ErrorKind::OtherError(
             "У вас нет аккаунта, пожалуйста добавьте его. Подробнее о добавлении оффлайн аккаунта можно узнать из статьи автора".to_string(),
         )
-        .as_error()
+            .as_error()
     })?;
 
     Ok(credentials)
@@ -93,7 +92,7 @@ pub async fn get_user(user: uuid::Uuid) -> crate::Result<Credentials> {
         crate::ErrorKind::OtherError(format!(
             "Tried to get nonexistent user with ID {user}"
         ))
-        .as_error()
+            .as_error()
     })?;
     Ok(user)
 }
diff --git a/theseus/src/api/hydra/complete.rs b/theseus/src/api/hydra/complete.rs
@@ -38,7 +38,7 @@ pub async fn wait_finish(device_code: String) -> crate::Result<Credentials> {
                 "Error getting XBox Live token: {}",
                 err
             ))
-            .as_error())
+                .as_error())
         }
         xsts_token::XSTSResponse::Success { token: xsts_token } => {
             // Get xsts bearer token from xsts token
@@ -55,7 +55,7 @@ pub async fn wait_finish(device_code: String) -> crate::Result<Credentials> {
             // Get player info from bearer token
             let player_info = player_info::fetch_info(&bearer_token).await.map_err(|_err| {
                 crate::ErrorKind::HydraError("No Minecraft account for profile. Make sure you own the game and have set a username through the official Minecraft launcher."
-            .to_string())
+                    .to_string())
             })?;
 
             // Create credentials

diff --git a/theseus_gui/src-tauri/src/api/auth.rs b/theseus_gui/src-tauri/src/api/auth.rs
@@ -1,4 +1,4 @@
-use crate::api::Result;
+use crate::api::{Result,};
 use tauri::plugin::TauriPlugin;
 use theseus::{hydra, hydra::init::DeviceLoginSuccess, prelude::*};
 pub fn init<R: tauri::Runtime>() -> TauriPlugin<R> {