mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-06-07 07:59:24 +00:00
Code Issues Projects Releases Wiki Activity

fix test, rename functions

Browse source
This commit is contained in:
Felix Ableitner 2023-03-28 22:05:03 +02:00
parent cbe41b17ba
commit ebaa84b88d
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/api/src/site/leave_admin.rs
View file

@ -63,7 +63,7 @@ impl Perform for LeaveAdmin {
let admins = PersonView::admins(context.pool()).await?;
let all_languages = Language::read_all(context.pool()).await?;
let discussion_languages = SiteLanguage::read_local(context.pool()).await?;
let discussion_languages = SiteLanguage::read_local_raw(context.pool()).await?;
let taglines = Tagline::get_all(context.pool(), site_view.local_site.id).await?;
let custom_emojis = CustomEmojiView::get_all(context.pool(), site_view.local_site.id).await?;

2
crates/api_crud/src/community/create.rs
View file

@ -135,7 +135,7 @@ impl PerformCrud for CreateCommunity {
// Update the discussion_languages if that's provided
let community_id = inserted_community.id;
if let Some(languages) = data.discussion_languages.clone() {
let site_languages = SiteLanguage::read_local(context.pool()).await?;
let site_languages = SiteLanguage::read_local_raw(context.pool()).await?;
// check that community languages are a subset of site languages
// https://stackoverflow.com/a/64227550
let is_subset = languages.iter().all(|item| site_languages.contains(item));

2
crates/api_crud/src/community/update.rs
View file

@ -53,7 +53,7 @@ impl PerformCrud for EditCommunity {
let community_id = data.community_id;
if let Some(languages) = data.discussion_languages.clone() {
let site_languages = SiteLanguage::read_local(context.pool()).await?;
let site_languages = SiteLanguage::read_local_raw(context.pool()).await?;
// check that community languages are a subset of site languages
// https://stackoverflow.com/a/64227550
let is_subset = languages.iter().all(|item| site_languages.contains(item));

2
crates/api_crud/src/site/read.rs
View file

@ -87,7 +87,7 @@ impl PerformCrud for GetSite {
build_federated_instances(&site_view.local_site, context.pool()).await?;
let all_languages = Language::read_all(context.pool()).await?;
let discussion_languages = SiteLanguage::read_local(context.pool()).await?;
let discussion_languages = SiteLanguage::read_local_raw(context.pool()).await?;
let taglines = Tagline::get_all(context.pool(), site_view.local_site.id).await?;
let custom_emojis = CustomEmojiView::get_all(context.pool(), site_view.local_site.id).await?;

20
crates/db_schema/src/impls/actor_language.rs
View file

@ -108,7 +108,7 @@ impl LocalUserLanguage {
}
impl SiteLanguage {
pub async fn read_local(pool: &DbPool) -> Result<Vec<LanguageId>, Error> {
pub async fn read_local_raw(pool: &DbPool) -> Result<Vec<LanguageId>, Error> {
let conn = &mut get_conn(pool).await?;
site::table
.inner_join(local_site::table)
@ -119,7 +119,7 @@ impl SiteLanguage {
.await
}
async fn read_internal(
async fn read_raw(
conn: &mut PooledConnection<AsyncPgConnection>,
for_site_id: SiteId,
) -> Result<Vec<LanguageId>, Error> {
@ -133,7 +133,7 @@ impl SiteLanguage {
pub async fn read(pool: &DbPool, for_site_id: SiteId) -> Result<Vec<LanguageId>, Error> {
let conn = &mut get_conn(pool).await?;
let langs = Self::read_internal(conn, for_site_id).await?;
let langs = Self::read_raw(conn, for_site_id).await?;
convert_read_languages(conn, langs).await
}
@ -244,7 +244,7 @@ impl CommunityLanguage {
Ok(())
}
async fn read_internal(
async fn read_raw(
conn: &mut PooledConnection<AsyncPgConnection>,
for_community_id: CommunityId,
) -> Result<Vec<LanguageId>, Error> {
@ -262,7 +262,7 @@ impl CommunityLanguage {
for_community_id: CommunityId,
) -> Result<Vec<LanguageId>, Error> {
let conn = &mut get_conn(pool).await?;
let langs = Self::read_internal(conn, for_community_id).await?;
let langs = Self::read_raw(conn, for_community_id).await?;
convert_read_languages(conn, langs).await
}
@ -273,12 +273,12 @@ impl CommunityLanguage {
) -> Result<(), Error> {
let conn = &mut get_conn(pool).await?;
if language_ids.is_empty() {
language_ids = SiteLanguage::read_local(pool).await?;
language_ids = SiteLanguage::read_local_raw(pool).await?;
}
let lang_ids = convert_update_languages(conn, language_ids).await?;
// No need to update if languages are unchanged
let current = CommunityLanguage::read_internal(conn, for_community_id).await?;
let current = CommunityLanguage::read_raw(conn, for_community_id).await?;
if current == lang_ids {
return Ok(());
}
@ -499,7 +499,7 @@ mod tests {
let pool = &build_db_pool_for_tests().await;
let (site, instance) = create_test_site(pool).await;
let site_languages1 = SiteLanguage::read_local(pool).await.unwrap();
let site_languages1 = SiteLanguage::read_local_raw(pool).await.unwrap();
// site is created with all languages
assert_eq!(184, site_languages1.len());
@ -508,7 +508,7 @@ mod tests {
.await
.unwrap();
let site_languages2 = SiteLanguage::read_local(pool).await.unwrap();
let site_languages2 = SiteLanguage::read_local_raw(pool).await.unwrap();
// after update, site only has new languages
assert_eq!(test_langs, site_languages2);
@ -574,7 +574,7 @@ mod tests {
assert_eq!(test_langs, read_site_langs);
// Test the local ones are the same
let read_local_site_langs = SiteLanguage::read_local(pool).await.unwrap();
let read_local_site_langs = SiteLanguage::read_local_raw(pool).await.unwrap();
assert_eq!(test_langs, read_local_site_langs);
let community_form = CommunityInsertForm::builder()

2
crates/db_schema/src/impls/local_user.rs
View file

@ -83,7 +83,7 @@ impl Crud for LocalUser {
.await
.expect("couldnt create local user");
let site_languages = SiteLanguage::read_local(pool).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?;

2
crates/db_schema/src/impls/site.rs
View file

@ -40,7 +40,7 @@ impl Crud for Site {
.await?;
// initialize languages if site is newly created
if !is_new_site {
if is_new_site {
// initialize with all languages
SiteLanguage::update(pool, vec![], &site_).await?;
}