anpleenko/iplist
1
0
Fork 0
mirror of https://github.com/rekryt/iplist.git synced 2026-02-26 09:18:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: optimize filters in getSites()

Browse Source
This commit is contained in:
Rekryt
2026-02-20 08:11:27 +03:00
parent d44ed677b9
commit 3464b596ab
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/App/Controller/AbstractIPListController.php
View File

@@ -7,6 +7,7 @@ use Amp\Http\Server\Request;
use OpenCCK\App\Service\IPListService; use OpenCCK\App\Service\IPListService;
use OpenCCK\Domain\Entity\Site; use OpenCCK\Domain\Entity\Site;
use OpenCCK\Domain\Factory\SiteFactory;
use OpenCCK\Infrastructure\API\App; use OpenCCK\Infrastructure\API\App;
use Monolog\Logger; use Monolog\Logger;
@@ -44,6 +45,7 @@ abstract class AbstractIPListController extends AbstractController {
* @return array<string, Site> * @return array<string, Site>
*/ */
protected function getSites(): array { protected function getSites(): array {
$querySites = SiteFactory::normalizeArray($this->request->getQueryParameters()['site'] ?? []);
$wildcard = !!($this->request->getQueryParameter('wildcard') ?? ''); $wildcard = !!($this->request->getQueryParameter('wildcard') ?? '');
$group = $this->request->getQueryParameterArray('group') ?? []; $group = $this->request->getQueryParameterArray('group') ?? [];
@@ -59,6 +61,9 @@ abstract class AbstractIPListController extends AbstractController {
$sites = []; $sites = [];
foreach ($this->service->sites as $siteEntity) { foreach ($this->service->sites as $siteEntity) {
if (count($querySites) && !in_array($siteEntity->name, $querySites)) {
continue;
}
if (isset($exclude['site'][$siteEntity->name])) { if (isset($exclude['site'][$siteEntity->name])) {
continue; continue;
} }
@@ -71,15 +76,29 @@ abstract class AbstractIPListController extends AbstractController {
$site = clone $siteEntity; $site = clone $siteEntity;
$site->domains = array_values( $site->domains = array_values(
array_filter( count($exclude['domain'])
? array_filter(
$siteEntity->getDomains($wildcard), $siteEntity->getDomains($wildcard),
fn(string $domain) => !isset($exclude['domain'][$domain]) fn(string $domain) => !isset($exclude['domain'][$domain])
) )
: $siteEntity->getDomains($wildcard)
); );
if (count($exclude['ip4'])) {
$site->ip4 = array_values(array_filter($site->ip4, fn(string $ip) => !isset($exclude['ip4'][$ip]))); $site->ip4 = array_values(array_filter($site->ip4, fn(string $ip) => !isset($exclude['ip4'][$ip])));
$site->cidr4 = array_values(array_filter($site->cidr4, fn(string $ip) => !isset($exclude['cidr4'][$ip]))); }
if (count($exclude['cidr4'])) {
$site->cidr4 = array_values(
array_filter($site->cidr4, fn(string $ip) => !isset($exclude['cidr4'][$ip]))
);
}
if (count($exclude['ip6'])) {
$site->ip6 = array_values(array_filter($site->ip6, fn(string $ip) => !isset($exclude['ip6'][$ip]))); $site->ip6 = array_values(array_filter($site->ip6, fn(string $ip) => !isset($exclude['ip6'][$ip])));
$site->cidr6 = array_values(array_filter($site->cidr6, fn(string $ip) => !isset($exclude['cidr6'][$ip]))); }
if (count($exclude['cidr6'])) {
$site->cidr6 = array_values(
array_filter($site->cidr6, fn(string $ip) => !isset($exclude['cidr6'][$ip]))
);
}
$sites[$site->name] = $site; $sites[$site->name] = $site;
} }