diff --git a/include/globalfunctions.php b/include/globalfunctions.php index 76821e6d..a953e315 100644 --- a/include/globalfunctions.php +++ b/include/globalfunctions.php @@ -915,17 +915,11 @@ function isIPSeedBoxFromASN($ip, $exceptionWhenYes = false): bool return $result; } -/** - * @deprecated - * @param $ip - * @param $uid - * @param $withoutCache - * @param $exceptionWhenYes - * @return bool - * @throws \App\Exceptions\SeedBoxYesException - */ -function isIPSeedBox($ip, $uid, $withoutCache = false, $exceptionWhenYes = false): bool +function isIPSeedBox($ip, $uid): bool { + return \App\Repositories\SeedBoxRepository::isSeedBoxFromUserRecords($uid, $ip)['result']; + + /* $key = "nexus_is_ip_seed_box:ip:$ip:uid:$uid"; $cacheData = \Nexus\Database\NexusDB::cache_get($key); if (in_array($cacheData, [0, 1, '0', '1'], true) && !$withoutCache) { @@ -985,6 +979,7 @@ function isIPSeedBox($ip, $uid, $withoutCache = false, $exceptionWhenYes = false \Nexus\Database\NexusDB::cache_put($key, 0, 300); do_log("$key, no result, false"); return false; + */ } function getDataTraffic(array $torrent, array $queries, array $user, $peer, $snatch, $promotionInfo) diff --git a/public/announce.php b/public/announce.php index 56b43d05..1c1a75a8 100644 --- a/public/announce.php +++ b/public/announce.php @@ -337,10 +337,10 @@ $isSeedBoxRuleEnabled = get_setting('seed_box.enabled') == 'yes'; $isIPSeedBox = false; if ($isSeedBoxRuleEnabled) { if (!empty($ipv4)) { - $isIPSeedBox = \App\Repositories\SeedBoxRepository::isSeedBoxFromUserRecords($userid, $ipv4)['result']; + $isIPSeedBox = isIPSeedBox($ipv4, $userid); } if (!$isIPSeedBox && !empty($ipv6)) { - $isIPSeedBox = \App\Repositories\SeedBoxRepository::isSeedBoxFromUserRecords($userid, $ipv6)['result']; + $isIPSeedBox = isIPSeedBox($ipv6, $userid); } } $log .= ", [SEED_BOX], isSeedBoxRuleEnabled: $isSeedBoxRuleEnabled, isIPSeedBox: $isIPSeedBox";