use crate::{
newtypes::{DbUrl, PersonId},
schema::person::dsl::*,
- source::person::{Person, PersonForm, PersonSafe},
+ source::person::{Person, PersonInsertForm, PersonUpdateForm},
traits::{ApubActor, Crud},
utils::{functions::lower, naive_now},
};
admin,
bot_account,
ban_expires,
+ instance_id,
);
impl ToSafe for Person {
admin,
bot_account,
ban_expires,
- )
- }
- }
-}
-
-mod safe_type_alias_1 {
- use crate::{schema::person_alias_1::columns::*, source::person::PersonAlias1, traits::ToSafe};
-
- type Columns = (
- id,
- name,
- display_name,
- avatar,
- banned,
- published,
- updated,
- actor_id,
- bio,
- local,
- banner,
- deleted,
- inbox_url,
- shared_inbox_url,
- matrix_user_id,
- admin,
- bot_account,
- ban_expires,
- );
-
- impl ToSafe for PersonAlias1 {
- type SafeColumns = Columns;
- fn safe_columns_tuple() -> Self::SafeColumns {
- (
- id,
- name,
- display_name,
- avatar,
- banned,
- published,
- updated,
- actor_id,
- bio,
- local,
- banner,
- deleted,
- inbox_url,
- shared_inbox_url,
- matrix_user_id,
- admin,
- bot_account,
- ban_expires,
- )
- }
- }
-}
-
-mod safe_type_alias_2 {
- use crate::{schema::person_alias_2::columns::*, source::person::PersonAlias2, traits::ToSafe};
-
- type Columns = (
- id,
- name,
- display_name,
- avatar,
- banned,
- published,
- updated,
- actor_id,
- bio,
- local,
- banner,
- deleted,
- inbox_url,
- shared_inbox_url,
- matrix_user_id,
- admin,
- bot_account,
- ban_expires,
- );
-
- impl ToSafe for PersonAlias2 {
- type SafeColumns = Columns;
- fn safe_columns_tuple() -> Self::SafeColumns {
- (
- id,
- name,
- display_name,
- avatar,
- banned,
- published,
- updated,
- actor_id,
- bio,
- local,
- banner,
- deleted,
- inbox_url,
- shared_inbox_url,
- matrix_user_id,
- admin,
- bot_account,
- ban_expires,
+ instance_id,
)
}
}
}
impl Crud for Person {
- type Form = PersonForm;
+ type InsertForm = PersonInsertForm;
+ type UpdateForm = PersonUpdateForm;
type IdType = PersonId;
- fn read(conn: &PgConnection, person_id: PersonId) -> Result<Self, Error> {
+ fn read(conn: &mut PgConnection, person_id: PersonId) -> Result<Self, Error> {
person
.filter(deleted.eq(false))
.find(person_id)
.first::<Self>(conn)
}
- fn delete(conn: &PgConnection, person_id: PersonId) -> Result<usize, Error> {
+ fn delete(conn: &mut PgConnection, person_id: PersonId) -> Result<usize, Error> {
diesel::delete(person.find(person_id)).execute(conn)
}
- fn create(conn: &PgConnection, form: &PersonForm) -> Result<Self, Error> {
- insert_into(person).values(form).get_result::<Self>(conn)
- }
- fn update(conn: &PgConnection, person_id: PersonId, form: &PersonForm) -> Result<Self, Error> {
- diesel::update(person.find(person_id))
+ fn create(conn: &mut PgConnection, form: &PersonInsertForm) -> Result<Self, Error> {
+ insert_into(person)
+ .values(form)
+ .on_conflict(actor_id)
+ .do_update()
.set(form)
.get_result::<Self>(conn)
}
-}
-
-impl Person {
- pub fn ban_person(
- conn: &PgConnection,
+ fn update(
+ conn: &mut PgConnection,
person_id: PersonId,
- ban: bool,
- expires: Option<chrono::NaiveDateTime>,
+ form: &PersonUpdateForm,
) -> Result<Self, Error> {
diesel::update(person.find(person_id))
- .set((banned.eq(ban), ban_expires.eq(expires)))
- .get_result::<Self>(conn)
- }
-
- pub fn add_admin(conn: &PgConnection, person_id: PersonId, added: bool) -> Result<Self, Error> {
- diesel::update(person.find(person_id))
- .set(admin.eq(added))
- .get_result::<Self>(conn)
- }
-
- pub fn mark_as_updated(conn: &PgConnection, person_id: PersonId) -> Result<Person, Error> {
- diesel::update(person.find(person_id))
- .set((last_refreshed_at.eq(naive_now()),))
+ .set(form)
.get_result::<Self>(conn)
}
+}
- pub fn delete_account(conn: &PgConnection, person_id: PersonId) -> Result<Person, Error> {
+impl Person {
+ pub fn delete_account(conn: &mut PgConnection, person_id: PersonId) -> Result<Person, Error> {
use crate::schema::local_user;
// Set the local user info to none
diesel::update(person.find(person_id))
.set((
display_name.eq::<Option<String>>(None),
+ avatar.eq::<Option<String>>(None),
+ banner.eq::<Option<String>>(None),
bio.eq::<Option<String>>(None),
matrix_user_id.eq::<Option<String>>(None),
deleted.eq(true),
))
.get_result::<Self>(conn)
}
-
- pub fn upsert(conn: &PgConnection, person_form: &PersonForm) -> Result<Person, Error> {
- insert_into(person)
- .values(person_form)
- .on_conflict(actor_id)
- .do_update()
- .set(person_form)
- .get_result::<Self>(conn)
- }
-
- pub fn update_deleted(
- conn: &PgConnection,
- person_id: PersonId,
- new_deleted: bool,
- ) -> Result<Person, Error> {
- use crate::schema::person::dsl::*;
- diesel::update(person.find(person_id))
- .set(deleted.eq(new_deleted))
- .get_result::<Self>(conn)
- }
-
- pub fn is_banned(&self) -> bool {
- is_banned(self.banned, self.ban_expires)
- }
-
- pub fn leave_admin(conn: &PgConnection, person_id: PersonId) -> Result<Self, Error> {
- diesel::update(person.find(person_id))
- .set(admin.eq(false))
- .get_result::<Self>(conn)
- }
}
-impl PersonSafe {
- pub fn is_banned(&self) -> bool {
- is_banned(self.banned, self.ban_expires)
- }
-}
-
-fn is_banned(banned_: bool, expires: Option<chrono::NaiveDateTime>) -> bool {
+pub fn is_banned(banned_: bool, expires: Option<chrono::NaiveDateTime>) -> bool {
if let Some(expires) = expires {
banned_ && expires.gt(&naive_now())
} else {
}
impl ApubActor for Person {
- fn read_from_apub_id(conn: &PgConnection, object_id: &DbUrl) -> Result<Option<Self>, Error> {
+ fn read_from_apub_id(conn: &mut PgConnection, object_id: &DbUrl) -> Result<Option<Self>, Error> {
use crate::schema::person::dsl::*;
Ok(
person
)
}
- fn read_from_name(conn: &PgConnection, from_name: &str) -> Result<Person, Error> {
- person
- .filter(deleted.eq(false))
+ fn read_from_name(
+ conn: &mut PgConnection,
+ from_name: &str,
+ include_deleted: bool,
+ ) -> Result<Person, Error> {
+ let mut q = person
+ .into_boxed()
.filter(local.eq(true))
- .filter(lower(name).eq(lower(from_name)))
- .first::<Person>(conn)
+ .filter(lower(name).eq(lower(from_name)));
+ if !include_deleted {
+ q = q.filter(deleted.eq(false))
+ }
+ q.first::<Self>(conn)
}
fn read_from_name_and_domain(
- conn: &PgConnection,
+ conn: &mut PgConnection,
person_name: &str,
protocol_domain: &str,
) -> Result<Person, Error> {
#[cfg(test)]
mod tests {
- use crate::{source::person::*, traits::Crud, utils::establish_unpooled_connection};
+ use crate::{
+ source::{instance::Instance, person::*},
+ traits::Crud,
+ utils::establish_unpooled_connection,
+ };
+ use serial_test::serial;
#[test]
+ #[serial]
fn test_crud() {
- let conn = establish_unpooled_connection();
+ let conn = &mut establish_unpooled_connection();
- let new_person = PersonForm {
- name: "holly".into(),
- public_key: "nada".to_owned(),
- ..PersonForm::default()
- };
+ let inserted_instance = Instance::create(conn, "my_domain.tld").unwrap();
+
+ let new_person = PersonInsertForm::builder()
+ .name("holly".into())
+ .public_key("nada".to_owned())
+ .instance_id(inserted_instance.id)
+ .build();
- let inserted_person = Person::create(&conn, &new_person).unwrap();
+ let inserted_person = Person::create(conn, &new_person).unwrap();
let expected_person = Person {
id: inserted_person.id,
shared_inbox_url: None,
matrix_user_id: None,
ban_expires: None,
+ instance_id: inserted_instance.id,
};
- let read_person = Person::read(&conn, inserted_person.id).unwrap();
- let updated_person = Person::update(&conn, inserted_person.id, &new_person).unwrap();
- let num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
+ let read_person = Person::read(conn, inserted_person.id).unwrap();
+
+ let update_person_form = PersonUpdateForm::builder()
+ .actor_id(Some(inserted_person.actor_id.to_owned()))
+ .build();
+ let updated_person = Person::update(conn, inserted_person.id, &update_person_form).unwrap();
+
+ let num_deleted = Person::delete(conn, inserted_person.id).unwrap();
+ Instance::delete(conn, inserted_instance.id).unwrap();
assert_eq!(expected_person, read_person);
assert_eq!(expected_person, inserted_person);
projects / lemmy.git / blobdiff