Merge pull request #3233 from pixelfed/staging

Staging

CHANGELOG.md

@@ -42,6 +42,7 @@
 - Updated PostComponent.vue, filter out non-text comments. ([a7346f21](https://github.com/pixelfed/pixelfed/commit/a7346f21))
 - Updated Profile.vue component, fix v-once bug. ([4d003d00](https://github.com/pixelfed/pixelfed/commit/4d003d00))
 - Updated filesystems config, set S3 visibility to public by default. Fixes #2913. ([49a53c27](https://github.com/pixelfed/pixelfed/commit/49a53c27))
+- Updated CommentPipeline, improve parent reply_count calculation. ([ccc94802](https://github.com/pixelfed/pixelfed/commit/ccc94802))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)

app/Jobs/CommentPipeline/CommentPipeline.php

@@ -59,10 +59,13 @@ class CommentPipeline implements ShouldQueue
         $target = $status->profile;
         $actor = $comment->profile;
 
-        DB::transaction(function() use($status) {
-        	$status->reply_count = DB::table('statuses')->whereInReplyToId($status->id)->count();
-        	$status->save();
-        });
+        if(config('database.default') === 'mysql') {
+	        DB::transaction(function() use($status) {
+	        	$count = DB::select( DB::raw("select id, in_reply_to_id from statuses, (select @pv := :kid) initialisation where id > @pv and find_in_set(in_reply_to_id, @pv) > 0 and @pv := concat(@pv, ',', id)"), [ 'kid' => $status->id]);
+	        	$status->reply_count = count($count);
+	        	$status->save();
+	        });
+        }
 
         if ($actor->id === $target->id || $status->comments_disabled == true) {
             return true;

public/mix-manifest.json

@@ -24,7 +24,7 @@
     "/js/rempos.js": "/js/rempos.js?id=5f24e4ed251a202023f7",
     "/js/rempro.js": "/js/rempro.js?id=2cc0d82e0cef827608c5",
     "/js/search.js": "/js/search.js?id=dc888b173463dc3894ba",
-    "/js/spa.js": "/js/spa.js?id=1a51199a3cb0ec51635b",
+    "/js/spa.js": "/js/spa.js?id=964281eeffa0e59d0b1a",
     "/js/status.js": "/js/status.js?id=5869d8f86d80221006d3",
     "/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7",
     "/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a",