Moving db_views_actor and _moderator into db_views.

- This is necessary because the combined views use both, and that
  separation was arbitrary to begin with. db_schema has no such crate
  separation.
This commit is contained in:
Dessalines 2024-12-13 11:13:21 -05:00
parent 031dc2607e
commit 3721067cce
118 changed files with 741 additions and 931 deletions

47
Cargo.lock generated
View file

@ -2504,8 +2504,6 @@ dependencies = [
"lemmy_api_crud", "lemmy_api_crud",
"lemmy_db_schema", "lemmy_db_schema",
"lemmy_db_views", "lemmy_db_views",
"lemmy_db_views_actor",
"lemmy_db_views_moderator",
"lemmy_utils", "lemmy_utils",
"pretty_assertions", "pretty_assertions",
"serial_test", "serial_test",
@ -2531,8 +2529,6 @@ dependencies = [
"jsonwebtoken", "jsonwebtoken",
"lemmy_db_schema", "lemmy_db_schema",
"lemmy_db_views", "lemmy_db_views",
"lemmy_db_views_actor",
"lemmy_db_views_moderator",
"lemmy_utils", "lemmy_utils",
"mime", "mime",
"mime_guess", "mime_guess",
@ -2568,7 +2564,6 @@ dependencies = [
"lemmy_api_common", "lemmy_api_common",
"lemmy_db_schema", "lemmy_db_schema",
"lemmy_db_views", "lemmy_db_views",
"lemmy_db_views_actor",
"lemmy_utils", "lemmy_utils",
"regex", "regex",
"serde", "serde",
@ -2599,7 +2594,6 @@ dependencies = [
"lemmy_api_common", "lemmy_api_common",
"lemmy_db_schema", "lemmy_db_schema",
"lemmy_db_views", "lemmy_db_views",
"lemmy_db_views_actor",
"lemmy_utils", "lemmy_utils",
"moka", "moka",
"pretty_assertions", "pretty_assertions",
@ -2688,49 +2682,13 @@ dependencies = [
"serde", "serde",
"serde_with", "serde_with",
"serial_test", "serial_test",
"strum",
"tokio", "tokio",
"tracing", "tracing",
"ts-rs", "ts-rs",
"url", "url",
] ]
[[package]]
name = "lemmy_db_views_actor"
version = "0.19.6-beta.7"
dependencies = [
"chrono",
"diesel",
"diesel-async",
"i-love-jesus",
"lemmy_db_schema",
"lemmy_utils",
"pretty_assertions",
"serde",
"serde_with",
"serial_test",
"strum",
"tokio",
"ts-rs",
"url",
]
[[package]]
name = "lemmy_db_views_moderator"
version = "0.19.6-beta.7"
dependencies = [
"diesel",
"diesel-async",
"i-love-jesus",
"lemmy_db_schema",
"lemmy_utils",
"pretty_assertions",
"serde",
"serde_with",
"serial_test",
"tokio",
"ts-rs",
]
[[package]] [[package]]
name = "lemmy_federate" name = "lemmy_federate"
version = "0.19.6-beta.7" version = "0.19.6-beta.7"
@ -2746,7 +2704,7 @@ dependencies = [
"lemmy_api_common", "lemmy_api_common",
"lemmy_apub", "lemmy_apub",
"lemmy_db_schema", "lemmy_db_schema",
"lemmy_db_views_actor", "lemmy_db_views",
"lemmy_utils", "lemmy_utils",
"mockall", "mockall",
"moka", "moka",
@ -2775,7 +2733,6 @@ dependencies = [
"lemmy_api_common", "lemmy_api_common",
"lemmy_db_schema", "lemmy_db_schema",
"lemmy_db_views", "lemmy_db_views",
"lemmy_db_views_actor",
"lemmy_utils", "lemmy_utils",
"reqwest 0.12.8", "reqwest 0.12.8",
"reqwest-middleware", "reqwest-middleware",

View file

@ -50,8 +50,6 @@ members = [
"crates/db_perf", "crates/db_perf",
"crates/db_schema", "crates/db_schema",
"crates/db_views", "crates/db_views",
"crates/db_views_actor",
"crates/db_views_actor",
"crates/routes", "crates/routes",
"crates/federate", "crates/federate",
] ]
@ -91,8 +89,6 @@ lemmy_db_schema = { version = "=0.19.6-beta.7", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.19.6-beta.7", path = "./crates/api_common" } lemmy_api_common = { version = "=0.19.6-beta.7", path = "./crates/api_common" }
lemmy_routes = { version = "=0.19.6-beta.7", path = "./crates/routes" } lemmy_routes = { version = "=0.19.6-beta.7", path = "./crates/routes" }
lemmy_db_views = { version = "=0.19.6-beta.7", path = "./crates/db_views" } lemmy_db_views = { version = "=0.19.6-beta.7", path = "./crates/db_views" }
lemmy_db_views_actor = { version = "=0.19.6-beta.7", path = "./crates/db_views_actor" }
lemmy_db_views_moderator = { version = "=0.19.6-beta.7", path = "./crates/db_views_moderator" }
lemmy_federate = { version = "=0.19.6-beta.7", path = "./crates/federate" } lemmy_federate = { version = "=0.19.6-beta.7", path = "./crates/federate" }
activitypub_federation = { version = "0.6.1", default-features = false, features = [ activitypub_federation = { version = "0.6.1", default-features = false, features = [
"actix-web", "actix-web",

View file

@ -9,7 +9,7 @@ then
fi fi
export RUST_BACKTRACE=1 export RUST_BACKTRACE=1
export RUST_LOG="warn,lemmy_server=$LEMMY_LOG_LEVEL,lemmy_federate=$LEMMY_LOG_LEVEL,lemmy_api=$LEMMY_LOG_LEVEL,lemmy_api_common=$LEMMY_LOG_LEVEL,lemmy_api_crud=$LEMMY_LOG_LEVEL,lemmy_apub=$LEMMY_LOG_LEVEL,lemmy_db_schema=$LEMMY_LOG_LEVEL,lemmy_db_views=$LEMMY_LOG_LEVEL,lemmy_db_views_actor=$LEMMY_LOG_LEVEL,lemmy_db_views_moderator=$LEMMY_LOG_LEVEL,lemmy_routes=$LEMMY_LOG_LEVEL,lemmy_utils=$LEMMY_LOG_LEVEL,lemmy_websocket=$LEMMY_LOG_LEVEL" export RUST_LOG="warn,lemmy_server=$LEMMY_LOG_LEVEL,lemmy_federate=$LEMMY_LOG_LEVEL,lemmy_api=$LEMMY_LOG_LEVEL,lemmy_api_common=$LEMMY_LOG_LEVEL,lemmy_api_crud=$LEMMY_LOG_LEVEL,lemmy_apub=$LEMMY_LOG_LEVEL,lemmy_db_schema=$LEMMY_LOG_LEVEL,lemmy_db_views=$LEMMY_LOG_LEVEL,lemmy_routes=$LEMMY_LOG_LEVEL,lemmy_utils=$LEMMY_LOG_LEVEL,lemmy_websocket=$LEMMY_LOG_LEVEL"
export LEMMY_TEST_FAST_FEDERATION=1 # by default, the persistent federation queue has delays in the scale of 30s-5min export LEMMY_TEST_FAST_FEDERATION=1 # by default, the persistent federation queue has delays in the scale of 30s-5min

View file

@ -21,8 +21,6 @@ workspace = true
lemmy_utils = { workspace = true } lemmy_utils = { workspace = true }
lemmy_db_schema = { workspace = true, features = ["full"] } lemmy_db_schema = { workspace = true, features = ["full"] }
lemmy_db_views = { workspace = true, features = ["full"] } lemmy_db_views = { workspace = true, features = ["full"] }
lemmy_db_views_moderator = { workspace = true, features = ["full"] }
lemmy_db_views_actor = { workspace = true, features = ["full"] }
lemmy_api_common = { workspace = true, features = ["full"] } lemmy_api_common = { workspace = true, features = ["full"] }
activitypub_federation = { workspace = true } activitypub_federation = { workspace = true }
bcrypt = { workspace = true } bcrypt = { workspace = true }

View file

@ -14,8 +14,7 @@ use lemmy_db_schema::{
}, },
traits::{Crud, Joinable}, traits::{Crud, Joinable},
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityModeratorView, LocalUserView};
use lemmy_db_views_actor::structs::CommunityModeratorView;
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -24,8 +24,7 @@ use lemmy_db_schema::{
}, },
traits::{Bannable, Crud, Followable}, traits::{Bannable, Crud, Followable},
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{LocalUserView, PersonView};
use lemmy_db_views_actor::structs::PersonView;
use lemmy_utils::{ use lemmy_utils::{
error::{LemmyErrorExt, LemmyErrorType, LemmyResult}, error::{LemmyErrorExt, LemmyErrorType, LemmyResult},
utils::validation::is_valid_body_field, utils::validation::is_valid_body_field,

View file

@ -12,8 +12,7 @@ use lemmy_db_schema::{
}, },
traits::{Blockable, Followable}, traits::{Blockable, Followable},
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityView, LocalUserView};
use lemmy_db_views_actor::structs::CommunityView;
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -14,8 +14,7 @@ use lemmy_db_schema::{
traits::{Crud, Followable}, traits::{Crud, Followable},
CommunityVisibility, CommunityVisibility,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityPersonBanView, CommunityView, LocalUserView};
use lemmy_db_views_actor::structs::{CommunityPersonBanView, CommunityView};
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -4,8 +4,7 @@ use lemmy_api_common::{
context::LemmyContext, context::LemmyContext,
utils::is_mod_or_admin, utils::is_mod_or_admin,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityFollowerView, LocalUserView};
use lemmy_db_views_actor::structs::CommunityFollowerView;
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;
pub async fn get_pending_follows_count( pub async fn get_pending_follows_count(

View file

@ -4,8 +4,7 @@ use lemmy_api_common::{
context::LemmyContext, context::LemmyContext,
utils::check_community_mod_of_any_or_admin_action, utils::check_community_mod_of_any_or_admin_action,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityFollowerView, LocalUserView};
use lemmy_db_views_actor::structs::CommunityFollowerView;
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;
pub async fn get_pending_follows_list( pub async fn get_pending_follows_list(

View file

@ -10,8 +10,7 @@ use lemmy_db_schema::source::{
community::Community, community::Community,
local_site::LocalSite, local_site::LocalSite,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityView, LocalUserView};
use lemmy_db_views_actor::structs::CommunityView;
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -12,8 +12,7 @@ use lemmy_db_schema::{
}, },
traits::{Crud, Joinable}, traits::{Crud, Joinable},
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityModeratorView, CommunityView, LocalUserView};
use lemmy_db_views_actor::structs::{CommunityModeratorView, CommunityView};
use lemmy_utils::{ use lemmy_utils::{
error::{LemmyErrorExt, LemmyErrorType, LemmyResult}, error::{LemmyErrorExt, LemmyErrorType, LemmyResult},
location_info, location_info,

View file

@ -11,8 +11,7 @@ use lemmy_db_schema::{
}, },
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{LocalUserView, PersonView};
use lemmy_db_views_actor::structs::PersonView;
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -16,8 +16,7 @@ use lemmy_db_schema::{
}, },
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{LocalUserView, PersonView};
use lemmy_db_views_actor::structs::PersonView;
use lemmy_utils::{ use lemmy_utils::{
error::{LemmyErrorExt, LemmyErrorType, LemmyResult}, error::{LemmyErrorExt, LemmyErrorType, LemmyResult},
utils::validation::is_valid_body_field, utils::validation::is_valid_body_field,

View file

@ -7,8 +7,7 @@ use lemmy_db_schema::{
source::person_block::{PersonBlock, PersonBlockForm}, source::person_block::{PersonBlock, PersonBlockForm},
traits::Blockable, traits::Blockable,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{LocalUserView, PersonView};
use lemmy_db_views_actor::structs::PersonView;
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -1,7 +1,6 @@
use actix_web::web::{Data, Json}; use actix_web::web::{Data, Json};
use lemmy_api_common::{context::LemmyContext, person::BannedPersonsResponse, utils::is_admin}; use lemmy_api_common::{context::LemmyContext, person::BannedPersonsResponse, utils::is_admin};
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{LocalUserView, PersonView};
use lemmy_db_views_actor::structs::PersonView;
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;
pub async fn list_banned_users( pub async fn list_banned_users(

View file

@ -6,7 +6,7 @@ use lemmy_api_common::{
utils::check_private_instance, utils::check_private_instance,
}; };
use lemmy_db_views::{ use lemmy_db_views::{
person_saved_combined_view::PersonSavedCombinedQuery, combined::person_saved_combined_view::PersonSavedCombinedQuery,
structs::{LocalUserView, SiteView}, structs::{LocalUserView, SiteView},
}; };
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;

View file

@ -3,8 +3,7 @@ use lemmy_api_common::{
context::LemmyContext, context::LemmyContext,
person::{ListInbox, ListInboxResponse}, person::{ListInbox, ListInboxResponse},
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::{combined::inbox_combined_view::InboxCombinedQuery, structs::LocalUserView};
use lemmy_db_views_actor::inbox_combined_view::InboxCombinedQuery;
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -7,8 +7,7 @@ use lemmy_db_schema::{
source::person_comment_mention::{PersonCommentMention, PersonCommentMentionUpdateForm}, source::person_comment_mention::{PersonCommentMention, PersonCommentMentionUpdateForm},
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{LocalUserView, PersonCommentMentionView};
use lemmy_db_views_actor::structs::PersonCommentMentionView;
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -7,8 +7,7 @@ use lemmy_db_schema::{
source::person_post_mention::{PersonPostMention, PersonPostMentionUpdateForm}, source::person_post_mention::{PersonPostMention, PersonPostMentionUpdateForm},
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{LocalUserView, PersonPostMentionView};
use lemmy_db_views_actor::structs::PersonPostMentionView;
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -7,8 +7,7 @@ use lemmy_db_schema::{
source::comment_reply::{CommentReply, CommentReplyUpdateForm}, source::comment_reply::{CommentReply, CommentReplyUpdateForm},
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommentReplyView, LocalUserView};
use lemmy_db_views_actor::structs::CommentReplyView;
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -1,7 +1,6 @@
use actix_web::web::{Data, Json}; use actix_web::web::{Data, Json};
use lemmy_api_common::{context::LemmyContext, person::GetUnreadCountResponse}; use lemmy_api_common::{context::LemmyContext, person::GetUnreadCountResponse};
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{InboxCombinedViewInternal, LocalUserView};
use lemmy_db_views_actor::structs::InboxCombinedViewInternal;
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -7,8 +7,7 @@ use lemmy_db_schema::{
source::private_message::{PrivateMessage, PrivateMessageUpdateForm}, source::private_message::{PrivateMessage, PrivateMessageUpdateForm},
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{LocalUserView, PrivateMessageView};
use lemmy_db_views_actor::structs::PrivateMessageView;
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -4,7 +4,7 @@ use lemmy_api_common::{
reports::combined::{ListReports, ListReportsResponse}, reports::combined::{ListReports, ListReportsResponse},
utils::check_community_mod_of_any_or_admin_action, utils::check_community_mod_of_any_or_admin_action,
}; };
use lemmy_db_views::{report_combined_view::ReportCombinedQuery, structs::LocalUserView}; use lemmy_db_views::{combined::report_combined_view::ReportCombinedQuery, structs::LocalUserView};
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;
/// Lists reports for a community if an id is supplied /// Lists reports for a community if an id is supplied

View file

@ -12,8 +12,7 @@ use lemmy_db_schema::{
}, },
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::{LocalUserView, SiteView}; use lemmy_db_views::structs::{LocalUserView, PersonView, SiteView};
use lemmy_db_views_actor::structs::PersonView;
use lemmy_utils::{ use lemmy_utils::{
error::{LemmyErrorType, LemmyResult}, error::{LemmyErrorType, LemmyResult},
VERSION, VERSION,

View file

@ -5,8 +5,7 @@ use lemmy_api_common::{
utils::{check_community_mod_of_any_or_admin_action, check_private_instance}, utils::{check_community_mod_of_any_or_admin_action, check_private_instance},
}; };
use lemmy_db_schema::source::local_site::LocalSite; use lemmy_db_schema::source::local_site::LocalSite;
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::{combined::modlog_combined_view::ModlogCombinedQuery, structs::LocalUserView};
use lemmy_db_views_moderator::{self, modlog_combined_view::ModlogCombinedQuery};
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -17,8 +17,7 @@ use lemmy_db_schema::{
}, },
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityModeratorView, LocalUserView};
use lemmy_db_views_actor::structs::CommunityModeratorView;
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -7,7 +7,7 @@ use lemmy_api_common::{
}; };
use lemmy_db_schema::source::local_site::LocalSite; use lemmy_db_schema::source::local_site::LocalSite;
use lemmy_db_views::{ use lemmy_db_views::{
registration_application_view::RegistrationApplicationQuery, registration_applications::registration_application_view::RegistrationApplicationQuery,
structs::LocalUserView, structs::LocalUserView,
}; };
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;

View file

@ -21,8 +21,6 @@ full = [
"tracing", "tracing",
"rosetta-i18n", "rosetta-i18n",
"lemmy_db_views/full", "lemmy_db_views/full",
"lemmy_db_views_actor/full",
"lemmy_db_views_moderator/full",
"lemmy_utils/full", "lemmy_utils/full",
"activitypub_federation", "activitypub_federation",
"encoding_rs", "encoding_rs",
@ -41,8 +39,6 @@ full = [
[dependencies] [dependencies]
lemmy_db_views = { workspace = true } lemmy_db_views = { workspace = true }
lemmy_db_views_moderator = { workspace = true }
lemmy_db_views_actor = { workspace = true }
lemmy_db_schema = { workspace = true } lemmy_db_schema = { workspace = true }
lemmy_utils = { workspace = true } lemmy_utils = { workspace = true }
activitypub_federation = { workspace = true, optional = true } activitypub_federation = { workspace = true, optional = true }

View file

@ -25,8 +25,7 @@ use lemmy_db_schema::{
}, },
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::{CommentView, LocalUserView, PostView}; use lemmy_db_views::structs::{CommentView, CommunityView, LocalUserView, PostView};
use lemmy_db_views_actor::structs::CommunityView;
use lemmy_utils::{ use lemmy_utils::{
error::LemmyResult, error::LemmyResult,
utils::{markdown::markdown_to_html, mention::MentionData}, utils::{markdown::markdown_to_html, mention::MentionData},

View file

@ -4,7 +4,7 @@ use lemmy_db_schema::{
CommunityVisibility, CommunityVisibility,
ListingType, ListingType,
}; };
use lemmy_db_views_actor::structs::{ use lemmy_db_views::structs::{
CommunityModeratorView, CommunityModeratorView,
CommunitySortType, CommunitySortType,
CommunityView, CommunityView,

View file

@ -23,8 +23,6 @@ pub mod utils;
pub extern crate lemmy_db_schema; pub extern crate lemmy_db_schema;
pub extern crate lemmy_db_views; pub extern crate lemmy_db_views;
pub extern crate lemmy_db_views_actor;
pub extern crate lemmy_db_views_moderator;
pub extern crate lemmy_utils; pub extern crate lemmy_utils;
pub use lemmy_utils::error::LemmyErrorType; pub use lemmy_utils::error::LemmyErrorType;

View file

@ -16,18 +16,16 @@ use lemmy_db_schema::{
PostSortType, PostSortType,
}; };
use lemmy_db_views::structs::{ use lemmy_db_views::structs::{
LocalImageView,
PersonContentCombinedPaginationCursor,
PersonContentCombinedView,
PersonSavedCombinedPaginationCursor,
};
use lemmy_db_views_actor::structs::{
CommentReplyView, CommentReplyView,
CommunityModeratorView, CommunityModeratorView,
InboxCombinedPaginationCursor, InboxCombinedPaginationCursor,
InboxCombinedView, InboxCombinedView,
LocalImageView,
PersonCommentMentionView, PersonCommentMentionView,
PersonContentCombinedPaginationCursor,
PersonContentCombinedView,
PersonPostMentionView, PersonPostMentionView,
PersonSavedCombinedPaginationCursor,
PersonView, PersonView,
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};

View file

@ -4,8 +4,13 @@ use lemmy_db_schema::{
PostFeatureType, PostFeatureType,
PostSortType, PostSortType,
}; };
use lemmy_db_views::structs::{PaginationCursor, PostView, VoteView}; use lemmy_db_views::structs::{
use lemmy_db_views_actor::structs::{CommunityModeratorView, CommunityView}; CommunityModeratorView,
CommunityView,
PaginationCursor,
PostView,
VoteView,
};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_with::skip_serializing_none; use serde_with::skip_serializing_none;
#[cfg(feature = "full")] #[cfg(feature = "full")]

View file

@ -1,5 +1,5 @@
use lemmy_db_schema::newtypes::{PersonId, PrivateMessageId}; use lemmy_db_schema::newtypes::{PersonId, PrivateMessageId};
use lemmy_db_views_actor::structs::PrivateMessageView; use lemmy_db_views::structs::PrivateMessageView;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "full")] #[cfg(feature = "full")]
use ts_rs::TS; use ts_rs::TS;

View file

@ -11,7 +11,7 @@ use lemmy_db_schema::{
private_message::PrivateMessage, private_message::PrivateMessage,
}, },
}; };
use lemmy_db_views_actor::structs::PrivateMessageView; use lemmy_db_views::structs::PrivateMessageView;
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;
use std::sync::{LazyLock, OnceLock}; use std::sync::{LazyLock, OnceLock};
use tokio::{ use tokio::{

View file

@ -31,18 +31,17 @@ use lemmy_db_schema::{
}; };
use lemmy_db_views::structs::{ use lemmy_db_views::structs::{
CommentView, CommentView,
CommunityFollowerView,
CommunityModeratorView,
CommunityView,
LocalUserView, LocalUserView,
ModlogCombinedPaginationCursor,
ModlogCombinedView,
PersonView,
PostView, PostView,
RegistrationApplicationView, RegistrationApplicationView,
SiteView, SiteView,
}; };
use lemmy_db_views_actor::structs::{
CommunityFollowerView,
CommunityModeratorView,
CommunityView,
PersonView,
};
use lemmy_db_views_moderator::structs::{ModlogCombinedPaginationCursor, ModlogCombinedView};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_with::skip_serializing_none; use serde_with::skip_serializing_none;
#[cfg(feature = "full")] #[cfg(feature = "full")]

View file

@ -43,14 +43,16 @@ use lemmy_db_schema::{
RegistrationMode, RegistrationMode,
}; };
use lemmy_db_views::{ use lemmy_db_views::{
comment_view::CommentQuery, comment::comment_view::CommentQuery,
structs::{LocalImageView, LocalUserView, SiteView}, structs::{
}; CommunityFollowerView,
use lemmy_db_views_actor::structs::{ CommunityModeratorView,
CommunityFollowerView, CommunityPersonBanView,
CommunityModeratorView, CommunityView,
CommunityPersonBanView, LocalImageView,
CommunityView, LocalUserView,
SiteView,
},
}; };
use lemmy_utils::{ use lemmy_utils::{
email::{send_email, translations::Lang}, email::{send_email, translations::Lang},
@ -1190,8 +1192,8 @@ mod tests {
}, },
ModlogActionType, ModlogActionType,
}; };
use lemmy_db_views_moderator::{ use lemmy_db_views::{
modlog_combined_view::ModlogCombinedQuery, combined::modlog_combined_view::ModlogCombinedQuery,
structs::ModlogCombinedView, structs::ModlogCombinedView,
}; };
use pretty_assertions::assert_eq; use pretty_assertions::assert_eq;

View file

@ -16,7 +16,6 @@ workspace = true
lemmy_utils = { workspace = true, features = ["full"] } lemmy_utils = { workspace = true, features = ["full"] }
lemmy_db_schema = { workspace = true, features = ["full"] } lemmy_db_schema = { workspace = true, features = ["full"] }
lemmy_db_views = { workspace = true, features = ["full"] } lemmy_db_views = { workspace = true, features = ["full"] }
lemmy_db_views_actor = { workspace = true, features = ["full"] }
lemmy_api_common = { workspace = true, features = ["full"] } lemmy_api_common = { workspace = true, features = ["full"] }
activitypub_federation = { workspace = true } activitypub_federation = { workspace = true }
bcrypt = { workspace = true } bcrypt = { workspace = true }

View file

@ -11,8 +11,7 @@ use lemmy_db_schema::{
source::community::{Community, CommunityUpdateForm}, source::community::{Community, CommunityUpdateForm},
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityModeratorView, LocalUserView};
use lemmy_db_views_actor::structs::CommunityModeratorView;
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -4,8 +4,10 @@ use lemmy_api_common::{
context::LemmyContext, context::LemmyContext,
utils::{check_private_instance, is_admin}, utils::{check_private_instance, is_admin},
}; };
use lemmy_db_views::structs::{LocalUserView, SiteView}; use lemmy_db_views::{
use lemmy_db_views_actor::community_view::CommunityQuery; community::community_view::CommunityQuery,
structs::{LocalUserView, SiteView},
};
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -27,8 +27,7 @@ use lemmy_db_schema::{
utils::diesel_url_create, utils::diesel_url_create,
CommunityVisibility, CommunityVisibility,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityModeratorView, LocalUserView};
use lemmy_db_views_actor::structs::CommunityModeratorView;
use lemmy_utils::{ use lemmy_utils::{
error::{LemmyErrorExt, LemmyErrorType, LemmyResult}, error::{LemmyErrorExt, LemmyErrorType, LemmyResult},
spawn_try_task, spawn_try_task,

View file

@ -12,10 +12,9 @@ use lemmy_db_schema::{
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::{ use lemmy_db_views::{
post_view::PostQuery, post::post_view::PostQuery,
structs::{LocalUserView, PostView, SiteView}, structs::{CommunityModeratorView, CommunityView, LocalUserView, PostView, SiteView},
}; };
use lemmy_db_views_actor::structs::{CommunityModeratorView, CommunityView};
use lemmy_utils::error::{LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -21,8 +21,7 @@ use lemmy_db_schema::{
}, },
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{LocalUserView, PrivateMessageView};
use lemmy_db_views_actor::structs::PrivateMessageView;
use lemmy_utils::{ use lemmy_utils::{
error::{LemmyErrorExt, LemmyErrorType, LemmyResult}, error::{LemmyErrorExt, LemmyErrorType, LemmyResult},
utils::{markdown::markdown_to_html, validation::is_valid_body_field}, utils::{markdown::markdown_to_html, validation::is_valid_body_field},

View file

@ -9,8 +9,7 @@ use lemmy_db_schema::{
source::private_message::{PrivateMessage, PrivateMessageUpdateForm}, source::private_message::{PrivateMessage, PrivateMessageUpdateForm},
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{LocalUserView, PrivateMessageView};
use lemmy_db_views_actor::structs::PrivateMessageView;
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -14,8 +14,7 @@ use lemmy_db_schema::{
}, },
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{LocalUserView, PrivateMessageView};
use lemmy_db_views_actor::structs::PrivateMessageView;
use lemmy_utils::{ use lemmy_utils::{
error::{LemmyErrorExt, LemmyErrorType, LemmyResult}, error::{LemmyErrorExt, LemmyErrorType, LemmyResult},
utils::validation::is_valid_body_field, utils::validation::is_valid_body_field,

View file

@ -8,8 +8,7 @@ use lemmy_db_schema::source::{
oauth_provider::OAuthProvider, oauth_provider::OAuthProvider,
tagline::Tagline, tagline::Tagline,
}; };
use lemmy_db_views::structs::{LocalUserView, SiteView}; use lemmy_db_views::structs::{LocalUserView, PersonView, SiteView};
use lemmy_db_views_actor::structs::PersonView;
use lemmy_utils::{build_cache, error::LemmyResult, CacheLock, VERSION}; use lemmy_utils::{build_cache, error::LemmyResult, CacheLock, VERSION};
use std::sync::LazyLock; use std::sync::LazyLock;

View file

@ -6,8 +6,7 @@ use lemmy_db_schema::source::{
instance_block::InstanceBlock, instance_block::InstanceBlock,
person_block::PersonBlock, person_block::PersonBlock,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityFollowerView, CommunityModeratorView, LocalUserView};
use lemmy_db_views_actor::structs::{CommunityFollowerView, CommunityModeratorView};
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -21,7 +21,6 @@ workspace = true
lemmy_utils = { workspace = true, features = ["full"] } lemmy_utils = { workspace = true, features = ["full"] }
lemmy_db_schema = { workspace = true, features = ["full"] } lemmy_db_schema = { workspace = true, features = ["full"] }
lemmy_db_views = { workspace = true, features = ["full"] } lemmy_db_views = { workspace = true, features = ["full"] }
lemmy_db_views_actor = { workspace = true, features = ["full"] }
lemmy_api_common = { workspace = true, features = ["full"] } lemmy_api_common = { workspace = true, features = ["full"] }
activitypub_federation = { workspace = true } activitypub_federation = { workspace = true }
diesel = { workspace = true } diesel = { workspace = true }

View file

@ -14,7 +14,7 @@ use activitypub_federation::{
}; };
use lemmy_api_common::context::LemmyContext; use lemmy_api_common::context::LemmyContext;
use lemmy_db_schema::source::activity::ActivitySendTargets; use lemmy_db_schema::source::activity::ActivitySendTargets;
use lemmy_db_views_actor::structs::PrivateMessageView; use lemmy_db_views::structs::PrivateMessageView;
use lemmy_utils::error::{LemmyError, LemmyResult}; use lemmy_utils::error::{LemmyError, LemmyResult};
use url::Url; use url::Url;

View file

@ -43,7 +43,7 @@ use lemmy_db_schema::{
traits::Crud, traits::Crud,
CommunityVisibility, CommunityVisibility,
}; };
use lemmy_db_views_actor::structs::{CommunityPersonBanView, CommunityView}; use lemmy_db_views::structs::{CommunityPersonBanView, CommunityView};
use lemmy_utils::error::{FederationError, LemmyError, LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{FederationError, LemmyError, LemmyErrorExt, LemmyErrorType, LemmyResult};
use serde::Serialize; use serde::Serialize;
use tracing::info; use tracing::info;

View file

@ -16,7 +16,7 @@ use lemmy_db_schema::{
traits::Crud, traits::Crud,
}; };
use lemmy_db_views::{ use lemmy_db_views::{
comment_view::CommentQuery, comment::comment_view::CommentQuery,
structs::{LocalUserView, SiteView}, structs::{LocalUserView, SiteView},
}; };
use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType, LemmyResult};

View file

@ -7,7 +7,7 @@ use lemmy_api_common::{
utils::check_private_instance, utils::check_private_instance,
}; };
use lemmy_db_views::{ use lemmy_db_views::{
person_content_combined_view::PersonContentCombinedQuery, combined::person_content_combined_view::PersonContentCombinedQuery,
structs::{LocalUserView, SiteView}, structs::{LocalUserView, SiteView},
}; };
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;

View file

@ -15,7 +15,7 @@ use lemmy_db_schema::{
source::{community::Community, post::PostRead}, source::{community::Community, post::PostRead},
}; };
use lemmy_db_views::{ use lemmy_db_views::{
post_view::PostQuery, post::post_view::PostQuery,
structs::{LocalUserView, PaginationCursor, SiteView}, structs::{LocalUserView, PaginationCursor, SiteView},
}; };
use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};

View file

@ -11,8 +11,7 @@ use lemmy_db_schema::source::{
community::Community, community::Community,
local_site::LocalSite, local_site::LocalSite,
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityModeratorView, CommunityView, LocalUserView};
use lemmy_db_views_actor::structs::{CommunityModeratorView, CommunityView};
use lemmy_utils::error::{LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -6,8 +6,7 @@ use lemmy_api_common::{
person::{GetPersonDetails, GetPersonDetailsResponse}, person::{GetPersonDetails, GetPersonDetailsResponse},
utils::{check_private_instance, is_admin, read_site_for_actor}, utils::{check_private_instance, is_admin, read_site_for_actor},
}; };
use lemmy_db_views::structs::{LocalUserView, SiteView}; use lemmy_db_views::structs::{CommunityModeratorView, LocalUserView, PersonView, SiteView};
use lemmy_db_views_actor::structs::{CommunityModeratorView, PersonView};
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -11,8 +11,7 @@ use lemmy_api_common::{
utils::check_private_instance, utils::check_private_instance,
}; };
use lemmy_db_schema::{source::local_site::LocalSite, utils::DbPool}; use lemmy_db_schema::{source::local_site::LocalSite, utils::DbPool};
use lemmy_db_views::structs::{CommentView, LocalUserView, PostView}; use lemmy_db_views::structs::{CommentView, CommunityView, LocalUserView, PersonView, PostView};
use lemmy_db_views_actor::structs::{CommunityView, PersonView};
use lemmy_utils::error::{LemmyErrorExt2, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt2, LemmyErrorType, LemmyResult};
#[tracing::instrument(skip(context))] #[tracing::instrument(skip(context))]

View file

@ -8,14 +8,11 @@ use lemmy_api_common::{
}; };
use lemmy_db_schema::{source::community::Community, utils::post_to_comment_sort_type, SearchType}; use lemmy_db_schema::{source::community::Community, utils::post_to_comment_sort_type, SearchType};
use lemmy_db_views::{ use lemmy_db_views::{
comment_view::CommentQuery, comment::comment_view::CommentQuery,
post_view::PostQuery, community::community_view::CommunityQuery,
structs::{LocalUserView, SiteView}, person::person_view::PersonQuery,
}; post::post_view::PostQuery,
use lemmy_db_views_actor::{ structs::{CommunitySortType, LocalUserView, SiteView},
community_view::CommunityQuery,
person_view::PersonQuery,
structs::CommunitySortType,
}; };
use lemmy_utils::error::LemmyResult; use lemmy_utils::error::LemmyResult;

View file

@ -323,8 +323,7 @@ pub(crate) mod tests {
}, },
traits::{Crud, Followable}, traits::{Crud, Followable},
}; };
use lemmy_db_views::structs::LocalUserView; use lemmy_db_views::structs::{CommunityFollowerView, LocalUserView};
use lemmy_db_views_actor::structs::CommunityFollowerView;
use lemmy_utils::error::{LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorType, LemmyResult};
use serial_test::serial; use serial_test::serial;
use std::time::Duration; use std::time::Duration;

View file

@ -10,7 +10,7 @@ use activitypub_federation::{
}; };
use lemmy_api_common::{context::LemmyContext, utils::generate_followers_url}; use lemmy_api_common::{context::LemmyContext, utils::generate_followers_url};
use lemmy_db_schema::aggregates::structs::CommunityAggregates; use lemmy_db_schema::aggregates::structs::CommunityAggregates;
use lemmy_db_views_actor::structs::CommunityFollowerView; use lemmy_db_views::structs::CommunityFollowerView;
use lemmy_utils::error::LemmyError; use lemmy_utils::error::LemmyError;
use url::Url; use url::Url;

View file

@ -14,7 +14,7 @@ use lemmy_db_schema::{
source::community::{CommunityModerator, CommunityModeratorForm}, source::community::{CommunityModerator, CommunityModeratorForm},
traits::Joinable, traits::Joinable,
}; };
use lemmy_db_views_actor::structs::CommunityModeratorView; use lemmy_db_views::structs::CommunityModeratorView;
use lemmy_utils::error::{LemmyError, LemmyResult}; use lemmy_utils::error::{LemmyError, LemmyResult};
use url::Url; use url::Url;

View file

@ -19,7 +19,7 @@ use activitypub_federation::{
use futures::future::join_all; use futures::future::join_all;
use lemmy_api_common::{context::LemmyContext, utils::generate_outbox_url}; use lemmy_api_common::{context::LemmyContext, utils::generate_outbox_url};
use lemmy_db_schema::{source::site::Site, utils::FETCH_LIMIT_MAX, PostSortType}; use lemmy_db_schema::{source::site::Site, utils::FETCH_LIMIT_MAX, PostSortType};
use lemmy_db_views::post_view::PostQuery; use lemmy_db_views::post::post_view::PostQuery;
use lemmy_utils::error::{LemmyError, LemmyResult}; use lemmy_utils::error::{LemmyError, LemmyResult};
use url::Url; use url::Url;

View file

@ -23,7 +23,7 @@ use actix_web::{
}; };
use lemmy_api_common::context::LemmyContext; use lemmy_api_common::context::LemmyContext;
use lemmy_db_schema::{source::community::Community, traits::ApubActor, CommunityVisibility}; use lemmy_db_schema::{source::community::Community, traits::ApubActor, CommunityVisibility};
use lemmy_db_views_actor::structs::CommunityFollowerView; use lemmy_db_views::structs::CommunityFollowerView;
use lemmy_utils::error::{LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorType, LemmyResult};
use serde::Deserialize; use serde::Deserialize;

View file

@ -18,7 +18,7 @@ use lemmy_db_schema::{
source::{activity::SentActivity, community::Community}, source::{activity::SentActivity, community::Community},
CommunityVisibility, CommunityVisibility,
}; };
use lemmy_db_views_actor::structs::CommunityFollowerView; use lemmy_db_views::structs::CommunityFollowerView;
use lemmy_utils::error::{FederationError, LemmyErrorExt, LemmyErrorType, LemmyResult}; use lemmy_utils::error::{FederationError, LemmyErrorExt, LemmyErrorType, LemmyResult};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::{ops::Deref, time::Duration}; use std::{ops::Deref, time::Duration};

View file

@ -40,7 +40,7 @@ use lemmy_db_schema::{
traits::{ApubActor, Crud}, traits::{ApubActor, Crud},
CommunityVisibility, CommunityVisibility,
}; };
use lemmy_db_views_actor::structs::CommunityFollowerView; use lemmy_db_views::structs::CommunityFollowerView;
use lemmy_utils::{ use lemmy_utils::{
error::{LemmyError, LemmyResult}, error::{LemmyError, LemmyResult},
spawn_try_task, spawn_try_task,

View file

@ -36,7 +36,7 @@ use lemmy_db_schema::{
}, },
traits::Crud, traits::Crud,
}; };
use lemmy_db_views_actor::structs::CommunityModeratorView; use lemmy_db_views::structs::CommunityModeratorView;
use lemmy_utils::{ use lemmy_utils::{
error::{LemmyError, LemmyResult}, error::{LemmyError, LemmyResult},
spawn_try_task, spawn_try_task,

View file

@ -22,7 +22,7 @@ use lemmy_db_schema::{
utils::{build_db_pool, get_conn, now}, utils::{build_db_pool, get_conn, now},
PostSortType, PostSortType,
}; };
use lemmy_db_views::{post_view::PostQuery, structs::PaginationCursor}; use lemmy_db_views::{post::post_view::PostQuery, structs::PaginationCursor};
use lemmy_utils::error::{LemmyErrorExt2, LemmyResult}; use lemmy_utils::error::{LemmyErrorExt2, LemmyResult};
use std::num::NonZeroU32; use std::num::NonZeroU32;
use url::Url; use url::Url;

View file

@ -41,6 +41,7 @@ actix-web = { workspace = true, optional = true }
i-love-jesus = { workspace = true, optional = true } i-love-jesus = { workspace = true, optional = true }
chrono = { workspace = true } chrono = { workspace = true }
derive-new.workspace = true derive-new.workspace = true
strum = { workspace = true }
[dev-dependencies] [dev-dependencies]
serial_test = { workspace = true } serial_test = { workspace = true }

View file

@ -536,7 +536,7 @@ impl InternalToCombinedView for InboxCombinedViewInternal {
#[expect(clippy::indexing_slicing)] #[expect(clippy::indexing_slicing)]
mod tests { mod tests {
use crate::{ use crate::{
inbox_combined_view::InboxCombinedQuery, combined::inbox_combined_view::InboxCombinedQuery,
structs::{InboxCombinedView, InboxCombinedViewInternal, PrivateMessageView}, structs::{InboxCombinedView, InboxCombinedViewInternal, PrivateMessageView},
}; };
use lemmy_db_schema::{ use lemmy_db_schema::{

View file

@ -0,0 +1,12 @@
#[cfg(feature = "full")]
pub mod inbox_combined_view;
#[cfg(feature = "full")]
pub mod modlog_combined_view;
#[cfg(feature = "full")]
pub mod person_content_combined_view;
#[cfg(feature = "full")]
pub mod person_saved_combined_view;
#[cfg(feature = "full")]
pub mod report_combined_view;
#[cfg(feature = "full")]
pub mod search_combined_view;

View file

@ -609,7 +609,7 @@ impl InternalToCombinedView for ModlogCombinedViewInternal {
#[expect(clippy::indexing_slicing)] #[expect(clippy::indexing_slicing)]
mod tests { mod tests {
use crate::{modlog_combined_view::ModlogCombinedQuery, structs::ModlogCombinedView}; use crate::{combined::modlog_combined_view::ModlogCombinedQuery, structs::ModlogCombinedView};
use lemmy_db_schema::{ use lemmy_db_schema::{
newtypes::PersonId, newtypes::PersonId,
source::{ source::{

View file

@ -270,7 +270,7 @@ impl InternalToCombinedView for PersonContentViewInternal {
mod tests { mod tests {
use crate::{ use crate::{
person_content_combined_view::PersonContentCombinedQuery, combined::person_content_combined_view::PersonContentCombinedQuery,
structs::PersonContentCombinedView, structs::PersonContentCombinedView,
}; };
use lemmy_db_schema::{ use lemmy_db_schema::{

View file

@ -226,7 +226,7 @@ impl PersonSavedCombinedQuery {
mod tests { mod tests {
use crate::{ use crate::{
person_saved_combined_view::PersonSavedCombinedQuery, combined::person_saved_combined_view::PersonSavedCombinedQuery,
structs::{LocalUserView, PersonContentCombinedView}, structs::{LocalUserView, PersonContentCombinedView},
}; };
use lemmy_db_schema::{ use lemmy_db_schema::{

View file

@ -415,7 +415,7 @@ impl InternalToCombinedView for ReportCombinedViewInternal {
mod tests { mod tests {
use crate::{ use crate::{
report_combined_view::ReportCombinedQuery, combined::report_combined_view::ReportCombinedQuery,
structs::{ structs::{
CommentReportView, CommentReportView,
LocalUserView, LocalUserView,

View file

@ -363,7 +363,7 @@ fn handle_deleted(mut c: CommentView, is_admin: bool) -> CommentView {
mod tests { mod tests {
use crate::{ use crate::{
comment_view::{CommentQuery, CommentSortType, CommentView, DbPool}, comment::comment_view::{CommentQuery, CommentSortType, CommentView, DbPool},
structs::LocalUserView, structs::LocalUserView,
}; };
use lemmy_db_schema::{ use lemmy_db_schema::{

View file

@ -0,0 +1,4 @@
#[cfg(feature = "full")]
pub mod comment_reply_view;
#[cfg(feature = "full")]
pub mod comment_view;

View file

@ -266,7 +266,7 @@ impl CommunityQuery<'_> {
mod tests { mod tests {
use crate::{ use crate::{
community_view::CommunityQuery, community::community_view::CommunityQuery,
structs::{CommunitySortType, CommunityView}, structs::{CommunitySortType, CommunityView},
}; };
use lemmy_db_schema::{ use lemmy_db_schema::{

View file

@ -0,0 +1,8 @@
#[cfg(feature = "full")]
pub mod community_follower_view;
#[cfg(feature = "full")]
pub mod community_moderator_view;
#[cfg(feature = "full")]
pub mod community_person_ban_view;
#[cfg(feature = "full")]
pub mod community_view;

View file

@ -2,31 +2,23 @@
extern crate serial_test; extern crate serial_test;
#[cfg(feature = "full")] #[cfg(feature = "full")]
pub mod comment_report_view; pub mod combined;
#[cfg(feature = "full")] #[cfg(feature = "full")]
pub mod comment_view; pub mod comment;
#[cfg(feature = "full")] #[cfg(feature = "full")]
pub mod custom_emoji_view; pub mod community;
#[cfg(feature = "full")] #[cfg(feature = "full")]
pub mod local_image_view; pub mod local_user;
#[cfg(feature = "full")] #[cfg(feature = "full")]
pub mod local_user_view; pub mod person;
#[cfg(feature = "full")] #[cfg(feature = "full")]
pub mod person_content_combined_view; pub mod post;
#[cfg(feature = "full")] #[cfg(feature = "full")]
pub mod person_saved_combined_view; pub mod private_message;
#[cfg(feature = "full")] #[cfg(feature = "full")]
pub mod post_report_view; pub mod registration_applications;
#[cfg(feature = "full")] #[cfg(feature = "full")]
pub mod post_view; pub mod reports;
#[cfg(feature = "full")] #[cfg(feature = "full")]
pub mod private_message_report_view; pub mod site;
#[cfg(feature = "full")]
pub mod registration_application_view;
#[cfg(feature = "full")]
pub mod report_combined_view;
#[cfg(feature = "full")]
pub mod site_view;
pub mod structs; pub mod structs;
#[cfg(feature = "full")]
pub mod vote_view;

View file

@ -0,0 +1,2 @@
#[cfg(feature = "full")]
pub mod local_user_view;

View file

@ -0,0 +1,6 @@
#[cfg(feature = "full")]
pub mod person_comment_mention_view;
#[cfg(feature = "full")]
pub mod person_post_mention_view;
#[cfg(feature = "full")]
pub mod person_view;

View file

@ -0,0 +1,2 @@
#[cfg(feature = "full")]
pub mod post_view;

View file

@ -597,7 +597,7 @@ impl<'a> PostQuery<'a> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::{ use crate::{
post_view::{PaginationCursorData, PostQuery, PostView}, post::post_view::{PaginationCursorData, PostQuery, PostView},
structs::LocalUserView, structs::LocalUserView,
}; };
use chrono::Utc; use chrono::Utc;

View file

@ -0,0 +1,2 @@
#[cfg(feature = "full")]
pub mod private_message_view;

View file

@ -0,0 +1,2 @@
#[cfg(feature = "full")]
pub mod registration_application_view;

View file

@ -137,7 +137,7 @@ impl RegistrationApplicationQuery {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::registration_application_view::{ use crate::registration_applications::registration_application_view::{
RegistrationApplicationQuery, RegistrationApplicationQuery,
RegistrationApplicationView, RegistrationApplicationView,
}; };

View file

@ -0,0 +1,6 @@
#[cfg(feature = "full")]
pub mod comment_report_view;
#[cfg(feature = "full")]
pub mod post_report_view;
#[cfg(feature = "full")]
pub mod private_message_report_view;

Some files were not shown because too many files have changed in this diff Show more