mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-16 01:14:02 +00:00
c9f1407429
* Initial commit to bump diesel to 2.0.0-rc.0 and see what happens * Add chrono feature from diesel * db_schema crate is close to building? * Upgrade diesel-derive-newtype * Mostly modifying references to connections to be mutable ones; also used new way to do migrations as suggested by the migration guide; a lot more compiles now, though I can't figure out this tricky ToSql issue at the moment * Running clippy --fix * Trying to fix drone clippy 1 * Fix clippy * Upgrade clux-musl * Trying to fix drone clippy 2 * Trying to fix drone clippy 3 * Trying to fix drone clippy 5 * Adding diesel table aliases, removing sql view hack. Fixes #2101 Co-authored-by: Steven Chu <stevenc1@gmail.com> Co-authored-by: Nutomic <me@nutomic.com>
284 lines
7.1 KiB
Rust
284 lines
7.1 KiB
Rust
use crate::{
|
|
newtypes::{DbUrl, PersonId},
|
|
schema::person::dsl::*,
|
|
source::person::{Person, PersonForm},
|
|
traits::{ApubActor, Crud},
|
|
utils::{functions::lower, naive_now},
|
|
};
|
|
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,
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Crud for Person {
|
|
type Form = PersonForm;
|
|
type IdType = PersonId;
|
|
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: &mut PgConnection, person_id: PersonId) -> Result<usize, Error> {
|
|
diesel::delete(person.find(person_id)).execute(conn)
|
|
}
|
|
fn create(conn: &mut PgConnection, form: &PersonForm) -> Result<Self, Error> {
|
|
insert_into(person).values(form).get_result::<Self>(conn)
|
|
}
|
|
fn update(
|
|
conn: &mut PgConnection,
|
|
person_id: PersonId,
|
|
form: &PersonForm,
|
|
) -> Result<Self, Error> {
|
|
diesel::update(person.find(person_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Person {
|
|
pub fn ban_person(
|
|
conn: &mut PgConnection,
|
|
person_id: PersonId,
|
|
ban: bool,
|
|
expires: Option<chrono::NaiveDateTime>,
|
|
) -> 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: &mut 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: &mut PgConnection, person_id: PersonId) -> Result<Person, Error> {
|
|
diesel::update(person.find(person_id))
|
|
.set((last_refreshed_at.eq(naive_now()),))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
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(local_user::table.filter(local_user::person_id.eq(person_id)))
|
|
.set((
|
|
local_user::email.eq::<Option<String>>(None),
|
|
local_user::validator_time.eq(naive_now()),
|
|
))
|
|
.execute(conn)?;
|
|
|
|
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),
|
|
updated.eq(naive_now()),
|
|
))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
pub fn upsert(conn: &mut 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: &mut 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 leave_admin(conn: &mut PgConnection, person_id: PersonId) -> Result<Self, Error> {
|
|
diesel::update(person.find(person_id))
|
|
.set(admin.eq(false))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
pub fn remove_avatar_and_banner(
|
|
conn: &mut PgConnection,
|
|
person_id: PersonId,
|
|
) -> Result<Self, Error> {
|
|
diesel::update(person.find(person_id))
|
|
.set((
|
|
avatar.eq::<Option<String>>(None),
|
|
banner.eq::<Option<String>>(None),
|
|
))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
pub fn is_banned(banned_: bool, expires: Option<chrono::NaiveDateTime>) -> bool {
|
|
if let Some(expires) = expires {
|
|
banned_ && expires.gt(&naive_now())
|
|
} else {
|
|
banned_
|
|
}
|
|
}
|
|
|
|
impl ApubActor for Person {
|
|
fn read_from_apub_id(conn: &mut PgConnection, object_id: &DbUrl) -> Result<Option<Self>, Error> {
|
|
use crate::schema::person::dsl::*;
|
|
Ok(
|
|
person
|
|
.filter(deleted.eq(false))
|
|
.filter(actor_id.eq(object_id))
|
|
.first::<Person>(conn)
|
|
.ok()
|
|
.map(Into::into),
|
|
)
|
|
}
|
|
|
|
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)));
|
|
if !include_deleted {
|
|
q = q.filter(deleted.eq(false))
|
|
}
|
|
q.first::<Self>(conn)
|
|
}
|
|
|
|
fn read_from_name_and_domain(
|
|
conn: &mut PgConnection,
|
|
person_name: &str,
|
|
protocol_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)))
|
|
.first::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{source::person::*, traits::Crud, utils::establish_unpooled_connection};
|
|
|
|
#[test]
|
|
fn test_crud() {
|
|
let conn = &mut establish_unpooled_connection();
|
|
|
|
let new_person = PersonForm {
|
|
name: "holly".into(),
|
|
public_key: Some("nada".to_owned()),
|
|
..PersonForm::default()
|
|
};
|
|
|
|
let inserted_person = Person::create(conn, &new_person).unwrap();
|
|
|
|
let expected_person = Person {
|
|
id: inserted_person.id,
|
|
name: "holly".into(),
|
|
display_name: None,
|
|
avatar: None,
|
|
banner: None,
|
|
banned: false,
|
|
deleted: false,
|
|
published: inserted_person.published,
|
|
updated: None,
|
|
actor_id: inserted_person.actor_id.to_owned(),
|
|
bio: None,
|
|
local: true,
|
|
bot_account: false,
|
|
admin: false,
|
|
private_key: None,
|
|
public_key: "nada".to_owned(),
|
|
last_refreshed_at: inserted_person.published,
|
|
inbox_url: inserted_person.inbox_url.to_owned(),
|
|
shared_inbox_url: None,
|
|
matrix_user_id: None,
|
|
ban_expires: None,
|
|
};
|
|
|
|
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();
|
|
|
|
assert_eq!(expected_person, read_person);
|
|
assert_eq!(expected_person, inserted_person);
|
|
assert_eq!(expected_person, updated_person);
|
|
assert_eq!(1, num_deleted);
|
|
}
|
|
}
|