Subpackage common -> ariadne (#3323)

* Subpackage common -> ariadne

* add common

* Remove build

* only build labrinth

* common

* set sqlx offline

* copy dirs

* Fix build
This commit is contained in:
Jai Agrawal
2025-03-01 20:53:43 -08:00
committed by GitHub
parent 650ab71a83
commit 19787a3f51
80 changed files with 181 additions and 152 deletions

View File

@@ -1,5 +1,5 @@
use crate::state::{FriendsSocket, UserFriend};
use labrinth::common::users::UserStatus;
use ariadne::users::UserStatus;
#[tracing::instrument]
pub async fn friends() -> crate::Result<Vec<UserFriend>> {

View File

@@ -21,7 +21,7 @@ pub mod data {
Project, ProjectType, SearchResult, SearchResults, Settings,
TeamMember, Theme, User, UserFriend, Version, WindowSize,
};
pub use labrinth::common::users::UserStatus;
pub use ariadne::users::UserStatus;
}
pub mod prelude {

View File

@@ -15,7 +15,7 @@ pub enum ErrorKind {
#[error("Serialization error (websocket): {0}")]
WebsocketSerializationError(
#[from] labrinth::common::networking::serialization::SerializationError,
#[from] ariadne::networking::serialization::SerializationError,
),
#[error("Error parsing UUID: {0}")]

View File

@@ -1,6 +1,6 @@
//! Theseus state management system
use ariadne::users::{UserId, UserStatus};
use dashmap::DashMap;
use labrinth::common::users::{UserId, UserStatus};
use serde::{Deserialize, Serialize};
use std::{path::PathBuf, sync::Arc};
#[cfg(feature = "tauri")]

View File

@@ -5,6 +5,10 @@ use crate::event::FriendPayload;
use crate::state::tunnel::InternalTunnelSocket;
use crate::state::{ProcessManager, Profile, TunnelSocket};
use crate::util::fetch::{fetch_advanced, fetch_json, FetchSemaphore};
use ariadne::networking::message::{
ClientToServerMessage, ServerToClientMessage,
};
use ariadne::users::{UserId, UserStatus};
use async_tungstenite::tokio::{connect_async, ConnectStream};
use async_tungstenite::tungstenite::client::IntoClientRequest;
use async_tungstenite::tungstenite::Message;
@@ -14,10 +18,6 @@ use dashmap::DashMap;
use either::Either;
use futures::stream::SplitSink;
use futures::{SinkExt, StreamExt};
use labrinth::common::networking::message::{
ClientToServerMessage, ServerToClientMessage,
};
use labrinth::common::users::{UserId, UserStatus};
use reqwest::header::HeaderValue;
use reqwest::Method;
use serde::{Deserialize, Serialize};

View File

@@ -1,6 +1,6 @@
use crate::state::friends::{TunnelSockets, WriteSocket};
use crate::state::FriendsSocket;
use labrinth::common::networking::message::ClientToServerMessage;
use ariadne::networking::message::ClientToServerMessage;
use std::net::SocketAddr;
use std::sync::Arc;
use tokio::io::AsyncWriteExt;