rudub :bump domain

rgfootball: update cats
rudub: bump domain
2025-09-09 21:24:42 +02:00 · 2024-06-24 05:43:45 +12:00 · 2024-06-23 06:24:03 +12:00 · 2024-06-23 05:29:45 +12:00 · 2024-06-22 11:30:34 +01:00 · 2024-06-22 21:13:38 +12:00
324 changed files with 5083 additions and 3932 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -64,6 +64,6 @@ body:
  id: screenshots
  attributes:
    label: Screenshots
-    description: Place any screenshots of the issue here if needed
+    description: Place any useful screenshots of the issue here, if needed (not a screenshot of the error textbox)
  validations:
    required: false
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,11 +33,16 @@ on:
      - '!src/Jackett.Test/**'
  schedule:
    - cron: '00 00 * * 5'
+  
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 jobs:
  analyze:
    name: Analyze
    runs-on: windows-2022
+    if: github.repository == 'Jackett/Jackett'
    permissions:
      actions: read
      contents: read
--- a/.github/workflows/issuebot.yml
+++ b/.github/workflows/issuebot.yml
@@ -16,6 +16,7 @@ jobs:
  redeliver-failed-deliveries:
    name: Redeliver failed deliveries
    runs-on: ubuntu-latest
+    if: github.repository == 'Jackett/Jackett'
    steps:
      # This workflow will run a script that is stored in the repository. This step checks out the repository contents so that the workflow can access the script.
      - name: Check out repo content
@@ -47,4 +48,4 @@ jobs:
          WORKFLOW_REPO: ${{ github.event.repository.name }}
          WORKFLOW_REPO_OWNER: ${{ github.repository_owner }}
        run: |
-          node .github/workflows/scripts/redeliver-failed-deliveries.js
+          node .github/workflows/scripts/redeliver-failed-deliveries.mjs
--- a/.github/workflows/scripts/redeliver-failed-deliveries.mjs
+++ b/.github/workflows/scripts/redeliver-failed-deliveries.mjs
@@ -1,5 +1,5 @@
-// This script uses GitHub's Octokit SDK to make API requests. For more information, see "[AUTOTITLE](/rest/guides/scripting-with-the-rest-api-and-javascript)."
-const { App, Octokit } = require("octokit");
+// This script uses GitHub's Octokit SDK to make API requests. For more information, see https://docs.github.com/en/rest/guides/scripting-with-the-rest-api-and-javascript?apiVersion=2022-11-28
+import { App, Octokit } from "octokit";

 const sleep = ms => new Promise(r => setTimeout(r, ms));
 let secondDelivery = true;
--- a/README.md
+++ b/README.md
@@ -19,9 +19,9 @@ Developer note: The software implements the [Torznab](https://torznab.github.io/
 A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](https://github.com/webtor-io/go-jackett)

 #### Supported Systems
-* Windows 7 SP1 or greater
-* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md#linux)
-* macOS 10.15+ or greater
+* Windows 10 Version 1607+ or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#windows)
+* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#linux)
+* macOS 12.0+ (Monterey) or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#macos)

 <details> <summary> <b> Supported Public Trackers </b> </summary>

@@ -50,7 +50,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * cpasbien
 * cpasbienClone
 * CrackingPatching
- * Demonoid
 * DivxTotal
 * dmhy
 * DonTorrent
@@ -64,6 +63,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * GamesTorrents
 * GkTorrent
 * GloDLS
+ * GTorrent.pro
 * Idope
 * Il Corsaro Nero
 * Internet Archive (archive.org)
@@ -91,6 +91,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * NoNaMe Club (NNM-Club)
 * Nyaa.si
 * OneJAV
+ * OxTorrent
+ * OxTorrent-vip
 * ParnuXi
 * PC-torrent
 * PornoTorrent
@@ -113,15 +115,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TheRARBG
 * Tokyo Tosho
 * Torlock
- * Torrent[CORE]
+ * Torrent Downloads
 * Torrent Oyun indir
+ * Torrent[CORE]
 * torrent.by
 * torrent-pirat
 * Torrent9
- * Torrent9 clone
- * Torrent911
+ * Torrent9-tel
 * TorrentFunk
- * TorrentDownloads
+ * TorrentDownload
 * TorrentGalaxy (TGx)
 * TorrentKitty
 * TorrentProject2
@@ -206,15 +208,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * SkTorrent
 * SkTorrent-org
 * themixingbowl (TMB)
- * Toloka.to
+ * Toloka
 * TorrentMasters
 * Torrents-Local
- * TorrentDownload
 * TribalMixes
 * Union Fansub
 * UniOtaku
 * xTorrenty
- * YggTorrent (YGG)
 * ZOMB
 * Ztracker
 </details>
@@ -224,10 +224,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * 0day.kiev
 * 1ptbar
 * 2 Fast 4 You [![(invite needed)][inviteneeded]](#)
- * 2xFree
 * 3ChangTrai (3CT)
 * 3D Torrents (3DT)
- * 4thD (4th Dimension)
+ * 4thD (4th Dimension) [![(invite needed)][inviteneeded]](#)
 * 52PT
 * 720pier
 * Abnormal
@@ -257,16 +256,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Azusa (梓喵) [![(invite needed)][inviteneeded]](#)
 * Back-ups
 * BakaBT [![(invite needed)][inviteneeded]](#)
- * BeiTai (备胎)
 * Beload
 * Best-Core
 * BeyondHD (BHD)
- * Bibliotik
+ * Bibliotik [![(invite needed)][inviteneeded]](#)
 * Bit-Bázis
 * BIT-HDTV
 * Bitded
 * Bithorlo (BHO)
 * BitHUmen [![(invite needed)][inviteneeded]](#)
+ * Bitpalace
 * BitPorn
 * Bitspyder
 * BitTorrentFiles
@@ -279,7 +278,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Brasil Tracker
 * BroadcasTheNet (BTN) [![(invite needed)][inviteneeded]](#)
 * BrokenStones [![(invite needed)][inviteneeded]](#)
- * BrSociety
 * BTArg
 * BTNext (BTNT) [![(invite needed)][inviteneeded]](#)
 * BTSCHOOL
@@ -290,6 +288,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Carpathians
 * CarPT
 * Cathode-Ray.Tube (CRT)
+ * CD File
 * Central Torrent
 * CeskeForum
 * CGPeers [![(invite needed)][inviteneeded]](#)
@@ -306,6 +305,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * CrabPT (蟹黄堡)
 * CrazySpirits
 * CrnaBerza
+ * cyanbug (大青虫)
 * Dajiao (打胶) [![(invite needed)][inviteneeded]](#)
 * DANISH BYTES
 * Darius Tracker
@@ -322,7 +322,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * DocsPedia
 * Dream Tracker [![(invite needed)][inviteneeded]](#)
 * Drugari
- * Ebooks-Shares
+ * Ebooks-Shares [![(invite needed)][inviteneeded]](#)
 * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
 * Enthralled
 * eShareNet
@@ -330,14 +330,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Exitorrent.org [![(invite needed)][inviteneeded]](#)
 * ExoticaZ (YourExotic)
 * ExtremeBits
- * Falkon Vision Team
+ * F1Carreras
 * FANO.IN [![(invite needed)][inviteneeded]](#)
 * Fantastiko [![(invite needed)][inviteneeded]](#)
 * Fappaizuri
 * FearNoPeer
 * Femdomcult
+ * File-Shack
 * FileList (FL)
- * FinElite (FE) [![(invite needed)][inviteneeded]](#)
+ * FinElite (FE)
 * FinVip
 * Flux-Zone
 * Free Farm (自由农场)
@@ -362,12 +363,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * HappyFappy
 * Hares Club (白兔俱乐部) [![(invite needed)][inviteneeded]](#)
 * Hawke-uno
+ * HD Dolby
 * HD-Club [![(invite needed)][inviteneeded]](#)
 * HD-Forever (HDF) [![(invite needed)][inviteneeded]](#)
- * HD-Olimpo
+ * HD-Olimpo [![(invite needed)][inviteneeded]](#)
 * HD-Only (HDO)
 * HD-Space (HDS)
- * HD-Torrents (HDT)
+ * HD-Torrents (HDT) [![(invite needed)][inviteneeded]](#)
 * HD-UNiT3D
 * HD4FANS [![(invite needed)][inviteneeded]](#)
 * HDArea (HDA)
@@ -377,6 +379,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * HDFans
 * HDFun (HDZone)
 * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
+ * HDKylin (麒麟)
 * HDMaYi (小蚂蚁PT站)
 * HDPT (明教) [![(invite needed)][inviteneeded]](#)
 * HDRoute [![(invite needed)][inviteneeded]](#)
@@ -388,12 +391,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * HDU
 * hdvbits
 * HDVIDEO
- * Heavens-Hell
 * Hebits
 * HellasHut
 * HHanClub
+ * HomePornTorrents (HPT)
 * House of Devil
 * HQMusic
+ * HUDBT (蝴蝶) [![(invite needed)][inviteneeded]](#)
 * iAnon
 * ICC2022 (冰淇淋)
 * ilolicon PT
@@ -421,12 +425,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Last Digital Underground (LDU)
 * LastFiles
 * LaidBackManor
- * Lat-Team [![(invite needed)][inviteneeded]](#)
+ * Lat-Team
 * Le Saloon [![(invite needed)][inviteneeded]](#)
 * Le-Cinephile
 * LearnBits
 * LearnFlakes
- * leech24
 * Les-Cinephiles
 * Lesbians4u
 * Libble
@@ -444,14 +447,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * MegamixTracker
 * MeseVilág (Fairytale World)
 * MetalGuru [![(invite needed)][inviteneeded]](#)
+ * METALWRKS
 * Milkie
 * MMA-Torrents [![(invite needed)][inviteneeded]](#)
 * MNV (Max-New-Vision)
 * MOJBLiNK
 * MonikaDesign (MDU)
- * MoreThanTV (MTV)
+ * MoreThanTV (MTV) [![(invite needed)][inviteneeded]](#)
 * MouseBits
- * Movie-Torrentz
 * MyAnonamouse (MAM)
 * MySpleen [![(invite needed)][inviteneeded]](#)
 * NCore [![(invite needed)][inviteneeded]](#)
@@ -480,7 +483,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
 * Plusteca
 * Polish Torrent (PTT)
- * PolishTracker
+ * PolishTracker [![(invite needed)][inviteneeded]](#)
 * Pornbay [![(invite needed)][inviteneeded]](#)
 * Portugas
 * PotUK
@@ -494,15 +497,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * PTerClub (PT之友俱乐部)
 * PTFiles (PTF)
 * PThome [![(invite needed)][inviteneeded]](#)
- * PTLSP
 * PTSBAO (烧包) [![(invite needed)][inviteneeded]](#)
 * PTtime
+ * PTVicomo
 * Punk's Horror Tracker
- * PuntoTorrent
+ * PuntoTorrent [![(invite needed)][inviteneeded]](#)
 * PuTao (葡萄)
 * PWTorrents (PWT)
 * Qingwa (青蛙)
- * R3V WTF!
+ * R3V WTF! [![(invite needed)][inviteneeded]](#)
 * Racing4Everyone (R4E)
 * RacingForMe (RFM)
 * RareShare2
@@ -513,8 +516,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ReelFlix
 * Resurrect The Net [![(invite needed)][inviteneeded]](#)
 * RetroFlix
- * RevolutionTT
- * RM-HD
+ * RevolutionTT [![(invite needed)][inviteneeded]](#)
 * RocketHD
 * Romanian Metal Torrents (RMT)
 * RoTorrent
@@ -527,6 +529,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * SceneTime
 * Secret Cinema
 * SeedFile
+ * SFP (Share Friends Projekt)
 * Shadowflow (影) [![(invite needed)][inviteneeded]](#)
 * Shareisland
 * SharkPT
@@ -570,7 +573,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TheEmpire (TE)
 * TheLeachZone (TLZ)
 * TheScenePlace (TSP)
- * Thor's Land
 * TJUPT (北洋园PT)
 * TLFBits [![(invite needed)][inviteneeded]](#)
 * TmGHuB [![(invite needed)][inviteneeded]](#)
@@ -586,7 +588,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TOrrent-tuRK (TORK)
 * Torrent.LT
 * TorrentBD
- * TorrentBytes (TBy)
+ * TorrentBytes (TBy) [![(invite needed)][inviteneeded]](#)
 * TorrentCCF (TCCF)
 * TorrentDay (TD)
 * TorrentDD
@@ -598,24 +600,25 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TorrentLeech (TL)
 * TorrentLeech.pl
 * TorrentSeeds (TS)
+ * ToSky
 * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
 * TrackerMK
 * TranceTraffic
 * Trellas (Magico) [![(invite needed)][inviteneeded]](#)
 * TreZzoR
+ * TurkSeed
 * TurkTorrent (TT)
 * TV Chaos UK (TVCUK)
- * TvRoad
 * TVstore
 * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
 * UBits
 * UHDBits
 * UltraHD
 * UnionGang
- * Universal-Torrents
 * UnlimitZ
 * upload.cx
 * UTOPIA
+ * ViSiON HD
 * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
 * White Angel
 * WinterSakura
@@ -625,18 +628,20 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * x-ite.me (XM)
 * Xider-Torrent
 * XSpeeds (XS)
- * Xthor
+ * Xthor [![(invite needed)][inviteneeded]](#)
 * XtremeBytes
 * XWT-Classics
 * XWTorrents (XWT)
 * YDYPT (伊甸园PT)
+ * YggTorrent (YGG)
+ * YOiNKED
 * Zamunda.net
 * Zelka.org
 * ZmPT (织梦)
- * ZonaQ
+ * ZonaQ [![(invite needed)][inviteneeded]](#)
 </details>

-Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and may be missing features or be broken. If you have an invite for them please send it to garfieldsixtynine -at- gmail.com or jacketttest -at- gmail.com to get them fixed/improved.
+Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and may be broken or missing features. If you have an invite please send it to jacketttest [at] gmail [dot] com or garfieldsixtynine [at] gmail [dot] com get them fixed/improved.

 ### Jackett Torznab query syntax

@@ -685,7 +690,7 @@ Supported filters
 Filter | Condition
 -|-
 `type:<type>` | where the indexer type is equal to `<type>`
-`tag:<tag>` | where the indexer tags contains `<tag>`
+`tag:<tag>` | where the indexer tags contain `<tag>`
 `lang:<tag>` | where the indexer language start with `<lang>`
 `test:{passed\|failed}` | where the last indexer test performed `passed` or `failed`
 `status:{healthy\|failing\|unknown}` | where the indexer state is `healthy` (successfully operates in the last minutes), `failing` (generates errors in the recent call) or `unknown` (unused for a while)
@@ -708,7 +713,7 @@ The "filter" indexer at `/api/v2.0/indexers/!status:failing,test:passed` will qu
 A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab`.
 It will query all configured indexers and return the combined results.

-If your client supports multiple feeds it's recommended to add each indexer directly instead of using the all indexer.
+If your client supports multiple feeds it's recommended to add each indexer directly instead of using the "all" indexer.
 Using the "all" indexer has no advantages (besides reduced management overhead), the only disadvantages:
 * you lose control over indexer specific settings (categories, search modes, etc.)
 * mixing search modes (IMDB, query, etc.) might cause low-quality results
@@ -723,7 +728,7 @@ We recommend you install Jackett as a Windows service using the supplied install

 To get started with using the installer for Jackett, follow the steps below:

-1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net60#dependencies
+1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net80#dependencies
 2. Download the latest version of the Windows installer, "Jackett.Installer.Windows.exe" from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
 3. When prompted if you would like this app to make changes to your computer, select "yes".
 4. If you would like to install Jackett as a Windows Service, make sure the "Install as Windows Service" checkbox is filled.
@@ -736,35 +741,35 @@ When installed as a service the tray icon acts as a way to open/start/stop Jacke
 Jackett can also be run from the command line if you would like to see log messages (Ensure the server isn't already running from the tray/service). This can be done by using "JackettConsole.exe" (for Command Prompt), found in the Jackett data folder: "%ProgramData%\Jackett".


-## Install on Linux (AMDx64)
+## Installation on Linux (AMDx64)
 On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://github.com/dotnet/core/blob/master/Documentation/linux-prereqs.md

 ### Install as service
 A) Command to download and install the latest package and run the Jackett service:

-`cd /opt && f=Jackett.Binaries.LinuxAMDx64.tar.gz && release=$(wget -q https://github.com/Jackett/Jackett/releases/latest -O - | grep "title>Release" | cut -d " " -f 4) && sudo wget -Nc https://github.com/Jackett/Jackett/releases/download/$release/"$f" && sudo tar -xzf "$f" && sudo rm -f "$f" && cd Jackett* && sudo ./install_service_systemd.sh && systemctl status jackett.service && cd - && echo -e "\nVisit http://127.0.0.1:9117"`
+`cd /opt && f=Jackett.Binaries.LinuxAMDx64.tar.gz && sudo wget -Nc https://github.com/Jackett/Jackett/releases/latest/download/"$f" && sudo tar -xzf "$f" && sudo rm -f "$f" && cd Jackett* && sudo ./install_service_systemd.sh && systemctl status jackett.service && cd - && echo -e "\nVisit http://127.0.0.1:9117"`

 B) Or manually:

-1. Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases)
+1. Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page
 2. To install Jackett as a service, open a Terminal, cd to the jackett folder, and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.

 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases), open a Terminal, cd to the jackett folder, and run Jackett with the command `./jackett`
+Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page, open a Terminal, cd to the jackett folder, and run Jackett with the command `./jackett`

 ### home directory
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.


-## Install on Linux (ARMv7 or above)
+## Installation on Linux (ARMv7 or above)
 On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://github.com/dotnet/core/blob/master/Documentation/linux-prereqs.md

 ### Install as service
-1. Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases)
+1. Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page
 2. To install Jackett as a service, open a Terminal, cd to the jackett folder, and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.

 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases), open a Terminal, cd to the jackett folder and run Jackett with the command `./jackett`
+Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page, open a Terminal, cd to the jackett folder and run Jackett with the command `./jackett`

 ### home directory
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.
@@ -778,7 +783,7 @@ If you want to run it with a user without a /home directory you need to add `Env
       * Debian/Ubuntu: `apt-get install libcurl4-openssl-dev`
       * Redhat/Fedora: `yum install libcurl-devel`
       * For other distros see the  [Curl docs](http://curl.haxx.se/dlwiz/?type=devel).
- 3. Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett using mono with the command `mono --debug JackettConsole.exe`.
+ 3. Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page and run Jackett using mono with the command `mono --debug JackettConsole.exe`.
 4. (Optional) To install Jackett as a service, open the Terminal and run `sudo ./install_service_systemd_mono.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.

 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.
@@ -793,18 +798,17 @@ On a CentOS/RedHat 7 system: [jewflix.jackett](https://galaxy.ansible.com/jewfli
 On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chrisjohnson00/jackett)


-### Installation on Linux or macOS via Homebrew
-
-[Homebrew Formulae - Jackett](https://formulae.brew.sh/formula/jackett)
+## Uninstallation on Linux
+`wget https://raw.githubusercontent.com/Jackett/Jackett/master/uninstall_service_systemd.sh --quiet -O -|sudo bash`


 ## Installation on macOS

 ### Prerequisites
-macOS 10.15+ or greater
+macOS 12.0+ (Monterey) or greater

 ### Install as service
-1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
+1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
 2. Open the extracted folder and double-click on `install_service_macos`.
 3. If the installation was a success, you can close the Terminal window.

@@ -812,7 +816,16 @@ The service will start on each logon. You can always stop it by running `launchc
 Logs are stored as usual under `~/.config/Jackett/log.txt`.

 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`.
+Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page and run Jackett with the command `./jackett`.
+
+
+## Uninstallation on macOS
+`curl -sSL https://raw.githubusercontent.com/Jackett/Jackett/master/uninstall_jackett_macos| bash`
+
+
+## Installation on Linux or macOS via Homebrew
+
+[Homebrew Formulae - Jackett](https://formulae.brew.sh/formula/jackett)


 ## Installation using Docker
@@ -869,7 +882,7 @@ If you have enabled the Jackett internal cache, but have an indexer for which yo
 ## Configuring FlareSolverr
 Some indexers are protected by Cloudflare or similar services and Jackett is not able to solve the challenges.
 For these cases, [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) has been integrated into Jackett. This service is in charge of solving the challenges and configuring Jackett with the necessary cookies.
-Setting up this service is optional, most indexers don't need it.
+Setting up this service is optional; most indexers don't need it.
 * Install FlareSolverr service (following their instructions)
 * Configure **FlareSolverr API URL** in Jackett. For example: http://172.17.0.2:8191
 * It is recommended to keep the default value in **FlareSolverr Max Timeout (ms)**
@@ -938,21 +951,21 @@ git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src

 # dotnet core version
-dotnet publish Jackett.Server -f net6.0 --self-contained -r osx-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/net6.0/osx-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net8.0 --self-contained -r osx-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net8.0/osx-x64/jackett # run jackett
 ```

 ### Linux


 ```bash
-sudo apt install nuget msbuild dotnet-sdk-6.0 # install build tools (Debian/ubuntu)
+sudo apt install nuget msbuild dotnet-sdk-8.0 # install build tools (Debian/ubuntu)
 git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src

 # dotnet core version
-dotnet publish Jackett.Server -f net6.0 --self-contained -r linux-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/net6.0/linux-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net8.0 --self-contained -r linux-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net8.0/linux-x64/jackett # run jackett
 ```

 ## Screenshots
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,24 +2,36 @@
 name: $(majorVersion).$(minorVersion).$(patchVersion)
 variables:
  majorVersion: 0
-  minorVersion: 21
+  minorVersion: 22
  patchVersion: $[counter(variables['minorVersion'], 1)]  # this will reset when we bump minor
  jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
  buildConfiguration: Release
-  netCoreFramework: net6.0
-  netCoreSdkVersion: 6.0.x
+  netCoreFramework: net8.0
+  netCoreSdkVersion: 8.0.x
  # system.debug: true

 trigger:
  batch: true
  branches:
    include:
-      - '*'
+      - master
+      - test/**
+  paths:
+    exclude:
+      - .github
+      - README.md
+      - CONTRIBUTING.md

 pr:
  branches:
    include:
-      - '*'
+      - master
+      - test/**
+  paths:
+    exclude:
+      - .github
+      - README.md
+      - CONTRIBUTING.md

 stages:
  - stage: BuildJackett
@@ -117,7 +129,7 @@ stages:
            displayName: Build DateTimeRoutines
            # this task is not mandatory since DateTimeRoutines is build in the next task, but the purpose is to fix:
            # error MSB4018: System.IO.IOException: The process cannot access the file
-            # '/home/vsts/work/1/net6.0-linux-musl-arm/src/DateTimeRoutines/bin/Release/netstandard2.0/DateTimeRoutines.deps.json'
+            # '/home/vsts/work/1/src/DateTimeRoutines/bin/Release/netstandard2.0/DateTimeRoutines.deps.json'
            # because it is being used by another process.
            inputs:
              command: build
@@ -419,7 +431,7 @@ stages:
              framework: $(netCoreFramework)
              runtime: osx-x64
            LinuxAMDx64:
-              buildDescription: Linux AMD x64
+              buildDescription: LinuxAMDx64
              imageName: ubuntu-22.04
              framework: $(netCoreFramework)
              runtime: linux-x64
@@ -442,22 +454,23 @@ stages:
              installationPath: $(Agent.ToolsDirectory)/dotnet

          - task: DotNetCoreCLI@2
-            displayName: Unit Tests (Mono, Linux and macOS)
-            condition: and(succeeded(), not(startsWith(variables['runtime'], 'win')))
+            displayName: Unit Tests & Code Coverage
            inputs:
              command: test
-              projects: '**/*.Test*/*.csproj'
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)'
+              projects: '$(Build.SourcesDirectory)/src/**/*.Test*/*.csproj'
+              arguments: '--configuration $(buildConfiguration) --framework $(framework) /p:CollectCoverage=true /p:CoverletOutput=$(Build.SourcesDirectory)/coverlet/reports/coverage.cobertura.$(buildDescription).xml /p:CoverletOutputFormat=cobertura /p:IncludeTestAssembly=true /p:ExcludeByAttribute=TestSDKAutoGeneratedCode'
              testRunTitle: 'Unit - $(buildDescription) - $(Build.BuildId)'

-          - task: DotNetCoreCLI@2
-            displayName: Unit Tests & Code Coverage (Windows only)
+          - task: PublishPipelineArtifact@1
+            condition: and(succeeded(), not(startsWith(variables['runtime'], 'win')))
+            inputs:
+              targetPath: $(Build.SourcesDirectory)/coverlet/reports/
+
+          - task: DownloadPipelineArtifact@2
            condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
            inputs:
-              command: test
-              projects: '**/*.Test*/*.csproj'
-              arguments: '--configuration $(buildConfiguration) --framework $(framework) /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura'
-              testRunTitle: 'Unit - $(buildDescription) - $(Build.BuildId)'
+              downloadPath: $(Build.SourcesDirectory)/coverlet/reports/
+              itemPattern: '**/coverage.cobertura.*.xml'

          - task: DotNetCoreCLI@2
            displayName: Install Coverage ReportGenerator Tool (Windows only)
@@ -465,21 +478,29 @@ stages:
            inputs:
              command: custom
              custom: tool
-              arguments: install --tool-path . dotnet-reportgenerator-globaltool
+              arguments: install -g dotnet-reportgenerator-globaltool

          - task: PowerShell@2
            displayName: Generate Coverage Report (Windows only)
            condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
            inputs:
              targetType: inline
-              script: ./reportgenerator -reports:$(Build.SourcesDirectory)/src/*.Test*/coverage.*.cobertura.xml -targetdir:$(Build.SourcesDirectory)/coverlet/reports -reporttypes:"Cobertura"
+              script: reportgenerator -reports:$(Build.SourcesDirectory)/coverlet/reports/**/coverage.cobertura.*.xml -targetdir:$(Build.SourcesDirectory)/coverlet/reports/final/ -sourcedirs:$(Build.SourcesDirectory)/src/ -reporttypes:"Cobertura"

          - task: PublishCodeCoverageResults@1
-            displayName: Publish Code Coverage (Windows only)
+            displayName: Publish Code Coverage
            condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
            inputs:
              codeCoverageTool: Cobertura
-              summaryFileLocation: $(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml
+              summaryFileLocation: $(Build.SourcesDirectory)/coverlet/reports/final/Cobertura.xml
+              pathToSources: $(Build.SourcesDirectory)/src/
+              additionalCodeCoverageFiles: $(Agent.TempDirectory)/*.trx
+              failIfCoverageEmpty: true
+
+          - task: PublishPipelineArtifact@1
+            condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
+            inputs:
+              targetPath: $(Build.SourcesDirectory)/coverlet/reports/coverage.cobertura.Windows.net8.0.xml

  - stage: IntegrationTestJackett
    displayName: Integration Tests
@@ -558,20 +579,10 @@ stages:
              installationPath: $(Agent.ToolsDirectory)/dotnet

          - task: DotNetCoreCLI@2
-            displayName: Integration Tests (Mono, Linux and macOS)
-            condition: and(succeeded(), not(startsWith(variables['runtime'], 'win')))
+            displayName: Integration Tests
            inputs:
              command: test
-              projects: '**/*IntegrationTest*/*.csproj'
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)'
-              testRunTitle: 'Integration - $(buildDescription) - $(Build.BuildId)'
-
-          - task: DotNetCoreCLI@2
-            displayName: Integration Tests (Windows only)
-            condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
-            inputs:
-              command: test
-              projects: '**/*IntegrationTest*/*.csproj'
+              projects: '$(Build.SourcesDirectory)/src/**/*IntegrationTest*/*.csproj'
              arguments: '--configuration $(buildConfiguration) --framework $(framework)'
              testRunTitle: 'Integration - $(buildDescription) - $(Build.BuildId)'

--- a/install_service_systemd.sh
+++ b/install_service_systemd.sh
@@ -24,7 +24,7 @@ if systemctl is-active --quiet "${JACKETT_SERVICE}"; then
    if systemctl stop "${JACKETT_SERVICE}"; then
        echo "Service '${JACKETT_SERVICE}' stopped"
    else
-        echo "${BOLDRED}ERROR${NC}: The service '${JACKETT_SERVICE}' Can not be stopped"
+        echo "${BOLDRED}ERROR${NC}: The service '${JACKETT_SERVICE}' can not be stopped"
        exit 1
    fi

--- a/install_service_systemd_mono.sh
+++ b/install_service_systemd_mono.sh
@@ -24,7 +24,7 @@ if systemctl is-active --quiet "${JACKETT_SERVICE}"; then
    if systemctl stop "${JACKETT_SERVICE}"; then
        echo "Service '${JACKETT_SERVICE}' stopped"
    else
-        echo "${BOLDRED}ERROR${NC}: The service '${JACKETT_SERVICE}' Can not be stopped"
+        echo "${BOLDRED}ERROR${NC}: The service '${JACKETT_SERVICE}' can not be stopped"
        exit 1
    fi

--- a/nuget.config
+++ b/nuget.config
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-</configuration>
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -10,4 +10,8 @@
    <PropertyGroup Condition="'$(JackettProject)'=='true'">
        <PathMap>$(MSBuildProjectDirectory)=./$(MSBuildProjectName)/</PathMap>
    </PropertyGroup>
+
+    <PropertyGroup>
+        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+    </PropertyGroup>
 </Project>
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -6,27 +6,25 @@ language: en-US
 type: public
 encoding: UTF-8
 requestDelay: 2
+# get status and news on domains at the official site https://1337x-status.org/
 links:
  - https://1337x.to/
  - https://1337x.st/
  - https://x1337x.ws/
  - https://x1337x.eu/
  - https://x1337x.se/
-  - https://1337x.so/
-  - https://1337x.abcproxy.org/
+  - https://x1337x.cc/
+  - https://1337x.unblockit.black/
  - https://1337x.unblockninja.com/
  - https://1337x.ninjaproxy1.com/
  - https://1337x.proxyninja.org/
+  - https://1337x.proxyninja.net/
  - https://1337x.torrentbay.st/
+  - https://1337x.torrentsbay.org/
 legacylinks:
  - https://1337x.is/
  - https://1337x.gd/
-  - https://1337x.nocensor.art/
-  - https://1337x.unblockit.bio/
-  - https://1337x.unblockit.boo/
-  - https://1337x.mrunblock.guru/
  - https://1337x.mrunblock.life/
-  - https://1337x.unblockit.click/
  - https://1337x.unblockit.asia/
  - https://1337x.unblockit.mov/
  - https://1337x.unblockit.rsvp/
@@ -40,6 +38,10 @@ legacylinks:
  - https://1337x.unblockit.dad/
  - https://1337x.unblockit.africa/
  - https://1337x.unblockit.casa/ # 502
+  - https://1337x.unblockit.sbs/ # 502
+  - https://1337x.unblockit.ong/ # 502
+  - https://1337x.abcproxy.org/
+  - https://1337x.so/

 caps:
  categorymappings:
@@ -133,10 +135,8 @@ caps:
  allowrawsearch: true

 settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
  - name: downloadlink
    type: select
    label: Download link
--- a/src/Jackett.Common/Definitions/1ptbar.yml
+++ b/src/Jackett.Common/Definitions/1ptbar.yml
@@ -63,10 +63,8 @@ settings:
    options:
      desc: desc
      asc: asc
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
  - name: info_tpp
    type: info
    label: Results Per Page
@@ -197,4 +195,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.11 2024-03-27
+# NexusPHP v1.8.12 2024-05-20
--- a/src/Jackett.Common/Definitions/3changtrai.yml
+++ b/src/Jackett.Common/Definitions/3changtrai.yml
@@ -56,10 +56,8 @@ settings:
    options:
      desc: desc
      asc: asc
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
  - name: info_tpp
    type: info
    label: Results Per Page
--- a/src/Jackett.Common/Definitions/52bt.yml
+++ b/src/Jackett.Common/Definitions/52bt.yml
@@ -7,11 +7,12 @@ type: public
 encoding: UTF-8
 links:
  # Send any content to 52btbtbt@gmail.com to get the latest address. or visit https://521.52btbt.cyou/
-  - https://529048.xyz/
-  - https://529049.xyz/
  - https://www.529052.xyz/
+  - https://www.529053.xyz/
 legacylinks:
  - https://529050.xyz/
+  - https://529048.xyz/
+  - https://529049.xyz/

 caps:
  categorymappings:
@@ -53,14 +54,14 @@ settings:
      2: created
      1: size
      0: relevance
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr

 search:
  paths:
    - path: "search-{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}-{{ .Config.cat-id }}-{{ .Config.sort }}-1.html"
+  error:
+    - selector: :root:contains("Internal Server Error")

  rows:
    selector: div.ssbox
--- a/src/Jackett.Common/Definitions/Bittorrentfiles.yml
+++ b/src/Jackett.Common/Definitions/Bittorrentfiles.yml
@@ -208,7 +208,7 @@ search:
        - name: replace
          args: ["Gestern", "Yesterday"]
        - name: append
-          args: " +01:00" # CET
+          args: "+01:00" # CET
    date_year:
      # 30.02.2018 23:12:50
      selector: td:nth-child(10):contains("."):contains(":")
@@ -217,7 +217,7 @@ search:
        - name: split
          args: ["b", 0]
        - name: append
-          args: " +01:00" # CET
+          args: "+01:00" # CET
        - name: dateparse
          args: "dd.MM.yyyy HH:mm:ss zzz"
    date:
--- a/src/Jackett.Common/Definitions/abtorrents.yml
+++ b/src/Jackett.Common/Definitions/abtorrents.yml
@@ -1,5 +1,7 @@
 ---
 id: abtorrents
+replaces:
+  - audiobooktorrents
 name: ABtorrents
 description: "ABtorrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS"
 language: en-US
@@ -86,10 +88,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/agsvpt.yml
+++ b/src/Jackett.Common/Definitions/agsvpt.yml
@@ -206,4 +206,4 @@ search:
      filters:
        - name: prepend
          args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.8 2023-09-25
+# NexusPHP v1.8.12 2024-04-05
--- a/src/Jackett.Common/Definitions/aidoruonline.yml
+++ b/src/Jackett.Common/Definitions/aidoruonline.yml
@@ -35,10 +35,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/aither-api.yml
+++ b/src/Jackett.Common/Definitions/aither-api.yml
@@ -105,6 +105,13 @@ search:
      selector: category_id
    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
    details:
      selector: details_link
    download:
@@ -133,8 +140,6 @@ search:
          args: [" & ", "_&_"]
    description:
      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
    seeders:
      selector: seeders
    leechers:
@@ -173,9 +178,4 @@ search:
    minimumseedtime:
      # 5 days (as seconds = 5 x 24 x 60 x 60)
      text: 432000
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-# json UNIT3D 8.0.2
+# json UNIT3D 8.1.3
--- a/src/Jackett.Common/Definitions/animeworld-api.yml
+++ b/src/Jackett.Common/Definitions/animeworld-api.yml
@@ -40,11 +40,15 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://animeworld.cx/\" target=\"_blank\">AnimeWorld</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://animeworld.cx/\" target=\"_blank\">AnimeWorld</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
    default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
  - name: sort
    type: select
    label: Sort requested from site
@@ -110,8 +114,15 @@ search:
  fields:
    category:
      selector: category_id
-    title:
+    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
    details:
      selector: details_link
    download:
@@ -133,17 +144,11 @@ search:
      selector: meta.genres
      filters:
        - name: re_replace
-          args: ["(?i)^None$", ""]
-        - name: re_replace
-          args: ["(?i)(Cinema TV)", "Cinema_TV"]
-        - name: re_replace
-          args: ["(?i)(Ficção científica)", "Ficção_científica"]
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
        - name: replace
          args: [" & ", "_&_"]
    description:
      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
    seeders:
      selector: seeders
    leechers:
@@ -171,12 +176,15 @@ search:
        100%: 0 # freeleech
        "*": 0 # catch errors
    uploadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns False, True
      selector: double_upload
      case:
-        0: 1 # normal
-        1: 2 # double
+        False: 1 # normal
+        True: 2 # double
+# global MR is 1.0 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 1.0
    minimumseedtime:
      # 7 day (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# json UNIT3D 6.5.0
+# json UNIT3D 8.0.0
--- a/src/Jackett.Common/Definitions/anirena.yml
+++ b/src/Jackett.Common/Definitions/anirena.yml
@@ -9,10 +9,8 @@ links:
  - https://www.anirena.com/

 settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/anthelion-api.yml
+++ b/src/Jackett.Common/Definitions/anthelion-api.yml
@@ -1,10 +1,14 @@
 ---
 id: anthelion-api
+replaces:
+  - tehconnectionme
+  - anthelion
 name: Anthelion (API)
 description: "Anthelion is a Private MOVIES tracker"
 language: en-US
 type: private
 encoding: UTF-8
+# Status: https://ant.trackerstatus.info/
 links:
  - https://anthelion.me/

--- a/src/Jackett.Common/Definitions/audiences.yml
+++ b/src/Jackett.Common/Definitions/audiences.yml
@@ -33,10 +33,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/badasstorrents.yml
+++ b/src/Jackett.Common/Definitions/badasstorrents.yml
@@ -9,15 +9,6 @@ requestDelay: 5
 links:
  - https://badasstorrents.com/
 legacylinks:
-  - https://badasstorrents.nocensor.work/
-  - https://badasstorrents.nocensor.biz/
-  - https://badasstorrents.nocensor.sbs/
-  - https://badasstorrents.nocensor.world/
-  - https://badasstorrents.nocensor.lol/
-  - https://badasstorrents.nocensor.art/
-  - https://badasstorrents.mrunblock.guru/
-  - https://badasstorrents.mrunblock.life/
-  - https://badasstorrents.nocensor.click/
  - https://badasstorrents.mrunblock.bond/
  - https://badasstorrents.nocensor.cloud/

--- a/src/Jackett.Common/Definitions/beload.yml
+++ b/src/Jackett.Common/Definitions/beload.yml
@@ -55,10 +55,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: sort
    type: select
    label: Sort requested from site
--- a/src/Jackett.Common/Definitions/bigfangroup.yml
+++ b/src/Jackett.Common/Definitions/bigfangroup.yml
@@ -89,22 +89,19 @@ settings:
      asc: asc

 search:
-  # https://bigfangroup.org/browse.php?search=black+lightning&cat=0&incldead=0&year=0&format=0
-  headers:
-    Referer: ["{{ .Config.sitelink }}browse.php?search={{ .Keywords }}&cat=0&incldead=1&year=0&format=0"]
  paths:
    # https://bigfangroup.org/browse.php?ajax=1&search=the+librarian&cat=0&incldead=0&year=0&format=0
    - path: browse.php
  inputs:
    ajax: 1
    search: "{{ .Keywords }}"
-    cat: 0
+    cat: "{{ if .Keywords }}0{{ else }}{{ end }}"
    # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseed, 5 silver, 7 BFG
-    incldead: 1
-    year: 0
-    format: 0
-    s: "{{ .Config.sort }}"
-    d: "{{ .Config.type }}"
+    incldead: "{{ if .Keywords }}1{{ else }}{{ end }}"
+    year: "{{ if .Keywords }}0{{ else }}1{{ end }}"
+    format: "{{ if .Keywords }}0{{ else }}{{ end }}"
+    s: "{{ if .Keywords }}{{ .Config.sort }}{{ else }}{{ end }}"
+    d: "{{ if .Keywords }}{{ .Config.type }}{{ else }}{{ end }}"

  keywordsfilters:
    # strip season and/or ep
--- a/src/Jackett.Common/Definitions/bitbazis.yml
+++ b/src/Jackett.Common/Definitions/bitbazis.yml
@@ -46,10 +46,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Filter freeleech only
--- a/src/Jackett.Common/Definitions/bithorlo.yml
+++ b/src/Jackett.Common/Definitions/bithorlo.yml
@@ -56,17 +56,13 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: useragent
    type: text
    label: User-Agent
  - name: info_useragent
-    type: info
-    label: How to get the User-Agent
-    default: "<ol><li>From the same place you fetched the cookie,</li><li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_useragent
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/bitpalace.yml
+++ b/src/Jackett.Common/Definitions/bitpalace.yml
@@ -0,0 +1,166 @@
+---
+id: bitpalace
+name: Bitpalace
+description: "Bitpalace is a Hungarian Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: hu-HU
+type: private
+encoding: UTF-8
+links:
+  - https://bitpalace.cc/
+
+caps:
+  categorymappings:
+    - {id: 8, cat: Movies/BluRay, desc: "BLUERAY ENG"}
+    - {id: 7, cat: Movies/BluRay, desc: "BLUERAY HUN"}
+    - {id: 15, cat: Movies/DVD, desc: "DVD-R ENG"}
+    - {id: 2, cat: Movies/DVD, desc: "DVD-R HUN"}
+    - {id: 9, cat: Books, desc: "Ebook ENG"}
+    - {id: 5, cat: Books, desc: "Ebook HUN"}
+    - {id: 40, cat: Other, desc: "EGYÉBB"}
+    - {id: 16, cat: Movies/HD, desc: "HD ENG"}
+    - {id: 1, cat: Movies/HD, desc: "HD HUN"}
+    - {id: 25, cat: TV/Anime, desc: "MESE ENG"}
+    - {id: 24, cat: TV/Anime, desc: "MESE HUN"}
+    - {id: 18, cat: PC/Games, desc: "PC game ISO"}
+    - {id: 21, cat: Console, desc: "PC game KONZOL"}
+    - {id: 17, cat: PC/Games, desc: "PC game RIP"}
+    - {id: 27, cat: PC/ISO, desc: "Program ISO"}
+    - {id: 26, cat: PC/Mobile-Other, desc: "Program MOBIL"}
+    - {id: 78, cat: PC/0day, desc: "Program RIP"}
+    - {id: 23, cat: TV/SD, desc: "Sor.DVD-R ENG"}
+    - {id: 22, cat: TV/SD, desc: "Sor.DVD-R HUN"}
+    - {id: 14, cat: TV/SD, desc: "Sor.XVID ENG"}
+    - {id: 4, cat: TV, desc: "Sorozat HUN"}
+    - {id: 13, cat: Movies/SD, desc: "XVID ENG"}
+    - {id: 3, cat: Movies/SD, desc: "XVID HUN"}
+    - {id: 12, cat: XXX/DVD, desc: "XXX DVD-R"}
+    - {id: 6, cat: XXX/x264, desc: "XXX HD"}
+    - {id: 10, cat: XXX/ImageSet, desc: "XXX/Képek"}
+    - {id: 11, cat: XXX/XviD, desc: "XXX XVID"}
+    - {id: 19, cat: Audio/Video, desc: "ZENE Klipp"}
+    - {id: 26, cat: Audio/MP3, desc: "ZENE MP3"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login
+  method: form
+  form: form[action="/login_check"]
+  inputs:
+    _username: "{{ .Config.username }}"
+    _password: "{{ .Config.password }}"
+    logout: ""
+  error:
+    - selector: h3[style="color:red"]
+  test:
+    path: my
+    selector: a[href="/logout"]
+
+search:
+  paths:
+    - path: browse
+  keywordsfilters:
+    # the site uses % for wildcard
+    - name: re_replace
+      args: ["[^a-zA-Z0-9]+", "%"]
+  inputs:
+    $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not support imdbid searches
+
+  rows:
+    selector: "table#torrenttable > tbody > tr:has(a[onclick]):not(:contains(\"Törölt\")){{ if .Config.freeleech }}:has(img[src$=\"/freeicon.png\"]){{ else }}{{ end }}"
+
+  fields:
+    categorydesc:
+      selector: img
+      attribute: alt
+    title:
+      selector: a[onclick]
+      remove: style
+    _id:
+      selector: a[onclick]
+      attribute: onclick
+      filters:
+        - name: regexp
+          args: (\d+)
+    details:
+      text: "details?id={{ .Result._id }}"
+    download:
+      text: "/raw/download?id={{ .Result._id }}&name={{ .Result.title }}.torrent"
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    description:
+      case:
+        img[src$="/yes.png"]: "Verified"
+        img[src$="/nincs.png"]: "Unverified"
+    poster:
+      selector: img[width="200"][height="250"]
+      attribute: src
+    date:
+      selector: td:nth-last-child(6)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        img[src$="/freeicon.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="/2xup.jpg"]: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# engine n/a
--- a/src/Jackett.Common/Definitions/bitporn.yml
+++ b/src/Jackett.Common/Definitions/bitporn.yml
@@ -32,6 +32,7 @@ caps:
    - {id: 426, cat: XXX, desc: "Fetish"}
    - {id: 457, cat: XXX, desc: "Fisting"}
    - {id: 453, cat: XXX, desc: "Gangbang"}
+    - {id: 459, cat: XXX, desc: "Game"}
    - {id: 427, cat: XXX, desc: "Gay / Bi"}
    - {id: 412, cat: XXX, desc: "Hair"}
    - {id: 411, cat: XXX, desc: "Hardcore"}
--- a/src/Jackett.Common/Definitions/bitsearch.yml
+++ b/src/Jackett.Common/Definitions/bitsearch.yml
@@ -9,13 +9,6 @@ requestDelay: 2
 links:
  - https://bitsearch.to/
 legacylinks:
-  - https://bitsearch.nocensor.biz/
-  - https://bitsearch.nocensor.sbs/
-  - https://bitsearch.nocensor.world/
-  - https://bitsearch.nocensor.lol/
-  - https://bitsearch.mrunblock.guru/
-  - https://bitsearch.mrunblock.life/
-  - https://bitsearch.nocensor.click/
  - https://bitsearch.nocensor.cloud/
  - https://bitsearch.mrunblock.bond/

--- a/src/Jackett.Common/Definitions/blutopia-api.yml
+++ b/src/Jackett.Common/Definitions/blutopia-api.yml
@@ -105,6 +105,13 @@ search:
      selector: category_id
    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
    details:
      selector: details_link
    download:
@@ -133,8 +140,6 @@ search:
          args: [" & ", "_&_"]
    description:
      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
    seeders:
      selector: seeders
    leechers:
@@ -173,9 +178,4 @@ search:
    minimumseedtime:
      # 7 day (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-# json UNIT3D 8.0.2
+# json UNIT3D 8.1.3
--- a/src/Jackett.Common/Definitions/btmet.yml
+++ b/src/Jackett.Common/Definitions/btmet.yml
@@ -34,6 +34,8 @@ settings:
      0: relevance
      1: created
      2: size
+  - name: info_flaresolverr
+    type: info_flaresolverr

 search:
  paths:
@@ -41,10 +43,6 @@ search:
    - path: search.php
  inputs:
    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    # does not support multi cats so defaulting to all
-    c: ""
-    # 1 Chinese, 2 Japanese, 3 Korean
-    l: ""
    o: "{{ if .Keywords }}{{ .Config.sort }}{{ else }}1{{ end }}"

  rows:
@@ -63,7 +61,7 @@ search:
        - name: replace
          args: ["Video", "TV"]
    title:
-      selector: a.smashTitle > script
+      selector: a.smashTitle > script:contains("decodeURIComponent")
      filters:
        - name: urldecode
        - name: replace
@@ -74,6 +72,7 @@ search:
          args: ["<b style='color:#ea644a'>", ""]
        - name: replace
          args: ["</b>", ""]
+        - name: htmldecode
    details:
      selector: a.smashTitle
      attribute: href
--- a/src/Jackett.Common/Definitions/btschool.yml
+++ b/src/Jackett.Common/Definitions/btschool.yml
@@ -39,10 +39,8 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
  - name: info_tpp
    type: info
    label: Results Per Page
--- a/src/Jackett.Common/Definitions/btsow.yml
+++ b/src/Jackett.Common/Definitions/btsow.yml
@@ -5,6 +5,8 @@ description: "BTSOW is a Public torrent indexer"
 language: en-US
 type: public
 encoding: UTF-8
+certificates:
+  - 649f6dc2a68535205b443ccfae128931734f9f6f # Expired 20 june 2024
 # use https://tellme.pw/btsow to find the new domain
 links:
  - https://btsow.motorcycles/
--- a/src/Jackett.Common/Definitions/byrutor.yml
+++ b/src/Jackett.Common/Definitions/byrutor.yml
@@ -6,11 +6,12 @@ language: ru-RU
 type: public
 encoding: UTF-8
 links:
-  - https://thebyrut.org/
+  - https://byruthub.org/
 legacylinks:
  - https://byrutor.org/
  - https://byrutdb.org/
  - https://byrut.org/
+  - https://thebyrut.org/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/capybarabr.yml
+++ b/src/Jackett.Common/Definitions/capybarabr.yml
@@ -18,7 +18,9 @@ caps:
    - {id: 5, cat: Console, desc: "Jogos"}
    - {id: 9, cat: PC, desc: "Programas"}
    - {id: 10, cat: Audio, desc: "HQs"}
-    - {id: 11, cat: Books, desc: "Livros"}
+    - {id: 11, cat: Books/EBook, desc: "Livros"}
+    - {id: 12, cat: Other, desc: "Cursos"}
+    - {id: 13, cat: Books/Mags, desc: "Revistas"}

  modes:
    search: [q]
@@ -39,10 +41,10 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
-  - name: single_file_release_use_filename
+  - name: use_single_file_release_use_filename
    type: checkbox
-    label: Use filename as title for single file releases
-    default: true
+    label: Use filename as the title for single file releases
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
@@ -110,6 +112,13 @@ search:
      selector: category_id
    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.use_single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
    details:
      selector: details_link
    download:
@@ -138,8 +147,6 @@ search:
          args: [" & ", "_&_"]
    description:
      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
    seeders:
      selector: seeders
    leechers:
@@ -178,9 +185,4 @@ search:
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-# json UNIT3D 8.0.2
+# json UNIT3D 8.0.2 (custom)
--- a/src/Jackett.Common/Definitions/carphunter.yml
+++ b/src/Jackett.Common/Definitions/carphunter.yml
@@ -54,10 +54,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -77,6 +75,10 @@ settings:
    options:
      desc: desc
      asc: asc
+  - name: info_settings
+    type: info
+    label: Settings Requirement
+    default: This indexer only supports the details link option.<br>Navigate to the web site account <b>Beállítások (Settings)</b>, change the <b>Letöltések (Download)</b> option to <b>Link a részletekhez (Link to Details)</b>, and click <b>Mentés (Save)</b>. Selecting <i>Lenyíló menü (Dropdown Menu)</i> will return no results.

 login:
  method: cookie
--- a/src/Jackett.Common/Definitions/carpt.yml
+++ b/src/Jackett.Common/Definitions/carpt.yml
@@ -193,4 +193,4 @@ search:
    description:
      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP vv1.8.11 2024-03-11
+# NexusPHP v1.8.12 2024-05-10
--- a/src/Jackett.Common/Definitions/cathoderaytube.yml
+++ b/src/Jackett.Common/Definitions/cathoderaytube.yml
@@ -80,7 +80,8 @@ search:
    - path: torrents.php
  inputs:
    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchtext: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    searchtext: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}"
+    title: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}"
    order_by: "{{ .Config.sort }}"
    order_way: "{{ .Config.type }}"
    action: advanced
--- a/src/Jackett.Common/Definitions/cdfile.yml
+++ b/src/Jackett.Common/Definitions/cdfile.yml
@@ -0,0 +1,198 @@
+---
+id: cdfile
+name: CD File
+description: "CD File is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://pt.cdfile.org/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/MV"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 408, cat: Audio, desc: "Music/音轨"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 409, cat: Other, desc: "Others/其他"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the cyanbug Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not have their account deleted after parking (in the control panel)</li><li> Users with a parked account will be deleted if they do not log in for 400 consecutive days</li><li>Users with a non-parked account will be deleted if they do not log in for 150 consecutive days</li><li>Users who have no traffic (i.e. upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.</li></ol>"
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+      message:
+        selector: td.text
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
+    # 0 AND, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.11 2024-03-27
--- a/src/Jackett.Common/Definitions/chdbits.yml
+++ b/src/Jackett.Common/Definitions/chdbits.yml
@@ -7,7 +7,6 @@ type: private
 encoding: UTF-8
 links:
  - https://ptchdbits.co/
-legacylinks:
  - https://chdbits.co/

 caps:
--- a/src/Jackett.Common/Definitions/cinemamovies.yml
+++ b/src/Jackett.Common/Definitions/cinemamovies.yml
@@ -42,10 +42,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/src/Jackett.Common/Definitions/cinematik.yml
@@ -107,6 +107,13 @@ search:
      selector: category_id
    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
    details:
      selector: details_link
    download:
@@ -135,8 +142,6 @@ search:
          args: [" & ", "_&_"]
    description:
      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
    seeders:
      selector: seeders
    leechers:
@@ -169,15 +174,10 @@ search:
      case:
        False: 1 # normal
        True: 2 # double
-# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+# global MR is 0.6 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
-#      text: 0.4
+#      text: 0.6
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-# json UNIT3D 8.0.1
+# json UNIT3D 8.1.0
--- a/src/Jackett.Common/Definitions/cpabien.yml
+++ b/src/Jackett.Common/Definitions/cpabien.yml
@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://cpasbien-vf.li/
+  - https://feminalpes.fr/
 legacylinks:
  - https://www.cpasbiens.cz/
  - https://www.cpasbiens.bz/
@@ -26,6 +26,7 @@ legacylinks:
  - https://jardattraction.fr/
  - https://cpasbien-vf.fr/
  - https://cpasbien-vf.pics/
+  - https://cpasbien-vf.li/

 caps:
  categories:
@@ -37,10 +38,8 @@ caps:
    movie-search: [q]

 settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
  - name: info_8000
    type: info
    label: About cpasbien Categories
@@ -79,11 +78,16 @@ search:
  inputs:
    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}"
  # does not support imdbid search and does not return imdb link in results.
+
  keywordsfilters:
    # if searching for season packs with S01 to saison 1 #9712
    - name: re_replace
      args: ["(?i)\\b(?:S0?)(\\d{1,3})\\b", "saison $1"]

+  headers:
+    # site blocks Linux UAs, so slightly alter the Windows UA here (e.g. Safari/537.36 > Safari/537.35)
+    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"]
+
  rows:
    selector: div#gauche > table > tbody > tr:has(a), div#dle-content > a.cover2

--- a/src/Jackett.Common/Definitions/crabpt.yml
+++ b/src/Jackett.Common/Definitions/crabpt.yml
@@ -10,15 +10,16 @@ links:

 caps:
  categorymappings:
-    - {id: 408, cat: Audio, desc: "音乐"}
-    - {id: 409, cat: Other, desc: "其他"}
-    - {id: 407, cat: TV/Sport, desc: "体育竞技"}
+    - {id: 401, cat: Movies, desc: "电影 / Movies"}
+    - {id: 402, cat: TV, desc: "电视剧 / TVSeries"}
+    - {id: 413, cat: TV/Other, desc: "短剧 / Playlet"}
+    - {id: 408, cat: Audio, desc: "音乐 / Music"}
+    - {id: 405, cat: TV/Anime, desc: "动漫 / Anime"}
    - {id: 406, cat: Audio/Video, desc: "MV"}
-    - {id: 403, cat: Movies, desc: "综艺/真人秀"}
-    - {id: 402, cat: TV, desc: "电视剧"}
-    - {id: 405, cat: TV, desc: "动画"}
-    - {id: 404, cat: TV/Anime, desc: "纪录片"}
-    - {id: 401, cat: Movies, desc: "电影"}
+    - {id: 403, cat: Movies, desc: "综艺 / TV Shows"}
+    - {id: 407, cat: TV/Sport, desc: "体育竞技 / Sports"}
+    - {id: 409, cat: Other, desc: "其他 / Other"}
+    - {id: 404, cat: TV/Documentary, desc: "纪录片 / Documentary"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/crazyspirits.yml
+++ b/src/Jackett.Common/Definitions/crazyspirits.yml
@@ -113,10 +113,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/crt2fa.yml
+++ b/src/Jackett.Common/Definitions/crt2fa.yml
@@ -1,7 +1,7 @@
 ---
 id: crt2fa
 name: CRT2FA
-description: "Cathode-Ray.Tube (CRT) is a Private Torrent Tracker for CLASSIC MOVIES / TV.  Cookie Login for 2FA use."
+description: "Cathode-Ray.Tube (CRT) is a Private Torrent Tracker for CLASSIC MOVIES / TV. This indexer uses cookie login for 2FA."
 language: en-GB
 type: private
 encoding: UTF-8
@@ -26,9 +26,7 @@ settings:
    type: text
    label: Cookie
  - name: info_cookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -70,7 +68,8 @@ search:
    - path: torrents.php
  inputs:
    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchtext: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    searchtext: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}"
+    title: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}"
    order_by: "{{ .Config.sort }}"
    order_way: "{{ .Config.type }}"
    action: advanced
--- a/src/Jackett.Common/Definitions/cyanbug.yml
+++ b/src/Jackett.Common/Definitions/cyanbug.yml
@@ -1,38 +1,30 @@
 ---
-id: ptlsp
-name: PTLSP
-description: "PTLSP is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+id: cyanbug
+name: cyanbug (大青虫)
+description: "cyanbug (大青虫) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://www.ptlsp.com/
+  - https://cyanbug.net/

 caps:
  categorymappings:
-    - {id: 414, cat: Other, desc: "Ai(人工智能)"}
-    - {id: 401, cat: Movies, desc: "Movie(电影)"}
-    - {id: 402, cat: TV, desc: "TV Series(电视剧)"}
-    - {id: 405, cat: TV/Anime, desc: "Anime(动画)"}
-    - {id: 411, cat: Audio, desc: "Music(音乐)"}
-    - {id: 416, cat: Books/Comics, desc: "Comic(漫画)"}
-    - {id: 406, cat: Audio/Video, desc: "MV(演唱)"}
-    - {id: 412, cat: PC/0day, desc: "Software(软件)"}
-    - {id: 413, cat: PC/Games, desc: "Game(游戏)"}
-    - {id: 403, cat: TV, desc: "TV Shows(综艺)"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)"}
-    - {id: 407, cat: TV/Sport, desc: "Sports(体育)"}
-    - {id: 408, cat: Audio, desc: "Audio(音频)"}
-    - {id: 415, cat: Books/EBook, desc: "E-Booko(电子书/有声书)"}
-    - {id: 417, cat: Other, desc: "学习资料(Education)"}
-    - {id: 409, cat: Other, desc: "Misc(其他)"}
+    - {id: 409, cat: Other, desc: "Others/其他"}
+    - {id: 408, cat: Audio, desc: "Music/音轨"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/MV"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 401, cat: Movies, desc: "Movies/电影"}

  modes:
    search: [q]
-    tv-search: [q, season, ep, imdbid, doubanid]
-    movie-search: [q, imdbid, doubanid]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
    music-search: [q]
-    book-search: [q]

 settings:
  - name: username
@@ -47,7 +39,7 @@ settings:
  - name: info_2fa
    type: info
    label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the PTLSP Web Site. Otherwise just leave it empty."
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the cyanbug Web Site. Otherwise just leave it empty."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -75,7 +67,7 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if parked (at User CP).</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unparked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 7 days in a row.</li></ol>"
+    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not have their account deleted after parking (in the control panel)</li><li> Users with a parked account will be deleted if they do not log in for 400 consecutive days</li><li>Users with a non-parked account will be deleted if they do not log in for 150 consecutive days</li><li>Users who have no traffic (i.e. upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.</li></ol>"

 login:
  path: login.php
@@ -197,6 +189,9 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
    description_verified:
      case:
        span[title="通过"], span[title="通過"], span[title="Allowed"]: "Verified:"
@@ -208,4 +203,4 @@ search:
      filters:
        - name: prepend
          args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.8 2023-09-25
+# NexusPHP v1.8.9 2023-09-29
--- a/src/Jackett.Common/Definitions/danishbytes-api.yml
+++ b/src/Jackett.Common/Definitions/danishbytes-api.yml
@@ -9,9 +9,9 @@ links:
  - https://danishbytes.club/
  - https://danishbytes2.org/
  - https://dbytes.org/
-  - https://danishbytes.art/
 legacylinks:
  - https://danishbytes.org/
+  - https://danishbytes.art/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/demonoid.yml
+++ b/src/Jackett.Common/Definitions/demonoid.yml
@@ -8,10 +8,7 @@ encoding: UTF-8
 links:
  - https://www.demonoid.is/
  - https://www.dnoid.to/
-  - https://www.dnoid.pw/
-  - https://demonoid.torrentbay.st/
 legacylinks:
-  - https://demonoid.unblockit.boo/
  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.to/
  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.link/ # Origin is unreachable Error code 523
@@ -22,7 +19,6 @@ legacylinks:
  - https://demonoid.unblockit.mov/
  - https://demonoid.mrunblock.life/
  - https://demonoid.unblockit.rsvp/
-  - https://demonoid.nocensor.click/
  - https://demonoid.unblockit.vegas/
  - https://demonoid.unblockit.esq/
  - https://demonoid.unblockit.zip/
@@ -35,6 +31,11 @@ legacylinks:
  - https://demonoid.unblockit.dad/
  - https://demonoid.unblockit.africa/
  - https://demonoid.unblockit.casa/ # 302
+  - https://unblockit.sbs/ # 526
+  - https://unblockit.ong/ # 526
+  - https://demonoid.unblockit.black/ # site broken by ad
+  - https://www.dnoid.pw/
+  - https://demonoid.torrentbay.st/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/desitorrents-api.yml
+++ b/src/Jackett.Common/Definitions/desitorrents-api.yml
@@ -6,10 +6,10 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://desitorrents.rocks/
  - https://torrent.desi/
 legacylinks:
  - https://desitorrents.tv/
+  - https://desitorrents.rocks/

 caps:
  categorymappings:
@@ -54,10 +54,10 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "<ul><li>Accounts are regarded as inactive when users fail to sign into their accounts for more than 3 months (90 days). Inactive accounts are automatically disabled by a script that runs once every day.</li><li>For new accounts, members must generate some activity by downloading or uploading torrents in the first month (30 days) of their memberships.</li><li>Donors are exempt from automatic account disabling due to inactivity. If you wish to always maintain an active account consider donating.</li></ul>"
+    default: "Inactive accounts will be disabled after 3 months of inactivity, 1 month for new accounts. Members must generate some download or upload activity at least once every 3 months."

 login:
-  path: /api/torrents
+  path: /api/v1/torrents
  method: get
  error:
    - selector: a[href*="/login"]
@@ -68,7 +68,7 @@ search:
  paths:
    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
+    - path: "/api/v1/torrents/filter"
      response:
        type: json

--- a/src/Jackett.Common/Definitions/devil-torrents.yml
+++ b/src/Jackett.Common/Definitions/devil-torrents.yml
@@ -60,10 +60,8 @@ settings:
    options:
      POLISH: POLISH
      MULTi POLISH: MULTi POLISH
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr

 login:
  path: logowanie
--- a/src/Jackett.Common/Definitions/digitalcore.yml
+++ b/src/Jackett.Common/Definitions/digitalcore.yml
@@ -25,6 +25,7 @@ caps:
    - {id: 13, cat: TV/UHD, desc: Tv/2160p}
    - {id: 14, cat: TV/HD, desc: Tv/BluRay}
    - {id: 12, cat: TV/HD, desc: Tv/PACKS}
+    - {id: 15, cat: TV/Sport, desc: Tv/SPORTS}
    - {id: 17, cat: Other, desc: Unknown}
    - {id: 18, cat: PC/0day, desc: Apps/0DAY}
    - {id: 20, cat: PC/ISO, desc: Apps/PC}
@@ -63,10 +64,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/discfan.yml
+++ b/src/Jackett.Common/Definitions/discfan.yml
@@ -184,4 +184,4 @@ search:
          args: "cat={{ .Result.category_title }} - "
    minimumratio:
      text: 0.9
-# NexusPHP v1.8.11 2024-03-27
+# NexusPHP v1.8.12 2024-05-10
--- a/src/Jackett.Common/Definitions/divteam.yml
+++ b/src/Jackett.Common/Definitions/divteam.yml
@@ -59,9 +59,7 @@ settings:
    type: text
    label: Cookie
  - name: info_cookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Filter freeleech only
--- a/src/Jackett.Common/Definitions/dmhy.yml
+++ b/src/Jackett.Common/Definitions/dmhy.yml
@@ -42,10 +42,8 @@ caps:
    book-search: [q]

 settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr

 search:
  paths:
--- a/src/Jackett.Common/Definitions/electro-torrent.yml
+++ b/src/Jackett.Common/Definitions/electro-torrent.yml
@@ -58,17 +58,13 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: useragent
    type: text
    label: User-Agent
  - name: info_useragent
-    type: info
-    label: How to get the User-Agent
-    default: "<ol><li>From the same place you fetched the cookie,</li><li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_useragent
  - name: multilang
    type: checkbox
    label: Replace MULTi by another language in release name
--- a/src/Jackett.Common/Definitions/empornium2fa.yml
+++ b/src/Jackett.Common/Definitions/empornium2fa.yml
@@ -1,7 +1,7 @@
 ---
 id: empornium2fa
 name: Empornium2FA
-description: "this indexer uses a cookie login for Empornium for those that want to use 2FA"
+description: "Empornium (EMP) is a Private Torrent Tracker for 3X. This indexer uses cookie login for 2FA."
 language: en-US
 type: private
 encoding: UTF-8
@@ -69,10 +69,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: infocookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/enthralled2fa.yml
+++ b/src/Jackett.Common/Definitions/enthralled2fa.yml
@@ -24,9 +24,7 @@ settings:
    type: text
    label: Cookie
  - name: info_cookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/ex-torrenty.yml
+++ b/src/Jackett.Common/Definitions/ex-torrenty.yml
@@ -85,7 +85,7 @@ search:
    # does not support imdbid searching, or have imdb in results

  rows:
-    selector: table[width="100%"] > tbody > tr:has(a[href^="torrent/"])
+    selector: table[width="100%"] > tbody > tr:has(a[href*="torrent/"])

  fields:
    category:
@@ -117,9 +117,9 @@ search:
        ":contains(\"GSM/PDA\")": 31
        ":contains(\"Inne\")": 32
    title_phase1:
-      selector: a[href^="torrent/"]
+      selector: a[href*="torrent/"]
    title_multilang:
-      selector: a[href^="torrent/"]
+      selector: a[href*="torrent/"]
      filters:
        - name: re_replace
          args: ["(?i)\\b(MULTI(?!.*(?:POLISH|ENGLISH|\\bPL\\b)))\\b", "{{ .Config.multilanguage }}"]
@@ -128,10 +128,10 @@ search:
    title:
      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
    details:
-      selector: a[href^="torrent/"]
+      selector: a[href*="torrent/"]
      attribute: href
    download:
-      selector: a[href^="torrent/"]
+      selector: a[href*="torrent/"]
      attribute: href
      filters:
        - name: replace
--- a/src/Jackett.Common/Definitions/exitorrent-org.yml
+++ b/src/Jackett.Common/Definitions/exitorrent-org.yml
@@ -46,10 +46,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -106,7 +104,7 @@ search:
      args: [" +(?:19|20)\\d{2} *$", ""]

  rows:
-    selector: table[class="text"][border="0"][cellspacing="0"][cellpadding="4"] > tbody > tr:has(a[href^="details.php?id="]):has(td[class*="tableBody1"])
+    selector: table[class="text"][border="0"][cellspacing="0"][cellpadding="4"] > tbody > tr:has(a[href^="details.php?id="]):has(td[class*="tableBody1"], td[class*="tableBody1B"])
    filters:
      - name: andmatch

@@ -118,9 +116,9 @@ search:
        - name: querystring
          args: cat
    title_raw:
-      selector: a[href^="details.php?id="]
+      selector: div[class="span_title"] > a[href^="details.php?id="]
    title_stripped:
-      selector: a[href^="details.php?id="]
+      selector: div[class="span_title"] > a[href^="details.php?id="]
      filters:
        - name: re_replace
          args: ["^(.*/)(.*)$", "$2"]
@@ -131,8 +129,11 @@ search:
      selector: a[href^="details.php?id="]
      attribute: href
    download:
-      selector: a[href^="download.php/"], a[href^="downloadfl.php/"]
-      attribute: href
+      selector: div.span_icon > a[onclick^="return downloadTorrent"]
+      attribute: onclick
+      filters:
+        - name: re_replace
+          args: ["^return downloadTorrent\\('([^']+)', '([^']+)', ''\\);$", "download.php/$1/$2.torrent"]
    genre:
      selector: div.span_title span div
    _language:
--- a/src/Jackett.Common/Definitions/extratorrent-st.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-st.yml
@@ -9,17 +9,12 @@ links:
  - https://extratorrent.st/
  - https://extratorrent.ninjaproxy1.com/
  - https://extratorrent.proxyninja.org/
+  - https://extratorrent.proxyninja.net/
 legacylinks:
-  - https://extratorrent.nocensor.art/
-  - https://extratorrent.unblockit.bio/
-  - https://extratorrent.unblockit.boo/
-  - https://extratorrent.mrunblock.guru/
-  - https://extratorrent.unblockit.click/
  - https://extratorrent.unblockit.asia/
  - https://extratorrent.unblockit.mov/
  - https://extratorrent.mrunblock.life/
  - https://extratorrent.unblockit.rsvp/
-  - https://extratorrent.nocensor.click/
  - https://extratorrent.unblockit.vegas/
  - https://extratorrent.unblockit.esq/
  - https://extratorrent.unblockit.zip/
@@ -31,6 +26,9 @@ legacylinks:
  - https://extratorrent.unblockit.dad/
  - https://extratorrent.unblockit.africa/
  - https://extratorrent.unblockit.casa/ # 502
+  - https://extratorrent.unblockit.sbs/ # 502
+  - https://extratorrent.unblockit.ong/ # 502
+  - https://extratorrent.unblockit.black/ # 502

 caps:
  categorymappings:
@@ -87,10 +85,8 @@ caps:
    book-search: [q]

 settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr

 search:
  paths:
--- a/src/Jackett.Common/Definitions/exttorrents.yml
+++ b/src/Jackett.Common/Definitions/exttorrents.yml
@@ -96,10 +96,8 @@ settings:
    options:
      desc: desc
      asc: asc
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr

 download:
  selectors:
--- a/src/Jackett.Common/Definitions/eztv.yml
+++ b/src/Jackett.Common/Definitions/eztv.yml
@@ -11,23 +11,16 @@ links:
  - https://eztv.tf/
  - https://eztv.yt/
  - https://eztv1.xyz/
-  - https://eztv.abcproxy.org/
-  - https://eztv.unblockit.casa/
-  - https://eztv.unblockninja.com/
-  - https://eztv.ninjaproxy1.com/
-  - https://eztv.proxyninja.org/
+  - https://eztv.unblockit.black/
 legacylinks:
  - https://eztv.ag/ # redirects to .re
  - https://eztv.it/ # redirects to .re
  - https://eztv.ch/ # redirects to .re
  - https://eztv.io/
-  - https://eztv.mrunblock.guru/
-  - https://eztv.unblockit.click/
  - https://eztv.unblockit.asia/
  - https://eztv.unblockit.mov/
  - https://eztv.mrunblock.life/
  - https://eztv.unblockit.rsvp/
-  - https://eztv.nocensor.click/
  - https://eztv.unblockit.vegas/
  - https://eztv.unblockit.esq/
  - https://eztv.unblockit.zip/
@@ -40,6 +33,13 @@ legacylinks:
  - https://eztv.unblockit.date/
  - https://eztv.unblockit.dad/
  - https://eztv.unblockit.africa/
+  - https://eztv.unblockit.casa/
+  - https://eztv.unblockit.sbs/
+  - https://eztv.unblockninja.com/ # layout=def_wlinks not working
+  - https://eztv.ninjaproxy1.com/ # layout=def_wlinks not working
+  - https://eztv.proxyninja.org/ # layout=def_wlinks not working
+  - https://eztv.abcproxy.org/
+  - https://eztv.unblockit.ong/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/f1carreras-api.yml
+++ b/src/Jackett.Common/Definitions/f1carreras-api.yml
@@ -1,27 +1,31 @@
 ---
-id: brsociety-api
-name: BrSociety (API)
-description: "BrSociety (SemeandoCC) is a BRAZILIAN Private Torrent Tracker for E-LEARNING"
-language: pt-BR
+id: f1carreras-api
+name: F1Carreras (API)
+description: "F1Carreras is a Spanish Private Torrent Tracker for Motor Racing TV Releases"
+language: es-ES
 type: private
 encoding: UTF-8
 links:
-  - https://brsociety.club/
+  - https://f1carreras.xyz/

 caps:
  categorymappings:
-    - {id: 1, cat: Other, desc: "Cursos"}
-    - {id: 2, cat: Books/EBook, desc: "eBooks"}
-    - {id: 5, cat: Books/Mags, desc: "Revistas"}
-    - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 4, cat: Other, desc: "Arquivos de Auxilio"}
-    - {id: 6, cat: Other, desc: "Graduação"}
-    - {id: 7, cat: TV/Documentary, desc: "Documentários"}
+    - {id: 1, cat: TV/Sport, desc: "Movies"}
+    - {id: 2, cat: TV/Sport, desc: "TV"}
+    - {id: 3, cat: TV/Sport, desc: "Formula 1"}
+    - {id: 4, cat: TV/Sport, desc: "IndyCar Series"}
+    - {id: 5, cat: TV/Sport, desc: "Formula 2"}
+    - {id: 6, cat: TV/Sport, desc: "Formula E"}
+    - {id: 7, cat: TV/Sport, desc: "MotoGP"}
+    - {id: 8, cat: TV/Sport, desc: "Nascar"}
+    - {id: 9, cat: TV/Sport, desc: "Formula 3"}
+    - {id: 10, cat: TV/Sport, desc: "DTM"}
+    - {id: 11, cat: TV/Sport, desc: "Rally"}
+    - {id: 12, cat: TV/Sport, desc: "WEC"}

  modes:
    search: [q]
-    tv-search: [q, season, ep]
-    book-search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]

 settings:
  - name: apikey
@@ -30,7 +34,7 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://brsociety.club/\" target=\"_blank\">BrSociety</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://f1carreras.xyz/\" target=\"_blank\">F1Carreras</a> account <i>Settings</i> page and clicking on the <b>API Key</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -51,10 +55,6 @@ settings:
    options:
      desc: desc
      asc: asc
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Your account will be considered inactive if it exceeds 90 days without you logging in to the Website. After 90 days of inactivity (i.e., 180 days without login) it will be deleted from the tracker."

 login:
  path: /api/torrents
@@ -76,8 +76,14 @@ search:
    Authorization: ["Bearer {{ .Config.apikey }}"]

  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
    name: "{{ .Keywords }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
    sortField: "{{ .Config.sort }}"
    sortDirection: "{{ .Config.type }}"
@@ -100,11 +106,19 @@ search:
      selector: details_link
    download:
      selector: download_link
-    magnet:
-      selector: magnet_link
-      optional: true
    infohash:
      selector: info_hash
+    poster:
+      selector: meta.poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
    files:
      selector: num_file
    seeders:
@@ -139,10 +153,7 @@ search:
      case:
        False: 1 # normal
        True: 2 # double
-# global MR is 0.7 but torrents must be seeded for 4 days regardless of ratio
-#    minimumratio:
-#      text: 0.7
    minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# json UNIT3D 7.1.3 (custom)
+      # 6 hours (as seconds = 6 x 60 x 60)
+      text: 21600
+# json UNIT3D 7.2.5
--- a/src/Jackett.Common/Definitions/falkonvisionteam.yml
+++ b/src/Jackett.Common/Definitions/falkonvisionteam.yml
@@ -1,157 +0,0 @@
---
-id: falkonvisionteam
-name: Falkon Vision Team
-description: "Falkon Vision Team is a CROATIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: hr-HR
-type: private
-encoding: UTF-8
-links:
-  - http://falkonvision-team.com/ # does not support https, CA expired March 2018
-
-caps:
-  categorymappings:
-    - {id: 16, cat: Audio/Audiobook, desc: "Audio knjige"}
-    - {id: 10, cat: Movies/BluRay, desc: "Blue Ray"}
-    - {id: 6, cat: TV/Documentary, desc: "Dokumentarci"}
-    - {id: 9, cat: Movies/DVD, desc: "DVD"}
-    - {id: 4, cat: Movies/DVD, desc: "DVDRip"}
-    - {id: 12, cat: Books/EBook, desc: "E-KNJIGE"}
-    - {id: 3, cat: Other, desc: "FVT"}
-    - {id: 13, cat: Movies/HD, desc: "HD Rip"}
-    - {id: 14, cat: Audio/Video, desc: "Koncerti"}
-    - {id: 7, cat: Audio, desc: "Muzika"}
-    - {id: 15, cat: TV, desc: "Serije"}
-    - {id: 8, cat: TV/Sport, desc: "Sport"}
-    - {id: 5, cat: TV, desc: "TV Rip"}
-    - {id: 11, cat: Movies/Other, desc: "Video spotovi"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "To keep records updated reguarly, all inactive accounts will be deleted after 60 days of inactivity."
-
-login:
-  path: login.php?
-  method: form
-  form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img#regimage
-    input: imagestring
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-  error:
-    - selector: table:contains("Greska")
-  test:
-    path: index.php
-    selector: a[href*="/logout.php?logouthash="]
-
-search:
-  paths:
-    - path: browse.php
-  keywordsfilters:
-    - name: re_replace
-      args: ["[\\s]+", "%"]
-  inputs:
-    do: search
-    keywords: "{{ .Keywords }}"
-    # t_name, t_description, t_both, t_uploader, t_genre
-    # searching t_name yields no results!
-    search_type: t_both
-    # does not support multi category searching so defaulting to all.
-    category: 0
-    include_dead_torrents: yes
-    sort: "{{ if .Config.freeleech }}free{{ else }}{{ .Config.sort }}{{ end }}"
-    order: "{{ if .Config.freeleech }}asc{{ else }}{{ .Config.type }}{{ end }}"
-    # does not return imdb link in results and t_genre does not return imdbid search results
-
-  rows:
-    selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href*="/browse.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[href*="/details.php?id="]
-    details:
-      selector: a[href*="/details.php?id="]
-      attribute: href
-    download:
-      selector: a[href*="/download.php?id="]
-      attribute: href
-    poster:
-      selector: img[src*="/torrents/images/"]
-      attribute: src
-    date:
-      selector: td:nth-child(2)
-      # auto adjusted by site account profile
-      filters:
-        - name: regexp
-          args: "(\\d{2}-\\d{2}-\\d{2} \\d{2}:\\d{2})"
-        - name: dateparse
-          args: "dd-MM-yy HH:mm"
-    size:
-      selector: td:nth-last-child(5)
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    description:
-      # Wait: 4 h
-      # Cekanje: 4 h
-      selector: div.tooltip-content > div:last-child
-    downloadvolumefactor:
-      case:
-        img[src$="/freedownload.gif"]: 0
-        img[src$="/silverdownload.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="/x2.gif"]: 2
-        "*": 1
-    minimumseedtime:
-      # 60 hours (as seconds = 60 x 60 x 60)
-      text: 216000
-# TS Special Edition v.7.4
--- a/src/Jackett.Common/Definitions/fearnopeer.yml
+++ b/src/Jackett.Common/Definitions/fearnopeer.yml
@@ -105,6 +105,13 @@ search:
      selector: category_id
    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
    details:
      selector: details_link
    download:
@@ -133,8 +140,6 @@ search:
          args: [" & ", "_&_"]
    description:
      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
    seeders:
      selector: seeders
    leechers:
@@ -170,9 +175,4 @@ search:
 # Maintain global ratio above 0.5 or downloads will get disabled. No MST.
    minimumratio:
      text: 0.51
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-# json UNIT3D 8.0.2
+# json UNIT3D 8.1.3
--- a/src/Jackett.Common/Definitions/file-shack.yml
+++ b/src/Jackett.Common/Definitions/file-shack.yml
@@ -0,0 +1,176 @@
+---
+id: file-shack
+name: File-Shack
+description: "File-Shack is a Private tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://file-shack.xyz/
+
+caps:
+  categorymappings:
+    - {id: 6, cat: PC/0day, desc: "Apps: Windows"}
+    - {id: 7, cat: PC/Mac, desc: "Apps: Mac"}
+    - {id: 8, cat: PC, desc: "Apps: Linux"}
+    - {id: 75, cat: Movies/DVD, desc: "Movies: DVD"}
+    - {id: 26, cat: Movies/BluRay, desc: "Movies: Blu-Ray"}
+    - {id: 42, cat: Movies/HD, desc: "Movies: FHD-HD"}
+    - {id: 50, cat: Movies/WEB-DL, desc: "Movies: Web-Dl"}
+    - {id: 74, cat: Movies/SD, desc: "Movies: SD"}
+    - {id: 49, cat: Movies/UHD, desc: "Movies: 4k"}
+    - {id: 46, cat: Movies/3D, desc: "Movies: 3D"}
+    - {id: 24, cat: Movies, desc: "Movies: Packs"}
+    - {id: 28, cat: Movies/Other, desc: "Movies: Cartoons"}
+    - {id: 47, cat: XXX, desc: "Movies: XXX"}
+    - {id: 41, cat: TV/HD, desc: "TV: HD"}
+    - {id: 52, cat: TV/WEB-DL, desc: "TV: WEB-DL"}
+    - {id: 48, cat: TV, desc: "TV: Packs"}
+    - {id: 9, cat: TV/Documentary, desc: "TV: Documentaries"}
+    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music: FLAC"}
+    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
+    - {id: 27, cat: Audio, desc: "Music: Pack"}
+    - {id: 53, cat: PC/Games, desc: "Games: Pc"}
+    - {id: 54, cat: Console, desc: "Games: PsP"}
+    - {id: 76, cat: Audio/Audiobook, desc: "Books: Audio"}
+    - {id: 77, cat: Books/EBook, desc: "Books: eBooks"}
+    - {id: 78, cat: TV/UHD, desc: "TV: 4k"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_results
+    type: info
+    label: Search results
+    default: "If you are not getting results, then access the site with your browser and mark as read all PMs."
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Be active here, you must login at least once a month. Also, not downloading anything is considered being inactive (except if you're an uploader or VIP). The accounts inactive for 3 months are deleted."
+
+login:
+  path: account-login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div.myFrame:contains("Access Denied")
+  test:
+    path: index.php
+    selector: a[href^="account-logout.php"]
+
+search:
+  paths:
+    # https://file-shack.xyz/torrents-search.php?c22=1&c23=1&c76=1&c77=1&search=&incldead=0&freeleech=0&inclrosub=0
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    # 0 only active 1 incl dead 2 only dead
+    incldead: 1
+    # 0 all 1 not freeleech 2 only freeleech
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+
+  rows:
+    selector: table.ttable_headinner > tbody > tr
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: a[href^="torrents-details.php?id="]:not(a[onmouseover*="images/nocover.png"])
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=([^\s]+)
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    size:
+      selector: td:nth-child(4)
+    date:
+      # 15.11.21<br>07:47
+      selector: td:nth-child(5)
+      # auto adjusted by site account profile
+      filters:
+        - name: dateparse
+          args: "d.MM.yyHH:mm"
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    genre:
+      selector: a:contains("Genre:")
+      filters:
+        - name: replace
+          args: ["Genre: ", ""]
+    _source:
+      case:
+        img[src="images/t_extern.png"]: External
+        "*": Local
+    description:
+      text: "{{ .Result._source }} - {{ .Result.genre }}"
+    downloadvolumefactor:
+      case:
+        img[src="images/t_extern.png"]: 0
+        img[src="images/free.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+# global MR is 1.0 but torrents must be seeded for 1 day regardless of ratio
+#    minimumratio:
+#      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+# engine n/a
--- a/src/Jackett.Common/Definitions/finelite.yml
+++ b/src/Jackett.Common/Definitions/finelite.yml
@@ -13,7 +13,7 @@ settings:
    type: text
    label: Username
  - name: password
-    type: password
+    type: text
    label: Password
  - name: freeleech
    type: checkbox
@@ -35,6 +35,18 @@ settings:
    options:
      desc: desc
      asc: asc
+  - name: info_finelite
+    type: info
+    label: Login Requirement
+    default: "To successfully login, members must first <a href=\"https://finelite.org/staff.php\" target=\"_blank\">message FinElite staff</a>, asking that their account be whitelisted from captcha validation.</br></br>Onnistuakseen sisäänkirjautumisessa jäsenten on ensin lähetettävä <a href=\"https://finelite.org/staff.php\" target=\"_blank\">viesti FinElite henkilökunnalle</a> ja pyydettävä, että heidän tilinsä poistetaan captcha-varmennuksesta."
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Julkaisuja per sivu</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Unused IDs in the User and Power User categories are automatically deleted after 90 days. The account can be parked and stored on the site for 180 days."

 caps:
  categorymappings:
@@ -43,8 +55,7 @@ caps:
    - {id: 24, cat: Books/EBook, desc: "Ebooks"}
    - {id: 10, cat: Console, desc: "Games - Console"}
    - {id: 11, cat: PC/Games, desc: "Games - PC"}
-    - {id: 26, cat: Movies, desc: "Kids"}
-    - {id: 9, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 26, cat: Movies/Other, desc: "Kids"}
    - {id: 12, cat: Movies, desc: "Movie Pack"}
    - {id: 31, cat: Movies/UHD, desc: "Movies 4K"}
    - {id: 38, cat: Movies/BluRay, desc: "Movies BD"}
@@ -71,27 +82,26 @@ caps:
 login:
  path: login.php
  method: form
-  form: form#login
+  form: form[action="/take_login.php"]
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
  error:
-    - selector: td.embedded:contains("Virhe") # error
-    - selector: td.embedded:contains("epäonnistui") # falied
+    - selector: div.notice.notice-error
  test:
    path: /
-    selector: a[href="ulos.php"]
+    selector: a[href="/logout.php"]

 search:
  paths:
-    # https://finelite.org/selaa.php?c14=1&c15=1&c31=1&search=tt6591554&hae=2&type=desc&cat=0&incldead=1&sort=1
-    # https://finelite.org/selaa.php?search=&hae=0&type=desc&cat=0&incldead=1&freeleech=yes&sort=1
-    - path: selaa.php
+    # https://finelite.org/browse.php?c14=1&c15=1&c31=1&search=tt6591554&hae=2&type=desc&cat=0&incldead=1&sort=1
+    # https://finelite.org/browse.php?search=&hae=0&type=desc&cat=0&incldead=1&freeleech=yes&sort=1
+    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
    # 0 name&descr, 1 name, 2 descr, 3 tags, 4 imdb with rating
-    hae: "{{ if .Query.IMDBID }}2{{ else }}1{{ end }}"
+    hae: "{{ if .Query.IMDBID }}4{{ else }}1{{ end }}"
    # 0 active, 1 incldead, 2 deadonly
    incldead: 1
    freeleech: "{{ if .Config.freeleech }}yes{{ else }}{{ end }}"
@@ -99,23 +109,26 @@ search:
    type: "{{ .Config.type }}"

  rows:
-    selector: table.main > tbody >  tr:has(a[href^="/lataa.php/"])
+    selector: table.main > tbody >  tr:has(a[href^="/lataa/"])

  fields:
    category:
-      selector: a[href^="selaa.php?c"]
+      selector: a[href^="/browse.php?c"]
      attribute: href
      filters:
        - name: regexp
          args: c(\d+)=1
    title:
-      selector: a[href^="julkaisu.php?id="]
+      selector: a[href^="/details/"]
    details:
-      selector: a[href^="julkaisu.php?id="]
+      selector: a[href^="/details/"]
      attribute: href
    download:
-      selector: a[href^="/lataa.php/"]
+      selector: a[href^="/lataa/"]
      attribute: href
+    poster:
+      selector: a[href^="/details/"] img
+      attribute: src
    imdbid:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
@@ -128,7 +141,7 @@ search:
        - name: append
          args: " +02:00" # EET
        - name: dateparse
-          args: "d.M.yyyy HH:mm zzz"
+          args: "d.M.yyyy  HH:mm zzz"
    size:
      selector: td:nth-last-child(3)
    seeders:
@@ -137,7 +150,7 @@ search:
      selector: td:nth-last-child(1)
    downloadvolumefactor:
      case:
-        span.label-free: 0
+        span[title="Freeleech"]: 0
        "*": 1
    uploadvolumefactor:
      text: 1
@@ -146,4 +159,4 @@ search:
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
-# custom 3.6.8
+# FE v4.0.0
--- a/src/Jackett.Common/Definitions/freefarm.yml
+++ b/src/Jackett.Common/Definitions/freefarm.yml
@@ -69,10 +69,8 @@ settings:
    options:
      desc: desc
      asc: asc
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
  - name: info_tpp
    type: info
    label: Results Per Page
@@ -220,4 +218,4 @@ search:
      filters:
        - name: prepend
          args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.11 2024-03-27
+# NexusPHP v1.8.12 2024-04-13
--- a/src/Jackett.Common/Definitions/frozenlayer.yml
+++ b/src/Jackett.Common/Definitions/frozenlayer.yml
@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 requestDelay: 2
 certificates:
-  - b738ae9ae55c5553b1ff7d3004d807229be3a091  # Expired 4 Dec 2023
+  - 0e43335b4c778e95f8e4db46e20cc3d0e84e59ff  # expired 19 July 2024
 links:
  - https://www.frozen-layer.com/

--- a/src/Jackett.Common/Definitions/fuzer.yml
+++ b/src/Jackett.Common/Definitions/fuzer.yml
@@ -70,10 +70,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/gamera.yml
+++ b/src/Jackett.Common/Definitions/gamera.yml
@@ -32,10 +32,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/gamestorrents.yml
+++ b/src/Jackett.Common/Definitions/gamestorrents.yml
@@ -11,11 +11,6 @@ legacylinks:
  - https://www.gamestorrents.com/
  - https://www.gamestorrents.tv/
  - https://www.gamestorrents.nu/
-  - https://gamestorrents.nocensor.space/
-  - https://gamestorrents.nocensor.work/
-  - https://gamestorrents.nocensor.biz/
-  - https://gamestorrents.nocensor.sbs/
-  - https://gamestorrents.nocensor.world/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/gktorrent.yml
+++ b/src/Jackett.Common/Definitions/gktorrent.yml
@@ -5,21 +5,14 @@ description: "GkTorrent is a French Public site for TV / MOVIES / GENERAL"
 language: fr-FR
 type: public
 encoding: UTF-8
-followredirect: true
 # to fetch current domain use https://www.protege-torrent.com/Gktorrent
 links:
-  - https://www.gktorrent.eu/
+  - https://www.gktorrent.in/
 legacylinks:
  - https://www.rantop.org/
-  - https://gktorrent.nocensor.work/
-  - https://gktorrent.nocensor.biz/
-  - https://gktorrent.nocensor.sbs/
-  - https://gktorrent.nocensor.world/
-  - https://gktorrent.nocensor.lol/
-  - https://gktorrent.mrunblock.guru/
-  - https://gktorrent.mrunblock.life/
+  - https://www.torrent.ws/
+  - https://www.protege-torrent.com/
  - https://gktorrent.nocensor.click/
-  - https://www.gktorrent.ac/
  - https://www.gktorrent.ph/
  - https://www.gktorrent.vc/
  - https://www.gktorrent.mx/
@@ -31,10 +24,15 @@ legacylinks:
  - https://www.gktorrent.vg/
  - https://www.gktorrent.lol/
  - https://www.gktorrent.sh/
+  - https://www.gktorrent.eu/
+  - https://www.gktorrent.xyz/
+  - https://www.gktorrent.pm/
+  - https://www.gktorrent.tw/

 caps:
  categorymappings:
    - {id: Films, cat: Movies, desc: "Movies"}
+    - {id: Vidéos, cat: Movies, desc: "Vidéos"}
    - {id: Animes, cat: TV/Anime, desc: "Anime"}
    - {id: Séries, cat: TV, desc: "TV Series"}
    - {id: Spectacles, cat: TV, desc: "TV Shows"}
@@ -57,6 +55,8 @@ caps:
  allowrawsearch: true

 settings:
+  - name: info_flaresolverr
+    type: info_flaresolverr
  - name: multilang
    type: checkbox
    label: Replace MULTi by another language in release name
@@ -97,7 +97,7 @@ search:
      args: ["(?i)(S)(\\d{1,3})$", "saison $2"]

  rows:
-    selector: table.table-hover > tbody > tr
+    selector: table.table-hover > tbody > tr:has(td a[href])

  fields:
    category:
--- a/src/Jackett.Common/Definitions/glodls.yml
+++ b/src/Jackett.Common/Definitions/glodls.yml
@@ -8,21 +8,13 @@ encoding: UTF-8
 links:
  - https://glodls.to/
  - https://gtso.cc/
-  - https://glotorrents.unblockit.casa/
-  - https://glodls.unblockninja.com/
-  - https://glodls.ninjaproxy1.com/
+  - https://glotorrents.unblockit.black/
 legacylinks:
  - https://glodls.rocks/
  - https://gtdb.to/
-  - https://glotorrents.unblockit.bio/
-  - https://glotorrents.unblockit.boo/
-  - https://glotorrents.mrunblock.guru/
-  - https://glotorrents.unblockit.click/
  - https://glotorrents.unblockit.asia/
  - https://glotorrents.unblockit.mov/
-  - https://glotorrents.mrunblock.life/
  - https://glotorrents.unblockit.rsvp/
-  - https://glotorrents.nocensor.click/
  - https://gtdb.cc/
  - https://glotorrents.unblockit.vegas/
  - https://glotorrents.unblockit.esq/
@@ -35,6 +27,11 @@ legacylinks:
  - https://glotorrents.unblockit.date/
  - https://glotorrents.unblockit.dad/
  - https://glotorrents.unblockit.africa/
+  - https://glotorrents.unblockit.casa/
+  - https://glotorrents.unblockit.sbs/
+  - https://glotorrents.unblockit.ong/
+  - https://glodls.unblockninja.com/ # blank
+  - https://glodls.ninjaproxy1.com/ # blank

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/gtorrentpro.yml
+++ b/src/Jackett.Common/Definitions/gtorrentpro.yml
@@ -0,0 +1,79 @@
+---
+id: gtorrentpro
+name: GTorrent.club
+description: "GTorrent.club is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
+language: ru-RU
+type: public
+encoding: windows-1251
+links:
+  - https://gtorrent.club/
+legacylinks:
+  - http://gtorrent.pro/
+  - http://gtorrent.ru/
+
+caps:
+  categorymappings:
+    - {id: "filmy", cat: Movies, desc: "Фильмы (Movies)"}
+    - {id: "muzyka", cat: Audio, desc: "Музыка (Music)"}
+    - {id: "igry", cat: Console, desc: "Игры (Games)"}
+    - {id: "serialy", cat: TV, desc: "Сериалы (TV series)"}
+    - {id: "programmy", cat: PC, desc: "Программы (Software)"}
+    - {id: "prilozheniya", cat: Other, desc: "prilozheniya (Other)"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: info_flaresolverr
+    type: info_flaresolverr
+
+download:
+  selectors:
+    - selector: a[href^="/engine/download.php?id="]
+      attribute: href
+
+search:
+  # do=search&subaction=search&search_start=0&full_search=0&result_from=1&story=%D0%A6%D0%B5%D0%BB%D1%8C%D0%BD%D0%BE%D0%BC%D0%B5%D1%82%D0%B0%D0%BB%D0%BB%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B0%D1%8F+%D0%BE%D0%B1%D0%BE%D0%BB%D0%BE%D1%87%D0%BA%D0%B0+
+  paths:
+    - path: index.php
+  inputs:
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 0
+    result_from: 1
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.blog_brief_news:not(div.first_line):not(:has(div.uploaded:empty))
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: div.name a
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 3]
+    title:
+      selector: div.name
+    details:
+      selector: div.name a
+      attribute: href
+    download:
+      selector: div.name a
+      attribute: href
+    date:
+      text: now
+    size:
+      selector: div:nth-child(2)
+    seeders:
+      selector: div.uploaded
+    leechers:
+      selector: div.download
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/h-p2p.yml
+++ b/src/Jackett.Common/Definitions/h-p2p.yml
@@ -6,31 +6,28 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
+  - https://h-p2p.xyz/
+legacylinks:
  - https://h-p2p.cam/

 caps:
  categorymappings:
-    - {id: 6, cat: XXX/WEB-DL, desc: "OnlyFans"}
-    - {id: 8, cat: XXX/WEB-DL, desc: "Privacy"}
-    - {id: 9, cat: XXX/WEB-DL, desc: "Other"}
-    - {id: 11, cat: XXX/WEB-DL, desc: "JAV"}
-    - {id: 12, cat: XXX/WEB-DL, desc: "Hentai"}
-    - {id: 13, cat: XXX/WEB-DL, desc: "Straight"}
-    - {id: 14, cat: XXX/WEB-DL, desc: "Lesbian"}
-    - {id: 15, cat: XXX/WEB-DL, desc: "Gay"}
-    - {id: 16, cat: XXX/WEB-DL, desc: "Bisexual"}
-    - {id: 17, cat: XXX/WEB-DL, desc: "MILF"}
-    - {id: 18, cat: XXX/WEB-DL, desc: "Anal"}
-    - {id: 19, cat: XXX/WEB-DL, desc: "BDSM"}
-    - {id: 20, cat: XXX/WEB-DL, desc: "Gangbang"}
-    - {id: 21, cat: XXX/WEB-DL, desc: "Voyeurism"}
-    - {id: 22, cat: XXX/WEB-DL, desc: "JustForFans"}
-    - {id: 23, cat: XXX/WEB-DL, desc: "Fansly"}
+    - {id: 1, cat: XXX/WEB-DL, desc: "OnlyFans"}
+    - {id: 2, cat: XXX/WEB-DL, desc: "Fansly"}
+    - {id: 3, cat: XXX/WEB-DL, desc: "Privacy"}
+    - {id: 4, cat: XXX/WEB-DL, desc: "JustForFans"}
+    - {id: 5, cat: XXX/WEB-DL, desc: "ManyVids"}
+    - {id: 6, cat: XXX/WEB-DL, desc: "Clips4Sale"}
+    - {id: 7, cat: XXX/WEB-DL, desc: "Hentai"}
+    - {id: 8, cat: XXX/WEB-DL, desc: "JAV"}
+    - {id: 9, cat: XXX/WEB-DL, desc: "Paid Site"}
+    - {id: 10, cat: XXX/WEB-DL, desc: "HomeMade"}
+    - {id: 11, cat: XXX/WEB-DL, desc: "Other"}
+    - {id: 27, cat: XXX/WEB-DL, desc: "Gay"}
+    - {id: 28, cat: XXX/WEB-DL, desc: "XXX Movie"}

  modes:
    search: [q]
-    tv-search: [q]
-    movie-search: [q]

 settings:
  - name: apikey
@@ -39,11 +36,15 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://h-p2p.cam/\" target=\"_blank\">H-P2P</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://h-p2p.cam/\" target=\"_blank\">H-P2P</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
    default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
  - name: sort
    type: select
    label: Sort requested from site
@@ -83,10 +84,10 @@ search:
  inputs:
    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
    name: "{{ .Keywords }}"
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
    sortField: "{{ .Config.sort }}"
    sortDirection: "{{ .Config.type }}"
-    perPage: 100
+    perPage: 75

  keywordsfilters:
    - name: re_replace
@@ -97,10 +98,19 @@ search:
    attribute: attributes

  fields:
+    _id:
+      selector: ..id
    category:
      selector: category_id
-    title:
+    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
    details:
      selector: details_link
    download:
@@ -108,12 +118,16 @@ search:
    infohash:
      selector: info_hash
    poster:
-      selector: poster
+      text: "{{ .Config.sitelink }}files/img/torrent-cover_{{ .Result._id }}.jpg"
+    genre:
+      selector: meta.genres
      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-    files:
-      selector: num_file
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
    seeders:
      selector: seeders
    leechers:
@@ -141,14 +155,12 @@ search:
        100%: 0 # freeleech
        "*": 0 # catch errors
    uploadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns False, True
      selector: double_upload
      case:
-        0: 1 # normal
-        1: 2 # double
-    minimumratio:
-      text: 1.0
+        False: 1 # normal
+        True: 2 # double
    minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# json UNIT3D 6.3.0
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 8.1.3 (custom)
--- a/src/Jackett.Common/Definitions/haidan.yml
+++ b/src/Jackett.Common/Definitions/haidan.yml
@@ -63,6 +63,8 @@ settings:
    type: info
    label: Alert
    default: HaiDan has switched to a <b>group</b> torrent list, which means this Indexer can only display the first item in each group.<br>This <b>yml</b> Indexer will eventually be re-written in c# as soon as a c# dev volunteers, to display all items in a group.
+  - name: info_flaresolverr
+    type: info_flaresolverr
  - name: info_activity
    type: info
    label: Account Inactivity
--- a/src/Jackett.Common/Definitions/happyfappy2fa.yml
+++ b/src/Jackett.Common/Definitions/happyfappy2fa.yml
@@ -0,0 +1,147 @@
+---
+id: happyfappy2fa
+name: HappyFappy2FA
+description: "HappyFappy is a Private Torrent Tracker for 3X. This indexer uses cookie login for 2FA."
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.happyfappy.org/
+
+caps:
+  categorymappings:
+    - {id: 11, cat: XXX, desc: "Asian"}
+    - {id: 6, cat: XXX, desc: "Fansite"}
+    - {id: 13, cat: XXX, desc: "Games"}
+    - {id: 3, cat: XXX, desc: "Gay"}
+    - {id: 4, cat: XXX, desc: "Interracial"}
+    - {id: 5, cat: XXX, desc: "Lesbian"}
+    - {id: 9, cat: XXX, desc: "Packs"}
+    - {id: 10, cat: XXX, desc: "Pics"}
+    - {id: 1, cat: XXX, desc: "Pron"}
+    - {id: 8, cat: XXX, desc: "Retro"}
+    - {id: 12, cat: XXX, desc: "Transsexual"}
+    - {id: 7, cat: XXX, desc: "VR"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: time
+    options:
+      time: created
+      seeders: seeders
+      size: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "To keep your account active, sign in and browse the site at least once every 120 days. Seeding torrents does not count as account activity, so in order to remain active you need to sign in and browse the site. Pornstar Trainee (and above) have a longer inactivity timer, but logging in regularly is recommended to learn about special events and new features."
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: /
+    selector: "#nav_userinfo"
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    title: "{{ .Keywords }}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    action: advanced
+    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+
+  rows:
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"])
+
+  fields:
+    category:
+      selector: a[href^="/torrents.php?filter_cat["]
+      attribute: href
+      filters:
+        - name: regexp
+          args: \[(\d+)\]
+    title:
+      selector: a[href^="/torrents.php?id="]
+    details:
+      selector: a[href^="/torrents.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="torrents.php?action=download&id="]
+      attribute: href
+    description_tags:
+      selector: div.tags
+    description:
+      case:
+        span.icon_okay: "Verified: {{ .Result.description_tags }}"
+        "*": "Unverified: {{ .Result.description_tags }}"
+    poster:
+      selector: td:nth-child(2) > script
+      filters:
+        - name: regexp
+          args: "src=\\\\\"(.*?)\\\\\""
+        - name: re_replace
+          args: ["\\\\(.)", "$1"]
+        - name: replace
+          args: ["/static/common/noartwork/noimage.png", ""]
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: td:nth-child(5) > span
+      attribute: title
+      # auto adjusted by site account profile
+      filters:
+        - name: dateparse
+          args: "MMM dd yyyy, HH:mm"
+    size:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        span.icon[title*="Freeleech"]: 0
+        "img[alt=\"Freeleech\"]": 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        span.icon[title*="DoubleSeed"]: 2
+        "img[alt=\"DoubleSeed\"]": 2
+        "*": 1
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# Luminance
--- a/src/Jackett.Common/Definitions/hd-unit3d-api.yml
+++ b/src/Jackett.Common/Definitions/hd-unit3d-api.yml
@@ -104,6 +104,13 @@ search:
      selector: category_id
    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
    details:
      selector: details_link
    download:
@@ -132,8 +139,6 @@ search:
          args: [" & ", "_&_"]
    description:
      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
    seeders:
      selector: seeders
    leechers:
@@ -169,9 +174,4 @@ search:
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-# json UNIT3D 8.0.2
+# json UNIT3D 8.1.3
--- a/src/Jackett.Common/Definitions/hdarea.yml
+++ b/src/Jackett.Common/Definitions/hdarea.yml
@@ -42,10 +42,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/hdc.yml
+++ b/src/Jackett.Common/Definitions/hdc.yml
@@ -36,10 +36,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/hddolby.yml
+++ b/src/Jackett.Common/Definitions/hddolby.yml
@@ -0,0 +1,174 @@
+---
+id: hddolby
+name: HD Dolby
+description: "HD Dolby is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://www.hddolby.com/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies电影"}
+    - {id: 402, cat: TV, desc: "TV Series电视剧"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations动漫"}
+    - {id: 403, cat: TV, desc: "TV Shows综艺"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos"}
+    - {id: 407, cat: TV/Sport, desc: "Sports体育"}
+    - {id: 408, cat: Audio, desc: "HQ Audio音乐"}
+    - {id: 410, cat: PC/Games, desc: "Games游戏"}
+    - {id: 411, cat: Other, desc: "Study学习"}
+    - {id: 409, cat: Other, desc: "Others其他"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_flaresolverr
+    type: info_flaresolverr
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>(Division Commander) Extreme User and above will be retained forever</li><li>(Brigadier Commander) Veteran Users and above will not be deleted after their account has been parked (in the Control Panel)</li><li>Users who have parked their accounts will be disabled if they do not log in for 180 consecutive days</li><li>Users with a non-parked account will have their account disabled if they do not log in for 90 consecutive days</li><li>Newly registered users who do not have traffic (i.e., upload and download data is 0) and do not log in for 5 consecutive days will be disabld.</li></ol>"
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0=incldead, 1=active, 2=dead
+    incldead: 0
+    # show promotions: 0=all, 1=normal, 2=free, 3=2x, 4=2xFree, 5=50%, 6=2x50%, 7=30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0=title, 1=descr, 3=uploader
+    search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
+    # 0=AND, 1=OR, 2=Exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.5
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, b, font, img, span.tags
+      filters:
+        - name: re_replace
+          args: ["(?i)\\s*(剩余时间:|剩餘時間：|will end in)\\s*", ""]
+# NexusPHP 59e6a24 2024-5-9
--- a/src/Jackett.Common/Definitions/hdfans.yml
+++ b/src/Jackett.Common/Definitions/hdfans.yml
@@ -195,7 +195,10 @@ search:
        img.pro_2up: 2
        "*": 1
    minimumratio:
-      text: 0.81
+      text: 1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
    description_verified:
      case:
        span[title="通过"], span[title="通過"], span[title="Allowed"]: "Verified:"
--- a/src/Jackett.Common/Definitions/hdfun.yml
+++ b/src/Jackett.Common/Definitions/hdfun.yml
@@ -1,5 +1,7 @@
 ---
 id: hdfun
+replaces:
+  - hdzone
 name: HDFun
 description: "HDFun (HDZone) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
 language: zh-CN
--- a/src/Jackett.Common/Definitions/hdgalaktik.yml
+++ b/src/Jackett.Common/Definitions/hdgalaktik.yml
@@ -40,10 +40,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: stripcyrillic
    type: checkbox
    label: Strip Cyrillic Letters
@@ -119,17 +117,11 @@ search:
    selector: table.embedded > tbody > tr.torcontduo

  fields:
-    category_default:
-      selector: td:nth-child(1)
-      optional: true
-      filters:
-        - name: replace
-          args: ["---", 4]
    category:
      selector: a[href^="browse.php?cat="]
      attribute: href
      optional: true
-      default: "{{ .Result.category_default }}"
+      default: 4
      filters:
        - name: querystring
          args: cat
@@ -205,6 +197,9 @@ search:
      filters:
        - name: replace
          args: ["details", "download"]
+    poster:
+      selector: img.s
+      attribute: src
    imdbid:
      selector: a[href^="browse.php?imdb="]
      attribute: href
--- a/src/Jackett.Common/Definitions/hdhome.yml
+++ b/src/Jackett.Common/Definitions/hdhome.yml
@@ -73,10 +73,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -102,7 +100,6 @@ search:
    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
    incldead: 1
    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    inclbookmarked: 0
    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
    search_mode: 0
    notnewword: 1
--- a/src/Jackett.Common/Definitions/hdkylin.yml
+++ b/src/Jackett.Common/Definitions/hdkylin.yml
@@ -1,38 +1,44 @@
 ---
-id: beitai
-name: BeiTai (备胎)
-description: "BeiTai (备胎) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+id: hdkylin
+name: HDKylin (麒麟)
+description: "HDKylin (麒麟) is a Private CHINESE tracker for MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://www.beitai.pt/
+  - https://na.hdkylin.com/
+  - https://www.hdkyl.in/

 caps:
  categorymappings:
    - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 404, cat: Other, desc: "Record Education/纪录教育"}
+    - {id: 408, cat: Audio, desc: "HQ Audio/音乐"}
+    - {id: 421, cat: TV/Other, desc: "Playlet/短剧"}
    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-    - {id: 402, cat: TV, desc: "TV Series/剧集"}
-    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
-    - {id: 406, cat: Audio/Video, desc: "MusicVideo/音乐MV"}
-    - {id: 407, cat: TV/Sport, desc: "Sports/运体"}
+    - {id: 419, cat: Other, desc: "Study/学习"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育运动"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/音乐视频"}
+    - {id: 411, cat: PC, desc: "software/软件"}
+    - {id: 412, cat: Console, desc: "Game/游戏"}
+    - {id: 413, cat: Books, desc: "Ebook/电子书"}
    - {id: 409, cat: Other, desc: "Misc/其他"}
-    - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}
+    - {id: 420, cat: TV, desc: "TV Shows/综艺"}

  modes:
    search: [q]
    tv-search: [q, season, ep, imdbid, doubanid]
    movie-search: [q, imdbid, doubanid]
    music-search: [q]
+    book-search: [q]

 settings:
-  - name: username
+  - name: cookie
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -60,20 +66,12 @@ settings:
  - name: info_activity
    type: info
    label: Account Inactivity
-    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not have their account deleted after parking (in the control panel)</li><li>Users with a parked account will be deleted if they do not log in for 400 consecutive days</li><li>Users with a non-parked account be deleted if they do not log in for 150 consecutive days</li><li>Users with no traffic (ie, upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.</li></ol>"
+    default: "Retention rules:<ol><li>[Veteran User] and above will be retained forever.</li><li>[Elite User] and above will not be deleted after parking their accounts (in the Control Panel).</li><li>Users with a parked account will be deleted if they do not log in for 400 consecutive days.</li><li>Users with a non-parked account will be deleted if they do not log in for 150 consecutive days.</li><li>Users with no traffic (i.e. upload/download data are both 0) will have their accounts deleted if they do not log in for 40 consecutive days.</li></ol>"

 login:
-  path: takelogin.php
-  method: post
+  method: cookie
  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-    securelogin: ""
-    ssl: yes
-    trackerssl: yes
-  error:
-    - selector: td.embedded:has(h2:contains("失败"))
+    cookie: "{{ .Config.cookie }}"
  test:
    path: index.php
    selector: a[href="logout.php"]
@@ -83,14 +81,14 @@ search:
    - path: torrents.php
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
    # 0 incldead, 1 active, 2 dead
    incldead: 0
    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl (4 does not appear to work).
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
    search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    # 0 AND, 2 exact
    search_mode: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
@@ -100,6 +98,12 @@ search:
    selector: table.torrents > tbody > tr:has(table.torrentname)

  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
    title_default:
      selector: a[href^="details.php?id="]
    title:
@@ -107,21 +111,12 @@ search:
      attribute: title
      optional: true
      default: "{{ .Result.title_default }}"
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
    details:
      selector: a[href^="details.php?id="]
      attribute: href
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    imdbid:
-      selector: div.imdb_100 > a
-      attribute: href
    date_elapsed:
      # time type: time elapsed (default)
      selector: td:nth-child(4) > span[title]
@@ -165,7 +160,10 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP v1.8.11 2024-03-27
--- a/src/Jackett.Common/Definitions/hdolimpo-api.yml
+++ b/src/Jackett.Common/Definitions/hdolimpo-api.yml
@@ -32,10 +32,6 @@ settings:
    type: info
    label: About your API key
    default: "Find or Generate a new API Token by accessing your account <i>My configuration / Mi configuración => Secutiy / Seguridad</i> page and clicking on the <b>API Token</b> tab."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
  - name: sort
    type: select
    label: Sort requested from site
@@ -81,7 +77,6 @@ search:
    imdbId: "{{ .Query.IMDBIDShort }}"
    tmdbId: "{{ .Query.TMDBID }}"
    tvdbId: "{{ .Query.TVDBID }}"
-    "free": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
    sortField: "{{ .Config.sort }}"
    sortDirection: "{{ .Config.type }}"
    perPage: 100
@@ -93,63 +88,72 @@ search:
  fields:
    categorydesc:
      selector: category
-    title:
+    title_phase1:
      selector: name
      filters:
        - name: re_replace
-          args: ["\\[", " "]
+          args: ["(?i)\\b(full uhd|(uhd )?full\\s?(blu-?ray|uhd))\\b", "BRDISK"]
        - name: re_replace
-          args: ["\\]", " "]
+          args: ["\\bE-AC-3\\b", "EAC3"]
        - name: re_replace
-          args: ["(?i)(full(bluray)?)", "BRDISK"] # FULL(BR/UHD) -> BRDISK
-        - name: replace
-          args: ["HDOlimpo", ""] # Delete HDOlimpo
-        - name: replace
-          args: ["HD-Olimpo", ""] # Delete HD-Olimpo
-        - name: replace
-          args: ["E-AC-3", "EAC3"]
+          args: ["(?i)\\b(es-cat?-en|es-en-cat?|en-cat?-es|en-es-cat?|cat?-es-en|cat?-en-es)\\b", "MULTi SPANiSH CATALAN ENGLiSH"]
        - name: re_replace
-          args: ["[ -](?i)español[ -]", " SPANiSH "]
+          args: ["(?i)\\b(es-cat?-(ja|ja?p)|es-(ja|ja?p)-cat?|cat?-es-(ja|ja?p)|cat?-(ja|ja?p)-es|(ja|ja?p)-es-cat?|(ja|ja?p)-cat?-es)\\b", "MULTi SPANiSH CATALAN JAPANES"] # misspelled to accomodate negative lookback, corrected later
        - name: re_replace
-          args: ["[ -](?i)castellano[ -]", " SPANiSH "]
+          args: ["(?i)\\b(es-en|en-es)\\b", "MULTi SPANiSH ENGLiSH"]
        - name: re_replace
-          args: ["[ -](?i)spa[ -]", " SPANiSH "]
+          args: ["(?i)\\b(es-cat?|cat?-es)\\b", "MULTi SPANiSH CATALAN"]
        - name: re_replace
-          args: ["[ -](?i)esp[ -]", " SPANiSH "]
+          args: ["(?i)\\b(es-(ja|ja?p)|(ja|ja?p)-es)\\b", "MULTi SPANiSH JAPANES"] # misspelled to accomodate negative lookback, corrected later
        - name: re_replace
-          args: [" ES ", " SPANiSH "]
+          args: ["(?i)\\b(es-fr[ae]?n?|fr[ae]?n?-es)\\b", "MULTi SPANiSH FRENCHx"] # misspelled to accomodate negative lookback, corrected later
        - name: re_replace
-          args: ["[ -](?i)ingl[eé]s[ -]", " English "]
+          args: ["(?i)\\b(es-ita?|ita?-es)\\b", "MULTi SPANiSH iTALiAN"]
        - name: re_replace
-          args: ["[ -](?i)[ei]ng[ -]", " English "]
+          args: ["(?i)\\b(es-rus?|rus?-es)\\b", "MULTi SPANiSH RUSSiAN"]
        - name: re_replace
-          args: ["[ -](?i)cat[ -]", " Catalan "]
+          args: ["(?i)\\b(es-(ger?|al(e|em)?)|(ger?|al(e|em)?)-es)\\b", "MULTi SPANiSH GERMANx"] # misspelled to accomodate negative lookback, corrected later
        - name: re_replace
-          args: ["[ -](?i)vas[ -]", " Basque "]
+          args: ["(?i)\\btriaudio\\b", "MULTi SPANiSH"]
        - name: re_replace
-          args: ["[ -](?i)fr[ae][ -]", " French "]
+          args: ["(?i)\\b(espa[ñn]ol|castellano|esp)\\b", "SPANiSH"]
        - name: re_replace
-          args: ["[ -](?i)jap[ -]", " Japanese "]
+          args: ["(?i)\\b(ingl[ée]s|[ei]ng)\\b", "ENGLiSH"]
        - name: re_replace
-          args: ["[ -](?i)ita[ -]", " Italian "]
+          args: ["(?i)\\bcat\\b", "CATALAN"]
        - name: re_replace
-          args: ["[ -](?i)rus[ -]", " Russian "]
+          args: ["(?i)\\bfr[ae]?n?\\b", "FRENCHx"] # misspelled to accomodate negative lookback, corrected later
        - name: re_replace
-          args: ["[ -](?i)ger[ -]", " German "]
+          args: ["(?i)\\b(jap|jp)\\b", "JAPANES"] # misspelled to accomodate negative lookback, corrected later
        - name: re_replace
-          args: ["(?i)(triaudio)", "MULTi SPANiSH English"]
+          args: ["(?i)\\bita\\b", "iTALiAN"]
        - name: re_replace
-          args: ["(?i)(dual)", " MULTi SPANiSH "]
+          args: ["(?i)\\brus?\\b", "RUSSiAN"]
        - name: re_replace
-          args: ["(?i)(es-en)", " MULTi SPANiSH "]
+          args: ["(?i)\\b(ger?|alem)\\b", "GERMANx"] # misspelled to accomodate negative lookback, corrected later
        - name: re_replace
-          args: ["(?i)(en-es)", " MULTi SPANiSH "]
+          args: ["(\\s|\\.)+", "$1"]
+        # add MULTi SPANiSH if not preceded by another language or followed by SPANiSH
        - name: re_replace
-          args: ["\\.+", "."] # More than 1 dot -> .
+          args: ["(?<!(SPANiSH|ENGLiSH|CATALAN|FRENCHx|JAPANES|iTALiAN|RUSSiAN|GERMANx)[\\s.])\\b(ENGLiSH|CATALAN|FRENCHx|JAPANES|iTALiAN|RUSSiAN|GERMANx)\\b(?![\\s.]SPANiSH)", "MULTi SPANiSH $2"]
+        # correct purposefully misspelled languages
        - name: re_replace
-          args: ["^\\.", ""] # Delete first dot
+          args: ["\\bFRENCHx\\b", "FRENCH"]
        - name: re_replace
-          args: ["\\s+", " "] # More than 1 space to 1 space
+          args: ["\\bJAPANES\\b", "JAPANESE"]
+        - name: re_replace
+          args: ["\\bGERMANx\\b", "GERMAN"]
+    title_spanish:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: regexp
+          args: "(?i)(spanish)"
+    title:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        # append SPANiSH if title does not contain the word 'spanish'
+        - name: append
+          args: "{{ if .Result.title_spanish }}{{ else }} SPANiSH{{ end }}"
    details:
      selector: details_link
    download:
--- a/src/Jackett.Common/Definitions/hdonly.yml
+++ b/src/Jackett.Common/Definitions/hdonly.yml
@@ -262,16 +262,16 @@ search:
          args: .
        - name: append
          args: "{{ if .Result._release_group }}-{{ .Result._release_group }}{{ else }}{{ end }}"
-    _filename:
+    title_filename:
      selector: "fileName"
      optional: true
      filters:
-        - name: replace
-          args: [".mkv", ""]
+        - name: re_replace
+          args: ["\\s÷$", ""]
        - name: append
          args: " {{ if and (.Config.add_hybrid_features_to_filename) (eq .Result._hdr \"True\") }}[HDR]{{ else }}{{ end }}{{ if and (.Config.add_hybrid_features_to_filename) (eq .Result._hdr10plus \"True\") }}[HDR10+]{{ else }}{{ end }}{{ if and (.Config.add_hybrid_features_to_filename) (eq .Result._dovi \"True\") }}[DoVi]{{ else }}{{ end }}"
    title_phase1:
-      text: "{{ if and (eq .Result.files \"1\") (.Result._filename) }}{{ .Result._filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+      text: "{{ if and (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
    title_vostfr:
      text: "{{ .Result.title_phase1 }}"
      filters:
@@ -287,7 +287,10 @@ search:
    title:
      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
    description:
-      text: "{{ .Result._filename }}"
+      text: "{{ .Result.title_filename }}"
+      filters:
+        - name: re_replace
+          args: ["\\s÷$", ""]
    _free:
      selector: isFreeleech
    downloadvolumefactor:
--- a/src/Jackett.Common/Definitions/hdsky.yml
+++ b/src/Jackett.Common/Definitions/hdsky.yml
@@ -36,10 +36,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/hdspace.yml
+++ b/src/Jackett.Common/Definitions/hdspace.yml
@@ -67,10 +67,8 @@ settings:
    options:
      2: desc
      1: asc
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr

 login:
  path: index.php?page=login
--- a/src/Jackett.Common/Definitions/hdt-lafenice.yml
+++ b/src/Jackett.Common/Definitions/hdt-lafenice.yml
@@ -26,7 +26,8 @@ caps:
    - {id: 43, cat: PC/0day, desc: "App-Win"}
    - {id: 44, cat: PC/Mac, desc: "App-Mac"}
    - {id: 45, cat: PC/Mobile-Android, desc: "Android"}
-    - {id: 47, cat: Books, desc: "E-Book"}
+    - {id: 47, cat: Books/EBook, desc: "E-Book"}
+    - {id: 52, cat: Books/Mags, desc: "Edicola"}
    - {id: 49, cat: Other, desc: "Altro"}

  modes:
--- a/src/Jackett.Common/Definitions/hdtorrentsit.yml
+++ b/src/Jackett.Common/Definitions/hdtorrentsit.yml
@@ -103,6 +103,20 @@ search:
      selector: category_id
    title_optional:
      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+      filters:
+        - name: re_replace
+          args: ["\\.", " "]
+        - name: re_replace # Stagione X --> S0X
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
+        - name: re_replace # Stagione XX --> SXX
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
    details:
      selector: details_link
    download:
@@ -131,8 +145,6 @@ search:
          args: [" & ", "_&_"]
    description:
      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
    seeders:
      selector: seeders
    leechers:
@@ -166,16 +178,4 @@ search:
        False: 1 # normal
        True: 2 # double
 # as a pay site there is no MR or MST
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-      filters:
-        - name: re_replace
-          args: ["\\.", " "]
-        - name: re_replace # Stagione X --> S0X
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
-        - name: re_replace # Stagione XX --> SXX
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
-# json UNIT3D 8.0.2 (custom)
+# json UNIT3D 8.1.3 (custom)
--- a/src/Jackett.Common/Definitions/hdturk.yml
+++ b/src/Jackett.Common/Definitions/hdturk.yml
@@ -92,10 +92,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Filter freeleech only
--- a/src/Jackett.Common/Definitions/hdvideo.yml
+++ b/src/Jackett.Common/Definitions/hdvideo.yml
@@ -29,10 +29,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/src/Jackett.Common/Definitions/heavens-hell.yml
+++ b/src/Jackett.Common/Definitions/heavens-hell.yml
@@ -1,214 +0,0 @@
---
-id: heavens-hell
-name: Heavens-Hell
-description: "Heavens-Hell is a Private Torrent Tracker for MUSIC / AUDIO SOFTWARE"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://heavens-hell.info/
-
-caps:
-  categorymappings:
-    - {id: 39, cat: Audio, desc: "Albums"}
-    - {id: 40, cat: Audio, desc: "Alternative"}
-    - {id: 4, cat: PC, desc: "Apps"}
-    - {id: 50, cat: PC, desc: "Apps -- Miscellaneous"}
-    - {id: 11, cat: Audio, desc: "Billboard Top 100"}
-    - {id: 7, cat: Audio, desc: "Blues"}
-    - {id: 8, cat: Audio, desc: "Chillout"}
-    - {id: 41, cat: Audio, desc: "Christmas"}
-    - {id: 9, cat: Audio, desc: "Classical"}
-    - {id: 12, cat: Audio, desc: "Country"}
-    - {id: 10, cat: Audio, desc: "Dance"}
-    - {id: 13, cat: Audio, desc: "Discography"}
-    - {id: 42, cat: Audio, desc: "DJ Music"}
-    - {id: 44, cat: Audio, desc: "DJ Music -- Funkymix"}
-    - {id: 45, cat: Audio, desc: "DJ Music -- Promo Only"}
-    - {id: 43, cat: Audio, desc: "DJ Music -- Ultimix"}
-    - {id: 21, cat: Audio, desc: "DJ Radio Sets"}
-    - {id: 19, cat: Audio, desc: "DMC"}
-    - {id: 20, cat: Audio, desc: "Drum&Bass"}
-    - {id: 22, cat: Audio/Lossless, desc: "Flac Music"}
-    - {id: 23, cat: Audio/Lossless, desc: "Flac-24 Bit Hi-Res"}
-    - {id: 14, cat: Audio, desc: "Funk"}
-    - {id: 15, cat: Audio, desc: "Hardcore"}
-    - {id: 16, cat: Audio, desc: "Hip hop"}
-    - {id: 24, cat: Audio, desc: "House"}
-    - {id: 17, cat: Audio, desc: "Jazz"}
-    - {id: 25, cat: Audio, desc: "Jungle"}
-    - {id: 46, cat: Audio, desc: "K3 WAV"}
-    - {id: 49, cat: Audio/Other, desc: "K3 WAV -- Other WAV"}
-    - {id: 18, cat: Audio, desc: "Karaoke"}
-    - {id: 26, cat: Audio, desc: "Mastermix"}
-    - {id: 28, cat: Audio, desc: "Metal"}
-    - {id: 27, cat: Audio/MP3, desc: "MP3 NEW RELEASES"}
-    - {id: 51, cat: Audio/MP3, desc: "MP3 -- Other MP3"}
-    - {id: 33, cat: Audio, desc: "Music Packs"}
-    - {id: 32, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 29, cat: Audio, desc: "Oldies"}
-    - {id: 47, cat: Audio, desc: "Pop music"}
-    - {id: 30, cat: Audio, desc: "Punk"}
-    - {id: 34, cat: Audio, desc: "R&B/Motown"}
-    - {id: 35, cat: Audio, desc: "Reggae"}
-    - {id: 36, cat: Audio, desc: "Retro"}
-    - {id: 31, cat: Audio, desc: "Rock"}
-    - {id: 37, cat: Audio, desc: "Soul"}
-    - {id: 48, cat: Audio, desc: "Trance"}
-    - {id: 38, cat: Audio, desc: "VIPs only"}
-
-  modes:
-    search: [q]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>40</b> on your account profile. The Default is <i>15</i>.
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "To keep records updated regularly, all inactive accounts will be deleted after 60 days of inactivity."
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-  error:
-    - selector: table:has(a[href*="login.php?error=1"])
-      message:
-        text: "ERROR: Incorrect username!"
-    - selector: table:has(a[href*="login.php?error=4"])
-      message:
-        text: "ERROR: Incorrect password!"
-    - selector: table:has(a[href*="login.php?error="])
-      message:
-        text: "ERROR: Something went wrong during login!"
-  test:
-    path: index.php
-    selector: a[href*="/logout.php?logouthash="]
-
-download:
-  before:
-    path: takethanks.php
-    method: post
-    inputs:
-      torrentid: "{{ .DownloadUri.Query.id }}"
-  selectors:
-    - selector: a[href*="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-      method: post
-  keywordsfilters:
-    - name: re_replace
-      args: ["[\\s]+", "%"]
-  inputs:
-    do: search
-    keywords: "{{ .Keywords }}"
-    # t_name, t_description, t_both, t_uploader, t_genre
-    search_type: t_name
-    # does not support multi category searching so defaulting to all.
-    category: 0
-    # yes, no
-    include_dead_torrents: yes
-    sort: "{{ if .Config.freeleech }}free{{ else }}{{ .Config.sort }}{{ end }}"
-    order: "{{ if .Config.freeleech }}asc{{ else }}{{ .Config.type }}{{ end }}"
-
-  rows:
-    selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href*="/browse.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title_default:
-      # is usually abbreaviated
-      selector: a[href*="/details.php?id="]
-    title:
-      # while still abbreviated, is usually longer than the default
-      selector: div.tooltip-content div
-      optional: true
-      default: "{{ .Result.title_default }}"
-    details:
-      selector: a[href*="/details.php?id="]
-      attribute: href
-    download:
-      selector: a[href*="/details.php?id="]
-      attribute: href
-    poster:
-      selector: img[src*="/torrents/images/"]
-      attribute: src
-    date:
-      selector: td:nth-child(2)
-      # auto adjusted by site account profile
-      filters:
-        - name: regexp
-          args: "(\\d{2}-\\d{2}-\\d{4} \\d{2}:\\d{2})"
-        - name: dateparse
-          args: "dd-MM-yyyy HH:mm"
-    size:
-      selector: td:nth-last-child(5)
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    description:
-      # Wait: 4 h
-      selector: div.tooltip-content > div:last-child
-    downloadvolumefactor:
-      case:
-        img[src$="/freedownload.gif"]: 0
-        img[src$="/silverdownload.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="/x2.gif"]: 2
-        "*": 1
-    minimumratio:
-      text: 0.5
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# TS Special Edition v.8.0
--- a/src/Jackett.Common/Definitions/hebits.yml
+++ b/src/Jackett.Common/Definitions/hebits.yml
@@ -5,6 +5,7 @@ description: "The Israeli Tracker"
 language: he-IL
 type: private
 encoding: UTF-8
+# Status: https://status.hebits.net/
 links:
  - https://hebits.net/

@@ -32,10 +33,8 @@ settings:
  - name: cookie
    type: text
    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
  - name: freeleech
    type: checkbox
    label: Search freeleech only
--- a/Show More
+++ b/Show More