Crate lemmy_diesel_utils (#6122)

* Upgrade to latest stable Rust (fixes #6006)

* rust 1.91

* clippy

* update deps

* format

* test fixes

* upgrade debian for api tests

* remove once_cell

* Rename schema_setup to diesel_utils

* move dburl

* move db connection code

* move utils

* move sensitive string

* move crud trait

* clippy

* shear

* update paths

* remove protobuf dep

* feature fixes

* features

* fmt

Cargo.lock

@@ -3360,6 +3360,7 @@ dependencies = [
  "lemmy_db_views_search_combined",
  "lemmy_db_views_site",
  "lemmy_db_views_vote",
+ "lemmy_diesel_utils",
  "lemmy_email",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
@@ -3426,6 +3427,7 @@ dependencies = [
  "lemmy_db_views_search_combined",
  "lemmy_db_views_site",
  "lemmy_db_views_vote",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
 ]
 
@@ -3458,6 +3460,7 @@ dependencies = [
  "lemmy_db_views_registration_applications",
  "lemmy_db_views_search_combined",
  "lemmy_db_views_site",
+ "lemmy_diesel_utils",
  "lemmy_email",
  "lemmy_utils 1.0.0-alpha.12",
  "regex",
@@ -3500,6 +3503,7 @@ dependencies = [
  "lemmy_db_views_post",
  "lemmy_db_views_search_combined",
  "lemmy_db_views_site",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "url",
 ]
@@ -3535,6 +3539,7 @@ dependencies = [
  "lemmy_db_views_post",
  "lemmy_db_views_private_message",
  "lemmy_db_views_site",
+ "lemmy_diesel_utils",
  "lemmy_email",
  "lemmy_utils 1.0.0-alpha.12",
  "mime",
@@ -3575,6 +3580,7 @@ dependencies = [
  "lemmy_db_views_community_follower_approval",
  "lemmy_db_views_community_moderator",
  "lemmy_db_views_post",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -3608,6 +3614,7 @@ dependencies = [
  "lemmy_db_views_post",
  "lemmy_db_views_private_message",
  "lemmy_db_views_site",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "serde",
  "serde_json",
@@ -3640,6 +3647,7 @@ dependencies = [
  "lemmy_db_views_local_user",
  "lemmy_db_views_private_message",
  "lemmy_db_views_site",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "moka",
  "pretty_assertions",
@@ -3672,6 +3680,7 @@ dependencies = [
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
  "lemmy_db_views_community_follower",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "mockall",
  "moka",
@@ -3713,33 +3722,26 @@ dependencies = [
 name = "lemmy_db_schema"
 version = "1.0.0-alpha.12"
 dependencies = [
- "activitypub_federation",
  "bcrypt",
  "chrono",
- "deadpool",
  "derive-new",
  "diesel",
  "diesel-async",
  "diesel-derive-newtype",
  "diesel-uplete",
  "diesel_ltree",
- "futures-util",
  "i-love-jesus",
  "lemmy_db_schema_file",
- "lemmy_db_schema_setup",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "moka",
  "pretty_assertions",
- "rustls 0.23.34",
  "serde",
  "serde_json",
  "serde_with",
  "serial_test",
  "strum 0.27.2",
  "tokio",
- "tokio-postgres",
- "tokio-postgres-rustls",
- "tracing",
  "ts-rs",
  "url",
  "uuid",
@@ -3758,25 +3760,6 @@ dependencies = [
  "ts-rs",
 ]
 
-[[package]]
-name = "lemmy_db_schema_setup"
-version = "1.0.0-alpha.12"
-dependencies = [
- "anyhow",
- "chrono",
- "diesel",
- "diesel_ltree",
- "diesel_migrations",
- "diff",
- "itertools 0.14.0",
- "lemmy_db_schema_file",
- "lemmy_utils 1.0.0-alpha.12",
- "pathfinding",
- "serial_test",
- "tracing",
- "unified-diff",
-]
-
 [[package]]
 name = "lemmy_db_views"
 version = "0.19.12"
@@ -3814,6 +3797,7 @@ dependencies = [
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
  "lemmy_db_views_local_user",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -3833,6 +3817,7 @@ dependencies = [
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
  "lemmy_db_views_community_moderator",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "serde",
  "serde_with",
@@ -3851,6 +3836,7 @@ dependencies = [
  "diesel-async",
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "serde",
  "serde_with",
@@ -3866,6 +3852,7 @@ dependencies = [
  "i-love-jesus",
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "serde",
  "serde_with",
@@ -3882,6 +3869,7 @@ dependencies = [
  "diesel-async",
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "serde",
  "ts-rs",
@@ -3895,6 +3883,7 @@ dependencies = [
  "diesel-async",
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "serde",
  "serde_with",
@@ -3910,6 +3899,7 @@ dependencies = [
  "i-love-jesus",
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "serde",
  "serde_with",
@@ -3928,6 +3918,7 @@ dependencies = [
  "i-love-jesus",
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -3957,6 +3948,7 @@ dependencies = [
  "i-love-jesus",
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -3980,6 +3972,7 @@ dependencies = [
  "lemmy_db_views_modlog",
  "lemmy_db_views_post",
  "lemmy_db_views_private_message",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -4001,6 +3994,7 @@ dependencies = [
  "lemmy_db_schema_file",
  "lemmy_db_views_community",
  "lemmy_db_views_community_moderator",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -4024,6 +4018,7 @@ dependencies = [
  "lemmy_db_views_comment",
  "lemmy_db_views_local_user",
  "lemmy_db_views_post",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -4046,6 +4041,7 @@ dependencies = [
  "lemmy_db_views_comment",
  "lemmy_db_views_local_user",
  "lemmy_db_views_post",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -4068,6 +4064,7 @@ dependencies = [
  "lemmy_db_views_comment",
  "lemmy_db_views_local_user",
  "lemmy_db_views_post",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -4089,6 +4086,7 @@ dependencies = [
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
  "lemmy_db_views_local_user",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -4109,6 +4107,7 @@ dependencies = [
  "diesel-async",
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "serde",
  "ts-rs",
@@ -4123,6 +4122,7 @@ dependencies = [
  "i-love-jesus",
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -4143,6 +4143,7 @@ dependencies = [
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
  "lemmy_db_views_local_user",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -4167,6 +4168,7 @@ dependencies = [
  "lemmy_db_views_local_user",
  "lemmy_db_views_person",
  "lemmy_db_views_post",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -4195,6 +4197,7 @@ dependencies = [
  "lemmy_db_views_community_moderator",
  "lemmy_db_views_local_user",
  "lemmy_db_views_person",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "serde",
  "serde_with",
@@ -4213,6 +4216,7 @@ dependencies = [
  "i-love-jesus",
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "pretty_assertions",
  "serde",
@@ -4222,6 +4226,39 @@ dependencies = [
  "ts-rs",
 ]
 
+[[package]]
+name = "lemmy_diesel_utils"
+version = "1.0.0-alpha.12"
+dependencies = [
+ "activitypub_federation",
+ "anyhow",
+ "chrono",
+ "deadpool",
+ "diesel",
+ "diesel-async",
+ "diesel-derive-newtype",
+ "diesel_ltree",
+ "diesel_migrations",
+ "diff",
+ "futures-util",
+ "i-love-jesus",
+ "itertools 0.14.0",
+ "lemmy_db_schema_file",
+ "lemmy_utils 1.0.0-alpha.12",
+ "pathfinding",
+ "pretty_assertions",
+ "rustls 0.23.34",
+ "serde",
+ "serial_test",
+ "tokio",
+ "tokio-postgres",
+ "tokio-postgres-rustls",
+ "tracing",
+ "ts-rs",
+ "unified-diff",
+ "url",
+]
+
 [[package]]
 name = "lemmy_email"
 version = "1.0.0-alpha.12"
@@ -4230,6 +4267,7 @@ dependencies = [
  "lemmy_db_schema 1.0.0-alpha.12",
  "lemmy_db_schema_file",
  "lemmy_db_views_local_user",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "lettre",
  "rosetta-build",
@@ -4264,6 +4302,7 @@ dependencies = [
  "lemmy_db_views_person_content_combined",
  "lemmy_db_views_post",
  "lemmy_db_views_site",
+ "lemmy_diesel_utils",
  "lemmy_utils 1.0.0-alpha.12",
  "percent-encoding",
  "pretty_assertions",
@@ -4295,8 +4334,8 @@ dependencies = [
  "lemmy_apub_objects",
  "lemmy_apub_send",
  "lemmy_db_schema 1.0.0-alpha.12",
- "lemmy_db_schema_setup",
  "lemmy_db_views_site",
+ "lemmy_diesel_utils",
  "lemmy_routes",
  "lemmy_utils 1.0.0-alpha.12",
  "mimalloc",
@@ -5532,7 +5571,6 @@ dependencies = [
  "memchr",
  "parking_lot",
  "procfs",
- "protobuf",
  "thiserror 2.0.17",
 ]
 
@@ -5559,26 +5597,6 @@ dependencies = [
  "syn 2.0.108",
 ]
 
-[[package]]
-name = "protobuf"
-version = "3.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4"
-dependencies = [
- "once_cell",
- "protobuf-support",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "protobuf-support"
-version = "3.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6"
-dependencies = [
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "psm"
 version = "0.1.28"

Cargo.toml

@@ -24,7 +24,7 @@ members = [
   "crates/utils",
   "crates/db_schema",
   "crates/db_schema_file",
-  "crates/db_schema_setup",
+  "crates/diesel_utils",
   "crates/email",
   "crates/db_views/private_message",
   "crates/db_views/local_user",
@@ -101,7 +101,7 @@ lemmy_apub_objects = { version = "=1.0.0-alpha.12", path = "./crates/apub/object
 lemmy_utils = { version = "=1.0.0-alpha.12", path = "./crates/utils", default-features = false }
 lemmy_db_schema = { version = "=1.0.0-alpha.12", path = "./crates/db_schema" }
 lemmy_db_schema_file = { version = "=1.0.0-alpha.12", path = "./crates/db_schema_file" }
-lemmy_db_schema_setup = { version = "=1.0.0-alpha.12", path = "./crates/db_schema_setup" }
+lemmy_diesel_utils = { version = "=1.0.0-alpha.12", path = "./crates/diesel_utils" }
 lemmy_api_utils = { version = "=1.0.0-alpha.12", path = "./crates/api/api_utils" }
 lemmy_routes = { version = "=1.0.0-alpha.12", path = "./crates/routes" }
 lemmy_apub_send = { version = "=1.0.0-alpha.12", path = "./crates/apub/send" }

crates/api/api/Cargo.toml

@@ -73,6 +73,7 @@ serde = { workspace = true }
 itertools = { workspace = true }
 serde_json = { workspace = true }
 diesel = { workspace = true }
+lemmy_diesel_utils = { workspace = true }
 
 [dev-dependencies]
 serial_test = { workspace = true }

crates/api/api/src/comment/distinguish.rs

@@ -5,15 +5,13 @@ use lemmy_api_utils::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::{check_community_mod_action, check_community_user_action},
 };
-use lemmy_db_schema::{
-  source::comment::{Comment, CommentUpdateForm},
-  traits::Crud,
-};
+use lemmy_db_schema::source::comment::{Comment, CommentUpdateForm};
 use lemmy_db_views_comment::{
   CommentView,
   api::{CommentResponse, DistinguishComment},
 };
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 pub async fn distinguish_comment(

crates/api/api/src/community/add_mod.rs

@@ -7,18 +7,15 @@ use lemmy_api_utils::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::check_community_mod_action,
 };
-use lemmy_db_schema::{
-  source::{
-    community::{Community, CommunityActions, CommunityModeratorForm},
-    local_user::LocalUser,
-    modlog::{Modlog, ModlogInsertForm},
-  },
-  traits::Crud,
-  utils::get_conn,
+use lemmy_db_schema::source::{
+  community::{Community, CommunityActions, CommunityModeratorForm},
+  local_user::LocalUser,
+  modlog::{Modlog, ModlogInsertForm},
 };
 use lemmy_db_views_community::api::{AddModToCommunity, AddModToCommunityResponse};
 use lemmy_db_views_community_moderator::CommunityModeratorView;
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::{connection::get_conn, traits::Crud};
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 pub async fn add_mod_to_community(

crates/api/api/src/community/ban.rs

@@ -17,12 +17,12 @@ use lemmy_db_schema::{
     local_user::LocalUser,
     modlog::{Modlog, ModlogInsertForm},
   },
-  traits::{Bannable, Crud, Followable},
-  utils::get_conn,
+  traits::{Bannable, Followable},
 };
 use lemmy_db_views_community::api::BanFromCommunity;
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_person::{PersonView, api::PersonResponse};
+use lemmy_diesel_utils::{connection::get_conn, traits::Crud};
 use lemmy_utils::{error::LemmyResult, utils::validation::is_valid_body_field};
 
 pub async fn ban_from_community(

crates/api/api/src/community/block.rs

@@ -12,13 +12,13 @@ use lemmy_db_schema::{
     community::{CommunityActions, CommunityBlockForm},
   },
   traits::{Blockable, Followable},
-  utils::get_conn,
 };
 use lemmy_db_views_community::{
   CommunityView,
   api::{BlockCommunity, CommunityResponse},
 };
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::connection::get_conn;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn user_block_community(

crates/api/api/src/community/follow.rs

@@ -2,15 +2,13 @@ use crate::community::do_follow_community;
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
 use lemmy_api_utils::{context::LemmyContext, utils::check_local_user_valid};
-use lemmy_db_schema::{
-  source::{actor_language::CommunityLanguage, community::Community},
-  traits::Crud,
-};
+use lemmy_db_schema::source::{actor_language::CommunityLanguage, community::Community};
 use lemmy_db_views_community::{
   CommunityView,
   api::{CommunityResponse, FollowCommunity},
 };
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn follow_community(

crates/api/api/src/community/multi_community_follow.rs

@@ -5,16 +5,14 @@ use lemmy_api_utils::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::check_local_user_valid,
 };
-use lemmy_db_schema::{
-  source::multi_community::{MultiCommunity, MultiCommunityFollowForm},
-  traits::Crud,
-};
+use lemmy_db_schema::source::multi_community::{MultiCommunity, MultiCommunityFollowForm};
 use lemmy_db_schema_file::enums::CommunityFollowerState;
 use lemmy_db_views_community::{
   MultiCommunityView,
   api::{FollowMultiCommunity, MultiCommunityResponse},
 };
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn follow_multi_community(

crates/api/api/src/community/tag.rs

@@ -6,19 +6,16 @@ use lemmy_api_utils::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::{check_community_mod_action, slur_regex},
 };
-use lemmy_db_schema::{
-  source::{
-    community::Community,
-    tag::{Tag, TagInsertForm, TagUpdateForm},
-  },
-  traits::Crud,
-  utils::diesel_string_update,
+use lemmy_db_schema::source::{
+  community::Community,
+  tag::{Tag, TagInsertForm, TagUpdateForm},
 };
 use lemmy_db_views_community::{
   CommunityView,
   api::{CreateCommunityTag, DeleteCommunityTag, UpdateCommunityTag},
 };
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::{traits::Crud, utils::diesel_string_update};
 use lemmy_utils::{
   error::LemmyResult,
   utils::{

crates/api/api/src/community/transfer.rs

@@ -6,13 +6,9 @@ use lemmy_api_utils::{
   notify::notify_mod_action,
   utils::{check_community_user_action, is_admin, is_top_mod},
 };
-use lemmy_db_schema::{
-  source::{
-    community::{Community, CommunityActions, CommunityModeratorForm},
-    modlog::{Modlog, ModlogInsertForm},
-  },
-  traits::Crud,
-  utils::get_conn,
+use lemmy_db_schema::source::{
+  community::{Community, CommunityActions, CommunityModeratorForm},
+  modlog::{Modlog, ModlogInsertForm},
 };
 use lemmy_db_views_community::{
   CommunityView,
@@ -20,6 +16,7 @@ use lemmy_db_views_community::{
 };
 use lemmy_db_views_community_moderator::CommunityModeratorView;
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::{connection::get_conn, traits::Crud};
 use lemmy_utils::{
   error::{LemmyErrorType, LemmyResult},
   location_info,

crates/api/api/src/community/update_notifications.rs

@@ -2,14 +2,12 @@ use crate::community::do_follow_community;
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
 use lemmy_api_utils::context::LemmyContext;
-use lemmy_db_schema::{
-  source::community::{Community, CommunityActions},
-  traits::Crud,
-};
+use lemmy_db_schema::source::community::{Community, CommunityActions};
 use lemmy_db_schema_file::enums::CommunityNotificationsMode;
 use lemmy_db_views_community::api::UpdateCommunityNotifications;
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::api::SuccessResponse;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn update_community_notifications(

crates/api/api/src/federation/list_comments.rs

@@ -11,7 +11,7 @@ use lemmy_api_utils::{context::LemmyContext, utils::check_private_instance};
 use lemmy_db_schema::{
   newtypes::PaginationCursor,
   source::comment::Comment,
-  traits::{Crud, PaginationCursorBuilder},
+  traits::PaginationCursorBuilder,
 };
 use lemmy_db_views_comment::{
   CommentView,
@@ -20,6 +20,7 @@ use lemmy_db_views_comment::{
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 struct CommentsCommonOutput {

crates/api/api/src/federation/resolve_object.rs

@@ -127,8 +127,8 @@ mod tests {
       post::{Post, PostInsertForm, PostUpdateForm},
     },
     test_data::TestData,
-    traits::Crud,
   };
+  use lemmy_diesel_utils::traits::Crud;
   use serial_test::serial;
 
   #[tokio::test]

crates/api/api/src/federation/user_settings_backup.rs

@@ -21,7 +21,7 @@ use lemmy_db_schema::{
     person::{Person, PersonActions, PersonBlockForm, PersonUpdateForm},
     post::{PostActions, PostSavedForm},
   },
-  traits::{Blockable, Crud, Followable, Saveable},
+  traits::{Blockable, Followable, Saveable},
 };
 use lemmy_db_schema_file::enums::CommunityFollowerState;
 use lemmy_db_views_local_user::LocalUserView;
@@ -29,6 +29,7 @@ use lemmy_db_views_site::{
   api::{SuccessResponse, UserSettingsBackup},
   impls::user_backup_list_to_user_settings_backup,
 };
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::{
   error::LemmyResult,
   spawn_try_task,
@@ -306,10 +307,11 @@ pub(crate) mod tests {
       person::Person,
     },
     test_data::TestData,
-    traits::{Crud, Followable},
+    traits::Followable,
   };
   use lemmy_db_views_community_follower::CommunityFollowerView;
   use lemmy_db_views_local_user::LocalUserView;
+  use lemmy_diesel_utils::traits::Crud;
   use lemmy_utils::error::{LemmyErrorType, LemmyResult};
   use serial_test::serial;
   use std::time::Duration;

crates/api/api/src/local_user/save_settings.rs

@@ -11,14 +11,17 @@ use lemmy_db_schema::{
     local_user::{LocalUser, LocalUserUpdateForm},
     person::{Person, PersonUpdateForm},
   },
-  traits::Crud,
-  utils::{diesel_opt_number_update, diesel_string_update, limit_fetch_check},
+  utils::limit_fetch_check,
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::{
   SiteView,
   api::{SaveUserSettings, SuccessResponse},
 };
+use lemmy_diesel_utils::{
+  traits::Crud,
+  utils::{diesel_opt_number_update, diesel_string_update},
+};
 use lemmy_email::account::send_verification_email;
 use lemmy_utils::{
   error::{LemmyErrorType, LemmyResult},

crates/api/api/src/post/feature.rs

@@ -13,10 +13,10 @@ use lemmy_db_schema::{
     modlog::{Modlog, ModlogInsertForm},
     post::{Post, PostUpdateForm},
   },
-  traits::Crud,
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_post::api::{FeaturePost, PostResponse};
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn feature_post(

crates/api/api/src/post/lock.rs

@@ -7,18 +7,16 @@ use lemmy_api_utils::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::check_community_mod_action,
 };
-use lemmy_db_schema::{
-  source::{
-    modlog::{Modlog, ModlogInsertForm},
-    post::{Post, PostUpdateForm},
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  modlog::{Modlog, ModlogInsertForm},
+  post::{Post, PostUpdateForm},
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_post::{
   PostView,
   api::{LockPost, PostResponse},
 };
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn lock_post(

crates/api/api/src/post/mod_update.rs

@@ -13,16 +13,14 @@ use lemmy_api_utils::{
     update_post_tags,
   },
 };
-use lemmy_db_schema::{
-  source::post::{Post, PostUpdateForm},
-  traits::Crud,
-};
+use lemmy_db_schema::source::post::{Post, PostUpdateForm};
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_post::{
   PostView,
   api::{ModEditPost, PostResponse},
 };
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 use std::ops::Deref;
 

crates/api/api/src/post/update_notifications.rs

@@ -2,17 +2,15 @@ use crate::community::do_follow_community;
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
 use lemmy_api_utils::context::LemmyContext;
-use lemmy_db_schema::{
-  source::{
-    community::Community,
-    post::{Post, PostActions},
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  community::Community,
+  post::{Post, PostActions},
 };
 use lemmy_db_schema_file::enums::PostNotificationsMode;
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_post::api::UpdatePostNotifications;
 use lemmy_db_views_site::api::SuccessResponse;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn update_post_notifications(

crates/api/api/src/reports/community_report/create.rs

@@ -14,7 +14,7 @@ use lemmy_db_schema::{
     community_report::{CommunityReport, CommunityReportForm},
     site::Site,
   },
-  traits::{Crud, Reportable},
+  traits::Reportable,
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_report_combined::{
@@ -22,6 +22,7 @@ use lemmy_db_views_report_combined::{
   api::{CommunityReportResponse, CreateCommunityReport},
 };
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_email::admin::send_new_report_email_to_admins;
 use lemmy_utils::error::LemmyResult;
 

crates/api/api/src/reports/private_message_report/create.rs

@@ -10,7 +10,7 @@ use lemmy_db_schema::{
     private_message::PrivateMessage,
     private_message_report::{PrivateMessageReport, PrivateMessageReportForm},
   },
-  traits::{Crud, Reportable},
+  traits::Reportable,
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_report_combined::{
@@ -18,6 +18,7 @@ use lemmy_db_views_report_combined::{
   api::{CreatePrivateMessageReport, PrivateMessageReportResponse},
 };
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_email::admin::send_new_report_email_to_admins;
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 

crates/api/api/src/site/mod_log.rs

@@ -76,11 +76,12 @@ mod tests {
       person::{Person, PersonInsertForm},
       post::{Post, PostActions, PostInsertForm, PostLikeForm},
     },
-    traits::{Crud, Likeable},
+    traits::Likeable,
   };
   use lemmy_db_schema_file::enums::ModlogKind;
   use lemmy_db_views_comment::CommentView;
   use lemmy_db_views_post::PostView;
+  use lemmy_diesel_utils::traits::Crud;
   use pretty_assertions::assert_eq;
   use serial_test::serial;
 

crates/api/api/src/site/purge/comment.rs

@@ -5,17 +5,15 @@ use lemmy_api_utils::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::is_admin,
 };
-use lemmy_db_schema::{
-  source::{
-    comment::Comment,
-    local_user::LocalUser,
-    modlog::{Modlog, ModlogInsertForm},
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  comment::Comment,
+  local_user::LocalUser,
+  modlog::{Modlog, ModlogInsertForm},
 };
 use lemmy_db_views_comment::{CommentView, api::PurgeComment};
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::api::SuccessResponse;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn purge_comment(

crates/api/api/src/site/purge/community.rs

@@ -12,12 +12,12 @@ use lemmy_db_schema::{
     local_user::LocalUser,
     modlog::{Modlog, ModlogInsertForm},
   },
-  traits::Crud,
 };
 use lemmy_db_views_community::api::PurgeCommunity;
 use lemmy_db_views_community_moderator::CommunityModeratorView;
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::api::SuccessResponse;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn purge_community(

crates/api/api/src/site/purge/person.rs

@@ -12,11 +12,12 @@ use lemmy_db_schema::{
     modlog::{Modlog, ModlogInsertForm},
     person::Person,
   },
-  traits::{Bannable, Crud},
+  traits::Bannable,
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_person::api::PurgePerson;
 use lemmy_db_views_site::api::SuccessResponse;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn purge_person(

crates/api/api/src/site/purge/post.rs

@@ -5,17 +5,15 @@ use lemmy_api_utils::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::{is_admin, purge_post_images},
 };
-use lemmy_db_schema::{
-  source::{
-    local_user::LocalUser,
-    modlog::{Modlog, ModlogInsertForm},
-    post::Post,
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  local_user::LocalUser,
+  modlog::{Modlog, ModlogInsertForm},
+  post::Post,
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_post::api::PurgePost;
 use lemmy_db_views_site::api::SuccessResponse;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn purge_post(

crates/api/api/src/site/registration_applications/approve.rs

@@ -3,19 +3,16 @@ use actix_web::web::Json;
 use chrono::Utc;
 use diesel_async::scoped_futures::ScopedFutureExt;
 use lemmy_api_utils::{context::LemmyContext, utils::is_admin};
-use lemmy_db_schema::{
-  source::{
-    local_user::{LocalUser, LocalUserUpdateForm},
-    registration_application::{RegistrationApplication, RegistrationApplicationUpdateForm},
-  },
-  traits::Crud,
-  utils::{diesel_string_update, get_conn},
+use lemmy_db_schema::source::{
+  local_user::{LocalUser, LocalUserUpdateForm},
+  registration_application::{RegistrationApplication, RegistrationApplicationUpdateForm},
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_registration_applications::{
   RegistrationApplicationView,
   api::{ApproveRegistrationApplication, RegistrationApplicationResponse},
 };
+use lemmy_diesel_utils::{connection::get_conn, traits::Crud, utils::diesel_string_update};
 use lemmy_email::account::{send_application_approved_email, send_application_denied_email};
 use lemmy_utils::error::LemmyResult;
 

crates/api/api/src/site/registration_applications/tests.rs

@@ -16,8 +16,6 @@ use lemmy_db_schema::{
     registration_application::{RegistrationApplication, RegistrationApplicationInsertForm},
   },
   test_data::TestData,
-  traits::Crud,
-  utils::DbPool,
 };
 use lemmy_db_schema_file::enums::RegistrationMode;
 use lemmy_db_views_local_user::LocalUserView;
@@ -27,6 +25,7 @@ use lemmy_db_views_registration_applications::api::{
   ListRegistrationApplicationsResponse,
 };
 use lemmy_db_views_site::api::EditSite;
+use lemmy_diesel_utils::{connection::DbPool, traits::Crud};
 use lemmy_utils::{CACHE_DURATION_API, error::LemmyResult};
 use serial_test::serial;
 

crates/api/api/src/sitemap.rs

@@ -4,7 +4,8 @@ use actix_web::{
   web::Data,
 };
 use lemmy_api_utils::context::LemmyContext;
-use lemmy_db_schema::{newtypes::DbUrl, source::post::Post};
+use lemmy_db_schema::source::post::Post;
+use lemmy_diesel_utils::dburl::DbUrl;
 use lemmy_utils::error::LemmyResult;
 use sitemap_rs::{url::Url, url_set::UrlSet};
 use tracing::info;
@@ -45,7 +46,7 @@ pub(crate) mod tests {
   use crate::sitemap::generate_urlset;
   use chrono::{DateTime, NaiveDate, Utc};
   use elementtree::Element;
-  use lemmy_db_schema::newtypes::DbUrl;
+  use lemmy_diesel_utils::dburl::DbUrl;
   use lemmy_utils::error::LemmyResult;
   use pretty_assertions::assert_eq;
   use url::Url;

crates/api/api_common/Cargo.toml

@@ -71,3 +71,4 @@ lemmy_db_views_report_combined.workspace = true
 lemmy_db_views_search_combined.workspace = true
 lemmy_db_views_site.workspace = true
 lemmy_db_views_vote.workspace = true
+lemmy_diesel_utils.workspace = true

crates/api/api_common/src/lib.rs

@@ -18,7 +18,7 @@ pub mod search;
 pub mod site;
 pub mod tagline;
 
-pub use lemmy_db_schema::{newtypes::DbUrl, sensitive::SensitiveString};
 pub use lemmy_db_schema_file::enums::VoteShow;
 pub use lemmy_db_views_site::api::SuccessResponse;
 pub use lemmy_db_views_vote::VoteView;
+pub use lemmy_diesel_utils::{dburl::DbUrl, sensitive::SensitiveString};

crates/api/api_crud/Cargo.toml

@@ -52,6 +52,7 @@ serde_json = { workspace = true }
 serde = { workspace = true }
 serde_with = { workspace = true }
 diesel-async = { workspace = true }
+lemmy_diesel_utils = { workspace = true }
 
 [package.metadata.cargo-shear]
 ignored = ["futures", "futures-util"]

crates/api/api_crud/src/comment/create.rs

@@ -24,12 +24,13 @@ use lemmy_db_schema::{
     comment::{Comment, CommentActions, CommentInsertForm, CommentLikeForm},
     notification::Notification,
   },
-  traits::{Crud, Likeable},
+  traits::Likeable,
 };
 use lemmy_db_views_comment::api::{CommentResponse, CreateComment};
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_post::PostView;
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::{
   error::{LemmyErrorType, LemmyResult},
   utils::validation::is_valid_body_field,

crates/api/api_crud/src/comment/delete.rs

@@ -6,15 +6,13 @@ use lemmy_api_utils::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::check_community_user_action,
 };
-use lemmy_db_schema::{
-  source::comment::{Comment, CommentUpdateForm},
-  traits::Crud,
-};
+use lemmy_db_schema::source::comment::{Comment, CommentUpdateForm};
 use lemmy_db_views_comment::{
   CommentView,
   api::{CommentResponse, DeleteComment},
 };
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 pub async fn delete_comment(

crates/api/api_crud/src/comment/remove.rs

@@ -14,13 +14,14 @@ use lemmy_db_schema::{
     local_user::LocalUser,
     modlog::{Modlog, ModlogInsertForm},
   },
-  traits::{Crud, Reportable},
+  traits::Reportable,
 };
 use lemmy_db_views_comment::{
   CommentView,
   api::{CommentResponse, RemoveComment},
 };
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 pub async fn remove_comment(

crates/api/api_crud/src/comment/update.rs

@@ -12,13 +12,13 @@ use lemmy_api_utils::{
 use lemmy_db_schema::{
   impls::actor_language::validate_post_language,
   source::comment::{Comment, CommentUpdateForm},
-  traits::Crud,
 };
 use lemmy_db_views_comment::{
   CommentView,
   api::{CommentResponse, EditComment},
 };
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::{
   error::{LemmyErrorType, LemmyResult},
   utils::validation::is_valid_body_field,

crates/api/api_crud/src/community/create.rs

@@ -28,12 +28,13 @@ use lemmy_db_schema::{
       CommunityModeratorForm,
     },
   },
-  traits::{ApubActor, Crud, Followable},
+  traits::{ApubActor, Followable},
 };
 use lemmy_db_schema_file::enums::CommunityFollowerState;
 use lemmy_db_views_community::api::{CommunityResponse, CreateCommunity};
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::{
   error::{LemmyErrorType, LemmyResult},
   utils::{

crates/api/api_crud/src/community/delete.rs

@@ -6,13 +6,11 @@ use lemmy_api_utils::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::{check_community_mod_action, check_local_user_valid, is_top_mod},
 };
-use lemmy_db_schema::{
-  source::community::{Community, CommunityUpdateForm},
-  traits::Crud,
-};
+use lemmy_db_schema::source::community::{Community, CommunityUpdateForm};
 use lemmy_db_views_community::api::{CommunityResponse, DeleteCommunity};
 use lemmy_db_views_community_moderator::CommunityModeratorView;
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn delete_community(

crates/api/api_crud/src/community/remove.rs

@@ -13,11 +13,12 @@ use lemmy_db_schema::{
     community_report::CommunityReport,
     modlog::{Modlog, ModlogInsertForm},
   },
-  traits::{Crud, Reportable},
+  traits::Reportable,
 };
 use lemmy_db_views_community::api::{CommunityResponse, RemoveCommunity};
 use lemmy_db_views_community_moderator::CommunityModeratorView;
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn remove_community(

crates/api/api_crud/src/community/update.rs

@@ -15,18 +15,15 @@ use lemmy_api_utils::{
     slur_regex,
   },
 };
-use lemmy_db_schema::{
-  source::{
-    actor_language::{CommunityLanguage, SiteLanguage},
-    community::{Community, CommunityUpdateForm},
-    modlog::{Modlog, ModlogInsertForm},
-  },
-  traits::Crud,
-  utils::diesel_string_update,
+use lemmy_db_schema::source::{
+  actor_language::{CommunityLanguage, SiteLanguage},
+  community::{Community, CommunityUpdateForm},
+  modlog::{Modlog, ModlogInsertForm},
 };
 use lemmy_db_views_community::api::{CommunityResponse, EditCommunity};
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::{traits::Crud, utils::diesel_string_update};
 use lemmy_utils::{
   error::{LemmyErrorType, LemmyResult},
   utils::{

crates/api/api_crud/src/custom_emoji/create.rs

@@ -1,18 +1,16 @@
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
 use lemmy_api_utils::{context::LemmyContext, utils::is_admin};
-use lemmy_db_schema::{
-  source::{
-    custom_emoji::{CustomEmoji, CustomEmojiInsertForm},
-    custom_emoji_keyword::CustomEmojiKeyword,
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  custom_emoji::{CustomEmoji, CustomEmojiInsertForm},
+  custom_emoji_keyword::CustomEmojiKeyword,
 };
 use lemmy_db_views_custom_emoji::{
   CustomEmojiView,
   api::{CreateCustomEmoji, CustomEmojiResponse},
 };
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn create_custom_emoji(

crates/api/api_crud/src/custom_emoji/delete.rs

@@ -1,10 +1,11 @@
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
 use lemmy_api_utils::{context::LemmyContext, utils::is_admin};
-use lemmy_db_schema::{source::custom_emoji::CustomEmoji, traits::Crud};
+use lemmy_db_schema::source::custom_emoji::CustomEmoji;
 use lemmy_db_views_custom_emoji::api::DeleteCustomEmoji;
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::api::SuccessResponse;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn delete_custom_emoji(

crates/api/api_crud/src/custom_emoji/update.rs

@@ -1,18 +1,16 @@
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
 use lemmy_api_utils::{context::LemmyContext, utils::is_admin};
-use lemmy_db_schema::{
-  source::{
-    custom_emoji::{CustomEmoji, CustomEmojiUpdateForm},
-    custom_emoji_keyword::CustomEmojiKeyword,
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  custom_emoji::{CustomEmoji, CustomEmojiUpdateForm},
+  custom_emoji_keyword::CustomEmojiKeyword,
 };
 use lemmy_db_views_custom_emoji::{
   CustomEmojiView,
   api::{CustomEmojiResponse, EditCustomEmoji},
 };
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn update_custom_emoji(

crates/api/api_crud/src/multi_community/create.rs

@@ -6,7 +6,7 @@ use lemmy_api_utils::{
 };
 use lemmy_db_schema::{
   source::multi_community::{MultiCommunity, MultiCommunityFollowForm, MultiCommunityInsertForm},
-  traits::{ApubActor, Crud},
+  traits::ApubActor,
 };
 use lemmy_db_schema_file::enums::CommunityFollowerState;
 use lemmy_db_views_community::{
@@ -15,6 +15,7 @@ use lemmy_db_views_community::{
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::{
   error::LemmyResult,
   utils::{slurs::check_slurs, validation::is_valid_display_name},

crates/api/api_crud/src/multi_community/create_entry.rs

@@ -12,12 +12,13 @@ use lemmy_db_schema::{
     community::{Community, CommunityActions, CommunityFollowerForm},
     multi_community::{MultiCommunity, MultiCommunityEntry, MultiCommunityEntryForm},
   },
-  traits::{Crud, Followable},
+  traits::Followable,
 };
 use lemmy_db_schema_file::enums::CommunityFollowerState;
 use lemmy_db_views_community::api::{CommunityResponse, CreateOrDeleteMultiCommunityEntry};
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn create_multi_community_entry(

crates/api/api_crud/src/multi_community/delete_entry.rs

@@ -11,11 +11,12 @@ use lemmy_db_schema::{
     community::{Community, CommunityActions},
     multi_community::{MultiCommunity, MultiCommunityEntry, MultiCommunityEntryForm},
   },
-  traits::{Crud, Followable},
+  traits::Followable,
 };
 use lemmy_db_views_community::api::CreateOrDeleteMultiCommunityEntry;
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::{SiteView, api::SuccessResponse};
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn delete_multi_community_entry(

crates/api/api_crud/src/multi_community/update.rs

@@ -3,16 +3,13 @@ use activitypub_federation::config::Data;
 use actix_web::web::Json;
 use chrono::Utc;
 use lemmy_api_utils::{context::LemmyContext, utils::check_local_user_valid};
-use lemmy_db_schema::{
-  source::multi_community::{MultiCommunity, MultiCommunityUpdateForm},
-  traits::Crud,
-  utils::diesel_string_update,
-};
+use lemmy_db_schema::source::multi_community::{MultiCommunity, MultiCommunityUpdateForm};
 use lemmy_db_views_community::{
   MultiCommunityView,
   api::{MultiCommunityResponse, UpdateMultiCommunity},
 };
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::{traits::Crud, utils::diesel_string_update};
 use lemmy_utils::error::LemmyResult;
 
 pub async fn update_multi_community(

crates/api/api_crud/src/oauth_provider/create.rs

@@ -1,12 +1,10 @@
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
 use lemmy_api_utils::{context::LemmyContext, utils::is_admin};
-use lemmy_db_schema::{
-  source::oauth_provider::{OAuthProvider, OAuthProviderInsertForm},
-  traits::Crud,
-};
+use lemmy_db_schema::source::oauth_provider::{OAuthProvider, OAuthProviderInsertForm};
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::api::CreateOAuthProvider;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyError;
 use url::Url;
 

crates/api/api_crud/src/oauth_provider/delete.rs

@@ -1,9 +1,10 @@
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
 use lemmy_api_utils::{context::LemmyContext, utils::is_admin};
-use lemmy_db_schema::{source::oauth_provider::OAuthProvider, traits::Crud};
+use lemmy_db_schema::source::oauth_provider::OAuthProvider;
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::api::{DeleteOAuthProvider, SuccessResponse};
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyError;
 
 pub async fn delete_oauth_provider(

crates/api/api_crud/src/oauth_provider/update.rs

@@ -2,13 +2,13 @@ use activitypub_federation::config::Data;
 use actix_web::web::Json;
 use chrono::Utc;
 use lemmy_api_utils::{context::LemmyContext, utils::is_admin};
-use lemmy_db_schema::{
-  source::oauth_provider::{OAuthProvider, OAuthProviderUpdateForm},
+use lemmy_db_schema::source::oauth_provider::{OAuthProvider, OAuthProviderUpdateForm};
+use lemmy_db_views_local_user::LocalUserView;
+use lemmy_db_views_site::api::EditOAuthProvider;
+use lemmy_diesel_utils::{
   traits::Crud,
   utils::{diesel_required_string_update, diesel_required_url_update},
 };
-use lemmy_db_views_local_user::LocalUserView;
-use lemmy_db_views_site::api::EditOAuthProvider;
 use lemmy_utils::error::LemmyError;
 
 pub async fn update_oauth_provider(

crates/api/api_crud/src/post/create.rs

@@ -23,14 +23,14 @@ use lemmy_api_utils::{
 use lemmy_db_schema::{
   impls::actor_language::validate_post_language,
   source::post::{Post, PostActions, PostInsertForm, PostLikeForm},
-  traits::{Crud, Likeable},
-  utils::diesel_url_create,
+  traits::Likeable,
 };
 use lemmy_db_views_community::CommunityView;
 use lemmy_db_views_community_moderator::CommunityModeratorView;
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_post::api::{CreatePost, PostResponse};
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::{traits::Crud, utils::diesel_url_create};
 use lemmy_utils::{
   error::LemmyResult,
   utils::{

crates/api/api_crud/src/post/delete.rs

@@ -6,15 +6,13 @@ use lemmy_api_utils::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::check_community_user_action,
 };
-use lemmy_db_schema::{
-  source::{
-    community::Community,
-    post::{Post, PostUpdateForm},
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  community::Community,
+  post::{Post, PostUpdateForm},
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_post::api::{DeletePost, PostResponse};
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 pub async fn delete_post(

crates/api/api_crud/src/post/read.rs

@@ -9,7 +9,6 @@ use lemmy_db_schema::{
     comment::Comment,
     post::{Post, PostActions},
   },
-  traits::Crud,
 };
 use lemmy_db_views_community::CommunityView;
 use lemmy_db_views_local_user::LocalUserView;
@@ -19,6 +18,7 @@ use lemmy_db_views_search_combined::{
   impls::SearchCombinedQuery,
 };
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 pub async fn get_post(

crates/api/api_crud/src/post/remove.rs

@@ -15,10 +15,11 @@ use lemmy_db_schema::{
     post::{Post, PostUpdateForm},
     post_report::PostReport,
   },
-  traits::{Crud, Reportable},
+  traits::Reportable,
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_post::api::{PostResponse, RemovePost};
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub async fn remove_post(

crates/api/api_crud/src/post/update.rs

@@ -25,8 +25,6 @@ use lemmy_db_schema::{
     community::Community,
     post::{Post, PostUpdateForm},
   },
-  traits::Crud,
-  utils::{diesel_string_update, diesel_url_update},
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_post::{
@@ -34,6 +32,10 @@ use lemmy_db_views_post::{
   api::{EditPost, PostResponse},
 };
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::{
+  traits::Crud,
+  utils::{diesel_string_update, diesel_url_update},
+};
 use lemmy_utils::{
   error::{LemmyErrorType, LemmyResult},
   utils::{

crates/api/api_crud/src/private_message/create.rs

@@ -18,13 +18,14 @@ use lemmy_db_schema::{
     person::PersonActions,
     private_message::{PrivateMessage, PrivateMessageInsertForm},
   },
-  traits::{Blockable, Crud},
+  traits::Blockable,
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_private_message::{
   PrivateMessageView,
   api::{CreatePrivateMessage, PrivateMessageResponse},
 };
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::{error::LemmyResult, utils::validation::is_valid_body_field};
 
 pub async fn create_private_message(

crates/api/api_crud/src/private_message/delete.rs

@@ -5,15 +5,13 @@ use lemmy_api_utils::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::check_local_user_valid,
 };
-use lemmy_db_schema::{
-  source::private_message::{PrivateMessage, PrivateMessageUpdateForm},
-  traits::Crud,
-};
+use lemmy_db_schema::source::private_message::{PrivateMessage, PrivateMessageUpdateForm};
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_private_message::{
   PrivateMessageView,
   api::{DeletePrivateMessage, PrivateMessageResponse},
 };
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 pub async fn delete_private_message(

crates/api/api_crud/src/private_message/update.rs

@@ -8,15 +8,13 @@ use lemmy_api_utils::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::{check_local_user_valid, get_url_blocklist, process_markdown, slur_regex},
 };
-use lemmy_db_schema::{
-  source::private_message::{PrivateMessage, PrivateMessageUpdateForm},
-  traits::Crud,
-};
+use lemmy_db_schema::source::private_message::{PrivateMessage, PrivateMessageUpdateForm};
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_private_message::{
   PrivateMessageView,
   api::{EditPrivateMessage, PrivateMessageResponse},
 };
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::{
   error::{LemmyErrorType, LemmyResult},
   utils::validation::is_valid_body_field,

crates/api/api_crud/src/site/create.rs

@@ -14,21 +14,17 @@ use lemmy_api_utils::{
     slur_regex,
   },
 };
-use lemmy_db_schema::{
-  newtypes::DbUrl,
-  source::{
-    local_site::{LocalSite, LocalSiteUpdateForm},
-    local_site_rate_limit::{LocalSiteRateLimit, LocalSiteRateLimitUpdateForm},
-    site::{Site, SiteUpdateForm},
-  },
-  traits::Crud,
-  utils::diesel_string_update,
+use lemmy_db_schema::source::{
+  local_site::{LocalSite, LocalSiteUpdateForm},
+  local_site_rate_limit::{LocalSiteRateLimit, LocalSiteRateLimitUpdateForm},
+  site::{Site, SiteUpdateForm},
 };
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::{
   SiteView,
   api::{CreateSite, SiteResponse},
 };
+use lemmy_diesel_utils::{dburl::DbUrl, traits::Crud, utils::diesel_string_update};
 use lemmy_utils::{
   error::{LemmyErrorType, LemmyResult},
   utils::{

crates/api/api_crud/src/site/update.rs

@@ -13,17 +13,13 @@ use lemmy_api_utils::{
     slur_regex,
   },
 };
-use lemmy_db_schema::{
-  source::{
-    actor_language::SiteLanguage,
-    local_site::{LocalSite, LocalSiteUpdateForm},
-    local_site_rate_limit::{LocalSiteRateLimit, LocalSiteRateLimitUpdateForm},
-    local_site_url_blocklist::LocalSiteUrlBlocklist,
-    local_user::LocalUser,
-    site::{Site, SiteUpdateForm},
-  },
-  traits::Crud,
-  utils::{diesel_opt_number_update, diesel_string_update},
+use lemmy_db_schema::source::{
+  actor_language::SiteLanguage,
+  local_site::{LocalSite, LocalSiteUpdateForm},
+  local_site_rate_limit::{LocalSiteRateLimit, LocalSiteRateLimitUpdateForm},
+  local_site_url_blocklist::LocalSiteUrlBlocklist,
+  local_user::LocalUser,
+  site::{Site, SiteUpdateForm},
 };
 use lemmy_db_schema_file::enums::RegistrationMode;
 use lemmy_db_views_local_user::LocalUserView;
@@ -31,6 +27,10 @@ use lemmy_db_views_site::{
   SiteView,
   api::{EditSite, SiteResponse},
 };
+use lemmy_diesel_utils::{
+  traits::Crud,
+  utils::{diesel_opt_number_update, diesel_string_update},
+};
 use lemmy_utils::{
   error::LemmyResult,
   utils::{

crates/api/api_crud/src/tagline/create.rs

@@ -4,12 +4,10 @@ use lemmy_api_utils::{
   context::LemmyContext,
   utils::{get_url_blocklist, is_admin, process_markdown, slur_regex},
 };
-use lemmy_db_schema::{
-  source::tagline::{Tagline, TaglineInsertForm},
-  traits::Crud,
-};
+use lemmy_db_schema::source::tagline::{Tagline, TaglineInsertForm};
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::api::{CreateTagline, TaglineResponse};
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyError;
 
 pub async fn create_tagline(

crates/api/api_crud/src/tagline/delete.rs

@@ -1,9 +1,10 @@
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
 use lemmy_api_utils::{context::LemmyContext, utils::is_admin};
-use lemmy_db_schema::{source::tagline::Tagline, traits::Crud};
+use lemmy_db_schema::source::tagline::Tagline;
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::api::{DeleteTagline, SuccessResponse};
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyError;
 
 pub async fn delete_tagline(

crates/api/api_crud/src/tagline/update.rs

@@ -5,12 +5,10 @@ use lemmy_api_utils::{
   context::LemmyContext,
   utils::{get_url_blocklist, is_admin, process_markdown, slur_regex},
 };
-use lemmy_db_schema::{
-  source::tagline::{Tagline, TaglineUpdateForm},
-  traits::Crud,
-};
+use lemmy_db_schema::source::tagline::{Tagline, TaglineUpdateForm};
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::api::{TaglineResponse, UpdateTagline};
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyError;
 
 pub async fn update_tagline(

crates/api/api_crud/src/user/create.rs

@@ -37,8 +37,7 @@ use lemmy_db_schema::{
     post::{Post, PostActions, PostInsertForm, PostLikeForm},
     registration_application::{RegistrationApplication, RegistrationApplicationInsertForm},
   },
-  traits::{ApubActor, Crud, Likeable},
-  utils::get_conn,
+  traits::{ApubActor, Likeable},
 };
 use lemmy_db_schema_file::enums::RegistrationMode;
 use lemmy_db_views_local_user::LocalUserView;
@@ -48,6 +47,7 @@ use lemmy_db_views_site::{
   SiteView,
   api::{AuthenticateWithOauth, LoginResponse},
 };
+use lemmy_diesel_utils::{connection::get_conn, traits::Crud};
 use lemmy_email::{
   account::send_verification_email_if_required,
   admin::send_new_applicant_email_to_admins,

crates/api/api_crud/src/user/my_user.rs

@@ -38,7 +38,7 @@ pub async fn get_my_user(
     multi_community_follows,
     keyword_blocks,
     discussion_languages,
-  ) = lemmy_db_schema::try_join_with_pool!(pool => (
+  ) = lemmy_diesel_utils::try_join_with_pool!(pool => (
     |pool| CommunityFollowerView::for_person(pool, person_id),
     |pool| CommunityActions::read_blocks_for_person(pool, person_id),
     |pool| InstanceActions::read_communities_block_for_person(pool, person_id),

crates/api/api_utils/Cargo.toml

@@ -75,6 +75,7 @@ regex = { workspace = true }
 jsonwebtoken = { version = "10.1.0", features = ["rust_crypto"] }
 either.workspace = true
 derive-new.workspace = true
+lemmy_diesel_utils = { workspace = true }
 
 [dev-dependencies]
 serial_test = { workspace = true }

crates/api/api_utils/src/claims.rs

@@ -4,9 +4,9 @@ use chrono::{DateTime, Duration, Utc};
 use jsonwebtoken::{DecodingKey, EncodingKey, Header, Validation, decode, encode};
 use lemmy_db_schema::{
   newtypes::LocalUserId,
-  sensitive::SensitiveString,
   source::login_token::{LoginToken, LoginTokenCreateForm},
 };
+use lemmy_diesel_utils::sensitive::SensitiveString;
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 use serde::{Deserialize, Serialize};
 
@@ -84,14 +84,12 @@ mod tests {
 
   use crate::{claims::Claims, context::LemmyContext};
   use actix_web::test::TestRequest;
-  use lemmy_db_schema::{
-    source::{
-      instance::Instance,
-      local_user::{LocalUser, LocalUserInsertForm},
-      person::{Person, PersonInsertForm},
-    },
-    traits::Crud,
+  use lemmy_db_schema::source::{
+    instance::Instance,
+    local_user::{LocalUser, LocalUserInsertForm},
+    person::{Person, PersonInsertForm},
   };
+  use lemmy_diesel_utils::traits::Crud;
   use lemmy_utils::error::LemmyResult;
   use pretty_assertions::assert_eq;
   use serial_test::serial;

crates/api/api_utils/src/context.rs

@@ -1,9 +1,7 @@
 use crate::request::client_builder;
 use activitypub_federation::config::{Data, FederationConfig};
-use lemmy_db_schema::{
-  source::secret::Secret,
-  utils::{ActualDbPool, DbPool, build_db_pool_for_tests},
-};
+use lemmy_db_schema::source::secret::Secret;
+use lemmy_diesel_utils::connection::{ActualDbPool, DbPool, build_db_pool_for_tests};
 use lemmy_utils::{
   rate_limit::RateLimit,
   settings::{SETTINGS, structs::Settings},

crates/api/api_utils/src/notify.rs

@@ -1,6 +1,6 @@
 use crate::{context::LemmyContext, plugins::plugin_hook_notification};
 use lemmy_db_schema::{
-  newtypes::{DbUrl, PersonId},
+  newtypes::PersonId,
   source::{
     comment::Comment,
     community::{Community, CommunityActions},
@@ -10,7 +10,7 @@ use lemmy_db_schema::{
     person::{Person, PersonActions},
     post::{Post, PostActions},
   },
-  traits::{ApubActor, Blockable, Crud},
+  traits::{ApubActor, Blockable},
 };
 use lemmy_db_schema_file::enums::{
   CommunityNotificationsMode,
@@ -20,6 +20,7 @@ use lemmy_db_schema_file::enums::{
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_private_message::PrivateMessageView;
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::{dburl::DbUrl, traits::Crud};
 use lemmy_email::notifications::{NotificationEmailData, send_notification_email};
 use lemmy_utils::{
   error::{LemmyErrorType, LemmyResult},
@@ -379,13 +380,16 @@ mod tests {
       post::{Post, PostInsertForm},
       private_message::{PrivateMessage, PrivateMessageInsertForm},
     },
-    traits::{Blockable, Crud},
-    utils::{DbPool, build_db_pool_for_tests},
+    traits::Blockable,
   };
   use lemmy_db_schema_file::enums::NotificationType;
   use lemmy_db_views_local_user::LocalUserView;
   use lemmy_db_views_notification::{NotificationData, NotificationView, impls::NotificationQuery};
   use lemmy_db_views_private_message::PrivateMessageView;
+  use lemmy_diesel_utils::{
+    connection::{DbPool, build_db_pool_for_tests},
+    traits::Crud,
+  };
   use lemmy_utils::error::LemmyResult;
   use pretty_assertions::assert_eq;
   use serial_test::serial;

crates/api/api_utils/src/plugins.rs

@@ -2,12 +2,10 @@ use crate::context::LemmyContext;
 use anyhow::anyhow;
 use extism::{Manifest, PluginBuilder, Pool, PoolPlugin};
 use extism_convert::Json;
-use lemmy_db_schema::{
-  source::{notification::Notification, person::Person},
-  traits::Crud,
-};
+use lemmy_db_schema::source::{notification::Notification, person::Person};
 use lemmy_db_views_notification::NotificationView;
 use lemmy_db_views_site::api::PluginMetadata;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::{
   VERSION,
   error::{LemmyError, LemmyErrorType, LemmyResult},

crates/api/api_utils/src/request.rs

@@ -7,15 +7,13 @@ use activitypub_federation::config::Data;
 use chrono::{DateTime, Utc};
 use encoding_rs::{Encoding, UTF_8};
 use futures::StreamExt;
-use lemmy_db_schema::{
-  source::{
-    images::{ImageDetailsInsertForm, LocalImage, LocalImageForm},
-    post::{Post, PostUpdateForm},
-    site::Site,
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  images::{ImageDetailsInsertForm, LocalImage, LocalImageForm},
+  post::{Post, PostUpdateForm},
+  site::Site,
 };
 use lemmy_db_views_post::api::{LinkMetadata, OpenGraphData};
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::{
   REQWEST_TIMEOUT,
   VERSION,

crates/api/api_utils/src/send_activity.rs

@@ -2,7 +2,7 @@ use crate::context::LemmyContext;
 use activitypub_federation::config::Data;
 use either::Either;
 use lemmy_db_schema::{
-  newtypes::{CommunityId, DbUrl, PersonId},
+  newtypes::{CommunityId, PersonId},
   source::{
     comment::Comment,
     community::Community,
@@ -16,6 +16,7 @@ use lemmy_db_schema::{
 use lemmy_db_views_community::api::BanFromCommunity;
 use lemmy_db_views_post::api::DeletePost;
 use lemmy_db_views_private_message::PrivateMessageView;
+use lemmy_diesel_utils::dburl::DbUrl;
 use lemmy_utils::error::LemmyResult;
 use std::sync::LazyLock;
 use tokio::{

crates/api/api_utils/src/utils.rs

@@ -8,7 +8,7 @@ use actix_web_httpauth::headers::authorization::{Authorization, Bearer};
 use chrono::{DateTime, Days, Local, TimeZone, Utc};
 use enum_map::{EnumMap, enum_map};
 use lemmy_db_schema::{
-  newtypes::{CommunityId, DbUrl, InstanceId, PersonId, PostId, PostOrCommentId, TagId},
+  newtypes::{CommunityId, InstanceId, PersonId, PostId, PostOrCommentId, TagId},
   source::{
     comment::{Comment, CommentActions},
     community::{Community, CommunityActions, CommunityUpdateForm},
@@ -26,8 +26,7 @@ use lemmy_db_schema::{
     site::Site,
     tag::{PostTag, Tag},
   },
-  traits::{Crud, Likeable},
-  utils::DbPool,
+  traits::Likeable,
 };
 use lemmy_db_schema_file::enums::{FederationMode, RegistrationMode};
 use lemmy_db_views_community_follower_approval::PendingFollowerView;
@@ -35,6 +34,7 @@ use lemmy_db_views_community_moderator::{CommunityModeratorView, CommunityPerson
 use lemmy_db_views_local_image::LocalImageView;
 use lemmy_db_views_local_user::LocalUserView;
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::{connection::DbPool, dburl::DbUrl, traits::Crud};
 use lemmy_utils::{
   CACHE_DURATION_FEDERATION,
   CacheLock,

crates/api/routes_v3/Cargo.toml

@@ -28,6 +28,7 @@ lemmy_db_views_post = { workspace = true }
 lemmy_utils = { workspace = true }
 lemmy_api_utils = { workspace = true }
 lemmy_db_views_local_user = { workspace = true }
+lemmy_diesel_utils = { workspace = true }
 actix-web = { workspace = true }
 chrono = { workspace = true }
 url = { workspace = true }

crates/api/routes_v3/src/lib.rs

@@ -90,8 +90,7 @@ use lemmy_api_crud::{
 };
 use lemmy_api_utils::context::LemmyContext;
 use lemmy_db_schema::{
-  newtypes::{CommentId, CommunityId, DbUrl, LanguageId, PersonId, PostId},
-  sensitive::SensitiveString,
+  newtypes::{CommentId, CommunityId, LanguageId, PersonId, PostId},
   source::{
     comment::Comment,
     community::Community,
@@ -119,6 +118,7 @@ use lemmy_db_views_site::{
   SiteView,
   api::{GetSiteResponse, Login, LoginResponse, MyUserInfo, ResolveObject},
 };
+use lemmy_diesel_utils::{dburl::DbUrl, sensitive::SensitiveString};
 use lemmy_utils::{error::LemmyResult, rate_limit::RateLimit};
 use std::sync::LazyLock;
 use url::Url;
@@ -469,17 +469,11 @@ async fn list_posts_v3(
     time_range_seconds: Default::default(),
     community_id: community_id.map(|id| CommunityId(id.0)),
     community_name,
-    multi_community_id: None,
-    multi_community_name: None,
     show_hidden,
     show_read,
     show_nsfw,
-    hide_media: None,
-    mark_as_read: None,
-    no_comments_only: None,
-    page_cursor: None,
-    page_back: None,
     limit,
+    ..Default::default()
   };
   let posts = list_posts(Query(data), context, local_user_view)
     .await?

crates/apub/activities/Cargo.toml

@@ -49,6 +49,7 @@ anyhow = { workspace = true }
 serde_with.workspace = true
 enum_delegate = "0.2.0"
 either = { workspace = true }
+lemmy_diesel_utils = { workspace = true }
 
 [dev-dependencies]
 

crates/apub/activities/src/block/mod.rs

@@ -9,10 +9,9 @@ use lemmy_apub_objects::{
 use lemmy_db_schema::{
   newtypes::CommunityId,
   source::{comment::Comment, community::Community, person::Person, post::Post, site::Site},
-  traits::Crud,
-  utils::DbPool,
 };
 use lemmy_db_views_community::api::BanFromCommunity;
+use lemmy_diesel_utils::{connection::DbPool, traits::Crud};
 use lemmy_utils::error::LemmyResult;
 use url::Url;
 

crates/apub/activities/src/community/collection_add.rs

@@ -32,8 +32,8 @@ use lemmy_db_schema::{
     person::Person,
     post::{Post, PostUpdateForm},
   },
-  traits::Crud,
 };
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyError, LemmyResult};
 use url::Url;
 

crates/apub/activities/src/community/collection_remove.rs

@@ -30,8 +30,8 @@ use lemmy_db_schema::{
     modlog::{Modlog, ModlogInsertForm},
     post::{Post, PostUpdateForm},
   },
-  traits::Crud,
 };
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyError, LemmyResult};
 use url::Url;
 

crates/apub/activities/src/community/lock.rs

@@ -21,16 +21,14 @@ use lemmy_apub_objects::{
     protocol::InCommunity,
   },
 };
-use lemmy_db_schema::{
-  source::{
-    activity::ActivitySendTargets,
-    comment::Comment,
-    modlog::{Modlog, ModlogInsertForm},
-    person::Person,
-    post::{Post, PostUpdateForm},
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  activity::ActivitySendTargets,
+  comment::Comment,
+  modlog::{Modlog, ModlogInsertForm},
+  person::Person,
+  post::{Post, PostUpdateForm},
 };
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyError, LemmyResult};
 use url::Url;
 

crates/apub/activities/src/community/mod.rs

@@ -16,16 +16,14 @@ use lemmy_apub_objects::{
   },
   utils::functions::verify_mod_action,
 };
-use lemmy_db_schema::{
-  source::{
-    activity::ActivitySendTargets,
-    person::{Person, PersonActions},
-    site::Site,
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  activity::ActivitySendTargets,
+  person::{Person, PersonActions},
+  site::Site,
 };
 use lemmy_db_views_community_moderator::CommunityModeratorView;
 use lemmy_db_views_local_user::LocalUserView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 
 pub mod announce;

crates/apub/activities/src/create_or_update/comment.rs

@@ -33,9 +33,10 @@ use lemmy_db_schema::{
     person::Person,
     post::Post,
   },
-  traits::{Crud, Likeable},
+  traits::Likeable,
 };
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyError, LemmyResult};
 use serde_json::{from_value, to_value};
 use url::Url;

crates/apub/activities/src/create_or_update/post.rs

@@ -31,9 +31,10 @@ use lemmy_db_schema::{
     person::Person,
     post::{Post, PostActions, PostLikeForm, PostUpdateForm},
   },
-  traits::{Crud, Likeable},
+  traits::Likeable,
 };
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyError, LemmyResult};
 use url::Url;
 

crates/apub/activities/src/deletion/delete.rs

@@ -17,9 +17,10 @@ use lemmy_db_schema::{
     post::{Post, PostUpdateForm},
     post_report::PostReport,
   },
-  traits::{Crud, Reportable},
+  traits::Reportable,
 };
 use lemmy_db_views_community_moderator::CommunityModeratorView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyError, LemmyErrorType, LemmyResult, UntranslatedError};
 use url::Url;
 

crates/apub/activities/src/deletion/mod.rs

@@ -32,18 +32,16 @@ use lemmy_apub_objects::{
     protocol::InCommunity,
   },
 };
-use lemmy_db_schema::{
-  source::{
-    activity::ActivitySendTargets,
-    comment::{Comment, CommentUpdateForm},
-    community::{Community, CommunityUpdateForm},
-    person::Person,
-    post::{Post, PostUpdateForm},
-    private_message::{PrivateMessage as DbPrivateMessage, PrivateMessageUpdateForm},
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  activity::ActivitySendTargets,
+  comment::{Comment, CommentUpdateForm},
+  community::{Community, CommunityUpdateForm},
+  person::Person,
+  post::{Post, PostUpdateForm},
+  private_message::{PrivateMessage as DbPrivateMessage, PrivateMessageUpdateForm},
 };
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 use std::ops::Deref;
 use url::Url;

crates/apub/activities/src/deletion/undo_delete.rs

@@ -6,16 +6,14 @@ use crate::{
 use activitypub_federation::{config::Data, kinds::activity::UndoType, traits::Activity};
 use lemmy_api_utils::{context::LemmyContext, notify::notify_mod_action};
 use lemmy_apub_objects::objects::person::ApubPerson;
-use lemmy_db_schema::{
-  source::{
-    comment::{Comment, CommentUpdateForm},
-    community::{Community, CommunityUpdateForm},
-    modlog::{Modlog, ModlogInsertForm},
-    post::{Post, PostUpdateForm},
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  comment::{Comment, CommentUpdateForm},
+  community::{Community, CommunityUpdateForm},
+  modlog::{Modlog, ModlogInsertForm},
+  post::{Post, PostUpdateForm},
 };
 use lemmy_db_views_community_moderator::CommunityModeratorView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyError, LemmyErrorType, LemmyResult, UntranslatedError};
 use url::Url;
 

crates/apub/activities/src/following/mod.rs

@@ -12,8 +12,8 @@ use lemmy_apub_objects::objects::{CommunityOrMulti, UserOrCommunityOrMulti, pers
 use lemmy_db_schema::{
   newtypes::{CommunityId, PersonId},
   source::{activity::ActivitySendTargets, community::Community, person::Person},
-  traits::Crud,
 };
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyError, LemmyResult};
 use serde::Serialize;
 

crates/apub/activities/src/lib.rs

@@ -36,16 +36,14 @@ use lemmy_apub_objects::{
   objects::{PostOrComment, person::ApubPerson},
   utils::functions::GetActorType,
 };
-use lemmy_db_schema::{
-  source::{
-    activity::{ActivitySendTargets, SentActivity, SentActivityForm},
-    community::Community,
-    instance::InstanceActions,
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  activity::{ActivitySendTargets, SentActivity, SentActivityForm},
+  community::Community,
+  instance::InstanceActions,
 };
 use lemmy_db_views_post::PostView;
 use lemmy_db_views_site::SiteView;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::{LemmyError, LemmyResult, UntranslatedError};
 use serde::Serialize;
 use tracing::info;

crates/apub/activities/src/protocol/create_or_update/note.rs

@@ -10,7 +10,8 @@ use lemmy_apub_objects::{
   protocol::note::Note,
   utils::{mentions::MentionOrValue, protocol::InCommunity},
 };
-use lemmy_db_schema::{source::community::Community, traits::Crud};
+use lemmy_db_schema::source::community::Community;
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 use serde::{Deserialize, Serialize};
 use url::Url;

crates/apub/activities/src/protocol/deletion/delete.rs

@@ -11,10 +11,8 @@ use lemmy_apub_objects::{
   objects::{community::ApubCommunity, person::ApubPerson},
   utils::protocol::InCommunity,
 };
-use lemmy_db_schema::{
-  source::{community::Community, post::Post},
-  traits::Crud,
-};
+use lemmy_db_schema::source::{community::Community, post::Post};
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::error::LemmyResult;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;

crates/apub/activities/src/voting/mod.rs

@@ -19,7 +19,6 @@ use lemmy_apub_objects::objects::{
   post::ApubPost,
 };
 use lemmy_db_schema::{
-  newtypes::DbUrl,
   source::{
     activity::ActivitySendTargets,
     comment::{CommentActions, CommentLikeForm},
@@ -29,6 +28,7 @@ use lemmy_db_schema::{
   },
   traits::Likeable,
 };
+use lemmy_diesel_utils::dburl::DbUrl;
 use lemmy_utils::error::LemmyResult;
 
 pub mod undo_vote;

crates/apub/apub/Cargo.toml

@@ -33,6 +33,7 @@ lemmy_db_schema = { workspace = true, features = ["full"] }
 lemmy_api_utils = { workspace = true, features = ["full"] }
 lemmy_apub_activities = { workspace = true }
 lemmy_apub_objects = { workspace = true }
+lemmy_diesel_utils = { workspace = true }
 activitypub_federation = { workspace = true }
 lemmy_db_schema_file = { workspace = true }
 serde_json = { workspace = true }

crates/apub/apub/src/collections/community_moderators.rs

@@ -114,8 +114,8 @@ mod tests {
       site::Site,
     },
     test_data::TestData,
-    traits::Crud,
   };
+  use lemmy_diesel_utils::traits::Crud;
   use pretty_assertions::assert_eq;
   use serial_test::serial;
 

crates/apub/apub/src/http/comment.rs

@@ -7,8 +7,8 @@ use lemmy_apub_objects::{objects::comment::ApubComment, utils::functions::contex
 use lemmy_db_schema::{
   newtypes::CommentId,
   source::{comment::Comment, community::Community, post::Post},
-  traits::Crud,
 };
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::{
   FEDERATION_CONTEXT,
   error::{LemmyErrorType, LemmyResult},

crates/apub/apub/src/http/community.rs

@@ -240,8 +240,8 @@ pub(crate) mod tests {
       post::{Post, PostInsertForm},
     },
     test_data::TestData,
-    traits::Crud,
   };
+  use lemmy_diesel_utils::traits::Crud;
   use serde::de::DeserializeOwned;
   use serial_test::serial;
   use url::Url;

crates/apub/apub/src/http/post.rs

@@ -7,8 +7,8 @@ use lemmy_apub_objects::{objects::post::ApubPost, utils::functions::context_url}
 use lemmy_db_schema::{
   newtypes::PostId,
   source::{community::Community, post::Post},
-  traits::Crud,
 };
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::{
   FEDERATION_CONTEXT,
   error::{LemmyErrorType, LemmyResult},

crates/apub/apub/src/lib.rs

@@ -3,7 +3,8 @@ use async_trait::async_trait;
 use chrono::{Days, Utc};
 use lemmy_api_utils::context::LemmyContext;
 use lemmy_apub_objects::utils::functions::{check_apub_id_valid, local_site_data_cached};
-use lemmy_db_schema::{source::site::Site, utils::ActualDbPool};
+use lemmy_db_schema::source::site::Site;
+use lemmy_diesel_utils::connection::ActualDbPool;
 use lemmy_utils::error::{LemmyError, LemmyErrorType, LemmyResult, UntranslatedError};
 use url::Url;
 

crates/apub/objects/Cargo.toml

@@ -50,6 +50,7 @@ stringreader = "0.1.1"
 semver = "1.0.27"
 either = "1.15.0"
 assert-json-diff = "2.0.2"
+lemmy_diesel_utils = { workspace = true }
 
 [dev-dependencies]
 serial_test = { workspace = true }

crates/apub/objects/src/objects/comment.rs

@@ -36,15 +36,13 @@ use lemmy_api_utils::{
     slur_regex,
   },
 };
-use lemmy_db_schema::{
-  source::{
-    comment::{Comment, CommentInsertForm, CommentUpdateForm},
-    community::Community,
-    person::Person,
-    post::Post,
-  },
-  traits::Crud,
+use lemmy_db_schema::source::{
+  comment::{Comment, CommentInsertForm, CommentUpdateForm},
+  community::Community,
+  person::Person,
+  post::Post,
 };
+use lemmy_diesel_utils::traits::Crud;
 use lemmy_utils::{
   error::{LemmyError, LemmyResult, UntranslatedError},
   utils::markdown::markdown_to_html,