Explorar o código

Merge pull request #3978 from pixelfed/staging

Staging
daniel %!s(int64=2) %!d(string=hai) anos
pai
achega
8cd0f0b5df
Modificáronse 2 ficheiros con 2 adicións e 8 borrados
  1. 2 0
      CHANGELOG.md
  2. 0 8
      app/Jobs/CommentPipeline/CommentPipeline.php

+ 2 - 0
CHANGELOG.md

@@ -61,6 +61,8 @@
 - Update MediaStorageService, clear MediaService and StatusService caches after localToCloud ([de56b0f0](https://github.com/pixelfed/pixelfed/commit/de56b0f0))
 - Add CloudMediaMigrate command to migrate older local media to cloud storage ([382d00d9](https://github.com/pixelfed/pixelfed/commit/382d00d9))
 - Update MediaS3GarbageCollector command, handle thumbnail deletion ([95bbcc38](https://github.com/pixelfed/pixelfed/commit/95bbcc38))
+- Update StatusReplyPipeline, remove expensive reply count re-calculation query ([a2f8aad1](https://github.com/pixelfed/pixelfed/commit/a2f8aad1))
+- Update CommentPipeline, remove expensive reply count re-calculation query ([b457a446](https://github.com/pixelfed/pixelfed/commit/b457a446))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

+ 0 - 8
app/Jobs/CommentPipeline/CommentPipeline.php

@@ -59,14 +59,6 @@ class CommentPipeline implements ShouldQueue
         $target = $status->profile;
         $actor = $comment->profile;
 
-        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;
         }