use crate::{
- newtypes::{DbUrl, PersonId},
- schema::person::dsl::{
- actor_id,
- avatar,
- banner,
- bio,
- deleted,
- display_name,
- local,
- matrix_user_id,
- name,
- person,
- updated,
+ newtypes::{CommunityId, DbUrl, PersonId},
+ schema::{instance, local_user, person, person_follower},
+ source::person::{
+ Person,
+ PersonFollower,
+ PersonFollowerForm,
+ PersonInsertForm,
+ PersonUpdateForm,
},
- source::person::{Person, PersonInsertForm, PersonUpdateForm},
- traits::{ApubActor, Crud},
+ traits::{ApubActor, Crud, Followable},
utils::{functions::lower, get_conn, naive_now, DbPool},
};
-use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl, TextExpressionMethods};
+use diesel::{dsl::insert_into, result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
use diesel_async::RunQueryDsl;
-mod safe_type {
- use crate::{
- schema::person::columns::{
- actor_id,
- admin,
- avatar,
- ban_expires,
- banned,
- banner,
- bio,
- bot_account,
- deleted,
- display_name,
- id,
- inbox_url,
- instance_id,
- local,
- matrix_user_id,
- name,
- published,
- shared_inbox_url,
- updated,
- },
- 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,
- instance_id,
- );
-
- 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,
- instance_id,
- )
- }
- }
-}
-
#[async_trait]
impl Crud for Person {
type InsertForm = PersonInsertForm;
type UpdateForm = PersonUpdateForm;
type IdType = PersonId;
- async fn read(pool: &DbPool, person_id: PersonId) -> Result<Self, Error> {
+ async fn read(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Self, Error> {
let conn = &mut get_conn(pool).await?;
- person
- .filter(deleted.eq(false))
+ person::table
+ .filter(person::deleted.eq(false))
.find(person_id)
.first::<Self>(conn)
.await
}
- async fn delete(pool: &DbPool, person_id: PersonId) -> Result<usize, Error> {
+ async fn delete(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<usize, Error> {
let conn = &mut get_conn(pool).await?;
- diesel::delete(person.find(person_id)).execute(conn).await
+ diesel::delete(person::table.find(person_id))
+ .execute(conn)
+ .await
}
- async fn create(pool: &DbPool, form: &PersonInsertForm) -> Result<Self, Error> {
+ async fn create(pool: &mut DbPool<'_>, form: &PersonInsertForm) -> Result<Self, Error> {
let conn = &mut get_conn(pool).await?;
- insert_into(person)
+ insert_into(person::table)
.values(form)
- .on_conflict(actor_id)
- .do_update()
- .set(form)
.get_result::<Self>(conn)
.await
}
async fn update(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
person_id: PersonId,
form: &PersonUpdateForm,
) -> Result<Self, Error> {
let conn = &mut get_conn(pool).await?;
- diesel::update(person.find(person_id))
+ diesel::update(person::table.find(person_id))
.set(form)
.get_result::<Self>(conn)
.await
}
impl Person {
- pub async fn delete_account(pool: &DbPool, person_id: PersonId) -> Result<Person, Error> {
- use crate::schema::local_user;
+ /// 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 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
.execute(conn)
.await?;
- diesel::update(person.find(person_id))
+ diesel::update(person::table.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),
- 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)
.await
#[async_trait]
impl ApubActor for Person {
- async fn read_from_apub_id(pool: &DbPool, object_id: &DbUrl) -> Result<Option<Self>, Error> {
+ 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()
}
async fn read_from_name(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
from_name: &str,
include_deleted: bool,
) -> Result<Person, Error> {
let conn = &mut get_conn(pool).await?;
- let mut q = person
+ let mut q = person::table
.into_boxed()
- .filter(local.eq(true))
- .filter(lower(name).eq(lower(from_name)));
+ .filter(person::local.eq(true))
+ .filter(lower(person::name).eq(from_name.to_lowercase()));
if !include_deleted {
- q = q.filter(deleted.eq(false))
+ q = q.filter(person::deleted.eq(false))
}
q.first::<Self>(conn).await
}
async fn read_from_name_and_domain(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
person_name: &str,
- protocol_domain: &str,
+ for_domain: &str,
) -> Result<Person, Error> {
let conn = &mut get_conn(pool).await?;
- person
- .filter(lower(name).eq(lower(person_name)))
- .filter(actor_id.like(format!("{}%", protocol_domain)))
+
+ 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
}
}
+#[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
+ }
+}
+
+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
+ }
+}
+
#[cfg(test)]
mod tests {
use crate::{
source::{
instance::Instance,
- person::{Person, PersonInsertForm, PersonUpdateForm},
+ person::{Person, PersonFollower, PersonFollowerForm, PersonInsertForm, PersonUpdateForm},
},
- traits::Crud,
+ traits::{Crud, Followable},
utils::build_db_pool_for_tests,
};
use serial_test::serial;
#[serial]
async fn test_crud() {
let pool = &build_db_pool_for_tests().await;
+ let pool = &mut pool.into();
- let inserted_instance = Instance::create(pool, "my_domain.tld").await.unwrap();
+ let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
+ .await
+ .unwrap();
let new_person = PersonInsertForm::builder()
.name("holly".into())
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