-use crate::{source::moderator::*, traits::Crud};
-use diesel::{dsl::*, result::Error, *};
-
+use crate::{
+ source::moderator::{
+ AdminPurgeComment,
+ AdminPurgeCommentForm,
+ AdminPurgeCommunity,
+ AdminPurgeCommunityForm,
+ AdminPurgePerson,
+ AdminPurgePersonForm,
+ AdminPurgePost,
+ AdminPurgePostForm,
+ ModAdd,
+ ModAddCommunity,
+ ModAddCommunityForm,
+ ModAddForm,
+ ModBan,
+ ModBanForm,
+ ModBanFromCommunity,
+ ModBanFromCommunityForm,
+ ModFeaturePost,
+ ModFeaturePostForm,
+ ModHideCommunity,
+ ModHideCommunityForm,
+ ModLockPost,
+ ModLockPostForm,
+ ModRemoveComment,
+ ModRemoveCommentForm,
+ ModRemoveCommunity,
+ ModRemoveCommunityForm,
+ ModRemovePost,
+ ModRemovePostForm,
+ ModTransferCommunity,
+ ModTransferCommunityForm,
+ },
+ traits::Crud,
+ utils::{get_conn, DbPool},
+};
+use diesel::{dsl::insert_into, result::Error, QueryDsl};
+use diesel_async::RunQueryDsl;
+
+#[async_trait]
impl Crud for ModRemovePost {
- type Form = ModRemovePostForm;
+ type InsertForm = ModRemovePostForm;
+ type UpdateForm = ModRemovePostForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::mod_remove_post::dsl::*;
- mod_remove_post.find(from_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::mod_remove_post::dsl::mod_remove_post;
+ let conn = &mut get_conn(pool).await?;
+ mod_remove_post.find(from_id).first::<Self>(conn).await
}
- fn create(conn: &mut PgConnection, form: &ModRemovePostForm) -> Result<Self, Error> {
- use crate::schema::mod_remove_post::dsl::*;
+ async fn create(pool: &mut DbPool<'_>, form: &ModRemovePostForm) -> Result<Self, Error> {
+ use crate::schema::mod_remove_post::dsl::mod_remove_post;
+ let conn = &mut get_conn(pool).await?;
insert_into(mod_remove_post)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(
- conn: &mut PgConnection,
+ async fn update(
+ pool: &mut DbPool<'_>,
from_id: i32,
form: &ModRemovePostForm,
) -> Result<Self, Error> {
- use crate::schema::mod_remove_post::dsl::*;
+ use crate::schema::mod_remove_post::dsl::mod_remove_post;
+ let conn = &mut get_conn(pool).await?;
diesel::update(mod_remove_post.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for ModLockPost {
- type Form = ModLockPostForm;
+ type InsertForm = ModLockPostForm;
+ type UpdateForm = ModLockPostForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::mod_lock_post::dsl::*;
- mod_lock_post.find(from_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::mod_lock_post::dsl::mod_lock_post;
+ let conn = &mut get_conn(pool).await?;
+ mod_lock_post.find(from_id).first::<Self>(conn).await
}
- fn create(conn: &mut PgConnection, form: &ModLockPostForm) -> Result<Self, Error> {
- use crate::schema::mod_lock_post::dsl::*;
+ async fn create(pool: &mut DbPool<'_>, form: &ModLockPostForm) -> Result<Self, Error> {
+ use crate::schema::mod_lock_post::dsl::mod_lock_post;
+ let conn = &mut get_conn(pool).await?;
insert_into(mod_lock_post)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(conn: &mut PgConnection, from_id: i32, form: &ModLockPostForm) -> Result<Self, Error> {
- use crate::schema::mod_lock_post::dsl::*;
+ async fn update(
+ pool: &mut DbPool<'_>,
+ from_id: i32,
+ form: &ModLockPostForm,
+ ) -> Result<Self, Error> {
+ use crate::schema::mod_lock_post::dsl::mod_lock_post;
+ let conn = &mut get_conn(pool).await?;
diesel::update(mod_lock_post.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
-impl Crud for ModStickyPost {
- type Form = ModStickyPostForm;
+#[async_trait]
+impl Crud for ModFeaturePost {
+ type InsertForm = ModFeaturePostForm;
+ type UpdateForm = ModFeaturePostForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::mod_sticky_post::dsl::*;
- mod_sticky_post.find(from_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::mod_feature_post::dsl::mod_feature_post;
+ let conn = &mut get_conn(pool).await?;
+ mod_feature_post.find(from_id).first::<Self>(conn).await
}
- fn create(conn: &mut PgConnection, form: &ModStickyPostForm) -> Result<Self, Error> {
- use crate::schema::mod_sticky_post::dsl::*;
- insert_into(mod_sticky_post)
+ async fn create(pool: &mut DbPool<'_>, form: &ModFeaturePostForm) -> Result<Self, Error> {
+ use crate::schema::mod_feature_post::dsl::mod_feature_post;
+ let conn = &mut get_conn(pool).await?;
+ insert_into(mod_feature_post)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(
- conn: &mut PgConnection,
+ async fn update(
+ pool: &mut DbPool<'_>,
from_id: i32,
- form: &ModStickyPostForm,
+ form: &ModFeaturePostForm,
) -> Result<Self, Error> {
- use crate::schema::mod_sticky_post::dsl::*;
- diesel::update(mod_sticky_post.find(from_id))
+ use crate::schema::mod_feature_post::dsl::mod_feature_post;
+ let conn = &mut get_conn(pool).await?;
+ diesel::update(mod_feature_post.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for ModRemoveComment {
- type Form = ModRemoveCommentForm;
+ type InsertForm = ModRemoveCommentForm;
+ type UpdateForm = ModRemoveCommentForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::mod_remove_comment::dsl::*;
- mod_remove_comment.find(from_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::mod_remove_comment::dsl::mod_remove_comment;
+ let conn = &mut get_conn(pool).await?;
+ mod_remove_comment.find(from_id).first::<Self>(conn).await
}
- fn create(conn: &mut PgConnection, form: &ModRemoveCommentForm) -> Result<Self, Error> {
- use crate::schema::mod_remove_comment::dsl::*;
+ async fn create(pool: &mut DbPool<'_>, form: &ModRemoveCommentForm) -> Result<Self, Error> {
+ use crate::schema::mod_remove_comment::dsl::mod_remove_comment;
+ let conn = &mut get_conn(pool).await?;
insert_into(mod_remove_comment)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(
- conn: &mut PgConnection,
+ async fn update(
+ pool: &mut DbPool<'_>,
from_id: i32,
form: &ModRemoveCommentForm,
) -> Result<Self, Error> {
- use crate::schema::mod_remove_comment::dsl::*;
+ use crate::schema::mod_remove_comment::dsl::mod_remove_comment;
+ let conn = &mut get_conn(pool).await?;
diesel::update(mod_remove_comment.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for ModRemoveCommunity {
- type Form = ModRemoveCommunityForm;
+ type InsertForm = ModRemoveCommunityForm;
+ type UpdateForm = ModRemoveCommunityForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::mod_remove_community::dsl::*;
- mod_remove_community.find(from_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::mod_remove_community::dsl::mod_remove_community;
+ let conn = &mut get_conn(pool).await?;
+ mod_remove_community.find(from_id).first::<Self>(conn).await
}
- fn create(conn: &mut PgConnection, form: &ModRemoveCommunityForm) -> Result<Self, Error> {
- use crate::schema::mod_remove_community::dsl::*;
+ async fn create(pool: &mut DbPool<'_>, form: &ModRemoveCommunityForm) -> Result<Self, Error> {
+ use crate::schema::mod_remove_community::dsl::mod_remove_community;
+ let conn = &mut get_conn(pool).await?;
insert_into(mod_remove_community)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(
- conn: &mut PgConnection,
+ async fn update(
+ pool: &mut DbPool<'_>,
from_id: i32,
form: &ModRemoveCommunityForm,
) -> Result<Self, Error> {
- use crate::schema::mod_remove_community::dsl::*;
+ use crate::schema::mod_remove_community::dsl::mod_remove_community;
+ let conn = &mut get_conn(pool).await?;
diesel::update(mod_remove_community.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for ModBanFromCommunity {
- type Form = ModBanFromCommunityForm;
+ type InsertForm = ModBanFromCommunityForm;
+ type UpdateForm = ModBanFromCommunityForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::mod_ban_from_community::dsl::*;
- mod_ban_from_community.find(from_id).first::<Self>(conn)
- }
-
- fn create(conn: &mut PgConnection, form: &ModBanFromCommunityForm) -> Result<Self, Error> {
- use crate::schema::mod_ban_from_community::dsl::*;
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::mod_ban_from_community::dsl::mod_ban_from_community;
+ let conn = &mut get_conn(pool).await?;
+ mod_ban_from_community
+ .find(from_id)
+ .first::<Self>(conn)
+ .await
+ }
+
+ async fn create(pool: &mut DbPool<'_>, form: &ModBanFromCommunityForm) -> Result<Self, Error> {
+ use crate::schema::mod_ban_from_community::dsl::mod_ban_from_community;
+ let conn = &mut get_conn(pool).await?;
insert_into(mod_ban_from_community)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(
- conn: &mut PgConnection,
+ async fn update(
+ pool: &mut DbPool<'_>,
from_id: i32,
form: &ModBanFromCommunityForm,
) -> Result<Self, Error> {
- use crate::schema::mod_ban_from_community::dsl::*;
+ use crate::schema::mod_ban_from_community::dsl::mod_ban_from_community;
+ let conn = &mut get_conn(pool).await?;
diesel::update(mod_ban_from_community.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for ModBan {
- type Form = ModBanForm;
+ type InsertForm = ModBanForm;
+ type UpdateForm = ModBanForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::mod_ban::dsl::*;
- mod_ban.find(from_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::mod_ban::dsl::mod_ban;
+ let conn = &mut get_conn(pool).await?;
+ mod_ban.find(from_id).first::<Self>(conn).await
}
- fn create(conn: &mut PgConnection, form: &ModBanForm) -> Result<Self, Error> {
- use crate::schema::mod_ban::dsl::*;
- insert_into(mod_ban).values(form).get_result::<Self>(conn)
+ async fn create(pool: &mut DbPool<'_>, form: &ModBanForm) -> Result<Self, Error> {
+ use crate::schema::mod_ban::dsl::mod_ban;
+ let conn = &mut get_conn(pool).await?;
+ insert_into(mod_ban)
+ .values(form)
+ .get_result::<Self>(conn)
+ .await
}
- fn update(conn: &mut PgConnection, from_id: i32, form: &ModBanForm) -> Result<Self, Error> {
- use crate::schema::mod_ban::dsl::*;
+ async fn update(pool: &mut DbPool<'_>, from_id: i32, form: &ModBanForm) -> Result<Self, Error> {
+ use crate::schema::mod_ban::dsl::mod_ban;
+ let conn = &mut get_conn(pool).await?;
diesel::update(mod_ban.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for ModHideCommunity {
- type Form = ModHideCommunityForm;
+ type InsertForm = ModHideCommunityForm;
+ type UpdateForm = ModHideCommunityForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::mod_hide_community::dsl::*;
- mod_hide_community.find(from_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::mod_hide_community::dsl::mod_hide_community;
+ let conn = &mut get_conn(pool).await?;
+ mod_hide_community.find(from_id).first::<Self>(conn).await
}
- fn create(conn: &mut PgConnection, form: &ModHideCommunityForm) -> Result<Self, Error> {
- use crate::schema::mod_hide_community::dsl::*;
+ async fn create(pool: &mut DbPool<'_>, form: &ModHideCommunityForm) -> Result<Self, Error> {
+ use crate::schema::mod_hide_community::dsl::mod_hide_community;
+ let conn = &mut get_conn(pool).await?;
insert_into(mod_hide_community)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(
- conn: &mut PgConnection,
+ async fn update(
+ pool: &mut DbPool<'_>,
from_id: i32,
form: &ModHideCommunityForm,
) -> Result<Self, Error> {
- use crate::schema::mod_hide_community::dsl::*;
+ use crate::schema::mod_hide_community::dsl::mod_hide_community;
+ let conn = &mut get_conn(pool).await?;
diesel::update(mod_hide_community.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for ModAddCommunity {
- type Form = ModAddCommunityForm;
+ type InsertForm = ModAddCommunityForm;
+ type UpdateForm = ModAddCommunityForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::mod_add_community::dsl::*;
- mod_add_community.find(from_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::mod_add_community::dsl::mod_add_community;
+ let conn = &mut get_conn(pool).await?;
+ mod_add_community.find(from_id).first::<Self>(conn).await
}
- fn create(conn: &mut PgConnection, form: &ModAddCommunityForm) -> Result<Self, Error> {
- use crate::schema::mod_add_community::dsl::*;
+ async fn create(pool: &mut DbPool<'_>, form: &ModAddCommunityForm) -> Result<Self, Error> {
+ use crate::schema::mod_add_community::dsl::mod_add_community;
+ let conn = &mut get_conn(pool).await?;
insert_into(mod_add_community)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(
- conn: &mut PgConnection,
+ async fn update(
+ pool: &mut DbPool<'_>,
from_id: i32,
form: &ModAddCommunityForm,
) -> Result<Self, Error> {
- use crate::schema::mod_add_community::dsl::*;
+ use crate::schema::mod_add_community::dsl::mod_add_community;
+ let conn = &mut get_conn(pool).await?;
diesel::update(mod_add_community.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for ModTransferCommunity {
- type Form = ModTransferCommunityForm;
+ type InsertForm = ModTransferCommunityForm;
+ type UpdateForm = ModTransferCommunityForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::mod_transfer_community::dsl::*;
- mod_transfer_community.find(from_id).first::<Self>(conn)
- }
-
- fn create(conn: &mut PgConnection, form: &ModTransferCommunityForm) -> Result<Self, Error> {
- use crate::schema::mod_transfer_community::dsl::*;
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::mod_transfer_community::dsl::mod_transfer_community;
+ let conn = &mut get_conn(pool).await?;
+ mod_transfer_community
+ .find(from_id)
+ .first::<Self>(conn)
+ .await
+ }
+
+ async fn create(pool: &mut DbPool<'_>, form: &ModTransferCommunityForm) -> Result<Self, Error> {
+ use crate::schema::mod_transfer_community::dsl::mod_transfer_community;
+ let conn = &mut get_conn(pool).await?;
insert_into(mod_transfer_community)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(
- conn: &mut PgConnection,
+ async fn update(
+ pool: &mut DbPool<'_>,
from_id: i32,
form: &ModTransferCommunityForm,
) -> Result<Self, Error> {
- use crate::schema::mod_transfer_community::dsl::*;
+ use crate::schema::mod_transfer_community::dsl::mod_transfer_community;
+ let conn = &mut get_conn(pool).await?;
diesel::update(mod_transfer_community.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for ModAdd {
- type Form = ModAddForm;
+ type InsertForm = ModAddForm;
+ type UpdateForm = ModAddForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::mod_add::dsl::*;
- mod_add.find(from_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::mod_add::dsl::mod_add;
+ let conn = &mut get_conn(pool).await?;
+ mod_add.find(from_id).first::<Self>(conn).await
}
- fn create(conn: &mut PgConnection, form: &ModAddForm) -> Result<Self, Error> {
- use crate::schema::mod_add::dsl::*;
- insert_into(mod_add).values(form).get_result::<Self>(conn)
+ async fn create(pool: &mut DbPool<'_>, form: &ModAddForm) -> Result<Self, Error> {
+ use crate::schema::mod_add::dsl::mod_add;
+ let conn = &mut get_conn(pool).await?;
+ insert_into(mod_add)
+ .values(form)
+ .get_result::<Self>(conn)
+ .await
}
- fn update(conn: &mut PgConnection, from_id: i32, form: &ModAddForm) -> Result<Self, Error> {
- use crate::schema::mod_add::dsl::*;
+ async fn update(pool: &mut DbPool<'_>, from_id: i32, form: &ModAddForm) -> Result<Self, Error> {
+ use crate::schema::mod_add::dsl::mod_add;
+ let conn = &mut get_conn(pool).await?;
diesel::update(mod_add.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for AdminPurgePerson {
- type Form = AdminPurgePersonForm;
+ type InsertForm = AdminPurgePersonForm;
+ type UpdateForm = AdminPurgePersonForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::admin_purge_person::dsl::*;
- admin_purge_person.find(from_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::admin_purge_person::dsl::admin_purge_person;
+ let conn = &mut get_conn(pool).await?;
+ admin_purge_person.find(from_id).first::<Self>(conn).await
}
- fn create(conn: &mut PgConnection, form: &Self::Form) -> Result<Self, Error> {
- use crate::schema::admin_purge_person::dsl::*;
+ async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error> {
+ use crate::schema::admin_purge_person::dsl::admin_purge_person;
+ let conn = &mut get_conn(pool).await?;
insert_into(admin_purge_person)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(conn: &mut PgConnection, from_id: i32, form: &Self::Form) -> Result<Self, Error> {
- use crate::schema::admin_purge_person::dsl::*;
+ async fn update(
+ pool: &mut DbPool<'_>,
+ from_id: i32,
+ form: &Self::InsertForm,
+ ) -> Result<Self, Error> {
+ use crate::schema::admin_purge_person::dsl::admin_purge_person;
+ let conn = &mut get_conn(pool).await?;
diesel::update(admin_purge_person.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for AdminPurgeCommunity {
- type Form = AdminPurgeCommunityForm;
+ type InsertForm = AdminPurgeCommunityForm;
+ type UpdateForm = AdminPurgeCommunityForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::admin_purge_community::dsl::*;
- admin_purge_community.find(from_id).first::<Self>(conn)
- }
-
- fn create(conn: &mut PgConnection, form: &Self::Form) -> Result<Self, Error> {
- use crate::schema::admin_purge_community::dsl::*;
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::admin_purge_community::dsl::admin_purge_community;
+ let conn = &mut get_conn(pool).await?;
+ admin_purge_community
+ .find(from_id)
+ .first::<Self>(conn)
+ .await
+ }
+
+ async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error> {
+ use crate::schema::admin_purge_community::dsl::admin_purge_community;
+ let conn = &mut get_conn(pool).await?;
insert_into(admin_purge_community)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(conn: &mut PgConnection, from_id: i32, form: &Self::Form) -> Result<Self, Error> {
- use crate::schema::admin_purge_community::dsl::*;
+ async fn update(
+ pool: &mut DbPool<'_>,
+ from_id: i32,
+ form: &Self::InsertForm,
+ ) -> Result<Self, Error> {
+ use crate::schema::admin_purge_community::dsl::admin_purge_community;
+ let conn = &mut get_conn(pool).await?;
diesel::update(admin_purge_community.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for AdminPurgePost {
- type Form = AdminPurgePostForm;
+ type InsertForm = AdminPurgePostForm;
+ type UpdateForm = AdminPurgePostForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::admin_purge_post::dsl::*;
- admin_purge_post.find(from_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::admin_purge_post::dsl::admin_purge_post;
+ let conn = &mut get_conn(pool).await?;
+ admin_purge_post.find(from_id).first::<Self>(conn).await
}
- fn create(conn: &mut PgConnection, form: &Self::Form) -> Result<Self, Error> {
- use crate::schema::admin_purge_post::dsl::*;
+ async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error> {
+ use crate::schema::admin_purge_post::dsl::admin_purge_post;
+ let conn = &mut get_conn(pool).await?;
insert_into(admin_purge_post)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(conn: &mut PgConnection, from_id: i32, form: &Self::Form) -> Result<Self, Error> {
- use crate::schema::admin_purge_post::dsl::*;
+ async fn update(
+ pool: &mut DbPool<'_>,
+ from_id: i32,
+ form: &Self::InsertForm,
+ ) -> Result<Self, Error> {
+ use crate::schema::admin_purge_post::dsl::admin_purge_post;
+ let conn = &mut get_conn(pool).await?;
diesel::update(admin_purge_post.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
+#[async_trait]
impl Crud for AdminPurgeComment {
- type Form = AdminPurgeCommentForm;
+ type InsertForm = AdminPurgeCommentForm;
+ type UpdateForm = AdminPurgeCommentForm;
type IdType = i32;
- fn read(conn: &mut PgConnection, from_id: i32) -> Result<Self, Error> {
- use crate::schema::admin_purge_comment::dsl::*;
- admin_purge_comment.find(from_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, from_id: i32) -> Result<Self, Error> {
+ use crate::schema::admin_purge_comment::dsl::admin_purge_comment;
+ let conn = &mut get_conn(pool).await?;
+ admin_purge_comment.find(from_id).first::<Self>(conn).await
}
- fn create(conn: &mut PgConnection, form: &Self::Form) -> Result<Self, Error> {
- use crate::schema::admin_purge_comment::dsl::*;
+ async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error> {
+ use crate::schema::admin_purge_comment::dsl::admin_purge_comment;
+ let conn = &mut get_conn(pool).await?;
insert_into(admin_purge_comment)
.values(form)
.get_result::<Self>(conn)
+ .await
}
- fn update(conn: &mut PgConnection, from_id: i32, form: &Self::Form) -> Result<Self, Error> {
- use crate::schema::admin_purge_comment::dsl::*;
+ async fn update(
+ pool: &mut DbPool<'_>,
+ from_id: i32,
+ form: &Self::InsertForm,
+ ) -> Result<Self, Error> {
+ use crate::schema::admin_purge_comment::dsl::admin_purge_comment;
+ let conn = &mut get_conn(pool).await?;
diesel::update(admin_purge_comment.find(from_id))
.set(form)
.get_result::<Self>(conn)
+ .await
}
}
#[cfg(test)]
mod tests {
+ #![allow(clippy::unwrap_used)]
+ #![allow(clippy::indexing_slicing)]
+
use crate::{
- source::{comment::*, community::*, moderator::*, person::*, post::*},
+ source::{
+ comment::{Comment, CommentInsertForm},
+ community::{Community, CommunityInsertForm},
+ instance::Instance,
+ moderator::{
+ ModAdd,
+ ModAddCommunity,
+ ModAddCommunityForm,
+ ModAddForm,
+ ModBan,
+ ModBanForm,
+ ModBanFromCommunity,
+ ModBanFromCommunityForm,
+ ModFeaturePost,
+ ModFeaturePostForm,
+ ModLockPost,
+ ModLockPostForm,
+ ModRemoveComment,
+ ModRemoveCommentForm,
+ ModRemoveCommunity,
+ ModRemoveCommunityForm,
+ ModRemovePost,
+ ModRemovePostForm,
+ },
+ person::{Person, PersonInsertForm},
+ post::{Post, PostInsertForm},
+ },
traits::Crud,
- utils::establish_unpooled_connection,
+ utils::build_db_pool_for_tests,
};
use serial_test::serial;
- // use Crud;
- #[test]
+ #[tokio::test]
#[serial]
- fn test_crud() {
- let conn = &mut establish_unpooled_connection();
+ async fn test_crud() {
+ let pool = &build_db_pool_for_tests().await;
+ let pool = &mut pool.into();
- let new_mod = PersonForm {
- name: "the mod".into(),
- public_key: Some("pubkey".to_string()),
- ..PersonForm::default()
- };
+ let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
+ .await
+ .unwrap();
- let inserted_mod = Person::create(conn, &new_mod).unwrap();
+ let new_mod = PersonInsertForm::builder()
+ .name("the mod".into())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
- let new_person = PersonForm {
- name: "jim2".into(),
- public_key: Some("pubkey".to_string()),
- ..PersonForm::default()
- };
+ let inserted_mod = Person::create(pool, &new_mod).await.unwrap();
- let inserted_person = Person::create(conn, &new_person).unwrap();
+ let new_person = PersonInsertForm::builder()
+ .name("jim2".into())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
- let new_community = CommunityForm {
- name: "mod_community".to_string(),
- title: "nada".to_owned(),
- public_key: Some("pubkey".to_string()),
- ..CommunityForm::default()
- };
+ let inserted_person = Person::create(pool, &new_person).await.unwrap();
- let inserted_community = Community::create(conn, &new_community).unwrap();
+ let new_community = CommunityInsertForm::builder()
+ .name("mod_community".to_string())
+ .title("nada".to_owned())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
- let new_post = PostForm {
- name: "A test post thweep".into(),
- creator_id: inserted_person.id,
- community_id: inserted_community.id,
- ..PostForm::default()
- };
+ let inserted_community = Community::create(pool, &new_community).await.unwrap();
- let inserted_post = Post::create(conn, &new_post).unwrap();
+ let new_post = PostInsertForm::builder()
+ .name("A test post thweep".into())
+ .creator_id(inserted_person.id)
+ .community_id(inserted_community.id)
+ .build();
- let comment_form = CommentForm {
- content: "A test comment".into(),
- creator_id: inserted_person.id,
- post_id: inserted_post.id,
- ..CommentForm::default()
- };
+ let inserted_post = Post::create(pool, &new_post).await.unwrap();
+
+ let comment_form = CommentInsertForm::builder()
+ .content("A test comment".into())
+ .creator_id(inserted_person.id)
+ .post_id(inserted_post.id)
+ .build();
- let inserted_comment = Comment::create(conn, &comment_form, None).unwrap();
+ let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap();
// Now the actual tests
reason: None,
removed: None,
};
- let inserted_mod_remove_post = ModRemovePost::create(conn, &mod_remove_post_form).unwrap();
- let read_mod_remove_post = ModRemovePost::read(conn, inserted_mod_remove_post.id).unwrap();
+ let inserted_mod_remove_post = ModRemovePost::create(pool, &mod_remove_post_form)
+ .await
+ .unwrap();
+ let read_mod_remove_post = ModRemovePost::read(pool, inserted_mod_remove_post.id)
+ .await
+ .unwrap();
let expected_mod_remove_post = ModRemovePost {
id: inserted_mod_remove_post.id,
post_id: inserted_post.id,
mod_person_id: inserted_mod.id,
reason: None,
- removed: Some(true),
+ removed: true,
when_: inserted_mod_remove_post.when_,
};
post_id: inserted_post.id,
locked: None,
};
- let inserted_mod_lock_post = ModLockPost::create(conn, &mod_lock_post_form).unwrap();
- let read_mod_lock_post = ModLockPost::read(conn, inserted_mod_lock_post.id).unwrap();
+ let inserted_mod_lock_post = ModLockPost::create(pool, &mod_lock_post_form)
+ .await
+ .unwrap();
+ let read_mod_lock_post = ModLockPost::read(pool, inserted_mod_lock_post.id)
+ .await
+ .unwrap();
let expected_mod_lock_post = ModLockPost {
id: inserted_mod_lock_post.id,
post_id: inserted_post.id,
mod_person_id: inserted_mod.id,
- locked: Some(true),
+ locked: true,
when_: inserted_mod_lock_post.when_,
};
- // sticky post
+ // feature post
- let mod_sticky_post_form = ModStickyPostForm {
+ let mod_feature_post_form = ModFeaturePostForm {
mod_person_id: inserted_mod.id,
post_id: inserted_post.id,
- stickied: None,
+ featured: false,
+ is_featured_community: true,
};
- let inserted_mod_sticky_post = ModStickyPost::create(conn, &mod_sticky_post_form).unwrap();
- let read_mod_sticky_post = ModStickyPost::read(conn, inserted_mod_sticky_post.id).unwrap();
- let expected_mod_sticky_post = ModStickyPost {
- id: inserted_mod_sticky_post.id,
+ let inserted_mod_feature_post = ModFeaturePost::create(pool, &mod_feature_post_form)
+ .await
+ .unwrap();
+ let read_mod_feature_post = ModFeaturePost::read(pool, inserted_mod_feature_post.id)
+ .await
+ .unwrap();
+ let expected_mod_feature_post = ModFeaturePost {
+ id: inserted_mod_feature_post.id,
post_id: inserted_post.id,
mod_person_id: inserted_mod.id,
- stickied: Some(true),
- when_: inserted_mod_sticky_post.when_,
+ featured: false,
+ is_featured_community: true,
+ when_: inserted_mod_feature_post.when_,
};
// comment
reason: None,
removed: None,
};
- let inserted_mod_remove_comment =
- ModRemoveComment::create(conn, &mod_remove_comment_form).unwrap();
- let read_mod_remove_comment =
- ModRemoveComment::read(conn, inserted_mod_remove_comment.id).unwrap();
+ let inserted_mod_remove_comment = ModRemoveComment::create(pool, &mod_remove_comment_form)
+ .await
+ .unwrap();
+ let read_mod_remove_comment = ModRemoveComment::read(pool, inserted_mod_remove_comment.id)
+ .await
+ .unwrap();
let expected_mod_remove_comment = ModRemoveComment {
id: inserted_mod_remove_comment.id,
comment_id: inserted_comment.id,
mod_person_id: inserted_mod.id,
reason: None,
- removed: Some(true),
+ removed: true,
when_: inserted_mod_remove_comment.when_,
};
expires: None,
};
let inserted_mod_remove_community =
- ModRemoveCommunity::create(conn, &mod_remove_community_form).unwrap();
+ ModRemoveCommunity::create(pool, &mod_remove_community_form)
+ .await
+ .unwrap();
let read_mod_remove_community =
- ModRemoveCommunity::read(conn, inserted_mod_remove_community.id).unwrap();
+ ModRemoveCommunity::read(pool, inserted_mod_remove_community.id)
+ .await
+ .unwrap();
let expected_mod_remove_community = ModRemoveCommunity {
id: inserted_mod_remove_community.id,
community_id: inserted_community.id,
mod_person_id: inserted_mod.id,
reason: None,
- removed: Some(true),
+ removed: true,
expires: None,
when_: inserted_mod_remove_community.when_,
};
expires: None,
};
let inserted_mod_ban_from_community =
- ModBanFromCommunity::create(conn, &mod_ban_from_community_form).unwrap();
+ ModBanFromCommunity::create(pool, &mod_ban_from_community_form)
+ .await
+ .unwrap();
let read_mod_ban_from_community =
- ModBanFromCommunity::read(conn, inserted_mod_ban_from_community.id).unwrap();
+ ModBanFromCommunity::read(pool, inserted_mod_ban_from_community.id)
+ .await
+ .unwrap();
let expected_mod_ban_from_community = ModBanFromCommunity {
id: inserted_mod_ban_from_community.id,
community_id: inserted_community.id,
mod_person_id: inserted_mod.id,
other_person_id: inserted_person.id,
reason: None,
- banned: Some(true),
+ banned: true,
expires: None,
when_: inserted_mod_ban_from_community.when_,
};
banned: None,
expires: None,
};
- let inserted_mod_ban = ModBan::create(conn, &mod_ban_form).unwrap();
- let read_mod_ban = ModBan::read(conn, inserted_mod_ban.id).unwrap();
+ let inserted_mod_ban = ModBan::create(pool, &mod_ban_form).await.unwrap();
+ let read_mod_ban = ModBan::read(pool, inserted_mod_ban.id).await.unwrap();
let expected_mod_ban = ModBan {
id: inserted_mod_ban.id,
mod_person_id: inserted_mod.id,
other_person_id: inserted_person.id,
reason: None,
- banned: Some(true),
+ banned: true,
expires: None,
when_: inserted_mod_ban.when_,
};
community_id: inserted_community.id,
removed: None,
};
- let inserted_mod_add_community =
- ModAddCommunity::create(conn, &mod_add_community_form).unwrap();
- let read_mod_add_community =
- ModAddCommunity::read(conn, inserted_mod_add_community.id).unwrap();
+ let inserted_mod_add_community = ModAddCommunity::create(pool, &mod_add_community_form)
+ .await
+ .unwrap();
+ let read_mod_add_community = ModAddCommunity::read(pool, inserted_mod_add_community.id)
+ .await
+ .unwrap();
let expected_mod_add_community = ModAddCommunity {
id: inserted_mod_add_community.id,
community_id: inserted_community.id,
mod_person_id: inserted_mod.id,
other_person_id: inserted_person.id,
- removed: Some(false),
+ removed: false,
when_: inserted_mod_add_community.when_,
};
other_person_id: inserted_person.id,
removed: None,
};
- let inserted_mod_add = ModAdd::create(conn, &mod_add_form).unwrap();
- let read_mod_add = ModAdd::read(conn, inserted_mod_add.id).unwrap();
+ let inserted_mod_add = ModAdd::create(pool, &mod_add_form).await.unwrap();
+ let read_mod_add = ModAdd::read(pool, inserted_mod_add.id).await.unwrap();
let expected_mod_add = ModAdd {
id: inserted_mod_add.id,
mod_person_id: inserted_mod.id,
other_person_id: inserted_person.id,
- removed: Some(false),
+ removed: false,
when_: inserted_mod_add.when_,
};
- Comment::delete(conn, inserted_comment.id).unwrap();
- Post::delete(conn, inserted_post.id).unwrap();
- Community::delete(conn, inserted_community.id).unwrap();
- Person::delete(conn, inserted_person.id).unwrap();
- Person::delete(conn, inserted_mod.id).unwrap();
+ Comment::delete(pool, inserted_comment.id).await.unwrap();
+ Post::delete(pool, inserted_post.id).await.unwrap();
+ Community::delete(pool, inserted_community.id)
+ .await
+ .unwrap();
+ Person::delete(pool, inserted_person.id).await.unwrap();
+ Person::delete(pool, inserted_mod.id).await.unwrap();
+ Instance::delete(pool, inserted_instance.id).await.unwrap();
assert_eq!(expected_mod_remove_post, read_mod_remove_post);
assert_eq!(expected_mod_lock_post, read_mod_lock_post);
- assert_eq!(expected_mod_sticky_post, read_mod_sticky_post);
+ assert_eq!(expected_mod_feature_post, read_mod_feature_post);
assert_eq!(expected_mod_remove_comment, read_mod_remove_comment);
assert_eq!(expected_mod_remove_community, read_mod_remove_community);
assert_eq!(expected_mod_ban_from_community, read_mod_ban_from_community);
projects / lemmy.git / blobdiff