mirror of
https://github.com/LemmyNet/lemmy.git
synced 2025-03-02 17:41:02 +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
52 lines
1.4 KiB
Rust
52 lines
1.4 KiB
Rust
use crate::{
|
|
newtypes::PersonId,
|
|
schema::person_block::dsl::{person_block, person_id, target_id},
|
|
source::person_block::{PersonBlock, PersonBlockForm},
|
|
traits::Blockable,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
impl PersonBlock {
|
|
pub async fn read(
|
|
pool: &mut DbPool<'_>,
|
|
for_person_id: PersonId,
|
|
for_recipient_id: PersonId,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
person_block
|
|
.filter(person_id.eq(for_person_id))
|
|
.filter(target_id.eq(for_recipient_id))
|
|
.first::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl Blockable for PersonBlock {
|
|
type Form = PersonBlockForm;
|
|
async fn block(
|
|
pool: &mut DbPool<'_>,
|
|
person_block_form: &PersonBlockForm,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
insert_into(person_block)
|
|
.values(person_block_form)
|
|
.on_conflict((person_id, target_id))
|
|
.do_update()
|
|
.set(person_block_form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
async fn unblock(pool: &mut DbPool<'_>, person_block_form: &Self::Form) -> Result<usize, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::delete(
|
|
person_block
|
|
.filter(person_id.eq(person_block_form.person_id))
|
|
.filter(target_id.eq(person_block_form.target_id)),
|
|
)
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
}
|