Merge branch 'main' into random-project-easter-egg

Author: Prospector

apps/labrinth/tests/common/api_common/generic.rs

@@ -7,7 +7,7 @@ use labrinth::models::{
     teams::{OrganizationPermissions, ProjectPermissions},
 };
 
-use ariadne::{api_v2::ApiV2, api_v3::ApiV3, dummy_data::TestFile};
+use crate::common::{api_v2::ApiV2, api_v3::ApiV3, dummy_data::TestFile};
 
 use super::{
     models::{CommonProject, CommonVersion},
@@ -81,7 +81,7 @@ delegate_api_variant!(
         [add_gallery_item, ServiceResponse, id_or_slug: &str, image: ImageData,  featured: bool, title: Option<String>, description: Option<String>, ordering: Option<i32>, pat: Option<&str>],
         [remove_gallery_item, ServiceResponse, id_or_slug: &str, image_url: &str, pat: Option<&str>],
         [edit_gallery_item, ServiceResponse, id_or_slug: &str, image_url: &str, patch: HashMap<String, String>, pat: Option<&str>],
-        [create_report, ServiceResponse, report_type: &str, id: &str, item_type: ariadne::api_common::models::CommonItemType, body: &str, pat: Option<&str>],
+        [create_report, ServiceResponse, report_type: &str, id: &str, item_type: crate::common::api_common::models::CommonItemType, body: &str, pat: Option<&str>],
         [get_report, ServiceResponse, id: &str, pat: Option<&str>],
         [get_reports, ServiceResponse, ids: &[&str], pat: Option<&str>],
         [get_user_reports, ServiceResponse, pat: Option<&str>],
@@ -100,28 +100,28 @@ delegate_api_variant!(
     #[async_trait(?Send)]
     impl ApiTags for GenericApi {
         [get_loaders, ServiceResponse,],
-        [get_loaders_deserialized_common, Vec<ariadne::api_common::models::CommonLoaderData>,],
+        [get_loaders_deserialized_common, Vec<crate::common::api_common::models::CommonLoaderData>,],
         [get_categories, ServiceResponse,],
-        [get_categories_deserialized_common, Vec<ariadne::api_common::models::CommonCategoryData>,],
+        [get_categories_deserialized_common, Vec<crate::common::api_common::models::CommonCategoryData>,],
     }
 );
 
 delegate_api_variant!(
     #[async_trait(?Send)]
     impl ApiTeams for GenericApi {
         [get_team_members, ServiceResponse, team_id: &str, pat: Option<&str>],
-        [get_team_members_deserialized_common, Vec<ariadne::api_common::models::CommonTeamMember>, team_id: &str, pat: Option<&str>],
+        [get_team_members_deserialized_common, Vec<crate::common::api_common::models::CommonTeamMember>, team_id: &str, pat: Option<&str>],
         [get_teams_members, ServiceResponse, ids: &[&str], pat: Option<&str>],
         [get_project_members, ServiceResponse, id_or_slug: &str, pat: Option<&str>],
-        [get_project_members_deserialized_common, Vec<ariadne::api_common::models::CommonTeamMember>, id_or_slug: &str, pat: Option<&str>],
+        [get_project_members_deserialized_common, Vec<crate::common::api_common::models::CommonTeamMember>, id_or_slug: &str, pat: Option<&str>],
         [get_organization_members, ServiceResponse, id_or_title: &str, pat: Option<&str>],
-        [get_organization_members_deserialized_common, Vec<ariadne::api_common::models::CommonTeamMember>, id_or_title: &str, pat: Option<&str>],
+        [get_organization_members_deserialized_common, Vec<crate::common::api_common::models::CommonTeamMember>, id_or_title: &str, pat: Option<&str>],
         [join_team, ServiceResponse, team_id: &str, pat: Option<&str>],
         [remove_from_team, ServiceResponse, team_id: &str, user_id: &str, pat: Option<&str>],
         [edit_team_member, ServiceResponse, team_id: &str, user_id: &str, patch: serde_json::Value, pat: Option<&str>],
         [transfer_team_ownership, ServiceResponse, team_id: &str, user_id: &str, pat: Option<&str>],
         [get_user_notifications, ServiceResponse, user_id: &str, pat: Option<&str>],
-        [get_user_notifications_deserialized_common, Vec<ariadne::api_common::models::CommonNotification>, user_id: &str, pat: Option<&str>],
+        [get_user_notifications_deserialized_common, Vec<crate::common::api_common::models::CommonNotification>, user_id: &str, pat: Option<&str>],
         [get_notification, ServiceResponse, notification_id: &str, pat: Option<&str>],
         [get_notifications, ServiceResponse, ids: &[&str], pat: Option<&str>],
         [mark_notification_read, ServiceResponse, notification_id: &str, pat: Option<&str>],

apps/labrinth/tests/common/api_common/request_data.rs

@@ -3,7 +3,7 @@
 
 use labrinth::util::actix::MultipartSegment;
 
-use ariadne::dummy_data::TestFile;
+use crate::common::dummy_data::TestFile;
 
 #[allow(dead_code)]
 pub struct ProjectCreationRequestData {

apps/labrinth/tests/common/api_v2/project.rs

@@ -24,7 +24,7 @@ use labrinth::{
 };
 use serde_json::json;
 
-use ariadne::database::MOD_USER_PAT;
+use crate::common::database::MOD_USER_PAT;
 
 use super::{
     request_data::{self, get_public_project_creation_data},

apps/labrinth/tests/common/api_v2/request_data.rs

@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 use serde_json::json;
 
-use ariadne::{
+use crate::common::{
     api_common::request_data::{
         ProjectCreationRequestData, VersionCreationRequestData,
     },

apps/labrinth/tests/common/api_v2/user.rs

@@ -1,6 +1,6 @@
 use super::ApiV2;
+use crate::common::api_common::{Api, ApiUser, AppendsOptionalPat};
 use actix_web::{dev::ServiceResponse, test};
-use ariadne::api_common::{Api, ApiUser, AppendsOptionalPat};
 use async_trait::async_trait;
 
 #[async_trait(?Send)]

apps/labrinth/tests/common/api_v3/request_data.rs

@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 use serde_json::json;
 
-use ariadne::{
+use crate::common::{
     api_common::request_data::{
         ProjectCreationRequestData, VersionCreationRequestData,
     },

apps/labrinth/tests/common/api_v3/user.rs

@@ -1,7 +1,7 @@
 use actix_web::{dev::ServiceResponse, test};
 use async_trait::async_trait;
 
-use ariadne::api_common::{Api, ApiUser, AppendsOptionalPat};
+use crate::common::api_common::{Api, ApiUser, AppendsOptionalPat};
 
 use super::ApiV3;
 

apps/labrinth/tests/common/asserts.rs

@@ -1,6 +1,6 @@
 #![allow(dead_code)]
 
-use ariadne::get_json_val_str;
+use crate::common::get_json_val_str;
 use itertools::Itertools;
 use labrinth::models::v3::projects::Version;
 

apps/labrinth/tests/common/database.rs

@@ -5,7 +5,7 @@ use sqlx::{postgres::PgPoolOptions, PgPool};
 use std::time::Duration;
 use url::Url;
 
-use ariadne::{dummy_data, environment::TestEnvironment};
+use crate::common::{dummy_data, environment::TestEnvironment};
 
 use super::{api_v3::ApiV3, dummy_data::DUMMY_DATA_UPDATE};
 

apps/labrinth/tests/common/permissions.rs

@@ -6,7 +6,7 @@ use itertools::Itertools;
 use labrinth::models::teams::{OrganizationPermissions, ProjectPermissions};
 use serde_json::json;
 
-use ariadne::{
+use crate::common::{
     api_common::ApiTeams,
     database::{generate_random_name, ADMIN_USER_PAT},
 };