Merge commit '81ec068747a39e927c42273011252daaa58f1e14' into feature-clean

packages/app-lib/src/api/friends.rs

@@ -0,0 +1,35 @@
+use crate::state::{FriendsSocket, UserFriend, UserStatus};
+
+#[tracing::instrument]
+pub async fn friends() -> crate::Result<Vec<UserFriend>> {
+    let state = crate::State::get().await?;
+    let friends =
+        FriendsSocket::friends(&state.pool, &state.api_semaphore).await?;
+
+    Ok(friends)
+}
+
+pub async fn friend_statuses() -> crate::Result<Vec<UserStatus>> {
+    let state = crate::State::get().await?;
+    let statuses = state.friends_socket.friend_statuses();
+
+    Ok(statuses)
+}
+
+#[tracing::instrument]
+pub async fn add_friend(user_id: &str) -> crate::Result<()> {
+    let state = crate::State::get().await?;
+    FriendsSocket::add_friend(user_id, &state.pool, &state.api_semaphore)
+        .await?;
+
+    Ok(())
+}
+
+#[tracing::instrument]
+pub async fn remove_friend(user_id: &str) -> crate::Result<()> {
+    let state = crate::State::get().await?;
+    FriendsSocket::remove_friend(user_id, &state.pool, &state.api_semaphore)
+        .await?;
+
+    Ok(())
+}

packages/app-lib/src/api/logs.rs

@@ -289,7 +289,7 @@ pub async fn delete_logs_by_filename(
     };
 
     let path = logs_folder.join(filename);
-    io::remove_dir_all(&path).await?;
+    io::remove_file(&path).await?;
     Ok(())
 }
 

packages/app-lib/src/api/mod.rs

@@ -1,5 +1,6 @@
 //! API for interacting with Theseus
 pub mod cache;
+pub mod friends;
 pub mod handler;
 pub mod jre;
 pub mod logs;
@@ -19,7 +20,7 @@ pub mod data {
         Hooks, JavaVersion, LinkedData, MemorySettings, ModLoader,
         ModrinthCredentials, Organization, ProcessMetadata, ProfileFile,
         Project, ProjectType, SearchResult, SearchResults, Settings,
-        TeamMember, Theme, User, Version, WindowSize,
+        TeamMember, Theme, User, UserFriend, UserStatus, Version, WindowSize,
     };
 }
 

packages/app-lib/src/api/mr_auth.rs

@@ -1,7 +1,7 @@
 use crate::state::ModrinthCredentials;
 
 #[tracing::instrument]
-pub fn authenticate_begin_flow() -> &'static str {
+pub fn authenticate_begin_flow() -> String {
     crate::state::get_login_url()
 }
 
@@ -19,6 +19,10 @@ pub async fn authenticate_finish_flow(
     .await?;
 
     creds.upsert(&state.pool).await?;
+    state
+        .friends_socket
+        .connect(&state.pool, &state.api_semaphore, &state.process_manager)
+        .await?;
 
     Ok(creds)
 }
@@ -30,6 +34,7 @@ pub async fn logout() -> crate::Result<()> {
 
     if let Some(current) = current {
         ModrinthCredentials::remove(&current.user_id, &state.pool).await?;
+        state.friends_socket.disconnect().await?;
     }
 
     Ok(())

packages/app-lib/src/api/pack/install_from.rs

@@ -44,11 +44,11 @@ pub enum PackFileHash {
 
 impl From<String> for PackFileHash {
     fn from(s: String) -> Self {
-        return match s.as_str() {
+        match s.as_str() {
             "sha1" => PackFileHash::Sha1,
             "sha512" => PackFileHash::Sha512,
             _ => PackFileHash::Unknown(s),
-        };
+        }
     }
 }
 
@@ -324,7 +324,6 @@ pub async fn generate_pack_from_file(
 
 /// Sets generated profile attributes to the pack ones (using profile::edit)
 /// This includes the pack name, icon, game version, loader version, and loader
-
 pub async fn set_profile_information(
     profile_path: String,
     description: &CreatePackDescription,

packages/app-lib/src/api/pack/install_mrpack.rs

@@ -25,7 +25,6 @@ use super::install_from::{
 /// Wrapper around install_pack_files that generates a pack creation description, and
 /// attempts to install the pack files. If it fails, it will remove the profile (fail safely)
 /// Install a modpack from a mrpack file (a modrinth .zip format)
-
 pub async fn install_zipped_mrpack(
     location: CreatePackLocation,
     profile_path: String,
@@ -68,7 +67,6 @@ pub async fn install_zipped_mrpack(
 
 /// Install all pack files from a description
 /// Does not remove the profile if it fails
-
 pub async fn install_zipped_mrpack_files(
     create_pack: CreatePack,
     ignore_lock: bool,

packages/app-lib/src/api/profile/create.rs

@@ -118,7 +118,7 @@ pub async fn profile_create(
             &state.file_watcher,
             &state.directories,
         )
-        .await?;
+        .await;
 
         profile.upsert(&state.pool).await?;