Subpackage common -> ariadne (#3323)

* Subpackage common -> ariadne

* add common

* Remove build

* only build labrinth

* common

* set sqlx offline

* copy dirs

* Fix build

apps/labrinth/src/routes/internal/admin.rs

@@ -74,11 +74,10 @@ pub async fn count_download(
     let project_id: crate::database::models::ids::ProjectId =
         download_body.project_id.into();
 
-    let id_option = crate::common::ids::base62_impl::parse_base62(
-        &download_body.version_name,
-    )
-    .ok()
-    .map(|x| x as i64);
+    let id_option =
+        ariadne::ids::base62_impl::parse_base62(&download_body.version_name)
+            .ok()
+            .map(|x| x as i64);
 
     let (version_id, project_id) = if let Some(version) = sqlx::query!(
         "

apps/labrinth/src/routes/internal/billing.rs

@@ -1,5 +1,4 @@
 use crate::auth::{get_user_from_headers, send_email};
-use crate::common::ids::base62_impl::{parse_base62, to_base62};
 use crate::database::models::charge_item::ChargeItem;
 use crate::database::models::{
     generate_charge_id, generate_user_subscription_id, product_item,
@@ -16,6 +15,7 @@ use crate::models::users::Badges;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use actix_web::{delete, get, patch, post, web, HttpRequest, HttpResponse};
+use ariadne::ids::base62_impl::{parse_base62, to_base62};
 use chrono::Utc;
 use log::{info, warn};
 use rust_decimal::prelude::ToPrimitive;

apps/labrinth/src/routes/internal/flows.rs

@@ -1,8 +1,6 @@
 use crate::auth::email::send_email;
 use crate::auth::validate::get_user_record_from_bearer_token;
 use crate::auth::{get_user_from_headers, AuthProvider, AuthenticationError};
-use crate::common::ids::base62_impl::{parse_base62, to_base62};
-use crate::common::ids::random_base62_rng;
 use crate::database::models::flow_item::Flow;
 use crate::database::redis::RedisPool;
 use crate::file_hosting::FileHost;
@@ -20,6 +18,8 @@ use actix_web::web::{scope, Data, Query, ServiceConfig};
 use actix_web::{delete, get, patch, post, web, HttpRequest, HttpResponse};
 use argon2::password_hash::SaltString;
 use argon2::{Argon2, PasswordHash, PasswordHasher, PasswordVerifier};
+use ariadne::ids::base62_impl::{parse_base62, to_base62};
+use ariadne::ids::random_base62_rng;
 use base64::Engine;
 use chrono::{Duration, Utc};
 use rand_chacha::rand_core::SeedableRng;

apps/labrinth/src/routes/internal/moderation.rs

@@ -1,5 +1,4 @@
 use super::ApiError;
-use crate::common::ids::random_base62;
 use crate::database;
 use crate::database::redis::RedisPool;
 use crate::models::projects::ProjectStatus;
@@ -7,6 +6,7 @@ use crate::queue::moderation::{ApprovalType, IdentifiedFile, MissingMetadata};
 use crate::queue::session::AuthQueue;
 use crate::{auth::check_is_moderator_from_headers, models::pats::Scopes};
 use actix_web::{web, HttpRequest, HttpResponse};
+use ariadne::ids::random_base62;
 use serde::Deserialize;
 use sqlx::PgPool;
 use std::collections::HashMap;

apps/labrinth/src/routes/internal/statuses.rs

@@ -1,10 +1,5 @@
 use crate::auth::validate::get_user_record_from_bearer_token;
 use crate::auth::AuthenticationError;
-use crate::common::ids::UserId;
-use crate::common::networking::message::{
-    ClientToServerMessage, ServerToClientMessage,
-};
-use crate::common::users::UserStatus;
 use crate::database::models::friend_item::FriendItem;
 use crate::database::redis::RedisPool;
 use crate::models::pats::Scopes;
@@ -17,6 +12,11 @@ use crate::routes::ApiError;
 use actix_web::web::{Data, Payload};
 use actix_web::{get, web, HttpRequest, HttpResponse};
 use actix_ws::Message;
+use ariadne::ids::UserId;
+use ariadne::networking::message::{
+    ClientToServerMessage, ServerToClientMessage,
+};
+use ariadne::users::UserStatus;
 use chrono::Utc;
 use either::Either;
 use futures_util::{StreamExt, TryStreamExt};