From 40f2ed6fbc0fefc4284a7a7ed66063fa4b3013d1 Mon Sep 17 00:00:00 2001
From: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>
Date: Thu, 28 Apr 2022 06:01:08 +0100
Subject: [PATCH] assorted 3x: tidy modes & descriptions. #13191 (#13212)

---
 src/Jackett.Common/Definitions/bitsexy.yml       | 2 +-
 src/Jackett.Common/Definitions/empornium.yml     | 4 +---
 src/Jackett.Common/Definitions/empornium2fa.yml  | 2 --
 src/Jackett.Common/Definitions/femdomcult.yml    | 4 +---
 src/Jackett.Common/Definitions/gay-torrents.yml  | 2 +-
 src/Jackett.Common/Definitions/happyfappy.yml    | 2 --
 src/Jackett.Common/Definitions/kinorun.yml       | 2 --
 src/Jackett.Common/Definitions/kufirc.yml        | 2 --
 src/Jackett.Common/Definitions/lepornoinfo.yml   | 2 --
 src/Jackett.Common/Definitions/mteamtp.yml       | 2 +-
 src/Jackett.Common/Definitions/mypornclub.yml    | 2 --
 src/Jackett.Common/Definitions/pornbits.yml      | 2 --
 src/Jackett.Common/Definitions/rintor.yml        | 2 --
 src/Jackett.Common/Definitions/sukebeinyaasi.yml | 1 -
 src/Jackett.Common/Definitions/x-ite.me.yml      | 2 +-
 src/Jackett.Common/Definitions/ydypt.yml         | 1 -
 src/Jackett.Common/Indexers/ExoticaZ.cs          | 8 +-------
 17 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/src/Jackett.Common/Definitions/bitsexy.yml b/src/Jackett.Common/Definitions/bitsexy.yml
index 514a7512e..8278c276c 100644
--- a/src/Jackett.Common/Definitions/bitsexy.yml
+++ b/src/Jackett.Common/Definitions/bitsexy.yml
@@ -1,7 +1,7 @@
 ---
 id: bitsexy
 name: BitSexy
-description: "BitSexy is a Private Torrent Tracker for 3x"
+description: "BitSexy is a Private Torrent Tracker for 3X"
 language: en-US
 type: private
 encoding: UTF-8
diff --git a/src/Jackett.Common/Definitions/empornium.yml b/src/Jackett.Common/Definitions/empornium.yml
index 4de4b42ee..bb5090c24 100644
--- a/src/Jackett.Common/Definitions/empornium.yml
+++ b/src/Jackett.Common/Definitions/empornium.yml
@@ -1,7 +1,7 @@
 ---
 id: empornium
 name: Empornium
-description: "Empornium (EMP) is a Private Torrent Tracker for XXX"
+description: "Empornium (EMP) is a Private Torrent Tracker for 3X"
 language: en-US
 type: private
 encoding: UTF-8
@@ -64,8 +64,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: username
diff --git a/src/Jackett.Common/Definitions/empornium2fa.yml b/src/Jackett.Common/Definitions/empornium2fa.yml
index 446a0c89b..6706ac33c 100644
--- a/src/Jackett.Common/Definitions/empornium2fa.yml
+++ b/src/Jackett.Common/Definitions/empornium2fa.yml
@@ -64,8 +64,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: cookie
diff --git a/src/Jackett.Common/Definitions/femdomcult.yml b/src/Jackett.Common/Definitions/femdomcult.yml
index 00cd542f8..fe9a68212 100644
--- a/src/Jackett.Common/Definitions/femdomcult.yml
+++ b/src/Jackett.Common/Definitions/femdomcult.yml
@@ -4,7 +4,7 @@
 ---
 id: femdomcult
 name: Femdomcult
-description: "Femdomcult is a Private Torrent Tracker for FETISH XXX"
+description: "Femdomcult is a Private Torrent Tracker for FETISH 3X"
 language: en-US
 type: private
 encoding: UTF-8
@@ -36,8 +36,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: username
diff --git a/src/Jackett.Common/Definitions/gay-torrents.yml b/src/Jackett.Common/Definitions/gay-torrents.yml
index ffde6a7be..6f0fbf9ed 100644
--- a/src/Jackett.Common/Definitions/gay-torrents.yml
+++ b/src/Jackett.Common/Definitions/gay-torrents.yml
@@ -1,7 +1,7 @@
 ---
 id: gay-torrents
 name: Gay-Torrents.net
-description: "Gay-Torrents.net is a Private Torrent Tracker for GAY XXX"
+description: "Gay-Torrents.net is a Private Torrent Tracker for GAY 3X"
 language: en-US
 type: semi-private
 encoding: UTF-8
diff --git a/src/Jackett.Common/Definitions/happyfappy.yml b/src/Jackett.Common/Definitions/happyfappy.yml
index 32db42990..b73043cd3 100644
--- a/src/Jackett.Common/Definitions/happyfappy.yml
+++ b/src/Jackett.Common/Definitions/happyfappy.yml
@@ -14,8 +14,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: username
diff --git a/src/Jackett.Common/Definitions/kinorun.yml b/src/Jackett.Common/Definitions/kinorun.yml
index 035eb090f..e650c4b8f 100644
--- a/src/Jackett.Common/Definitions/kinorun.yml
+++ b/src/Jackett.Common/Definitions/kinorun.yml
@@ -52,8 +52,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: username
diff --git a/src/Jackett.Common/Definitions/kufirc.yml b/src/Jackett.Common/Definitions/kufirc.yml
index b1093f9c6..79f5c3479 100644
--- a/src/Jackett.Common/Definitions/kufirc.yml
+++ b/src/Jackett.Common/Definitions/kufirc.yml
@@ -64,8 +64,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: username
diff --git a/src/Jackett.Common/Definitions/lepornoinfo.yml b/src/Jackett.Common/Definitions/lepornoinfo.yml
index 2bfb35509..79c543e0b 100644
--- a/src/Jackett.Common/Definitions/lepornoinfo.yml
+++ b/src/Jackett.Common/Definitions/lepornoinfo.yml
@@ -32,8 +32,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: sort
diff --git a/src/Jackett.Common/Definitions/mteamtp.yml b/src/Jackett.Common/Definitions/mteamtp.yml
index 11acc7c11..9201c95e5 100644
--- a/src/Jackett.Common/Definitions/mteamtp.yml
+++ b/src/Jackett.Common/Definitions/mteamtp.yml
@@ -1,7 +1,7 @@
 ---
 id: mteamtp
 name: M-Team - TP
-description: "M-Team TP (MTTP) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / XXX"
+description: "M-Team TP (MTTP) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / 3X"
 language: zh-CN
 type: private
 encoding: UTF-8
diff --git a/src/Jackett.Common/Definitions/mypornclub.yml b/src/Jackett.Common/Definitions/mypornclub.yml
index f7bdfef7e..95c7b01b7 100644
--- a/src/Jackett.Common/Definitions/mypornclub.yml
+++ b/src/Jackett.Common/Definitions/mypornclub.yml
@@ -14,8 +14,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: flaresolverr
diff --git a/src/Jackett.Common/Definitions/pornbits.yml b/src/Jackett.Common/Definitions/pornbits.yml
index bbe7cf993..fe0a3eeb3 100644
--- a/src/Jackett.Common/Definitions/pornbits.yml
+++ b/src/Jackett.Common/Definitions/pornbits.yml
@@ -16,8 +16,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: username
diff --git a/src/Jackett.Common/Definitions/rintor.yml b/src/Jackett.Common/Definitions/rintor.yml
index a18fb4308..5c7461cd0 100644
--- a/src/Jackett.Common/Definitions/rintor.yml
+++ b/src/Jackett.Common/Definitions/rintor.yml
@@ -60,8 +60,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: username
diff --git a/src/Jackett.Common/Definitions/sukebeinyaasi.yml b/src/Jackett.Common/Definitions/sukebeinyaasi.yml
index 90a4157b6..ac0907a1b 100644
--- a/src/Jackett.Common/Definitions/sukebeinyaasi.yml
+++ b/src/Jackett.Common/Definitions/sukebeinyaasi.yml
@@ -57,7 +57,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
 
 search:
   paths:
diff --git a/src/Jackett.Common/Definitions/x-ite.me.yml b/src/Jackett.Common/Definitions/x-ite.me.yml
index e52e8302b..cecadb830 100644
--- a/src/Jackett.Common/Definitions/x-ite.me.yml
+++ b/src/Jackett.Common/Definitions/x-ite.me.yml
@@ -1,7 +1,7 @@
 ---
 id: xiteme
 name: x-ite.me
-description: "Tracker for LGBTQ movies, TV, books, magazines, anime, PC and XXX."
+description: "Tracker for LGBTQ movies, TV, books, magazines, anime, PC and 3X."
 language: en-US
 type: private
 encoding: UTF-8
diff --git a/src/Jackett.Common/Definitions/ydypt.yml b/src/Jackett.Common/Definitions/ydypt.yml
index 59834bca4..6c64e5db3 100644
--- a/src/Jackett.Common/Definitions/ydypt.yml
+++ b/src/Jackett.Common/Definitions/ydypt.yml
@@ -27,7 +27,6 @@ caps:
     search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
-    music-search: [q]
 
 settings:
   - name: username
diff --git a/src/Jackett.Common/Indexers/ExoticaZ.cs b/src/Jackett.Common/Indexers/ExoticaZ.cs
index a81561c72..566894bce 100644
--- a/src/Jackett.Common/Indexers/ExoticaZ.cs
+++ b/src/Jackett.Common/Indexers/ExoticaZ.cs
@@ -25,13 +25,7 @@ namespace Jackett.Common.Indexers
                    name: "ExoticaZ",
                    description: "ExoticaZ (YourExotic) is a Private Torrent Tracker for 3X",
                    link: "https://exoticaz.to/",
-                   caps: new TorznabCapabilities
-                   {
-                       MovieSearchParams = new List<MovieSearchParam>
-                       {
-                           MovieSearchParam.Q
-                       }
-                   },
+                   caps: new TorznabCapabilities(),
                    configService: configService,
                    client: wc,
                    logger: l,