Merge pull request #731 from podverse/develop

Release v4.16.4
podverse · Apr 6, 2024 · 5b38a4e · 5b38a4e
2 parents bf97c77 + 0723cd1
commit 5b38a4e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "podverse-api",
-  "version": "4.16.3",
+  "version": "4.16.4",
   "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
@@ -763,16 +763,26 @@ const retrieveLatestChapters = async (id, includeNonToc = true) => {
             try {
               const newChapter = newChapters[i]
               const roundedStartTime = Math.floor(newChapter.startTime)
+              const roundedEndTime =
+                newChapter.endTime !== null && newChapter.endTime >= 1 ? Math.floor(newChapter.endTime) : null
               const isChapterToc = newChapter.toc === false ? false : newChapter.toc
-              const chapterHash = uuidv5(JSON.stringify(newChapter), uuidNIL)
+
+              const chapterInfoToHash = {
+                startTime: roundedStartTime,
+                endTime: roundedEndTime || null,
+                isChapterToc,
+                episodeId: id
+              }
+
+              const chapterHash = uuidv5(JSON.stringify(chapterInfoToHash), uuidNIL)
 
               // If a chapter with that chapterHash already exists, then update it.
               // If it does not exist, then create a new mediaRef with isOfficialChapter = true.
               const existingChapter = existingChapters.find((x) => x.chapterHash === chapterHash)
               if (existingChapter && existingChapter.id) {
                 await updateMediaRef(
                   {
-                    endTime: newChapter.endTime || null,
+                    endTime: roundedEndTime,
                     id: existingChapter.id,
                     imageUrl: newChapter.img || null,
                     isOfficialChapter: true,
@@ -788,7 +798,7 @@ const retrieveLatestChapters = async (id, includeNonToc = true) => {
                 )
               } else {
                 await createMediaRef({
-                  endTime: newChapter.endTime || null,
+                  endTime: roundedEndTime,
                   imageUrl: newChapter.img || null,
                   isOfficialChapter: true,
                   isPublic: true,
@@ -806,6 +816,27 @@ const retrieveLatestChapters = async (id, includeNonToc = true) => {
             }
           }
         }
+
+        const qb = mediaRefRepository
+          .createQueryBuilder('mediaRef')
+          .select('mediaRef.id', 'id')
+          .addSelect('mediaRef.isOfficialChapter', 'isOfficialChapter')
+          .addSelect('mediaRef.chapterHash', 'chapterHash')
+          .addSelect('mediaRef.isPublic', 'isPublic')
+          .where({
+            isOfficialChapter: true,
+            episode: episode.id,
+            isPublic: false
+          })
+
+        const hiddenChaptersToDelete = await qb.getRawMany()
+        for (const chapterToDelete of hiddenChaptersToDelete) {
+          try {
+            await mediaRefRepository.remove(chapterToDelete)
+          } catch (error) {
+            console.log('error removing isPublic false chapter:', error)
+          }
+        }
       } catch (error) {
         console.log('retrieveLatestChapters request', error)
       }