mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-09-16 19:29:09 -06:00
5d837780f5
* Moving settings to Database. - Moves many settings into the database. Fixes #2285 - Adds a local_site and instance table. Fixes #2365 . Fixes #2368 - Separates SQL update an insert forms, to avoid runtime errors. - Adds TypedBuilder to all the SQL forms, instead of default. * Fix weird clippy issue. * Removing extra lines. * Some fixes from suggestions. * Fixing apub tests. * Using instance creation helper function. * Move forms to their own line. * Trying to fix local_site_data, still broken. * Testing out async * Testing out async 2 * Fixing federation tests. * Trying to fix check features 1. * Starting on adding diesel async. 1/4th done. * Added async to views and schema. * Adding some more async * Compiling now. * Added diesel async. Fixes #2465 * Running clippy --fix * Trying to fix cargo test on drone. * Trying new muslrust. * Trying a custom dns * Trying a custom dns 2 * Trying a custom dns 3 * Trying a custom dns 4 * Trying a custom dns 5 * Trying a custom dns 6 * Trying a custom dns 7 * Addressing PR comments. * Adding check_apub to all verify functions. * Reverting back drone. * Fixing merge * Fix docker images. * Adding missing discussion_languages. * Trying to fix federation tests. * Fix site setup user creation. * Fix clippy * Fix clippy 2 * Test api faster * Try to fix 1 * Try to fix 2 * What are these lines about * Trying to fix 3 * Moving federation test back to top. * Remove logging cat.
43 lines
1.3 KiB
Rust
43 lines
1.3 KiB
Rust
use crate::structs::CommunityPersonBanView;
|
|
use diesel::{dsl::*, result::Error, BoolExpressionMethods, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
use lemmy_db_schema::{
|
|
newtypes::{CommunityId, PersonId},
|
|
schema::{community, community_person_ban, person},
|
|
source::{
|
|
community::{Community, CommunitySafe},
|
|
person::{Person, PersonSafe},
|
|
},
|
|
traits::ToSafe,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
|
|
impl CommunityPersonBanView {
|
|
pub async fn get(
|
|
pool: &DbPool,
|
|
from_person_id: PersonId,
|
|
from_community_id: CommunityId,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let (community, person) = community_person_ban::table
|
|
.inner_join(community::table)
|
|
.inner_join(person::table)
|
|
.select((
|
|
Community::safe_columns_tuple(),
|
|
Person::safe_columns_tuple(),
|
|
))
|
|
.filter(community_person_ban::community_id.eq(from_community_id))
|
|
.filter(community_person_ban::person_id.eq(from_person_id))
|
|
.filter(
|
|
community_person_ban::expires
|
|
.is_null()
|
|
.or(community_person_ban::expires.gt(now)),
|
|
)
|
|
.order_by(community_person_ban::published)
|
|
.first::<(CommunitySafe, PersonSafe)>(conn)
|
|
.await?;
|
|
|
|
Ok(CommunityPersonBanView { community, person })
|
|
}
|
|
}
|