2e8687e203
* Update comment_report_view.rs * Update comment_report_view.rs * Update post_view.rs * Update utils.rs * Update schema.rs * stuff * stuff * fix actions * PostLike * fmt * more post stuff (partial) * remove uplete * returning * rename read_comments field * PersonPostAggregates * a * fix usage of read_comments_amount * comment * community * community_block * instance_block * LocalUser::export_backup * person_block * person * stuff (partial) * update cargo.lock * fix lemmy_db_schema * post_view * comment_report_view * comment_view * post_report_view * find and replace some selected values * private_message_view * vote_view * comment_reply_view * some action views * action_query, find_action * community_view * block views * person_mention_view * remove struct update * refactor actions function * actions_alias * clean up return types and trait bounds * fix all rust code * fmt * clippy fix * Migrate tables * migrate indexes and contraints, and add statistics * fix what appears to be a messed up merge * commented thing * Create uplete.rs * Update uplete.rs * Update uplete.rs * Update up.sql * Update comment.rs * Update Cargo.toml * Update comment.rs * Update post.rs * Update comment_view.rs * Update post_view.rs * Update comment_reply_view.rs * Update person_mention_view.rs * Update Cargo.toml * Update utils.rs * Update comment.rs * Update utils.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update comment.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update comment_view.rs * Update post_view.rs * Update triggers.sql * Update triggers.sql * Update triggers.sql * Update comment_reply_view.rs * Update person_mention_view.rs * Update person_mention_view.rs * Update comment_reply_view.rs * Update uplete.rs * start removing post_id column * Update down.sql * Update schema.rs * Update comment.rs * Update comment.rs * Update comment.rs * Update schema.rs * Update comment.rs * Update like.rs * Update comment.rs * Update up.sql * Update down.sql * Update down.sql * Update up.sql * Update up.sql * Update down.sql * Update comment.rs * Update vote_view.rs * Update vote_view.rs * Update comment_aggregates.rs * Update person_aggregates.rs * Update comment_view.rs * Update vote_view.rs * Update mod.rs * Update create.rs * Update comment.rs * Update community.rs * Update community.rs * Update up.sql * Update uplete.rs * Update uplete.rs * revert to UpleteCount * Update comment.rs * Update traits.rs * Update comment.rs * Update community.rs * Update community_block.rs * Update community.rs * Update instance_block.rs * Update instance.rs * Update community_block.rs * Update person.rs * Update person_block.rs * Update person.rs * Update person_block.rs * Update person.rs * Update instance.rs * Update instance_block.rs * Update instance.rs * Update person.rs * Update post.rs * Update comment.rs * Update community.rs * Update person.rs * Update post_view.rs * Update comment.rs * reduce diff * revert some changes in views * Update post_view.rs * Update comment.rs * Update post.rs * fix missing cfg_attr * rewrite uplete * Update Cargo.toml * Update Cargo.toml * Update uplete.rs * add `pub` to structs that appear in trait bounds * optional = true * Update uplete.rs * Update community.rs * Update comment.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * something is wrong with me * use new uplete function everywhere * fmt * fmt * Keep post_id when comment_actions::liked is not null * Update up.sql * Update up.sql * clean up up.sql * clean up down.sql * fix * Update person_aggregates.rs * fmt * Update uplete.rs * fmt * Update uplete.rs * Update community.rs * Update uplete.rs * Update local_user.rs * fmt * fix * fix * fmt * improve uplete api * Update uplete.rs * fix * fix * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * fix * fix test * fix db_views_actor imports * fix uplete import in post_view test * rerun ci * fix AllNull syntax error * fix DynColumn * Fix rust syntax * fmt * fix iter * pain * Update community_moderators.rs * Update community_moderator_view.rs * Update uplete.rs * Fix mistake found by chatgpt * revert debugging stuff, change migration date, refactor constraint * Update down.sql * Update down.sql * fmt * make things added to db_schema::utils more understandable * update rust version for woodpecker * finish merge * Fix index that checked read_comments twice instead of also checking read_comments_amount * fix * uplete: test_count, test_generated_sql_setting_one_column_null, test_count_methods * refactor uplete sql test * test setting both columns to null in uplete * make AllNull generic * test AllNull * Merge remote-tracking branch 'upstream/main' into smoosh-tables-together --------- Co-authored-by: phiresky <phireskyde+git@gmail.com>
86 lines
2.4 KiB
Rust
86 lines
2.4 KiB
Rust
use crate::{
|
|
newtypes::{InstanceId, PersonId},
|
|
schema::{instance, instance_actions},
|
|
source::{
|
|
instance::Instance,
|
|
instance_block::{InstanceBlock, InstanceBlockForm},
|
|
},
|
|
traits::Blockable,
|
|
utils::{action_query, find_action, get_conn, now, uplete, DbPool},
|
|
};
|
|
use diesel::{
|
|
dsl::{exists, insert_into, not},
|
|
expression::SelectableHelper,
|
|
result::Error,
|
|
select,
|
|
ExpressionMethods,
|
|
NullableExpressionMethods,
|
|
QueryDsl,
|
|
};
|
|
use diesel_async::RunQueryDsl;
|
|
use lemmy_utils::error::{LemmyErrorType, LemmyResult};
|
|
|
|
impl InstanceBlock {
|
|
pub async fn read(
|
|
pool: &mut DbPool<'_>,
|
|
for_person_id: PersonId,
|
|
for_instance_id: InstanceId,
|
|
) -> LemmyResult<()> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
select(not(exists(find_action(
|
|
instance_actions::blocked,
|
|
(for_person_id, for_instance_id),
|
|
))))
|
|
.get_result::<bool>(conn)
|
|
.await?
|
|
.then_some(())
|
|
.ok_or(LemmyErrorType::InstanceIsBlocked.into())
|
|
}
|
|
|
|
pub async fn for_person(
|
|
pool: &mut DbPool<'_>,
|
|
person_id: PersonId,
|
|
) -> Result<Vec<Instance>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
action_query(instance_actions::blocked)
|
|
.inner_join(instance::table)
|
|
.select(instance::all_columns)
|
|
.filter(instance_actions::person_id.eq(person_id))
|
|
.order_by(instance_actions::blocked)
|
|
.load::<Instance>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl Blockable for InstanceBlock {
|
|
type Form = InstanceBlockForm;
|
|
async fn block(pool: &mut DbPool<'_>, instance_block_form: &Self::Form) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let instance_block_form = (
|
|
instance_block_form,
|
|
instance_actions::blocked.eq(now().nullable()),
|
|
);
|
|
insert_into(instance_actions::table)
|
|
.values(instance_block_form)
|
|
.on_conflict((instance_actions::person_id, instance_actions::instance_id))
|
|
.do_update()
|
|
.set(instance_block_form)
|
|
.returning(Self::as_select())
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
async fn unblock(
|
|
pool: &mut DbPool<'_>,
|
|
instance_block_form: &Self::Form,
|
|
) -> Result<uplete::Count, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
uplete::new(instance_actions::table.find((
|
|
instance_block_form.person_id,
|
|
instance_block_form.instance_id,
|
|
)))
|
|
.set_null(instance_actions::blocked)
|
|
.get_result(conn)
|
|
.await
|
|
}
|
|
}
|