mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-04-28 22:41:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Announce: Seeder not getting Leecher Peers

Browse Source
This commit is contained in:
alkl58
2024-04-02 17:10:11 +02:00
parent 0f138bd6e2
commit 17bbd99514
1 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AnnounceController.php
+33 -15
View File
@@ -552,34 +552,30 @@ final class AnnounceController extends Controller
*/
private function generateSuccessAnnounceResponse(AnnounceQueryDTO $queries, Torrent $torrent, User $user): string
{
// Build Response For Bittorrent Client
// Keys must be ordered alphabetically
$response = 'd8:completei'
.$torrent->seeders
.'e10:downloadedi'
.$torrent->times_completed
.'e10:incompletei'
.$torrent->leechers
.'e8:intervali'
.random_int(self::MIN, self::MAX)
.'e12:min intervali'
.random_int(intdiv(self::MIN * 95, 100), self::MIN)
.'e';
$peersIpv4 = '';
$peersIpv6 = '';
$peerCount = 0;
$seederCount = 0;
$leecherCount = 0;
/**
* For non `stopped` event only where either the torrent has at least one leech, or the user is a leech.
* We query peers from database and send peerlist, otherwise just quick return.
*/
if ($queries->event !== 'stopped' && ($queries->left !== 0 || $torrent->leechers !== 0)) {
if ($queries->event !== 'stopped') {
$limit = (min($queries->numwant, 25));
// Get Torrents Peers (Only include leechers in a seeder's peerlist)
if ($queries->left === 0) {
foreach ($torrent->peers as $peer) {
if ($peer->active && $peer->seeder) {
$seederCount++;
}
if ($peer->active && ! $peer->seeder) {
$leecherCount++;
}
// Don't include other seeders, inactive peers, invisible peers nor other peers belonging to the same user
if ($peer->seeder || !$peer->active || !$peer->visible || $peer->user_id === $user->id) {
continue;
@@ -602,6 +598,14 @@ final class AnnounceController extends Controller
}
} else {
foreach ($torrent->peers as $peer) {
if ($peer->active && $peer->seeder) {
$seederCount++;
}
if ($peer->active && ! $peer->seeder) {
$leecherCount++;
}
// Don't include inactive peers, invisible peers, nor other peers belonging to the same user
if (!$peer->active || !$peer->visible || $peer->user_id === $user->id) {
continue;
@@ -625,6 +629,20 @@ final class AnnounceController extends Controller
}
}
// Build Response For Bittorrent Client
// Keys must be ordered alphabetically
$response = 'd8:completei'
.$seederCount
.'e10:downloadedi'
.$torrent->times_completed
.'e10:incompletei'
.$leecherCount
.'e8:intervali'
.random_int(self::MIN, self::MAX)
.'e12:min intervali'
.random_int(intdiv(self::MIN * 95, 100), self::MIN)
.'e';
if ($peersIpv6 === '') {
return $response.'5:peers'.\strlen($peersIpv4).':'.$peersIpv4.'e';
}