Fix n plus query issue with likes (#1345)

driesvints · web-flow · commit 2d2df61a2828 · 2025-09-03T21:20:21.000+02:00
diff --git a/app/Livewire/Likes.php b/app/Livewire/Likes.php
@@ -33,7 +33,7 @@ public function mount($subject): void
 
     public function getLikers(): array
     {
-        $likers = $this->subject->likersRelation()->limit($this->limit + 1)->pluck('username')->toArray();
+        $likers = $this->subject->likes()->slice($this->limit + 1)->pluck('username')->toArray();
 
         if (auth()->check() && in_array($authUsername = auth()->user()->username, $likers)) {
             $likers = array_diff($likers, [$authUsername]);
diff --git a/app/Models/Thread.php b/app/Models/Thread.php
@@ -294,10 +294,7 @@ public static function feedByTagQuery(Tag $tag): Builder
      */
     public static function feedQuery(): Builder
     {
-        return self::withOnly([
-            'tagsRelation',
-            'authorRelation',
-        ])
+        return self::query()
             ->withCount(['repliesRelation as reply_count', 'likesRelation as like_count'])
             ->latest('last_activity_at');
     }
diff --git a/composer.json b/composer.json
@@ -40,6 +40,7 @@
         "symfony/mailgun-mailer": "^7.0"
     },
     "require-dev": {
+        "barryvdh/laravel-debugbar": "^3.16",
         "fakerphp/faker": "^1.23",
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^8.0",
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function mount($subject): void`
`33`	`33`
`34`	`34`	`public function getLikers(): array`
`35`	`35`	`{`
`36`		`- $likers = $this->subject->likersRelation()->limit($this->limit + 1)->pluck('username')->toArray();`
	`36`	`+ $likers = $this->subject->likes()->slice($this->limit + 1)->pluck('username')->toArray();`
`37`	`37`
`38`	`38`	`if (auth()->check() && in_array($authUsername = auth()->user()->username, $likers)) {`
`39`	`39`	`$likers = array_diff($likers, [$authUsername]);`
Original file line number	Diff line number	Diff line change
`@@ -294,10 +294,7 @@ public static function feedByTagQuery(Tag $tag): Builder`
`294`	`294`	`*/`
`295`	`295`	`public static function feedQuery(): Builder`
`296`	`296`	`{`
`297`		`- return self::withOnly([`
`298`		`- 'tagsRelation',`
`299`		`- 'authorRelation',`
`300`		`- ])`
	`297`	`+ return self::query()`
`301`	`298`	`->withCount(['repliesRelation as reply_count', 'likesRelation as like_count'])`
`302`	`299`	`->latest('last_activity_at');`
`303`	`300`	`}`