Merge 6b4b56b0eb into b459949f57

Cargo.lock

@@ -2582,7 +2582,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lemmy_api"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "activitypub_federation",
  "actix-web",
@@ -2611,7 +2611,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_api_common"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "activitypub_federation",
  "actix-web",
@@ -2649,7 +2649,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_api_crud"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "accept-language",
  "activitypub_federation",
@@ -2672,7 +2672,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_apub"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "activitypub_federation",
  "actix-web",
@@ -2710,7 +2710,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_perf"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "anyhow",
  "clap",
@@ -2725,7 +2725,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_schema"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "activitypub_federation",
  "anyhow",
@@ -2765,7 +2765,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_views"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "actix-web",
  "chrono",
@@ -2787,7 +2787,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_views_actor"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "chrono",
  "diesel",
@@ -2807,7 +2807,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_views_moderator"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "diesel",
  "diesel-async",
@@ -2819,7 +2819,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_federate"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "activitypub_federation",
  "anyhow",
@@ -2842,7 +2842,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_routes"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "activitypub_federation",
  "actix-web",
@@ -2867,7 +2867,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_server"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "activitypub_federation",
  "actix-cors",
@@ -2910,7 +2910,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_utils"
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 dependencies = [
  "actix-web",
  "anyhow",

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.19.4-beta.4"
+version = "0.19.4-beta.5"
 edition = "2021"
 description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
@@ -88,17 +88,17 @@ unused_self = "deny"
 unwrap_used = "deny"
 
 [workspace.dependencies]
-lemmy_api = { version = "=0.19.4-beta.4", path = "./crates/api" }
-lemmy_api_crud = { version = "=0.19.4-beta.4", path = "./crates/api_crud" }
-lemmy_apub = { version = "=0.19.4-beta.4", path = "./crates/apub" }
-lemmy_utils = { version = "=0.19.4-beta.4", path = "./crates/utils", default-features = false }
-lemmy_db_schema = { version = "=0.19.4-beta.4", path = "./crates/db_schema" }
-lemmy_api_common = { version = "=0.19.4-beta.4", path = "./crates/api_common" }
-lemmy_routes = { version = "=0.19.4-beta.4", path = "./crates/routes" }
-lemmy_db_views = { version = "=0.19.4-beta.4", path = "./crates/db_views" }
-lemmy_db_views_actor = { version = "=0.19.4-beta.4", path = "./crates/db_views_actor" }
-lemmy_db_views_moderator = { version = "=0.19.4-beta.4", path = "./crates/db_views_moderator" }
-lemmy_federate = { version = "=0.19.4-beta.4", path = "./crates/federate" }
+lemmy_api = { version = "=0.19.4-beta.5", path = "./crates/api" }
+lemmy_api_crud = { version = "=0.19.4-beta.5", path = "./crates/api_crud" }
+lemmy_apub = { version = "=0.19.4-beta.5", path = "./crates/apub" }
+lemmy_utils = { version = "=0.19.4-beta.5", path = "./crates/utils", default-features = false }
+lemmy_db_schema = { version = "=0.19.4-beta.5", path = "./crates/db_schema" }
+lemmy_api_common = { version = "=0.19.4-beta.5", path = "./crates/api_common" }
+lemmy_routes = { version = "=0.19.4-beta.5", path = "./crates/routes" }
+lemmy_db_views = { version = "=0.19.4-beta.5", path = "./crates/db_views" }
+lemmy_db_views_actor = { version = "=0.19.4-beta.5", path = "./crates/db_views_actor" }
+lemmy_db_views_moderator = { version = "=0.19.4-beta.5", path = "./crates/db_views_moderator" }
+lemmy_federate = { version = "=0.19.4-beta.5", path = "./crates/federate" }
 activitypub_federation = { version = "0.5.4", default-features = false, features = [
   "actix-web",
 ] }

crates/apub/src/activities/create_or_update/post.rs

@@ -38,7 +38,7 @@ use url::Url;
 
 impl CreateOrUpdatePage {
   pub(crate) async fn new(
-    post: ApubPost,
+    post: &ApubPost,
     actor: &ApubPerson,
     community: &ApubCommunity,
     kind: CreateOrUpdateType,
@@ -51,7 +51,7 @@ impl CreateOrUpdatePage {
     Ok(CreateOrUpdatePage {
       actor: actor.id().into(),
       to: vec![public()],
-      object: post.into_json(context).await?,
+      object: post.clone().into_json(context).await?,
       cc: vec![community.id()],
       kind,
       id: id.clone(),
@@ -66,7 +66,6 @@ impl CreateOrUpdatePage {
     kind: CreateOrUpdateType,
     context: Data<LemmyContext>,
   ) -> LemmyResult<()> {
-    let post = ApubPost(post);
     let community_id = post.community_id;
     let person: ApubPerson = Person::read(&mut context.pool(), person_id)
       .await?
@@ -78,7 +77,7 @@ impl CreateOrUpdatePage {
       .into();
 
     let create_or_update =
-      CreateOrUpdatePage::new(post, &person, &community, kind, &context).await?;
+      CreateOrUpdatePage::new(&post.into(), &person, &community, kind, &context).await?;
     let is_mod_action = create_or_update.object.is_mod_action(&context).await?;
     let activity = AnnouncableActivities::CreateOrUpdatePost(create_or_update);
     send_activity_in_community(

crates/apub/src/collections/community_outbox.rs

@@ -1,6 +1,6 @@
 use crate::{
   activity_lists::AnnouncableActivities,
-  objects::{community::ApubCommunity, post::ApubPost},
+  objects::community::ApubCommunity,
   protocol::{
     activities::{
       community::announce::AnnounceActivity,
@@ -18,11 +18,8 @@ use activitypub_federation::{
 };
 use futures::future::join_all;
 use lemmy_api_common::{context::LemmyContext, utils::generate_outbox_url};
-use lemmy_db_schema::{
-  source::{person::Person, post::Post},
-  traits::Crud,
-  utils::FETCH_LIMIT_MAX,
-};
+use lemmy_db_schema::{utils::FETCH_LIMIT_MAX, SortType};
+use lemmy_db_views::{post_view::PostQuery, structs::SiteView};
 use lemmy_utils::{
   error::{LemmyError, LemmyResult},
   LemmyErrorType,
@@ -41,19 +38,30 @@ impl Collection for ApubCommunityOutbox {
 
   #[tracing::instrument(skip_all)]
   async fn read_local(owner: &Self::Owner, data: &Data<Self::DataType>) -> LemmyResult<Self::Kind> {
-    let post_list: Vec<ApubPost> = Post::list_for_community(&mut data.pool(), owner.id)
+    let site = SiteView::read_local(&mut data.pool())
       .await?
-      .into_iter()
-      .map(Into::into)
-      .collect();
+      .ok_or(LemmyErrorType::LocalSiteNotSetup)?
+      .site;
+
+    let post_views = PostQuery {
+      community_id: Some(owner.id),
+      sort: Some(SortType::New),
+      limit: Some(FETCH_LIMIT_MAX),
+      ..Default::default()
+    }
+    .list(&site, &mut data.pool())
+    .await?;
+
     let mut ordered_items = vec![];
-    for post in post_list {
-      let person = Person::read(&mut data.pool(), post.creator_id)
-        .await?
-        .ok_or(LemmyErrorType::CouldntFindPerson)?
-        .into();
-      let create =
-        CreateOrUpdatePage::new(post, &person, owner, CreateOrUpdateType::Create, data).await?;
+    for post_view in post_views {
+      let create = CreateOrUpdatePage::new(
+        &post_view.post.into(),
+        &post_view.creator.into(),
+        owner,
+        CreateOrUpdateType::Create,
+        data,
+      )
+      .await?;
       let announcable = AnnouncableActivities::CreateOrUpdatePost(create);
       let announce = AnnounceActivity::new(announcable.try_into()?, owner, data)?;
       ordered_items.push(announce);

crates/apub/src/http/community.rs

@@ -128,7 +128,14 @@ pub(crate) mod tests {
   use crate::protocol::objects::{group::Group, tombstone::Tombstone};
   use actix_web::body::to_bytes;
   use lemmy_db_schema::{
-    source::{community::CommunityInsertForm, instance::Instance},
+    newtypes::InstanceId,
+    source::{
+      community::CommunityInsertForm,
+      instance::Instance,
+      local_site::{LocalSite, LocalSiteInsertForm},
+      local_site_rate_limit::{LocalSiteRateLimit, LocalSiteRateLimitInsertForm},
+      site::{Site, SiteInsertForm},
+    },
     traits::Crud,
     CommunityVisibility,
   };
@@ -142,6 +149,8 @@ pub(crate) mod tests {
   ) -> LemmyResult<(Instance, Community)> {
     let instance =
       Instance::read_or_create(&mut context.pool(), "my_domain.tld".to_string()).await?;
+    create_local_site(context, instance.id).await?;
+
     let community_form = CommunityInsertForm::builder()
       .name("testcom6".to_string())
       .title("nada".to_owned())
@@ -154,6 +163,28 @@ pub(crate) mod tests {
     Ok((instance, community))
   }
 
+  /// Necessary for the community outbox fetching
+  async fn create_local_site(
+    context: &Data<LemmyContext>,
+    instance_id: InstanceId,
+  ) -> LemmyResult<()> {
+    // Create a local site, since this is necessary for community fetching.
+    let site_form = SiteInsertForm::builder()
+      .name("test site".to_string())
+      .instance_id(instance_id)
+      .build();
+    let site = Site::create(&mut context.pool(), &site_form).await?;
+
+    let local_site_form = LocalSiteInsertForm::builder().site_id(site.id).build();
+    let local_site = LocalSite::create(&mut context.pool(), &local_site_form).await?;
+    let local_site_rate_limit_form = LocalSiteRateLimitInsertForm::builder()
+      .local_site_id(local_site.id)
+      .build();
+
+    LocalSiteRateLimit::create(&mut context.pool(), &local_site_rate_limit_form).await?;
+    Ok(())
+  }
+
   async fn decode_response<T: DeserializeOwned>(res: HttpResponse) -> LemmyResult<T> {
     let body = to_bytes(res.into_body()).await.unwrap();
     let body = std::str::from_utf8(&body)?;
@@ -164,6 +195,7 @@ pub(crate) mod tests {
   #[serial]
   async fn test_get_community() -> LemmyResult<()> {
     let context = LemmyContext::init_test_context().await;
+    let (instance, community) = init(false, CommunityVisibility::Public, &context).await?;
 
     // fetch invalid community
     let query = CommunityQuery {
@@ -172,8 +204,6 @@ pub(crate) mod tests {
     let res = get_apub_community_http(query.into(), context.reset_request_count()).await;
     assert!(res.is_err());
 
-    let (instance, community) = init(false, CommunityVisibility::Public, &context).await?;
-
     // fetch valid community
     let query = CommunityQuery {
       community_name: community.name.clone(),

crates/db_schema/src/impls/post.rs

@@ -84,22 +84,6 @@ impl Post {
       .await
   }
 
-  pub async fn list_for_community(
-    pool: &mut DbPool<'_>,
-    the_community_id: CommunityId,
-  ) -> Result<Vec<Self>, Error> {
-    let conn = &mut get_conn(pool).await?;
-    post::table
-      .filter(post::community_id.eq(the_community_id))
-      .filter(post::deleted.eq(false))
-      .filter(post::removed.eq(false))
-      .then_order_by(post::featured_community.desc())
-      .then_order_by(post::published.desc())
-      .limit(FETCH_LIMIT_MAX)
-      .load::<Self>(conn)
-      .await
-  }
-
   pub async fn list_featured_for_community(
     pool: &mut DbPool<'_>,
     the_community_id: CommunityId,

crates/utils/translations

@@ -1 +1 @@
-Subproject commit c88dd1e3b36ee1617f1b86acf94c1b7946e97cd4
+Subproject commit 866e4056656755f7b31e20094b46391e6931e3e7