assorted: *nocensor.sbs -> *.world

redirects to torrentcore - https://github.com/Jackett/Jackett/issues/13347

README.md

@@ -167,7 +167,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * UnionDHT
  * VSTHouse
  * VST Torrents
- * xBiT
  * xxxAdultTorrent
  * xxxtor
  * xxxtorrents
@@ -455,7 +454,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
  * NorBits
- * oMg[WtF]trackr
  * OpenCD [![(invite needed)][inviteneeded]](#)
  * Oppaitime
  * Orpheus

azure-pipelines.yml

@@ -45,14 +45,14 @@ stages:
               artifactName: Jackett.Binaries.Windows.zip
             macOS:
               buildDescription: macOS
-              imageName: macOS-10.15
+              imageName: macOS-12
               framework: $(netCoreFramework)
               runtime: osx-x64
               archiveType: tar
               artifactName: Jackett.Binaries.macOS.tar.gz
             macOSARM64:
               buildDescription: macOS ARM64
-              imageName: macOS-10.15
+              imageName: macOS-12
               framework: $(netCoreFramework)
               runtime: osx-arm64
               archiveType: tar
@@ -352,7 +352,7 @@ stages:
               runtime: win-x86
             macOS:
               buildDescription: macOS
-              imageName: macOS-10.15
+              imageName: macOS-12
               framework: $(netCoreFramework)
               runtime: osx-x64
             LinuxAMDx64:
@@ -447,7 +447,7 @@ stages:
               runtime: win-x86
             macOS:
               buildDescription: macOS
-              imageName: macOS-10.15
+              imageName: macOS-12
               artifactName: Jackett.Binaries.macOS.tar.gz
               framework: $(netCoreFramework)
               runtime: osx-x64

src/Jackett.Common/Definitions/1337x.yml

@@ -13,7 +13,7 @@ links:
   - https://x1337x.eu/
   - https://x1337x.se/
   - https://1337x.unblockit.ist/
-  - https://1337x.nocensor.sbs/
+  - https://1337x.nocensor.world/
   - https://1337x.unblockninja.com/
 legacylinks:
   - https://1337x.unblocked.monster/
@@ -35,6 +35,7 @@ legacylinks:
   - https://1337x.unblockit.llc/
   - https://1337x.unblockit.blue/
   - https://1337x.unblockit.name/
+  - https://1337x.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/arenabg.yml

@@ -9,6 +9,8 @@ links:
   - https://arenabg.com/
 legacylinks:
   - https://arenabg.ch/
+certificates:
+  - 4605acf4b01f565f3c3f3ee1407ce22450172a9d # expired 15 Jul 2022
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -7,10 +7,11 @@ type: public
 encoding: UTF-8
 links:
   - https://badasstorrents.com/
-  - https://badasstorrents.nocensor.sbs/
+  - https://badasstorrents.nocensor.world/
 legacylinks:
   - https://badasstorrents.nocensor.work/
   - https://badasstorrents.nocensor.biz/
+  - https://badasstorrents.nocensor.sbs/
 
 caps:
   categories:

src/Jackett.Common/Definitions/bitsearch.yml

@@ -7,9 +7,10 @@ type: public
 encoding: UTF-8
 links:
   - https://bitsearch.to/
-  - https://bitsearch.nocensor.sbs/
+  - https://bitsearch.nocensor.world/
 legacylinks:
   - https://bitsearch.nocensor.biz/
+  - https://bitsearch.nocensor.sbs/
 
 caps:
   categories:

src/Jackett.Common/Definitions/demonoid.yml

@@ -14,7 +14,7 @@ links:
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.pet/
   - https://demonoid.unblockit.ist/
   - https://demonoid.torrentbay.to/
-  - https://demonoid.nocensor.sbs/
+  - https://demonoid.nocensor.world/
 legacylinks:
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
   - https://demonoid.unblockit.li/
@@ -33,6 +33,7 @@ legacylinks:
   - https://demonoid.unblockit.llc/
   - https://demonoid.unblockit.blue/
   - https://demonoid.unblockit.name/
+  - https://demonoid.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/elitetorrent-biz.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://www.elitetorrent.com/
-  - https://elitetorrent.nocensor.sbs/
+  - https://elitetorrent.nocensor.world/
 legacylinks:
   - https://www.elitetorrent.biz/
   - https://www.elitetorrent.io/
@@ -31,6 +31,7 @@ legacylinks:
   - https://elitetorrent.la/
   - https://www.elitetorrent.wtf/
   - https://www.elitetorrent.dev/
+  - https://elitetorrent.nocensor.sbs/
 
 caps:
   categories:

src/Jackett.Common/Definitions/extratorrent-st.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 links:
   - https://extratorrent.st/
   - https://extratorrent.unblockit.ist/
-  - https://extratorrent.nocensor.sbs/
+  - https://extratorrent.nocensor.world/
 legacylinks:
   - https://extratorrent.nocensor.work/
   - https://extratorrent.unblockit.kim/
@@ -21,6 +21,7 @@ legacylinks:
   - https://extratorrent.unblockit.llc/
   - https://extratorrent.unblockit.blue/
   - https://extratorrent.unblockit.name/
+  - https://extratorrent.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/eztv.yml

@@ -14,7 +14,7 @@ links:
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
   - https://eztv.unblockit.ist/
-  - https://eztv.nocensor.sbs/
+  - https://eztv.nocensor.world/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
@@ -37,6 +37,7 @@ legacylinks:
   - https://eztv.unblockit.llc/
   - https://eztv.unblockit.blue/
   - https://eztv.unblockit.name/
+  - https://eztv.nocensor.sbs/
 
 caps:
   categories:

src/Jackett.Common/Definitions/filelisting.yml

@@ -7,9 +7,10 @@ type: public
 encoding: UTF-8
 links:
   - https://filelisting.com/
-  - https://filelisting.nocensor.sbs/
+  - https://filelisting.nocensor.world/
 legacylinks:
   - https://filelisting.nocensor.biz/
+  - https://filelisting.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/gamestorrents.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://www.gamestorrents.fm/
-  - https://gamestorrents.nocensor.sbs/
+  - https://gamestorrents.nocensor.world/
 legacylinks:
   - https://www.gamestorrents.com/
   - https://www.gamestorrents.tv/
@@ -15,6 +15,7 @@ legacylinks:
   - https://gamestorrents.nocensor.space/
   - https://gamestorrents.nocensor.work/
   - https://gamestorrents.nocensor.biz/
+  - https://gamestorrents.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/gktorrent.yml

@@ -9,7 +9,7 @@ followredirect: true
 # to fetch current domain use https://www.protege-liens.com/gktorrent
 links:
   - https://www.gktorrents.cc/
-  - https://gktorrent.nocensor.sbs/
+  - https://gktorrent.nocensor.world/
 legacylinks:
   - http://www.gktorrent.co/
   - https://www.gktorrent.co/
@@ -32,6 +32,7 @@ legacylinks:
   - https://www.gktorrents.net/
   - https://gktorrent.nocensor.biz/
   - https://www.gktorrents.org/
+  - https://gktorrent.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/glodls.yml

@@ -11,7 +11,7 @@ links:
   - https://gtdb.cc/
   - https://www.gtdb.to/
   - https://glotorrents.unblockit.ist/
-  - https://glotorrents.nocensor.sbs/
+  - https://glotorrents.nocensor.world/
   - https://glodls.unblockninja.com/
 legacylinks:
   - https://glodls.rocks/
@@ -33,6 +33,7 @@ legacylinks:
   - https://glotorrents.unblockit.llc/
   - https://glotorrents.unblockit.blue/
   - https://glotorrents.unblockit.name/
+  - https://glotorrents.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -11,7 +11,7 @@ links:
   - https://ilcorsaronero.fun/
   - https://ilcorsaronero.pro/
   - https://ilcorsaronero.torrentbay.to/
-  - https://ilcorsaronero.nocensor.sbs/
+  - https://ilcorsaronero.nocensor.world/
 legacylinks:
   - https://ilcorsaronero.live/
   - https://ilcorsaronero.vip/
@@ -28,6 +28,7 @@ legacylinks:
   - https://ilcorsaronero.nocensor.space/
   - https://ilcorsaronero.nocensor.work/
   - https://ilcorsaronero.nocensor.biz/
+  - https://ilcorsaronero.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/knaben.yml

@@ -69,7 +69,7 @@ caps:
     - {id: 7000, cat: Books, desc: "Books"}
     - {id: 7020, cat: Books/EBook, desc: "Books/Ebook"}
     - {id: 7030, cat: Books/Comics, desc: "Books/Comics"}
-    - {id: 8030, cat: Books/Mags, desc: "Books/Magazines"}
+    - {id: 7010, cat: Books/Mags, desc: "Books/Magazines"}
     - {id: 7040, cat: Books/Technical, desc: "Books/Technical"}
     - {id: 7050, cat: Books/Other, desc: "Books/Other"}
     # Other

src/Jackett.Common/Definitions/limetorrents.yml

@@ -11,7 +11,7 @@ links:
   - https://www.limetorrents.lol/
   - https://limetorrents.unblockit.ist/
   - https://limetorrents.unblockninja.com/
-  - https://limetorrents.nocensor.sbs/
+  - https://limetorrents.nocensor.world/
 legacylinks:
   - https://www.limetorrents.io/
   - https://www.limetorrents.cc/
@@ -38,6 +38,7 @@ legacylinks:
   - https://limetorrents.unblockit.llc/
   - https://limetorrents.unblockit.blue/
   - https://limetorrents.unblockit.name/
+  - https://limetorrents.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/locadora.yml

@@ -10,8 +10,10 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Filmes"}
-    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 1, cat: Movies}
+    - {id: 2, cat: TV}
+    - {id: 6, cat: TV/Anime}
+    - {id: 7, cat: Movies, desc: "Concerts"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/newpct-me.yml

@@ -7,10 +7,11 @@ type: public
 encoding: UTF-8
 links:
   - https://www.newpct.net/
-  - https://newpct.nocensor.sbs/
+  - https://newpct.nocensor.world/
 legacylinks:
   - https://www.newpct.me/
   - https://newpct.nocensor.biz/
+  - https://newpct.nocensor.sbs/
 
 caps:
   categories:

src/Jackett.Common/Definitions/newretro.yml

@@ -86,7 +86,7 @@ search:
     incldead: 1
 
   rows:
-    selector: table.tableinborder[summary] > tbody > tr
+    selector: table.tableinborder > tbody > tr:has(a[href^="download.php?torrent="])
     filters:
       - name: andmatch
 
@@ -100,23 +100,23 @@ search:
     title:
       selector: a[href^="details.php?id="]:has(b)
     details:
-      selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(4) > a
+      selector: td.content_wrap > table > tbody > tr:nth-child(2) > td:nth-child(4) > a
       attribute: href
     download:
       selector: a[href^="download.php?torrent="]
       attribute: href
     size:
-      selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1)
+      selector: td.content_wrap > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1)
     grabs:
-      selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(3) > b
+      selector: td.content_wrap > table > tbody > tr:nth-child(2) > td:nth-child(3) > b
     files:
-      selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2)
+      selector: td.content_wrap > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2)
     seeders:
-      selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1)
+      selector: td.content_wrap > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1)
     leechers:
-      selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3)
+      selector: td.content_wrap > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3)
     date:
-      selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(5)
+      selector: td.content_wrap > table > tbody > tr:nth-child(2) > td:nth-child(5)
       filters:
         - name: replace
           args: ["\u00a0", " "]

src/Jackett.Common/Definitions/omgwtftrackr.yml

@@ -1,161 +0,0 @@
----
-id: omgwtftrackr
-name: oMg[WtF]trackr
-description: "oMg[WtF]trackr is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://omg.wtftrackr.xyz/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: PC/0day, desc: "en/0DAY"}
-    - {id: 2, cat: PC, desc: "en/APPS"}
-    - {id: 3, cat: Movies/BluRay, desc: "en/BLURAY"}
-    - {id: 4, cat: Movies/DVD, desc: "en/DVDR"}
-    - {id: 5, cat: Books, desc: "en/EBOOKS"}
-    - {id: 6, cat: Audio/Lossless, desc: "en/FLAC"}
-    - {id: 7, cat: Audio/Lossless, desc: "en/FLAC-today"}
-    - {id: 8, cat: PC/Games, desc: "en/GAMES"}
-    - {id: 9, cat: Movies/BluRay, desc: "en/MBLURAY"}
-    - {id: 10, cat: Movies/DVD, desc: "en/MDVDR"}
-    - {id: 11, cat: Audio/MP3, desc: "en/MP3"}
-    - {id: 12, cat: Audio/Video, desc: "en/MVID"}
-    - {id: 13, cat: Console/PS3, desc: "en/PS3"}
-    - {id: 14, cat: Console/PS4, desc: "en/PS4"}
-    - {id: 15, cat: Console/PSP, desc: "en/PSP"}
-    - {id: 16, cat: TV/SD, desc: "en/TV-DVDR"}
-    - {id: 17, cat: TV/SD, desc: "en/TV-DVDRIP"}
-    - {id: 18, cat: TV/HD, desc: "en/TV-HDRIP"}
-    - {id: 19, cat: TV/HD, desc: "en/TV-X264-HD"}
-    - {id: 20, cat: TV/SD, desc: "en/TV-X264-SD"}
-    - {id: 21, cat: Console/Wii, desc: "en/WII"}
-    - {id: 22, cat: Movies/HD, desc: "en/X264"}
-    - {id: 23, cat: Console/XBox 360, desc: "en/XBOX360"}
-    - {id: 24, cat: Console/XBox One, desc: "en/XBOXONE"}
-    - {id: 25, cat: Movies/SD, desc: "en/XVID"}
-    - {id: 26, cat: XXX, desc: "en/XXX"}
-    - {id: 27, cat: XXX/Other, desc: "en/XXX-0DAY"}
-    - {id: 28, cat: XXX/DVD, desc: "en/XXX-DVDR"}
-    - {id: 29, cat: XXX/ImageSet, desc: "en/XXX-iMAGESETS"}
-    - {id: 30, cat: Movies/BluRay, desc: "de/BLURAY"}
-    - {id: 31, cat: Movies/DVD, desc: "de/DVDR"}
-    - {id: 32, cat: TV, desc: "de/TV"}
-    - {id: 33, cat: TV/HD, desc: "de/X264"}
-    - {id: 34, cat: TV/SD, desc: "de/XVID"}
-    - {id: 35, cat: TV/Anime, desc: "fr/ANIME"}
-    - {id: 36, cat: Movies/DVD, desc: "fr/DVDR"}
-    - {id: 37, cat: TV/SD, desc: "fr/TV-DVDR"}
-    - {id: 38, cat: TV, desc: "fr/TV"}
-    - {id: 39, cat: Movies/HD, desc: "fr/X264"}
-    - {id: 40, cat: Movies/SD, desc: "fr/XVID"}
-    - {id: 41, cat: Movies/BluRay, desc: "nl/BLURAY"}
-    - {id: 42, cat: Movies/DVD, desc: "nl/DVDR"}
-    - {id: 43, cat: TV/SD, desc: "nl/TV-DVDR"}
-    - {id: 44, cat: TV, desc: "nl/TV"}
-    - {id: 45, cat: Movies/HD, desc: "nl/X264"}
-    - {id: 46, cat: Movies/SD, desc: "nl/XVID"}
-    - {id: 47, cat: TV, desc: "es/TV"}
-    - {id: 48, cat: Movies/HD, desc: "es/X264"}
-    - {id: 49, cat: Movies/SD, desc: "es/XVID"}
-
-  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: 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
-
-login:
-  path: login.php
-  method: form
-  form: form#loginform
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    keeplogged: 1
-  error:
-    - selector: form#loginform .warning
-  test:
-    path: index.php
-    selector: a[href^="logout.php?auth="]
-
-search:
-  paths:
-    # https://omg.wtftrackr.xyz/torrents.php?searchstr=trek+s07e04&order_by=time&order_way=desc&filter_cat[1]=1&filter_cat[18]=1&filter_cat[19]=1&action=basic&searchsubmit=1
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchstr: "{{ .Keywords }}"
-    order_by: "{{ .Config.sort }}"
-    order_way: "{{ .Config.type }}"
-    action: basic
-    searchsubmit: 1
-    # does not support imdbid searches and does not provide imdb links
-
-  rows:
-    selector: table#torrent_table > tbody > tr.torrent:has(a[href^="torrents.php?action=download&id="])
-
-  fields:
-    category:
-      selector: td:nth-child(1) > div
-      attribute: id
-      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
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(4) span
-      attribute: title
-      filters:
-        - name: append
-          args: " -07:00" # PDT
-        - name: dateparse
-          args: "Jan 2 2006, 15:04 -07:00"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# minimumratio: appears to be ratioless and no H&R for minimumseedtime
-# Engine n/a

src/Jackett.Common/Definitions/teamos.yml

@@ -6,9 +6,10 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://teamos-hkrg.com/
+  - https://teamos.xyz/
 legacylinks:
   - https://www.teamos-hkrg.com/
+  - https://teamos-hkrg.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/thepiratebay.yml

@@ -9,29 +9,23 @@ links:
   - https://thepiratebay.org/
   - https://piratebayo3klnzokct3wt5yyxb2vpebbuyjl7m623iaxmqhsd52coid.onion.ws/
   - https://piratebayo3klnzokct3wt5yyxb2vpebbuyjl7m623iaxmqhsd52coid.onion.pet/
-  - https://tpb22.ukpass.co/
-  - https://tpb.sadzawka.tk/
+  - https://tpb24.ukpass.co/
   - https://thepiratebay.host/
-  - https://tpb.cnp.cx/
   - https://thepiratebay.d4.re/
   - https://tpb.skynetcloud.site/
   - https://piratetoday.xyz/
   - https://piratenow.xyz/
-  - https://pirate-proxy.app/
-  - https://thepb.cyou/
+  - https://pirate-proxy.page/
   - https://mirrorbay.top/
-  - https://5mins.eu/
-  - https://piratebayproxy.buzz/
+  - https://5mins.shop/
   - https://tpb.surf/
-  - https://wearethereal.ninja/
   - https://tpb.monster/
   - https://tpb.wtf/
-  - https://bibtor.com/
-  - https://gigatorrent.xyz/
-  - https://thepirateb.xyz/
-  - https://ezrasstuff.com/
-legacylinks:
-  - https://piratebayo3klnzokct3wt5yyxb2vpebbuyjl7m623iaxmqhsd52coid.onion.ly/
+  - https://proxifiedpiratebay.org/
+  - https://unlockedpiratebay.com/
+  - https://tpb.one/
+  - https://piratebayorg.net/
+  - https://tpbproxy.click/
   - https://thepiratebay0.org/
   - https://thepiratebay10.org/
   - https://pirateproxy.live/
@@ -40,13 +34,10 @@ legacylinks:
   - https://tpb.party/
   - https://piratebayproxy.live/
   - https://piratebay.live/
-  - https://tpb.biz/
-  - https://pirate.johnedwarddoyle.co.uk/
-  - https://knaben.ru/
-  - https://piratebayztemzmv.onion.pet/
-  - https://piratebayztemzmv.onion.ly/
-  - https://pirateproxy.cloud/
-  - https://tpb18.ukpass.co/
+  - https://piratebay.party/
+  - https://thepiratebay.party/
+legacylinks:
+  - https://piratebayo3klnzokct3wt5yyxb2vpebbuyjl7m623iaxmqhsd52coid.onion.ly/
   - https://pirateproxy.dev/
   - https://tpb19.ukpass.co/
   - https://pirateproxy.tube/
@@ -54,6 +45,18 @@ legacylinks:
   - https://baypirated.site/
   - https://piratesbaycc.com/
   - https://pirateproxy.ltda/
+  - https://tpb22.ukpass.co/
+  - https://tpb.sadzawka.tk/
+  - https://tpb.cnp.cx/
+  - https://pirate-proxy.app/
+  - https://thepb.cyou/
+  - https://5mins.eu/
+  - https://piratebayproxy.buzz/
+  - https://wearethereal.ninja/
+  - https://bibtor.com/
+  - https://gigatorrent.xyz/
+  - https://thepirateb.xyz/
+  - https://ezrasstuff.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/tokyotosho.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://www.tokyotosho.info/
-  - https://tokyotosho.nocensor.sbs/
+  - https://tokyotosho.nocensor.world/
 legacylinks:
   - https://tokyotosho.black-mirror.xyz/
   - https://tokyotosho.unblocked.casa/
@@ -22,6 +22,7 @@ legacylinks:
   - https://tokyotosho.nocensor.space/
   - https://tokyotosho.nocensor.work/
   - https://tokyotosho.nocensor.biz/
+  - https://tokyotosho.nocensor.sbs/
 
 settings:
   - name: cat

src/Jackett.Common/Definitions/torlock.yml

@@ -10,7 +10,7 @@ links:
   - https://www.torlock2.com/
   - https://www.torlock.com/
   - https://torlock.unblockit.ist/
-  - https://torlock.nocensor.sbs/
+  - https://torlock.nocensor.world/
 legacylinks:
   - https://torlock.com/
   - https://torlock.unblockit.li/
@@ -30,6 +30,7 @@ legacylinks:
   - https://torlock.unblockit.blue/
   - https://www.torlock.icu/
   - https://torlock.unblockit.name/
+  - https://torlock.nocensor.sbs/
 
 caps:
   # dont forget to update the search fields category case block

src/Jackett.Common/Definitions/torlook.yml

@@ -9,9 +9,10 @@ certificates:
   - 273066e4b30229dfb0bb99474269f58b6fa8971a # expired ‎‎5 ‎April ‎2022
 links:
   - https://gw1.torlook.info/
-  - https://torlook.nocensor.sbs/
+  - https://torlook.nocensor.world/
 legacylinks:
   - https://torlook.nocensor.biz/
+  - https://torlook.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -9,7 +9,7 @@ followredirect: true
 # to fetch current domain use https://www.protege-liens.com/torrent9
 links:
   - https://ww1.torrent9.re/
-  - https://torrent9.nocensor.sbs/
+  - https://torrent9.nocensor.world/
 legacylinks:
   - https://www.t9.vc/
   - https://www.torrent9.ai/
@@ -33,6 +33,7 @@ legacylinks:
   - https://torrent9.nocensor.biz/
   - https://www.torrent9.nl/
   - https://www.torrent9.re/
+  - https://torrent9.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownload.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.torrentdownload.info/
   - https://torrentdownload.unblockit.ist/
-  - https://torrentdownload.nocensor.sbs/
+  - https://torrentdownload.nocensor.world/
 legacylinks:
   - https://torrentdownload.unblocked.rest/
   - https://torrentdownload.unblocked.monster/
@@ -29,6 +29,7 @@ legacylinks:
   - https://torrentdownload.unblockit.llc/
   - https://torrentdownload.unblockit.blue/
   - https://torrentdownload.unblockit.name/
+  - https://torrentdownload.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownloads.yml

@@ -10,7 +10,7 @@ links:
   - https://www.torrentdownloads.info/
   - https://www.torrentdownloads.pro/
   - https://torrentdownloads.unblockit.ist/
-  - https://torrentdownloads.nocensor.sbs/
+  - https://torrentdownloads.nocensor.world/
   - https://torrentdownloads.unblockninja.com/
 legacylinks:
   - https://torrentdownloads.unblocked.monster/
@@ -31,6 +31,7 @@ legacylinks:
   - https://torrentdownloads.unblockit.llc/
   - https://torrentdownloads.unblockit.blue/
   - https://torrentdownloads.unblockit.name/
+  - https://torrentdownloads.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentfunk.yml

@@ -10,7 +10,7 @@ links:
   - https://www.torrentfunk.com/
   - https://www.torrentfunk2.com/
   - https://torrentfunk.unblockit.ist/
-  - https://torrentfunk.nocensor.sbs/
+  - https://torrentfunk.nocensor.world/
 legacylinks:
   - https://torrentfunk.unblockit.li/
   - https://torrentfunk.unblockit.uno/
@@ -28,6 +28,7 @@ legacylinks:
   - https://torrentfunk.unblockit.llc/
   - https://torrentfunk.unblockit.blue/
   - https://torrentfunk.unblockit.name/
+  - https://torrentfunk.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentgalaxy.yml

@@ -12,7 +12,7 @@ links:
   - https://torrentgalaxy.su/
   - https://torrentgalaxy.unblockninja.com/
   - https://torrentgalaxy.unblockit.ist/
-  - https://torrentgalaxy.nocensor.sbs/
+  - https://torrentgalaxy.nocensor.world/
 legacylinks:
   - https://torrentgalaxy.org/ # redirects to *.to
   - https://torrentgalaxy.pw/ # proxy list only
@@ -33,6 +33,7 @@ legacylinks:
   - https://torrentgalaxy.unblockit.llc/
   - https://torrentgalaxy.unblockit.blue/
   - https://torrentgalaxy.unblockit.name/
+  - https://torrentgalaxy.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/xbit.yml

@@ -1,72 +0,0 @@
----
-id: xbit
-name: xBiT
-description: "xBiT is a Public torrent index"
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://xbit.pw/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: info_8000
-    type: info
-    label: About xBiT Categories
-    default: xBiT does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-
-search:
-  paths:
-    - path: api
-      response:
-        type: json
-  inputs:
-    search: "{{ .Keywords }}"
-    limit: "{{ if .Keywords }}100{{ else }}49{{ end }}"
-
-  rows:
-    selector: dht_results:has(MAGNET)
-
-  fields:
-    id:
-      selector: ID
-    category:
-      text: Other
-    title:
-      selector: NAME
-    details:
-      text: "{{ .Config.sitelink }}{{ if .Result.id }}?id={{ .Result.id }}{{ else }}{{ end }}"
-    download:
-      selector: TORRENT
-      optional: true
-    magnet:
-      selector: MAGNET
-    date:
-      # 2021-10-19 10:27:01
-      selector: DISCOVERED
-      filters:
-        - name: append
-          args: " +02:00" # EET
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      selector: SIZE
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# json engine n/a

src/Jackett.Common/Definitions/yggcookie.yml

@@ -163,6 +163,10 @@ settings:
     type: checkbox
     label: Enhance sonarr compatibility with anime by renaming episode (xxx to exxx). Works only if episode is at the end of the query. Can disturb movies search. (back to the future 3 -> back to the future e3)
     default: false
+  - name: enhancedAnime4
+    type: checkbox
+    label: Extend the sonarr compatibility with anime up to 4 digits. This WILL break all searches and result titles which contain years.
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -207,6 +211,8 @@ search:
       args: ["(?i)(.*)s([1-9])$", "$1 S0$2"]
     - name: re_replace # Full season S >= 10
       args: ["(?i)(.*)s([1-9][0-9])$", "$1 S$2"]
+    - name: re_replace # episode number at the end "1234" to "E1234"
+      args: ["(.*)(\\.|\\s|\\-)(\\d{4})(\\.|\\s|\\-*)(.*)", "{{ if .Config.enhancedAnime4 }}$1 E$3 $5{{ else }}$1$2$3$4$5{{ end }}"]
     - name: re_replace # episode number at the end "123" to "E123"
       args: ["(.*)(\\.|\\s|\\-)(\\d{2,3})(\\.|\\s|\\-*)(.*)", "{{ if .Config.enhancedAnime }}$1 E$3 $5{{ else }}$1$2$3$4$5{{ end }}"]
     # END ANIME HACK
@@ -291,15 +297,15 @@ search:
           args: ["(?i)[\\.\\s\\[\\-]subfrench[\\.\\s\\]\\-]", ".ENGLISH."]
     title_phase3:
       text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    title_anime:
+    title:
       text: "{{ .Result.title_phase3 }}"
       filters:
         # Sonarr need E in front of 3 digit number or else it thinks it is episode
         # S01E10 for number 110 for example ==> enhancedAnime
+        - name: re_replace # extend to 4 digits
+          args: ["(.*)(\\.|\\s|\\-)(\\d{4})(\\.|\\s|\\-)(.*)", "{{ if .Config.enhancedAnime4 }}$1 E$3 $5{{ else }}$1$2$3$4$5{{ end }}"]
         - name: re_replace
-          args: ["(.*)(\\.|\\s|\\-)(\\d{2,3})(\\.|\\s|\\-)(.*)", "$1 E$3 $5"]
-    title:
-      text: "{{ if .Config.enhancedAnime }}{{ .Result.title_anime }}{{ else }}{{ .Result.title_phase3 }}{{ end }}"
+          args: ["(.*)(\\.|\\s|\\-)(\\d{2,3})(\\.|\\s|\\-)(.*)", "{{ if .Config.enhancedAnime }}$1 E$3 $5{{ else }}$1$2$3$4$5{{ end }}"]
     details:
       selector: td:nth-child(2) > a
       attribute: href

src/Jackett.Common/Definitions/yggtorrent.yml

@@ -155,6 +155,10 @@ settings:
     type: checkbox
     label: Enhance sonarr compatibility with anime by renaming episode (xxx to exxx). Works only if episode is at the end of the query. Can disturb movies search. (back to the future 3 -> back to the future e3)
     default: false
+  - name: enhancedAnime4
+    type: checkbox
+    label: Extend the sonarr compatibility with anime up to 4 digits. This WILL break all searches and result titles which contain years.
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -217,6 +221,8 @@ search:
       args: ["(?i)(.*)s([1-9])$", "$1 S0$2"]
     - name: re_replace # Full season S >= 10
       args: ["(?i)(.*)s([1-9][0-9])$", "$1 S$2"]
+    - name: re_replace # episode number at the end "1234" to "E1234"
+      args: ["(.*)(\\.|\\s|\\-)(\\d{4})(\\.|\\s|\\-*)(.*)", "{{ if .Config.enhancedAnime4 }}$1 E$3 $5{{ else }}$1$2$3$4$5{{ end }}"]
     - name: re_replace # episode number at the end "123" to "E123"
       args: ["(.*)(\\.|\\s|\\-)(\\d{2,3})(\\.|\\s|\\-*)(.*)", "{{ if .Config.enhancedAnime }}$1 E$3 $5{{ else }}$1$2$3$4$5{{ end }}"]
     # END ANIME HACK
@@ -298,15 +304,15 @@ search:
           args: ["(?i)[\\.\\s\\[\\-]subfrench[\\.\\s\\]\\-]", ".ENGLISH."]
     title_phase3:
       text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    title_anime:
+    title:
       text: "{{ .Result.title_phase3 }}"
       filters:
         # Sonarr need E in front of 3 digit number or else it thinks it is episode
         # S01E10 for number 110 for example ==> enhancedAnime
+        - name: re_replace # extend to 4 digits
+          args: ["(.*)(\\.|\\s|\\-)(\\d{4})(\\.|\\s|\\-)(.*)", "{{ if .Config.enhancedAnime4 }}$1 E$3 $5{{ else }}$1$2$3$4$5{{ end }}"]
         - name: re_replace
-          args: ["(.*)(\\.|\\s|\\-)(\\d{2,3})(\\.|\\s|\\-)(.*)", "$1 E$3 $5"]
-    title:
-      text: "{{ if .Config.enhancedAnime }}{{ .Result.title_anime }}{{ else }}{{ .Result.title_phase3 }}{{ end }}"
+          args: ["(.*)(\\.|\\s|\\-)(\\d{2,3})(\\.|\\s|\\-)(.*)", "{{ if .Config.enhancedAnime }}$1 E$3 $5{{ else }}$1$2$3$4$5{{ end }}"]
     details:
       selector: td:nth-child(2) > a
       attribute: href

src/Jackett.Common/Definitions/yourbittorrent.yml

@@ -8,12 +8,13 @@ encoding: UTF-8
 links:
   - https://yourbittorrent.com/
   - https://yourbittorrent2.com/
-  - https://yourbittorrent.nocensor.sbs/
+  - https://yourbittorrent.nocensor.world/
 legacylinks:
   - https://yourbittorrent.host/
   - https://yourbittorrent.nocensor.space/
   - https://yourbittorrent.nocensor.work/
   - https://yourbittorrent.nocensor.biz/
+  - https://yourbittorrent.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/yts.yml

@@ -11,7 +11,7 @@ links:
   - https://yts.mx/
   - https://yts.unblockit.ist/
   - https://yts.unblockninja.com/
-  - https://yts.nocensor.sbs/
+  - https://yts.nocensor.world/
 legacylinks:
   - https://yts.ag/
   - https://yts.am/
@@ -32,6 +32,7 @@ legacylinks:
   - https://yts.unblockit.llc/
   - https://yts.unblockit.blue/
   - https://yts.unblockit.name/
+  - https://yts.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Indexers/EraiRaws.cs

@@ -21,13 +21,14 @@ namespace Jackett.Common.Indexers
         public override string[] AlternativeSiteLinks { get; protected set; } = {
             "https://www.erai-raws.info/",
             "https://beta.erai-raws.info/",
-            "https://erairaws.nocensor.sbs/"
+            "https://erairaws.nocensor.world/"
         };
 
         public override string[] LegacySiteLinks { get; protected set; } = {
             "https://erairaws.nocensor.space/",
             "https://erairaws.nocensor.work/",
-            "https://erairaws.nocensor.biz/"
+            "https://erairaws.nocensor.biz/",
+            "https://erairaws.nocensor.sbs/"
         };
 
         public EraiRaws(IIndexerConfigurationService configService, Utils.Clients.WebClient wc, Logger l,

src/Jackett.Common/Indexers/SubsPlease.cs

@@ -22,13 +22,14 @@ namespace Jackett.Common.Indexers
     {
         public override string[] AlternativeSiteLinks { get; protected set; } = {
             "https://subsplease.org/",
-            "https://subsplease.nocensor.sbs/"
+            "https://subsplease.nocensor.world/"
         };
 
         public override string[] LegacySiteLinks { get; protected set; } = {
             "https://subsplease.nocensor.space/",
             "https://subsplease.nocensor.work/",
-            "https://subsplease.nocensor.biz/"
+            "https://subsplease.nocensor.biz/",
+            "https://subsplease.nocensor.sbs/"
         };
 
         private string ApiEndpoint => SiteLink + "/api/?";

src/Jackett.Updater/Program.cs

@@ -433,6 +433,7 @@ namespace Jackett.Updater
                 "Definitions/nyoo.yml",
                 "Definitions/oasis.yml",
                 "Definitions/obscure.yml",
+                "Definitions/omgwtftrackr.yml",
                 "Definitions/onlineselfeducation.yml",
                 "Definitions/onlyscene.yml",
                 "Definitions/oxtorrent.yml",
@@ -550,6 +551,7 @@ namespace Jackett.Updater
                 "Definitions/world-of-tomorrow.yml", // #9213
                 "Definitions/worldofp2p.yml",
                 "Definitions/worldwidetorrents.yml",
+                "Definitions/xbit.yml",
                 "Definitions/xfsub.yml",
                 "Definitions/xktorrent.yml",
                 "Definitions/xtremefile.yml",