mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-28 02:00:37 +00:00
* a lot * merge * Fix stuff broken by merge * Get rid of repetitive `&mut *context.conn().await?` * Add blank lines under each line with `conn =` * Fix style mistakes (partial) * Revert "Fix style mistakes (partial)" This reverts commit48a033b87f
. * Revert "Add blank lines under each line with `conn =`" This reverts commit773a6d3beb
. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commitd2c6263ea1
. * Use DbConn for CaptchaAnswer methods * DbConn trait * Remove more `&mut *` * Fix stuff * Re-run CI * try to make ci start * fix * fix * Fix api_common::utils * Fix apub::activities::block * Fix apub::api::resolve_object * Fix some things * Revert "Fix some things" This reverts commit2bf8574bc8
. * Revert "Fix apub::api::resolve_object" This reverts commit3e4059aabb
. * Revert "Fix apub::activities::block" This reverts commit3b02389abd
. * Revert "Fix api_common::utils" This reverts commit7dc73de613
. * Revert "Revert "Fix api_common::utils"" This reverts commitf740f115e5
. * Revert "Revert "Fix apub::activities::block"" This reverts commit2ee206af7c
. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit96ed8bf2e9
. * Fix fetch_local_site_data * Fix get_comment_parent_creator * Remove unused perma deleted text * Fix routes::feeds * Fix lib.rs * Update lib.rs * rerun ci * Attempt to create custom GetConn and RunQueryDsl traits * Start over * Add GetConn trait * aaaa * Revert "aaaa" This reverts commitacc9ca1aed
. * Revert "Revert "aaaa"" This reverts commit443a2a00a5
. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commitab4e94aea5
. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commite4d1712646
. * DbConn and DbPool enums (db_schema only fails to compile for tests) * fmt * Make functions take `&mut DbPool<'_>` and make db_schema tests compile * Add try_join_with_pool macro and run fix-clippy on more crates * Fix some errors * I did it * Remove function variants that take connection * rerun ci * rerun ci * rerun ci
118 lines
3.6 KiB
Rust
118 lines
3.6 KiB
Rust
use crate::{
|
|
newtypes::LocalUserId,
|
|
schema::local_user::dsl::{
|
|
accepted_application,
|
|
email,
|
|
email_verified,
|
|
local_user,
|
|
password_encrypted,
|
|
validator_time,
|
|
},
|
|
source::{
|
|
actor_language::{LocalUserLanguage, SiteLanguage},
|
|
local_user::{LocalUser, LocalUserInsertForm, LocalUserUpdateForm},
|
|
},
|
|
traits::Crud,
|
|
utils::{get_conn, naive_now, DbPool},
|
|
};
|
|
use bcrypt::{hash, DEFAULT_COST};
|
|
use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
impl LocalUser {
|
|
pub async fn update_password(
|
|
pool: &mut DbPool<'_>,
|
|
local_user_id: LocalUserId,
|
|
new_password: &str,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let password_hash = hash(new_password, DEFAULT_COST).expect("Couldn't hash password");
|
|
|
|
diesel::update(local_user.find(local_user_id))
|
|
.set((
|
|
password_encrypted.eq(password_hash),
|
|
validator_time.eq(naive_now()),
|
|
))
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn set_all_users_email_verified(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(local_user)
|
|
.set(email_verified.eq(true))
|
|
.get_results::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn set_all_users_registration_applications_accepted(
|
|
pool: &mut DbPool<'_>,
|
|
) -> Result<Vec<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(local_user)
|
|
.set(accepted_application.eq(true))
|
|
.get_results::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn is_email_taken(pool: &mut DbPool<'_>, email_: &str) -> Result<bool, Error> {
|
|
use diesel::dsl::{exists, select};
|
|
let conn = &mut get_conn(pool).await?;
|
|
select(exists(local_user.filter(email.eq(email_))))
|
|
.get_result(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl Crud for LocalUser {
|
|
type InsertForm = LocalUserInsertForm;
|
|
type UpdateForm = LocalUserUpdateForm;
|
|
type IdType = LocalUserId;
|
|
async fn read(pool: &mut DbPool<'_>, local_user_id: LocalUserId) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
local_user.find(local_user_id).first::<Self>(conn).await
|
|
}
|
|
async fn delete(pool: &mut DbPool<'_>, local_user_id: LocalUserId) -> Result<usize, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::delete(local_user.find(local_user_id))
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let mut form_with_encrypted_password = form.clone();
|
|
let password_hash =
|
|
hash(&form.password_encrypted, DEFAULT_COST).expect("Couldn't hash password");
|
|
form_with_encrypted_password.password_encrypted = password_hash;
|
|
|
|
let local_user_ = insert_into(local_user)
|
|
.values(form_with_encrypted_password)
|
|
.get_result::<Self>(conn)
|
|
.await?;
|
|
|
|
let site_languages = SiteLanguage::read_local_raw(pool).await;
|
|
if let Ok(langs) = site_languages {
|
|
// if site exists, init user with site languages
|
|
LocalUserLanguage::update(pool, langs, local_user_.id).await?;
|
|
} else {
|
|
// otherwise, init with all languages (this only happens during tests and
|
|
// for first admin user, which is created before site)
|
|
LocalUserLanguage::update(pool, vec![], local_user_.id).await?;
|
|
}
|
|
|
|
Ok(local_user_)
|
|
}
|
|
async fn update(
|
|
pool: &mut DbPool<'_>,
|
|
local_user_id: LocalUserId,
|
|
form: &Self::UpdateForm,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(local_user.find(local_user_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|