Merge pull request #700 from podverse/develop

Release v4.15.4
podverse · Nov 17, 2023 · b15af5e · b15af5e
2 parents 34b40fa + 85ae98b
commit b15af5e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "podverse-api",
-  "version": "4.15.3",
+  "version": "4.15.5",
   "description": "Data API, database migration scripts, and backend services for all Podverse models.",
   "contributors": [
     "Mitch Downey"

diff --git a/src/controllers/episode.ts b/src/controllers/episode.ts
@@ -204,7 +204,7 @@ const generateEpisodeSelects = (
   }
 
   if (podcastsOnly) {
-    qb.andWhere(`podcast.medium = 'podcast'`)
+    qb.andWhere(`podcast.medium = 'podcast' OR podcast."hasVideo" IS true`)
   }
 
   if (liveItemStatus) {

diff --git a/src/controllers/mediaRef.ts b/src/controllers/mediaRef.ts
@@ -214,7 +214,7 @@ const getMediaRefs = async (query, isFromManticoreSearch?, totalOverride?) => {
   }
 
   if (podcastsOnly) {
-    qb.andWhere(`podcast.medium = 'podcast'`)
+    qb.andWhere(`podcast.medium = 'podcast' OR podcast."hasVideo" IS true`)
   }
 
   const allowRandom = podcastIds.length > 0 || episodeIds.length > 0

diff --git a/src/controllers/podcast.ts b/src/controllers/podcast.ts
@@ -148,7 +148,7 @@ const getPodcastsFromSearchEngine = async (query) => {
   } else if (isMusic) {
     extraQuery = `AND medium = 'music'`
   } else if (podcastsOnly) {
-    extraQuery = `AND medium = 'podcast'`
+    extraQuery = `AND medium = 'podcast' OR hasvideo = 1`
   }
 
   const safeSqlString = SqlString.format(
@@ -271,7 +271,7 @@ const getPodcasts = async (query, countOverride?, isFromManticoreSearch?) => {
   }
 
   if (podcastsOnly) {
-    qb.andWhere(`podcast.medium = 'podcast'`)
+    qb.andWhere(`podcast.medium = 'podcast' OR podcast."hasVideo" IS true`)
   }
 
   const allowRandom = !!podcastIds

diff --git a/src/middleware/queryValidation/search.ts b/src/middleware/queryValidation/search.ts
@@ -40,6 +40,7 @@ const validateEpisodeSearch = async (ctx, next) => {
     isMusic: Joi.boolean(),
     maxResults: Joi.boolean(),
     podcastId: Joi.string(),
+    podcastsOnly: Joi.boolean(),
     searchTitle: Joi.string().min(2),
     sincePubDate: Joi.date().iso(),
     categories: Joi.string(),
@@ -97,6 +98,7 @@ const validateMediaRefSearch = async (ctx, next) => {
     includePodcast: Joi.boolean(),
     isMusic: Joi.boolean(),
     podcastId: Joi.string(),
+    podcastsOnly: Joi.boolean(),
     searchTitle: Joi.string().min(2),
     page: Joi.number().integer().min(0),
     skip: Joi.number().integer().min(0),

diff --git a/src/services/parser.ts b/src/services/parser.ts
@@ -962,9 +962,15 @@ const assignParsedEpisodeData = async (
   episode.imageUrl = parsedEpisode.imageURL
   episode.isExplicit = parsedEpisode.explicit
 
-  episode.itunesEpisode = parsedEpisode && Math.floor(parsedEpisode.itunesEpisode)
+  if (typeof parsedEpisode?.itunesEpisode === 'number') {
+    episode.itunesEpisode = Math.floor(parsedEpisode.itunesEpisode)
+  }
+
   episode.itunesEpisodeType = parsedEpisode.itunesEpisodeType
-  episode.itunesSeason = parsedEpisode.itunesSeason
+
+  if (typeof parsedEpisode?.itunesSeason === 'number') {
+    episode.itunesSeason = Math.floor(parsedEpisode.itunesSeason)
+  }
 
   episode.linkUrl = parsedEpisode.link