Merge branch 'main' into consistent-cmd-args2

Cargo.lock

@@ -2589,12 +2589,16 @@ version = "0.19.0-rc.13"
 dependencies = [
  "activitypub_federation",
  "actix-web",
+ "anyhow",
  "bcrypt",
+ "futures",
  "lemmy_api_common",
  "lemmy_db_schema",
  "lemmy_db_views",
  "lemmy_db_views_actor",
  "lemmy_utils",
+ "moka",
+ "once_cell",
  "tracing",
  "url",
  "uuid",

api_tests/src/image.spec.ts

@@ -18,7 +18,6 @@ import {
   setupLogins,
   unfollowRemotes,
 } from "./shared";
-import * as fs from "node:fs";
 const downloadFileSync = require("download-file-sync");
 
 beforeAll(setupLogins);
@@ -28,8 +27,9 @@ afterAll(() => {
 });
 
 test("Upload image and delete it", async () => {
-  // upload test image
-  const upload_image = fs.readFileSync("test.png");
+  // Upload test image. We use a simple string buffer as pictrs doesnt require an actual image
+  // in testing mode.
+  const upload_image = Buffer.from("test");
   const upload_form: UploadImage = {
     image: upload_image,
   };
@@ -60,7 +60,7 @@ test("Purge user, uploaded image removed", async () => {
   let user = await registerUser(alphaImage, alphaUrl);
 
   // upload test image
-  const upload_image = fs.readFileSync("test.png");
+  const upload_image = Buffer.from("test");
   const upload_form: UploadImage = {
     image: upload_image,
   };
@@ -91,7 +91,7 @@ test("Purge post, linked image removed", async () => {
   let user = await registerUser(beta, betaUrl);
 
   // upload test image
-  const upload_image = fs.readFileSync("test.png");
+  const upload_image = Buffer.from("test");
   const upload_form: UploadImage = {
     image: upload_image,
   };

crates/api_crud/Cargo.toml

@@ -22,5 +22,12 @@ bcrypt = { workspace = true }
 actix-web = { workspace = true }
 tracing = { workspace = true }
 url = { workspace = true }
-webmention = "0.5.0"
+futures.workspace = true
 uuid = { workspace = true }
+moka.workspace = true
+once_cell.workspace = true
+anyhow.workspace = true
+webmention = "0.5.0"
+
+[package.metadata.cargo-machete]
+ignored = ["futures"]

crates/api_crud/src/site/read.rs

@@ -21,46 +21,68 @@ use lemmy_utils::{
   error::{LemmyError, LemmyErrorExt, LemmyErrorType},
   version,
 };
+use moka::future::Cache;
+use once_cell::sync::Lazy;
+use std::time::Duration;
 
 #[tracing::instrument(skip(context))]
 pub async fn get_site(
   local_user_view: Option<LocalUserView>,
   context: Data<LemmyContext>,
 ) -> Result<Json<GetSiteResponse>, LemmyError> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  static CACHE: Lazy<Cache<(), GetSiteResponse>> = Lazy::new(|| {
+    Cache::builder()
+      .max_capacity(1)
+      .time_to_live(Duration::from_secs(1))
+      .build()
+  });
 
-  let admins = PersonView::admins(&mut context.pool()).await?;
+  // This data is independent from the user account so we can cache it across requests
+  let mut site_response = CACHE
+    .try_get_with::<_, LemmyError>((), async {
+      let site_view = SiteView::read_local(&mut context.pool()).await?;
+      let admins = PersonView::admins(&mut context.pool()).await?;
+      let all_languages = Language::read_all(&mut context.pool()).await?;
+      let discussion_languages = SiteLanguage::read_local_raw(&mut context.pool()).await?;
+      let taglines = Tagline::get_all(&mut context.pool(), site_view.local_site.id).await?;
+      let custom_emojis =
+        CustomEmojiView::get_all(&mut context.pool(), site_view.local_site.id).await?;
+      Ok(GetSiteResponse {
+        site_view,
+        admins,
+        version: version::VERSION.to_string(),
+        my_user: None,
+        all_languages,
+        discussion_languages,
+        taglines,
+        custom_emojis,
+      })
+    })
+    .await
+    .map_err(|e| anyhow::anyhow!("Failed to construct site response: {e}"))?;
 
-  // Build the local user
-  let my_user = if let Some(local_user_view) = local_user_view {
+  // Build the local user with parallel queries and add it to site response
+  site_response.my_user = if let Some(local_user_view) = local_user_view {
     let person_id = local_user_view.person.id;
     let local_user_id = local_user_view.local_user.id;
+    let pool = &mut context.pool();
 
-    let follows = CommunityFollowerView::for_person(&mut context.pool(), person_id)
-      .await
-      .with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
-
-    let person_id = local_user_view.person.id;
-    let community_blocks = CommunityBlockView::for_person(&mut context.pool(), person_id)
-      .await
-      .with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
-
-    let instance_blocks = InstanceBlockView::for_person(&mut context.pool(), person_id)
-      .await
-      .with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
-
-    let person_id = local_user_view.person.id;
-    let person_blocks = PersonBlockView::for_person(&mut context.pool(), person_id)
-      .await
-      .with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
-
-    let moderates = CommunityModeratorView::for_person(&mut context.pool(), person_id)
-      .await
-      .with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
-
-    let discussion_languages = LocalUserLanguage::read(&mut context.pool(), local_user_id)
-      .await
-      .with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
+    let (
+      follows,
+      community_blocks,
+      instance_blocks,
+      person_blocks,
+      moderates,
+      discussion_languages,
+    ) = lemmy_db_schema::try_join_with_pool!(pool => (
+      |pool| CommunityFollowerView::for_person(pool, person_id),
+      |pool| CommunityBlockView::for_person(pool, person_id),
+      |pool| InstanceBlockView::for_person(pool, person_id),
+      |pool| PersonBlockView::for_person(pool, person_id),
+      |pool| CommunityModeratorView::for_person(pool, person_id),
+      |pool| LocalUserLanguage::read(pool, local_user_id)
+    ))
+    .with_lemmy_type(LemmyErrorType::SystemErrLogin)?;
 
     Some(MyUserInfo {
       local_user_view,
@@ -75,20 +97,5 @@ pub async fn get_site(
     None
   };
 
-  let all_languages = Language::read_all(&mut context.pool()).await?;
-  let discussion_languages = SiteLanguage::read_local_raw(&mut context.pool()).await?;
-  let taglines = Tagline::get_all(&mut context.pool(), site_view.local_site.id).await?;
-  let custom_emojis =
-    CustomEmojiView::get_all(&mut context.pool(), site_view.local_site.id).await?;
-
-  Ok(Json(GetSiteResponse {
-    site_view,
-    admins,
-    version: version::VERSION.to_string(),
-    my_user,
-    all_languages,
-    discussion_languages,
-    taglines,
-    custom_emojis,
-  }))
+  Ok(Json(site_response))
 }

crates/db_views_actor/src/person_view.rs

@@ -1,6 +1,5 @@
 use crate::structs::PersonView;
 use diesel::{
-  dsl::exists,
   pg::Pg,
   result::Error,
   BoolExpressionMethods,
@@ -13,7 +12,17 @@ use diesel_async::RunQueryDsl;
 use lemmy_db_schema::{
   newtypes::PersonId,
   schema::{local_user, person, person_aggregates},
-  utils::{fuzzy_search, limit_and_offset, now, DbConn, DbPool, ListFn, Queries, ReadFn},
+  utils::{
+    functions::coalesce,
+    fuzzy_search,
+    limit_and_offset,
+    now,
+    DbConn,
+    DbPool,
+    ListFn,
+    Queries,
+    ReadFn,
+  },
   SortType,
 };
 use serde::{Deserialize, Serialize};
@@ -48,21 +57,15 @@ fn post_to_person_sort_type(sort: SortType) -> PersonSortType {
 
 fn queries<'a>(
 ) -> Queries<impl ReadFn<'a, PersonView, PersonId>, impl ListFn<'a, PersonView, ListMode>> {
-  let creator_is_admin = exists(
-    local_user::table.filter(
-      person::id
-        .eq(local_user::person_id)
-        .and(local_user::admin.eq(true)),
-    ),
-  );
   let all_joins = move |query: person::BoxedQuery<'a, Pg>| {
     query
       .inner_join(person_aggregates::table)
+      .left_join(local_user::table)
       .filter(person::deleted.eq(false))
       .select((
         person::all_columns,
         person_aggregates::all_columns,
-        creator_is_admin,
+        coalesce(local_user::admin.nullable(), false),
       ))
   };
 
@@ -77,7 +80,7 @@ fn queries<'a>(
     match mode {
       ListMode::Admins => {
         query = query
-          .filter(creator_is_admin.eq(true))
+          .filter(local_user::admin.eq(true))
           .filter(person::deleted.eq(false))
           .order_by(person::published);
       }

crates/utils/translations

@@ -1 +1 @@
-Subproject commit aa9438c4930deb23ae0dc54a061ed4b0b3824582
+Subproject commit 7a38baa7341cfa9299df5a80ebe42fe298380e40