Merge pull request #3767 from Roardom/fix-external-tracker-connectivi…

…ty-status (Fix) Connectivity check on external tracker
HDInnovations · Apr 19, 2024 · ab956c2 · ab956c2
2 parents 3b6dac0 + f653641
commit ab956c2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/app/Http/Controllers/TorrentPeerController.php b/app/Http/Controllers/TorrentPeerController.php
@@ -30,7 +30,7 @@ public function index(int $id): \Illuminate\Contracts\View\Factory|\Illuminate\V
             'torrent' => $torrent,
             'peers'   => Peer::query()
                 ->with('user')
-                ->select(['torrent_id', 'user_id', 'uploaded', 'downloaded', 'left', 'port', 'agent', 'created_at', 'updated_at', 'seeder', 'active', 'visible'])
+                ->select(['torrent_id', 'user_id', 'uploaded', 'downloaded', 'left', 'port', 'agent', 'created_at', 'updated_at', 'seeder', 'active', 'visible', 'connectable'])
                 ->selectRaw('INET6_NTOA(ip) as ip')
                 ->where('torrent_id', '=', $id)
                 ->orderByDesc('active')

diff --git a/app/Http/Controllers/User/UserController.php b/app/Http/Controllers/User/UserController.php
@@ -90,7 +90,7 @@ public function show(Request $request, User $user): \Illuminate\Contracts\View\F
             'invitedBy' => Invite::where('accepted_by', '=', $user->id)->first(),
             'clients'   => $user->peers()
                 ->select('agent', 'port')
-                ->selectRaw('INET6_NTOA(ip) as ip, MIN(created_at) as created_at, MAX(updated_at) as updated_at, COUNT(*) as num_peers')
+                ->selectRaw('INET6_NTOA(ip) as ip, MIN(created_at) as created_at, MAX(updated_at) as updated_at, COUNT(*) as num_peers, MAX(connectable) as connectable')
                 ->groupBy(['ip', 'port', 'agent'])
                 ->where('active', '=', true)
                 ->get(),

diff --git a/resources/views/livewire/user-active.blade.php b/resources/views/livewire/user-active.blade.php
@@ -294,7 +294,9 @@ class="user-active__name"
                                 <td class="user-active__connectable">
                                     @php
                                         $connectable = null;
-                                        if (cache()->has('peers:connectable:' . $active->ip . '-' . $active->port . '-' . $active->agent)) {
+                                        if (config('announce.external_tracker.is_enabled')) {
+                                            $connectable = $active->connectable;
+                                        } elseif (cache()->has('peers:connectable:' . $active->ip . '-' . $active->port . '-' . $active->agent)) {
                                             $connectable = cache()->get('peers:connectable:' . $active->ip . '-' . $active->port . '-' . $active->agent);
                                         }
                                     @endphp

diff --git a/resources/views/torrent/peers.blade.php b/resources/views/torrent/peers.blade.php
@@ -106,7 +106,9 @@ class="nav-tab__link"
                             @if (\config('announce.connectable_check') == true)
                                 @php
                                     $connectable = false;
-                                    if (cache()->has('peers:connectable:' . $peer->ip . '-' . $peer->port . '-' . $peer->agent)) {
+                                    if (config('announce.external_tracker.is_enabled')) {
+                                        $connectable = $peer->connectable;
+                                    } elseif (cache()->has('peers:connectable:' . $peer->ip . '-' . $peer->port . '-' . $peer->agent)) {
                                         $connectable = cache()->get('peers:connectable:' . $peer->ip . '-' . $peer->port . '-' . $peer->agent);
                                     }
                                 @endphp

diff --git a/resources/views/user/profile/show.blade.php b/resources/views/user/profile/show.blade.php
@@ -303,7 +303,9 @@ class="user-search__avatar"
                                     @if (\config('announce.connectable_check') == true)
                                         @php
                                             $connectable = false;
-                                            if (cache()->has('peers:connectable:' . $client->ip . '-' . $client->port . '-' . $client->agent)) {
+                                            if (config('announce.external_tracker.is_enabled')) {
+                                                $connectable = $client->connectable;
+                                            } elseif (cache()->has('peers:connectable:' . $client->ip . '-' . $client->port . '-' . $client->agent)) {
                                                 $connectable = cache()->get('peers:connectable:' . $client->ip . '-' . $client->port . '-' . $client->agent);
                                             }
                                         @endphp