Merge pull request #321 from LemmyNet/main

[pull] master from LemmyNet:main

Author: pull[bot]

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "1.0.0-alpha.3"
+version = "1.0.0-alpha.4"
 edition = "2021"
 description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
@@ -79,15 +79,15 @@ map_err_ignore = "deny"
 expect_used = "deny"
 
 [workspace.dependencies]
-lemmy_api = { version = "=1.0.0-alpha.3", path = "./crates/api" }
-lemmy_api_crud = { version = "=1.0.0-alpha.3", path = "./crates/api_crud" }
-lemmy_apub = { version = "=1.0.0-alpha.3", path = "./crates/apub" }
-lemmy_utils = { version = "=1.0.0-alpha.3", path = "./crates/utils", default-features = false }
-lemmy_db_schema = { version = "=1.0.0-alpha.3", path = "./crates/db_schema" }
-lemmy_api_common = { version = "=1.0.0-alpha.3", path = "./crates/api_common" }
-lemmy_routes = { version = "=1.0.0-alpha.3", path = "./crates/routes" }
-lemmy_db_views = { version = "=1.0.0-alpha.3", path = "./crates/db_views" }
-lemmy_federate = { version = "=1.0.0-alpha.3", path = "./crates/federate" }
+lemmy_api = { version = "=1.0.0-alpha.4", path = "./crates/api" }
+lemmy_api_crud = { version = "=1.0.0-alpha.4", path = "./crates/api_crud" }
+lemmy_apub = { version = "=1.0.0-alpha.4", path = "./crates/apub" }
+lemmy_utils = { version = "=1.0.0-alpha.4", path = "./crates/utils", default-features = false }
+lemmy_db_schema = { version = "=1.0.0-alpha.4", path = "./crates/db_schema" }
+lemmy_api_common = { version = "=1.0.0-alpha.4", path = "./crates/api_common" }
+lemmy_routes = { version = "=1.0.0-alpha.4", path = "./crates/routes" }
+lemmy_db_views = { version = "=1.0.0-alpha.4", path = "./crates/db_views" }
+lemmy_federate = { version = "=1.0.0-alpha.4", path = "./crates/federate" }
 activitypub_federation = { version = "0.6.3", default-features = false, features = [
   "actix-web",
 ] }

Cargo.toml

@@ -1,7 +1,7 @@
 use crate::{
   diesel::{DecoratableTarget, OptionalExtension},
   newtypes::{CommentId, DbUrl, InstanceId, PersonId},
-  schema::{comment, comment_actions, post},
+  schema::{comment, comment_actions, community, post},
   source::comment::{
     Comment,
     CommentActions,
@@ -26,6 +26,7 @@ use diesel::{
   result::Error,
   update,
   ExpressionMethods,
+  JoinOnDsl,
   QueryDsl,
 };
 use diesel_async::RunQueryDsl;
@@ -78,8 +79,9 @@ impl Comment {
     // Diesel can't update from join unfortunately, so you'll need to loop over these
     let comment_ids = comment::table
       .inner_join(post::table)
+      .inner_join(community::table.on(post::community_id.eq(community::id)))
       .filter(comment::creator_id.eq(creator_id))
-      .filter(post::instance_id.eq(instance_id))
+      .filter(community::instance_id.eq(instance_id))
       .select(comment::id)
       .load::<CommentId>(conn)
       .await?;

crates/db_schema/src/impls/comment.rs

@@ -162,7 +162,15 @@ impl Post {
     }
 
     if let Some(for_instance_id) = for_instance_id {
-      update = update.filter(post::instance_id.eq(for_instance_id));
+      // Diesel can't update from join unfortunately, so you'll need to loop over these
+      let post_ids = post::table
+        .inner_join(community::table)
+        .filter(post::creator_id.eq(for_creator_id))
+        .filter(community::instance_id.eq(for_instance_id))
+        .select(post::id)
+        .load::<PostId>(conn)
+        .await?;
+      update = update.filter(post::id.eq_any(post_ids));
     }
 
     update