fix: bonEarnings() method with explicit column selection to avoid ambiguity

Author: HDVinnie

app/Http/Livewire/UserEarnings.php

@@ -71,7 +71,25 @@ final public function bonEarnings(): \Illuminate\Support\Collection
     {
         $outerQuery = DB::query();
         $innerQuery = Peer::query()
-            ->join('history', fn ($join) => $join->on('history.torrent_id', '=', 'peers.torrent_id')->on('history.user_id', '=', 'peers.user_id'))
+            ->select([
+                'peers.torrent_id',
+                'peers.user_id',
+                'torrents.name',
+                'torrents.created_at as torrent_created_at',
+                'torrents.size',
+                'torrents.seeders',
+                'torrents.leechers',
+                'torrents.times_completed',
+                'torrents.internal',
+                'torrents.personal_release',
+                'torrents.type_id',
+                'history.seedtime',
+                'peers.connectable'
+            ])
+            ->join('history', function ($join): void {
+                $join->on('history.torrent_id', '=', 'peers.torrent_id')
+                    ->on('history.user_id', '=', 'peers.user_id');
+            })
             ->join('torrents', 'peers.torrent_id', '=', 'torrents.id')
             ->where('peers.seeder', '=', true)
             ->where('peers.active', '=', true)
@@ -87,16 +105,16 @@ final public function bonEarnings(): \Illuminate\Support\Collection
             foreach ($bonEarning->conditions as $condition) {
                 $conditionQuery .= ' AND '.match ($condition->operand1) {
                     '1'                => '1',
-                    'age'              => 'TIMESTAMPDIFF(SECOND, torrents.created_at, NOW())',
-                    'size'             => 'torrents.size',
-                    'seeders'          => 'torrents.seeders',
-                    'leechers'         => 'torrents.leechers',
-                    'times_completed'  => 'torrents.times_completed',
-                    'internal'         => 'torrents.internal',
-                    'personal_release' => 'torrents.personal_release',
-                    'type_id'          => 'torrents.type_id',
-                    'seedtime'         => 'history.seedtime',
-                    'connectable'      => 'peers.connectable',
+                    'age'              => 'TIMESTAMPDIFF(SECOND, torrent_created_at, NOW())',
+                    'size'             => 'size',
+                    'seeders'          => 'seeders',
+                    'leechers'         => 'leechers',
+                    'times_completed'  => 'times_completed',
+                    'internal'         => 'internal',
+                    'personal_release' => 'personal_release',
+                    'type_id'          => 'type_id',
+                    'seedtime'         => 'seedtime',
+                    'connectable'      => 'connectable',
                 }.' '.$condition->operator.' '.$condition->operand2;
             }