Merge b7e8981d29 into 9120207314

crates/api/src/comment/like.rs

@@ -59,7 +59,6 @@ pub async fn like_comment(
 
   let like_form = CommentLikeForm {
     comment_id: data.comment_id,
-    post_id: orig_comment.post.id,
     person_id: local_user_view.person.id,
     score: data.score,
   };

crates/api_common/src/utils.rs

@@ -169,7 +169,6 @@ pub async fn update_read_comments(
     person_id,
     post_id,
     read_comments,
-    ..PersonPostAggregatesForm::default()
   };
 
   PersonPostAggregates::upsert(pool, &person_post_agg_form)

crates/api_crud/src/comment/create.rs

@@ -160,7 +160,6 @@ pub async fn create_comment(
   // You like your own comment by default
   let like_form = CommentLikeForm {
     comment_id: inserted_comment.id,
-    post_id: post.id,
     person_id: local_user_view.person.id,
     score: 1,
   };

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

@@ -160,7 +160,6 @@ impl ActivityHandler for CreateOrUpdateNote {
     // author likes their own comment by default
     let like_form = CommentLikeForm {
       comment_id: comment.id,
-      post_id: comment.post_id,
       person_id: comment.creator_id,
       score: 1,
     };

crates/apub/src/activities/voting/mod.rs

@@ -62,7 +62,6 @@ async fn vote_comment(
   let comment_id = comment.id;
   let like_form = CommentLikeForm {
     comment_id,
-    post_id: comment.post_id,
     person_id: actor.id,
     score: vote_type.into(),
   };

crates/db_schema/src/aggregates/comment_aggregates.rs

@@ -110,7 +110,6 @@ mod tests {
 
     let comment_like = CommentLikeForm {
       comment_id: inserted_comment.id,
-      post_id: inserted_post.id,
       person_id: inserted_person.id,
       score: 1,
     };
@@ -129,7 +128,6 @@ mod tests {
     // Add a post dislike from the other person
     let comment_dislike = CommentLikeForm {
       comment_id: inserted_comment.id,
-      post_id: inserted_post.id,
       person_id: another_inserted_person.id,
       score: -1,
     };

crates/db_schema/src/aggregates/person_aggregates.rs

@@ -93,7 +93,6 @@ mod tests {
     let mut comment_like = CommentLikeForm {
       comment_id: inserted_comment.id,
       person_id: inserted_person.id,
-      post_id: inserted_post.id,
       score: 1,
     };
 
@@ -113,7 +112,6 @@ mod tests {
     let child_comment_like = CommentLikeForm {
       comment_id: inserted_child_comment.id,
       person_id: another_inserted_person.id,
-      post_id: inserted_post.id,
       score: 1,
     };
 

crates/db_schema/src/aggregates/structs.rs

@@ -173,7 +173,6 @@ pub struct PersonPostAggregatesForm {
   pub person_id: PersonId,
   pub post_id: PostId,
   pub read_comments: i64,
-  pub published: Option<DateTime<Utc>>,
 }
 
 #[derive(PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy, Hash)]

crates/db_schema/src/impls/comment.rs

@@ -293,7 +293,6 @@ mod tests {
     // Comment Like
     let comment_like_form = CommentLikeForm {
       comment_id: inserted_comment.id,
-      post_id: inserted_post.id,
       person_id: inserted_person.id,
       score: 1,
     };
@@ -302,7 +301,6 @@ mod tests {
 
     let expected_comment_like = CommentLike {
       comment_id: inserted_comment.id,
-      post_id: inserted_post.id,
       person_id: inserted_person.id,
       published: inserted_comment_like.published,
       score: 1,

crates/db_schema/src/source/comment.rs

@@ -99,7 +99,6 @@ pub struct CommentUpdateForm {
 pub struct CommentLike {
   pub person_id: PersonId,
   pub comment_id: CommentId,
-  pub post_id: PostId, // TODO this is redundant
   pub score: i16,
   pub published: DateTime<Utc>,
 }
@@ -110,7 +109,6 @@ pub struct CommentLike {
 pub struct CommentLikeForm {
   pub person_id: PersonId,
   pub comment_id: CommentId,
-  pub post_id: PostId, // TODO this is redundant
   pub score: i16,
 }
 

crates/db_views/src/comment_view.rs

@@ -604,7 +604,6 @@ mod tests {
 
     let comment_like_form = CommentLikeForm {
       comment_id: inserted_comment_0.id,
-      post_id: inserted_post.id,
       person_id: inserted_timmy_person.id,
       score: 1,
     };
@@ -704,7 +703,6 @@ mod tests {
     // Like a new comment
     let comment_like_form = CommentLikeForm {
       comment_id: data.inserted_comment_1.id,
-      post_id: data.inserted_post.id,
       person_id: data.timmy_local_user_view.person.id,
       score: 1,
     };

crates/db_views/src/vote_view.rs

@@ -10,7 +10,7 @@ use diesel::{
 use diesel_async::RunQueryDsl;
 use lemmy_db_schema::{
   newtypes::{CommentId, PostId},
-  schema::{comment_like, community_person_ban, person, post, post_like},
+  schema::{comment, comment_like, community_person_ban, person, post, post_like},
   utils::{get_conn, limit_and_offset, DbPool},
 };
 
@@ -59,7 +59,7 @@ impl VoteView {
 
     comment_like::table
       .inner_join(person::table)
-      .inner_join(post::table)
+      .inner_join(comment::table.inner_join(post::table))
       // Join to community_person_ban to get creator_banned_from_community
       .left_join(
         community_person_ban::table.on(
@@ -181,7 +181,6 @@ mod tests {
 
     // Timothy votes down his own comment
     let timmy_comment_vote_form = CommentLikeForm {
-      post_id: inserted_post.id,
       comment_id: inserted_comment.id,
       person_id: inserted_timmy.id,
       score: -1,
@@ -192,7 +191,6 @@ mod tests {
 
     // Sara upvotes timmy's comment
     let sara_comment_vote_form = CommentLikeForm {
-      post_id: inserted_post.id,
       comment_id: inserted_comment.id,
       person_id: inserted_sara.id,
       score: 1,

migrations/2024-06-05-134311_remove_redundant_post_id/down.sql

@@ -0,0 +1,16 @@
+ALTER TABLE comment_actions
+    ADD COLUMN post_id int REFERENCES post ON UPDATE CASCADE ON DELETE CASCADE;
+
+UPDATE
+    comment_actions
+SET
+    post_id = (
+        SELECT
+            post_id
+        FROM
+            comment
+        WHERE
+            comment.id = comment_actions.comment_id)
+WHERE
+    liked IS NOT NULL;
+

migrations/2024-06-05-134311_remove_redundant_post_id/up.sql

@@ -0,0 +1,3 @@
+ALTER TABLE comment_actions
+    DROP COLUMN post_id;
+