Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Always assign default language before checking if language is allowed #5132

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Always assign default language before checking if language is allowed #5132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b9edf7
Always assign default language before checking if language is allowed…
Nutomic Oct 22, 2024
c809819
handle all logic in same fn
Nutomic Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions crates/api_crud/src/comment/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ use lemmy_api_common::{
use lemmy_db_schema::{
impls::actor_language::default_post_language,
source::{
actor_language::CommunityLanguage,
comment::{Comment, CommentInsertForm, CommentLike, CommentLikeForm},
comment_reply::{CommentReply, CommentReplyUpdateForm},
local_site::LocalSite,
Expand Down Expand Up @@ -88,21 +87,13 @@ pub async fn create_comment(
check_comment_depth(parent)?;
}

// attempt to set default language if none was provided
let language_id = match data.language_id {
Some(lid) => lid,
None => {
default_post_language(
&mut context.pool(),
community_id,
local_user_view.local_user.id,
)
.await?
}
};

CommunityLanguage::is_allowed_community_language(&mut context.pool(), language_id, community_id)
.await?;
let language_id = default_post_language(
&mut context.pool(),
data.language_id,
community_id,
local_user_view.local_user.id,
)
.await?;

let comment_form = CommentInsertForm {
language_id: Some(language_id),
Expand Down
19 changes: 9 additions & 10 deletions crates/api_crud/src/comment/update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ use lemmy_api_common::{
},
};
use lemmy_db_schema::{
impls::actor_language::default_post_language,
source::{
actor_language::CommunityLanguage,
comment::{Comment, CommentUpdateForm},
local_site::LocalSite,
},
Expand Down Expand Up @@ -55,14 +55,13 @@ pub async fn update_comment(
Err(LemmyErrorType::NoCommentEditAllowed)?
}

if let Some(language_id) = data.language_id {
CommunityLanguage::is_allowed_community_language(
&mut context.pool(),
language_id,
orig_comment.community.id,
)
.await?;
}
let language_id = default_post_language(
&mut context.pool(),
data.language_id,
orig_comment.community.id,
local_user_view.local_user.id,
)
.await?;

let slur_regex = local_site_to_slur_regex(&local_site);
let url_blocklist = get_url_blocklist(&context).await?;
Expand All @@ -74,7 +73,7 @@ pub async fn update_comment(
let comment_id = data.comment_id;
let form = CommentUpdateForm {
content,
language_id: data.language_id,
language_id: Some(language_id),
updated: Some(Some(naive_now())),
..Default::default()
};
Expand Down
25 changes: 7 additions & 18 deletions crates/api_crud/src/post/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use lemmy_api_common::{
use lemmy_db_schema::{
impls::actor_language::default_post_language,
source::{
actor_language::CommunityLanguage,
community::Community,
local_site::LocalSite,
post::{Post, PostInsertForm, PostLike, PostLikeForm},
Expand Down Expand Up @@ -104,23 +103,13 @@ pub async fn create_post(
.await?;
}

// attempt to set default language if none was provided
let language_id = match data.language_id {
Some(lid) => lid,
None => {
default_post_language(
&mut context.pool(),
community_id,
local_user_view.local_user.id,
)
.await?
}
};

// Only need to check if language is allowed in case user set it explicitly. When using default
// language, it already only returns allowed languages.
CommunityLanguage::is_allowed_community_language(&mut context.pool(), language_id, community_id)
.await?;
let language_id = default_post_language(
&mut context.pool(),
data.language_id,
community_id,
local_user_view.local_user.id,
)
.await?;

let scheduled_publish_time =
convert_published_time(data.scheduled_publish_time, &local_user_view, &context).await?;
Expand Down
19 changes: 9 additions & 10 deletions crates/api_crud/src/post/update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ use lemmy_api_common::{
},
};
use lemmy_db_schema::{
impls::actor_language::default_post_language,
source::{
actor_language::CommunityLanguage,
community::Community,
local_site::LocalSite,
post::{Post, PostUpdateForm},
Expand Down Expand Up @@ -101,14 +101,13 @@ pub async fn update_post(
Err(LemmyErrorType::NoPostEditAllowed)?
}

if let Some(language_id) = data.language_id {
CommunityLanguage::is_allowed_community_language(
&mut context.pool(),
language_id,
orig_post.community_id,
)
.await?;
}
let language_id = default_post_language(
&mut context.pool(),
data.language_id,
orig_post.community_id,
local_user_view.local_user.id,
)
.await?;

// handle changes to scheduled_publish_time
let scheduled_publish_time = match (
Expand All @@ -131,7 +130,7 @@ pub async fn update_post(
body,
alt_text,
nsfw: data.nsfw,
language_id: data.language_id,
language_id: Some(language_id),
updated: Some(Some(naive_now())),
scheduled_publish_time,
..Default::default()
Expand Down
49 changes: 29 additions & 20 deletions crates/db_schema/src/impls/actor_language.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ impl SiteLanguage {

impl CommunityLanguage {
/// Returns true if the given language is one of configured languages for given community
pub async fn is_allowed_community_language(
async fn is_allowed_community_language(
pool: &mut DbPool<'_>,
for_language_id: LanguageId,
for_community_id: CommunityId,
Expand Down Expand Up @@ -321,27 +321,36 @@ impl CommunityLanguage {

pub async fn default_post_language(
pool: &mut DbPool<'_>,
language_id: Option<LanguageId>,
community_id: CommunityId,
local_user_id: LocalUserId,
) -> Result<LanguageId, Error> {
) -> LemmyResult<LanguageId> {
use crate::schema::{community_language::dsl as cl, local_user_language::dsl as ul};
let conn = &mut get_conn(pool).await?;
let mut intersection = ul::local_user_language
.inner_join(cl::community_language.on(ul::language_id.eq(cl::language_id)))
.filter(ul::local_user_id.eq(local_user_id))
.filter(cl::community_id.eq(community_id))
.select(cl::language_id)
.get_results::<LanguageId>(conn)
.await?;
let language_id = match language_id {
None | Some(LanguageId(0)) => {
let mut intersection = ul::local_user_language
.inner_join(cl::community_language.on(ul::language_id.eq(cl::language_id)))
.filter(ul::local_user_id.eq(local_user_id))
.filter(cl::community_id.eq(community_id))
.select(cl::language_id)
.get_results::<LanguageId>(conn)
.await?;

if intersection.len() == 1 {
Ok(intersection.pop().unwrap_or(UNDETERMINED_ID))
} else if intersection.len() == 2 && intersection.contains(&UNDETERMINED_ID) {
intersection.retain(|i| i != &UNDETERMINED_ID);
Ok(intersection.pop().unwrap_or(UNDETERMINED_ID))
} else {
Ok(UNDETERMINED_ID)
}
if intersection.len() == 1 {
intersection.pop().unwrap_or(UNDETERMINED_ID)
} else if intersection.len() == 2 && intersection.contains(&UNDETERMINED_ID) {
intersection.retain(|i| i != &UNDETERMINED_ID);
intersection.pop().unwrap_or(UNDETERMINED_ID)
} else {
UNDETERMINED_ID
}
}
Some(lid) => lid,
};

CommunityLanguage::is_allowed_community_language(pool, language_id, community_id).await?;
Ok(language_id)
}

/// If no language is given, set all languages
Expand Down Expand Up @@ -590,7 +599,7 @@ mod tests {

#[tokio::test]
#[serial]
async fn test_default_post_language() -> Result<(), Error> {
async fn test_default_post_language() -> LemmyResult<()> {
let pool = &build_db_pool_for_tests().await;
let pool = &mut pool.into();
let (site, instance) = create_test_site(pool).await?;
Expand All @@ -613,7 +622,7 @@ mod tests {
LocalUserLanguage::update(pool, test_langs2, local_user.id).await?;

// no overlap in user/community languages, so defaults to undetermined
let def1 = default_post_language(pool, community.id, local_user.id).await?;
let def1 = default_post_language(pool, None, community.id, local_user.id).await?;
assert_eq!(UNDETERMINED_ID, def1);

let ru = Language::read_id_from_code(pool, "ru").await?;
Expand All @@ -626,7 +635,7 @@ mod tests {
LocalUserLanguage::update(pool, test_langs3, local_user.id).await?;

// this time, both have ru as common lang
let def2 = default_post_language(pool, community.id, local_user.id).await?;
let def2 = default_post_language(pool, None, community.id, local_user.id).await?;
assert_eq!(ru, def2);

Person::delete(pool, person.id).await?;
Expand Down