adjust default extractor to catch more supported themes

Astrotomic · Jul 17, 2023 · 3364e1b · 3364e1b
1 parent 46570cf
commit 3364e1b
Show file tree

Hide file tree

Showing 62 changed files with 23 additions and 63 deletions.
diff --git a/src/Extractors/Banlist/DefaultExtractor.php b/src/Extractors/Banlist/DefaultExtractor.php
@@ -18,6 +18,7 @@ public function canHandle(Crawler $crawler): bool
 
         return collect($css)->contains(
             fn (string $href) => str_starts_with(trim($href, '/'), 'themes/default/css')
+                || str_starts_with(trim($href, '/'), 'themes/gcg/css')
         );
     }
 

diff --git a/tests/Datasets/baseurls.php b/tests/Datasets/baseurls.php
@@ -3,7 +3,6 @@
 dataset('baseurls', [
     // default
     'https://firepoweredgaming.com/sourcebanspp/index.php',
-    'https://neonheights.xyz/bans/index.php',
     'https://bans.harpoongaming.com/index.php',
     'https://bans.panda-community.com/index.php',
     'https://sourcebans.gamerzhost.de/sb419/index.php',
@@ -13,11 +12,9 @@
     'https://csgoskin.ir/server/index.php',
     'https://tf2-casual-fun.de/sourcebans/index.php',
     'https://vimo.lt/bans/index.php',
-    'http://95.216.143.68/index.php',
     'https://bans.blackwonder.tf/index.php',
     'https://sourcebans.pelikriisi.net/index.php',
     'https://hellbreak.pl/sb/index.php',
-    'http://162.55.184.155/index.php',
     'https://sourcebans.ghostcap.com/index.php',
     'https://pong.setti.info/sourcebans/index.php',
     // fluent
@@ -31,4 +28,6 @@
     'https://goodteemo.serverscstrike.com/index.php',
     'https://bans.gaming-biatch.eu/index.php',
     'https://newlandscsgo.com.br/sourcebans/index.php',
+    // blue
+    'https://neonheights.xyz/bans/index.php',
 ]);
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=1.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=1.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=10.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=10.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=11.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=11.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=12.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=12.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=13.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=13.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=14.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=14.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=15.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=15.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=16.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=16.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=17.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=17.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=18.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=18.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=19.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=19.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=2.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=2.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=20.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=20.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=3.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=3.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=4.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=4.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=5.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=5.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=6.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=6.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=7.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=7.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=8.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=8.json
diff --git a/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=9.json b/tests/Fixtures/Saloon/162.55.184.155/GET/index.php/p=banlist&page=9.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=1.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=1.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=10.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=10.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=11.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=11.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=12.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=12.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=13.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=13.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=14.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=14.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=15.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=15.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=16.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=16.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=17.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=17.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=18.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=18.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=19.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=19.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=2.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=2.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=20.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=20.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=3.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=3.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=4.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=4.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=5.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=5.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=6.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=6.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=7.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=7.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=8.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=8.json
diff --git a/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=9.json b/tests/Fixtures/Saloon/95.216.143.68/GET/index.php/p=banlist&page=9.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=1.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=1.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=10.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=10.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=11.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=11.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=12.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=12.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=13.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=13.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=14.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=14.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=15.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=15.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=16.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=16.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=17.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=17.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=18.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=18.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=19.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=19.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=2.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=2.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=20.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=20.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=3.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=3.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=4.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=4.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=5.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=5.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=6.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=6.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=7.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=7.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=8.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=8.json
diff --git a/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=9.json b/tests/Fixtures/Saloon/sourcebans.ghostcap.com/GET/index.php/p=banlist&page=9.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ public function canHandle(Crawler $crawler): bool @@
             return collect($css)->contains(
                 fn (string $href) => str_starts_with(trim($href, '/'), 'themes/default/css')
+                    || str_starts_with(trim($href, '/'), 'themes/gcg/css')
             );
         }
@@ Expand Down @@