Merge pull request #4169 from Roardom/profile-client-seedsize

(Add) Client torrent size sum to profile page
HDInnovations · Nov 21, 2024 · a93c9f1 · a93c9f1
2 parents cabf501 + 69b7f1f
commit a93c9f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/app/Http/Controllers/User/UserController.php b/app/Http/Controllers/User/UserController.php
@@ -94,8 +94,14 @@ public function show(Request $request, User $user): \Illuminate\Contracts\View\F
             // 'boughtDownload'        => BonTransactions::where('sender_id', '=', $user->id)->where([['name', 'like', '%Download%']])->sum('cost'),
             'invitedBy' => Invite::where('accepted_by', '=', $user->id)->first(),
             'clients'   => $user->peers()
+                ->join('torrents', 'torrents.id', '=', 'peers.torrent_id')
                 ->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, MAX(connectable) as connectable')
+                ->selectRaw('INET6_NTOA(peers.ip) as ip')
+                ->selectRaw('MIN(peers.created_at) as created_at')
+                ->selectRaw('MAX(peers.updated_at) as updated_at')
+                ->selectRaw('SUM(torrents.size) as size')
+                ->selectRaw('COUNT(*) as num_peers')
+                ->selectRaw('MAX(peers.connectable) as connectable')
                 ->groupBy(['ip', 'port', 'agent'])
                 ->where('active', '=', true)
                 ->get(),

diff --git a/resources/views/user/profile/show.blade.php b/resources/views/user/profile/show.blade.php
@@ -256,6 +256,7 @@ class="user-search__avatar"
                                 <th>{{ __('torrent.started') }}</th>
                                 <th>{{ __('torrent.last-update') }}</th>
                                 <th>{{ __('torrent.peers') }}</th>
+                                <th>{{ __('torrent.size') }}</th>
                                 @if (\config('announce.connectable_check') === true)
                                     <th>Connectable</th>
                                 @endif
@@ -300,6 +301,9 @@ class="user-search__avatar"
                                             {{ $client->num_peers }}
                                         </a>
                                     </td>
+                                    <td>
+                                        {{ App\Helpers\StringHelper::formatBytes($client->size) }}
+                                    </td>
                                     @if (\config('announce.connectable_check') == true)
                                         @php
                                             $connectable = false;