}
// Mod tables
- // TODO there should probably be another table for transfer community
- // Right now, it will just look like it modded them twice
- let form = ModAddCommunityForm {
+ let form = ModTransferCommunityForm {
mod_person_id: local_user_view.person.id,
other_person_id: data.person_id,
community_id: data.community_id,
removed: Some(false),
};
blocking(context.pool(), move |conn| {
- ModAddCommunity::create(conn, &form)
+ ModTransferCommunity::create(conn, &form)
})
.await??;
mod_remove_community_view::ModRemoveCommunityView,
mod_remove_post_view::ModRemovePostView,
mod_sticky_post_view::ModStickyPostView,
+ mod_transfer_community_view::ModTransferCommunityView,
};
use lemmy_utils::{
location_info,
})
.await??;
+ let transferred_to_community = blocking(context.pool(), move |conn| {
+ ModTransferCommunityView::list(conn, community_id, mod_person_id, page, limit)
+ })
+ .await??;
+
// These arrays are only for the full modlog, when a community isn't given
let (removed_communities, banned, added) = if data.community_id.is_none() {
blocking(context.pool(), move |conn| {
banned,
added_to_community,
added,
+ transferred_to_community,
})
}
}
mod_remove_community_view::ModRemoveCommunityView,
mod_remove_post_view::ModRemovePostView,
mod_sticky_post_view::ModStickyPostView,
+ mod_transfer_community_view::ModTransferCommunityView,
};
use serde::{Deserialize, Serialize};
pub banned_from_community: Vec<ModBanFromCommunityView>,
pub banned: Vec<ModBanView>,
pub added_to_community: Vec<ModAddCommunityView>,
+ pub transferred_to_community: Vec<ModTransferCommunityView>,
pub added: Vec<ModAddView>,
}
}
}
+impl Crud for ModTransferCommunity {
+ type Form = ModTransferCommunityForm;
+ type IdType = i32;
+ fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
+ use lemmy_db_schema::schema::mod_transfer_community::dsl::*;
+ mod_transfer_community.find(from_id).first::<Self>(conn)
+ }
+
+ fn create(conn: &PgConnection, form: &ModTransferCommunityForm) -> Result<Self, Error> {
+ use lemmy_db_schema::schema::mod_transfer_community::dsl::*;
+ insert_into(mod_transfer_community)
+ .values(form)
+ .get_result::<Self>(conn)
+ }
+
+ fn update(
+ conn: &PgConnection,
+ from_id: i32,
+ form: &ModTransferCommunityForm,
+ ) -> Result<Self, Error> {
+ use lemmy_db_schema::schema::mod_transfer_community::dsl::*;
+ diesel::update(mod_transfer_community.find(from_id))
+ .set(form)
+ .get_result::<Self>(conn)
+ }
+}
+
impl Crud for ModAdd {
type Form = ModAddForm;
type IdType = i32;
}
}
+table! {
+ mod_transfer_community (id) {
+ id -> Int4,
+ mod_person_id -> Int4,
+ other_person_id -> Int4,
+ community_id -> Int4,
+ removed -> Nullable<Bool>,
+ when_ -> Timestamp,
+ }
+}
+
table! {
mod_ban (id) {
id -> Int4,
joinable!(community_person_ban -> person (person_id));
joinable!(local_user -> person (person_id));
joinable!(mod_add_community -> community (community_id));
+joinable!(mod_transfer_community -> community (community_id));
joinable!(mod_ban_from_community -> community (community_id));
joinable!(mod_lock_post -> person (mod_person_id));
joinable!(mod_lock_post -> post (post_id));
local_user,
mod_add,
mod_add_community,
+ mod_transfer_community,
mod_ban,
mod_ban_from_community,
mod_lock_post,
mod_remove_community,
mod_remove_post,
mod_sticky_post,
+ mod_transfer_community,
},
CommentId,
CommunityId,
pub removed: Option<bool>,
}
+#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
+#[table_name = "mod_transfer_community"]
+pub struct ModTransferCommunity {
+ pub id: i32,
+ pub mod_person_id: PersonId,
+ pub other_person_id: PersonId,
+ pub community_id: CommunityId,
+ pub removed: Option<bool>,
+ pub when_: chrono::NaiveDateTime,
+}
+
+#[derive(Insertable, AsChangeset)]
+#[table_name = "mod_transfer_community"]
+pub struct ModTransferCommunityForm {
+ pub mod_person_id: PersonId,
+ pub other_person_id: PersonId,
+ pub community_id: CommunityId,
+ pub removed: Option<bool>,
+}
+
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
#[table_name = "mod_add"]
pub struct ModAdd {
pub mod mod_remove_community_view;
pub mod mod_remove_post_view;
pub mod mod_sticky_post_view;
+pub mod mod_transfer_community_view;
--- /dev/null
+use diesel::{result::Error, *};
+use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
+use lemmy_db_schema::{
+ schema::{community, mod_transfer_community, person, person_alias_1},
+ source::{
+ community::{Community, CommunitySafe},
+ moderator::ModTransferCommunity,
+ person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
+ },
+ CommunityId,
+ PersonId,
+};
+use serde::Serialize;
+
+#[derive(Debug, Serialize, Clone)]
+pub struct ModTransferCommunityView {
+ pub mod_transfer_community: ModTransferCommunity,
+ pub moderator: PersonSafe,
+ pub community: CommunitySafe,
+ pub modded_person: PersonSafeAlias1,
+}
+
+type ModTransferCommunityViewTuple = (
+ ModTransferCommunity,
+ PersonSafe,
+ CommunitySafe,
+ PersonSafeAlias1,
+);
+
+impl ModTransferCommunityView {
+ pub fn list(
+ conn: &PgConnection,
+ community_id: Option<CommunityId>,
+ mod_person_id: Option<PersonId>,
+ page: Option<i64>,
+ limit: Option<i64>,
+ ) -> Result<Vec<Self>, Error> {
+ let mut query = mod_transfer_community::table
+ .inner_join(person::table.on(mod_transfer_community::mod_person_id.eq(person::id)))
+ .inner_join(community::table)
+ .inner_join(
+ person_alias_1::table.on(mod_transfer_community::other_person_id.eq(person_alias_1::id)),
+ )
+ .select((
+ mod_transfer_community::all_columns,
+ Person::safe_columns_tuple(),
+ Community::safe_columns_tuple(),
+ PersonAlias1::safe_columns_tuple(),
+ ))
+ .into_boxed();
+
+ if let Some(mod_person_id) = mod_person_id {
+ query = query.filter(mod_transfer_community::mod_person_id.eq(mod_person_id));
+ };
+
+ if let Some(community_id) = community_id {
+ query = query.filter(mod_transfer_community::community_id.eq(community_id));
+ };
+
+ let (limit, offset) = limit_and_offset(page, limit);
+
+ let res = query
+ .limit(limit)
+ .offset(offset)
+ .order_by(mod_transfer_community::when_.desc())
+ .load::<ModTransferCommunityViewTuple>(conn)?;
+
+ Ok(Self::from_tuple_to_vec(res))
+ }
+}
+
+impl ViewToVec for ModTransferCommunityView {
+ type DbTuple = ModTransferCommunityViewTuple;
+ fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
+ items
+ .iter()
+ .map(|a| Self {
+ mod_transfer_community: a.0.to_owned(),
+ moderator: a.1.to_owned(),
+ community: a.2.to_owned(),
+ modded_person: a.3.to_owned(),
+ })
+ .collect::<Vec<Self>>()
+ }
+}
--- /dev/null
+drop table mod_transfer_community;
--- /dev/null
+-- Add the mod_transfer_community log table
+create table mod_transfer_community (
+ id serial primary key,
+ mod_person_id int references person on update cascade on delete cascade not null,
+ other_person_id int references person on update cascade on delete cascade not null,
+ community_id int references community on update cascade on delete cascade not null,
+ removed boolean default false,
+ when_ timestamp not null default now()
+);
projects / lemmy.git / commitdiff