use crate::{
- newtypes::{DbUrl, PersonId},
- schema::person::dsl::*,
- source::person::{Person, PersonForm, PersonSafe},
- traits::{ApubActor, Crud},
- utils::{functions::lower, naive_now},
+ newtypes::{CommunityId, DbUrl, PersonId},
+ schema::{instance, local_user, person, person_follower},
+ source::person::{
+ Person,
+ PersonFollower,
+ PersonFollowerForm,
+ PersonInsertForm,
+ PersonUpdateForm,
+ },
+ traits::{ApubActor, Crud, Followable},
+ utils::{functions::lower, get_conn, naive_now, DbPool},
};
-use diesel::{
- dsl::*,
- result::Error,
- ExpressionMethods,
- PgConnection,
- QueryDsl,
- RunQueryDsl,
- TextExpressionMethods,
-};
-
-mod safe_type {
- use crate::{schema::person::columns::*, source::person::Person, 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 Person {
- 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_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,
- )
- }
- }
-}
+use diesel::{dsl::insert_into, result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
+use diesel_async::RunQueryDsl;
+#[async_trait]
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> {
- person
- .filter(deleted.eq(false))
+ async fn read(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Self, Error> {
+ let conn = &mut get_conn(pool).await?;
+ person::table
+ .filter(person::deleted.eq(false))
.find(person_id)
.first::<Self>(conn)
+ .await
}
- fn delete(conn: &PgConnection, person_id: PersonId) -> Result<usize, Error> {
- diesel::delete(person.find(person_id)).execute(conn)
+ async fn delete(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<usize, Error> {
+ let conn = &mut get_conn(pool).await?;
+ diesel::delete(person::table.find(person_id))
+ .execute(conn)
+ .await
}
- 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))
- .set(form)
+ async fn create(pool: &mut DbPool<'_>, form: &PersonInsertForm) -> Result<Self, Error> {
+ let conn = &mut get_conn(pool).await?;
+ insert_into(person::table)
+ .values(form)
.get_result::<Self>(conn)
+ .await
}
-}
-
-impl Person {
- pub fn ban_person(
- conn: &PgConnection,
+ async fn update(
+ pool: &mut DbPool<'_>,
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))
+ let conn = &mut get_conn(pool).await?;
+ diesel::update(person::table.find(person_id))
+ .set(form)
.get_result::<Self>(conn)
+ .await
}
+}
- 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()),))
+impl Person {
+ /// Update or insert the person.
+ ///
+ /// This is necessary for federation, because Activitypub doesnt distinguish between these actions.
+ pub async fn upsert(pool: &mut DbPool<'_>, form: &PersonInsertForm) -> Result<Self, Error> {
+ let conn = &mut get_conn(pool).await?;
+ insert_into(person::table)
+ .values(form)
+ .on_conflict(person::actor_id)
+ .do_update()
+ .set(form)
.get_result::<Self>(conn)
+ .await
}
-
- pub fn delete_account(conn: &PgConnection, person_id: PersonId) -> Result<Person, Error> {
- use crate::schema::local_user;
+ pub async fn delete_account(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Person, Error> {
+ let conn = &mut get_conn(pool).await?;
// Set the local user info to none
diesel::update(local_user::table.filter(local_user::person_id.eq(person_id)))
local_user::email.eq::<Option<String>>(None),
local_user::validator_time.eq(naive_now()),
))
- .execute(conn)?;
+ .execute(conn)
+ .await?;
- diesel::update(person.find(person_id))
+ diesel::update(person::table.find(person_id))
.set((
- display_name.eq::<Option<String>>(None),
- bio.eq::<Option<String>>(None),
- matrix_user_id.eq::<Option<String>>(None),
- deleted.eq(true),
- updated.eq(naive_now()),
+ person::display_name.eq::<Option<String>>(None),
+ person::avatar.eq::<Option<String>>(None),
+ person::banner.eq::<Option<String>>(None),
+ person::bio.eq::<Option<String>>(None),
+ person::matrix_user_id.eq::<Option<String>>(None),
+ person::deleted.eq(true),
+ person::updated.eq(naive_now()),
))
.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)
+ .await
}
}
-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 {
}
}
+#[async_trait]
impl ApubActor for Person {
- fn read_from_apub_id(conn: &PgConnection, object_id: &DbUrl) -> Result<Option<Self>, Error> {
- use crate::schema::person::dsl::*;
+ async fn read_from_apub_id(
+ pool: &mut DbPool<'_>,
+ object_id: &DbUrl,
+ ) -> Result<Option<Self>, Error> {
+ let conn = &mut get_conn(pool).await?;
Ok(
- person
- .filter(deleted.eq(false))
- .filter(actor_id.eq(object_id))
+ person::table
+ .filter(person::deleted.eq(false))
+ .filter(person::actor_id.eq(object_id))
.first::<Person>(conn)
+ .await
.ok()
.map(Into::into),
)
}
- fn read_from_name(conn: &PgConnection, from_name: &str) -> Result<Person, Error> {
- person
- .filter(deleted.eq(false))
- .filter(local.eq(true))
- .filter(lower(name).eq(lower(from_name)))
- .first::<Person>(conn)
+ async fn read_from_name(
+ pool: &mut DbPool<'_>,
+ from_name: &str,
+ include_deleted: bool,
+ ) -> Result<Person, Error> {
+ let conn = &mut get_conn(pool).await?;
+ let mut q = person::table
+ .into_boxed()
+ .filter(person::local.eq(true))
+ .filter(lower(person::name).eq(from_name.to_lowercase()));
+ if !include_deleted {
+ q = q.filter(person::deleted.eq(false))
+ }
+ q.first::<Self>(conn).await
}
- fn read_from_name_and_domain(
- conn: &PgConnection,
+ async fn read_from_name_and_domain(
+ pool: &mut DbPool<'_>,
person_name: &str,
- protocol_domain: &str,
+ for_domain: &str,
) -> Result<Person, Error> {
- use crate::schema::person::dsl::*;
- person
- .filter(lower(name).eq(lower(person_name)))
- .filter(actor_id.like(format!("{}%", protocol_domain)))
+ let conn = &mut get_conn(pool).await?;
+
+ person::table
+ .inner_join(instance::table)
+ .filter(lower(person::name).eq(person_name.to_lowercase()))
+ .filter(instance::domain.eq(for_domain))
+ .select(person::all_columns)
.first::<Self>(conn)
+ .await
}
}
-#[cfg(test)]
-mod tests {
- use crate::{source::person::*, traits::Crud, utils::establish_unpooled_connection};
-
- #[test]
- fn test_crud() {
- let conn = establish_unpooled_connection();
+#[async_trait]
+impl Followable for PersonFollower {
+ type Form = PersonFollowerForm;
+ async fn follow(pool: &mut DbPool<'_>, form: &PersonFollowerForm) -> Result<Self, Error> {
+ use crate::schema::person_follower::dsl::{follower_id, person_follower, person_id};
+ let conn = &mut get_conn(pool).await?;
+ insert_into(person_follower)
+ .values(form)
+ .on_conflict((follower_id, person_id))
+ .do_update()
+ .set(form)
+ .get_result::<Self>(conn)
+ .await
+ }
+ async fn follow_accepted(_: &mut DbPool<'_>, _: CommunityId, _: PersonId) -> Result<Self, Error> {
+ unimplemented!()
+ }
+ async fn unfollow(pool: &mut DbPool<'_>, form: &PersonFollowerForm) -> Result<usize, Error> {
+ use crate::schema::person_follower::dsl::{follower_id, person_follower, person_id};
+ let conn = &mut get_conn(pool).await?;
+ diesel::delete(
+ person_follower
+ .filter(follower_id.eq(&form.follower_id))
+ .filter(person_id.eq(&form.person_id)),
+ )
+ .execute(conn)
+ .await
+ }
+}
- let new_person = PersonForm {
- name: "holly".into(),
- public_key: "nada".to_owned(),
- ..PersonForm::default()
- };
+impl PersonFollower {
+ pub async fn list_followers(
+ pool: &mut DbPool<'_>,
+ for_person_id: PersonId,
+ ) -> Result<Vec<Person>, Error> {
+ let conn = &mut get_conn(pool).await?;
+ person_follower::table
+ .inner_join(person::table.on(person_follower::follower_id.eq(person::id)))
+ .filter(person_follower::person_id.eq(for_person_id))
+ .select(person::all_columns)
+ .load(conn)
+ .await
+ }
+}
- let inserted_person = Person::create(&conn, &new_person).unwrap();
+#[cfg(test)]
+mod tests {
+ #![allow(clippy::unwrap_used)]
+ #![allow(clippy::indexing_slicing)]
+
+ use crate::{
+ source::{
+ instance::Instance,
+ person::{Person, PersonFollower, PersonFollowerForm, PersonInsertForm, PersonUpdateForm},
+ },
+ traits::{Crud, Followable},
+ utils::build_db_pool_for_tests,
+ };
+ use serial_test::serial;
+
+ #[tokio::test]
+ #[serial]
+ async fn test_crud() {
+ let pool = &build_db_pool_for_tests().await;
+ let pool = &mut pool.into();
+
+ let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
+ .await
+ .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(pool, &new_person).await.unwrap();
let expected_person = Person {
id: inserted_person.id,
deleted: false,
published: inserted_person.published,
updated: None,
- actor_id: inserted_person.actor_id.to_owned(),
+ actor_id: inserted_person.actor_id.clone(),
bio: None,
local: true,
bot_account: false,
private_key: None,
public_key: "nada".to_owned(),
last_refreshed_at: inserted_person.published,
- inbox_url: inserted_person.inbox_url.to_owned(),
+ inbox_url: inserted_person.inbox_url.clone(),
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(pool, inserted_person.id).await.unwrap();
+
+ let update_person_form = PersonUpdateForm::builder()
+ .actor_id(Some(inserted_person.actor_id.clone()))
+ .build();
+ let updated_person = Person::update(pool, inserted_person.id, &update_person_form)
+ .await
+ .unwrap();
+
+ let num_deleted = Person::delete(pool, inserted_person.id).await.unwrap();
+ Instance::delete(pool, inserted_instance.id).await.unwrap();
assert_eq!(expected_person, read_person);
assert_eq!(expected_person, inserted_person);
assert_eq!(expected_person, updated_person);
assert_eq!(1, num_deleted);
}
+
+ #[tokio::test]
+ #[serial]
+ async fn follow() {
+ let pool = &build_db_pool_for_tests().await;
+ let pool = &mut pool.into();
+ let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
+ .await
+ .unwrap();
+
+ let person_form_1 = PersonInsertForm::builder()
+ .name("erich".into())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
+ let person_1 = Person::create(pool, &person_form_1).await.unwrap();
+ let person_form_2 = PersonInsertForm::builder()
+ .name("michele".into())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
+ let person_2 = Person::create(pool, &person_form_2).await.unwrap();
+
+ let follow_form = PersonFollowerForm {
+ person_id: person_1.id,
+ follower_id: person_2.id,
+ pending: false,
+ };
+ let person_follower = PersonFollower::follow(pool, &follow_form).await.unwrap();
+ assert_eq!(person_1.id, person_follower.person_id);
+ assert_eq!(person_2.id, person_follower.follower_id);
+ assert!(!person_follower.pending);
+
+ let followers = PersonFollower::list_followers(pool, person_1.id)
+ .await
+ .unwrap();
+ assert_eq!(vec![person_2], followers);
+
+ let unfollow = PersonFollower::unfollow(pool, &follow_form).await.unwrap();
+ assert_eq!(1, unfollow);
+ }
}
projects / lemmy.git / blobdiff