From 22b0ab5ee386c1052397bb55c380ce2476e9b5be Mon Sep 17 00:00:00 2001
From: YozoraXCII <96386153+YozoraXCII@users.noreply.github.com>
Date: Mon, 23 Dec 2024 16:59:57 +0000
Subject: [PATCH] [30] [Defaults] Update Network and Streaming to include
 `Paramount+ with Showtime` (#2375)

---
 CHANGELOG                       | 1 +
 VERSION                         | 2 +-
 defaults/both/streaming.yml     | 2 +-
 defaults/overlays/network.yml   | 4 ++--
 defaults/overlays/streaming.yml | 4 ++--
 defaults/show/network.yml       | 5 ++++-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2866bf59..15d7845a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ Fixes an issue where Prime Video overlays/collections would not be built when th
 Fixes an issue where Rotten Tomatoes Verified Hot wasn't working
 Updates `Alien vs Predator` and `X-Men` lists to new lists which include most recent releases
 Adds `style` template variable for Streaming and Chart defaults, allowing user to choose color or white logos for collection posters
+Added `Paramount+ with Showtime` to both `Paramount+` and `Showtime` for Networks and Streaming, any existing weighting is unchanged.
 
 # Bug Fixes
 Fixed the `cast` search option for the `imdb_search` builder
diff --git a/VERSION b/VERSION
index d1397e7b..084402da 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0-build29
+2.1.0-build30
diff --git a/defaults/both/streaming.yml b/defaults/both/streaming.yml
index a9191991..4a5300e2 100644
--- a/defaults/both/streaming.yml
+++ b/defaults/both/streaming.yml
@@ -139,7 +139,7 @@ dynamic_collections:
         hulu: 15
         netflix: 8
         now: 39
-        paramount: 531
+        paramount: 531|1770
         peacock: 387
         amazon: 9
         showtime: 37
diff --git a/defaults/overlays/network.yml b/defaults/overlays/network.yml
index 8a3c0908..1c7a98a8 100644
--- a/defaults/overlays/network.yml
+++ b/defaults/overlays/network.yml
@@ -739,7 +739,7 @@ overlays:
 
   Paramount+:
     variables: { weight: 10}
-    template: [name: standard, name: networks]
+    template: [name: standard, {name: networks, search: [Paramount+, Paramount+ with Showtime]}]
 
   PBS:
     variables: { weight: 10}
@@ -831,7 +831,7 @@ overlays:
 
   Showtime:
     variables: { weight: 10}
-    template: [name: standard, name: networks]
+    template: [name: standard, {name: networks, search: [Showtime, Paramount+ with Showtime]}]
 
   Shudder:
     variables: { weight: 10}
diff --git a/defaults/overlays/streaming.yml b/defaults/overlays/streaming.yml
index fa19ccdb..97fd4b05 100644
--- a/defaults/overlays/streaming.yml
+++ b/defaults/overlays/streaming.yml
@@ -148,7 +148,7 @@ overlays:
     template: [name: standard, name: mdb_streaming]
 
   Paramount:
-    variables: {key: paramount, tmdb_key: 531, weight: 90}
+    variables: {key: paramount, tmdb_key: 531|1770, weight: 90}
     template: [name: standard, name: mdb_streaming]
 
   AppleTV:
@@ -160,7 +160,7 @@ overlays:
     template: [name: standard, name: mdb_streaming]
 
   Showtime:
-    variables: {key: showtime, tmdb_key: 37, weight: 60}
+    variables: {key: showtime, tmdb_key: 531|1770, weight: 60}
     template: [name: standard, name: mdb_streaming]
 
   discovery+:
diff --git a/defaults/show/network.yml b/defaults/show/network.yml
index e671b7e6..b3876e60 100644
--- a/defaults/show/network.yml
+++ b/defaults/show/network.yml
@@ -455,8 +455,12 @@ dynamic_collections:
         - Network 10
       Nickelodeon:
         - Nick at Nite
+      Paramount+:
+        - Paramount+ with Showtime
       ReelzChannel:
         - Reelz
+      Showtime:
+        - Paramount+ with Showtime
       Sky:
         - Sky One
         - Sky Atlantic
@@ -481,7 +485,6 @@ dynamic_collections:
         - sky Travel
         - Sky Vision
         - Sky News Weather Channel
-        - SkyShowtime
       Smithsonian:
         - Smithsonian Channel
         - Smithsonian Earth