Merge branch 'release/1.7.2'

PodShows · Feb 5, 2021 · 93b707f · 93b707f
2 parents de41307 + c09676c
commit 93b707f
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "podcloud-feeds",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "GraphQL API for podcloud",
   "scripts": {
     "test": "NODE_ENV=test mocha --opts test/mocha.opts",

diff --git a/src/schema/queries/resolvers/podcastItem.js b/src/schema/queries/resolvers/podcastItem.js
@@ -21,6 +21,7 @@ const podcastItem = function(obj, args, context, info) {
       if (err) {
         reject(err);
       } else {
+        item.preview = true; // Items loaded by ID should include preview token
         if (item && item.feed_id) {
           Feed.findOne({ _id: item.feed_id }).exec(function(err, feed) {
             if (err) {

diff --git a/src/schema/types/enclosure.js b/src/schema/types/enclosure.js
@@ -6,7 +6,7 @@ type Enclosure {
   duration: Int!
   size: BigInt!
   type: String!
-  url: String!
+  url(purpose: String): String!
   cover: Cover!
 }
 `;

diff --git a/src/schema/types/resolvers/enclosure.js b/src/schema/types/resolvers/enclosure.js
@@ -38,7 +38,9 @@ const Enclosure = {
 
     return `${prefix}${
       ctx.hosts.stats
-    }/${identifier}/${item_slug}/enclosure.${enclosure_sha256}${enclosure_ext}?p=f`;
+    }/${identifier}/${item_slug}/enclosure.${enclosure_sha256}${enclosure_ext}?p=${
+      empty(args.purpose) ? "dl" : args.purpose
+    }${enclosure.item.preview ? `&preview=${enclosure.item.id}` : ""}`;
   },
   cover(enclosure) {
     let cover = null;

diff --git a/src/schema/types/resolvers/playlist.js b/src/schema/types/resolvers/playlist.js
@@ -38,6 +38,11 @@ const Playlist = {
               return Promise.resolve();
             }
 
+            if (item.published_at <= new Date()) {
+              debug("Ignoring unpublished episode");
+              return Promise.resolve();
+            }
+
             if (!cached_feeds[item.feed_id]) {
               debug("no cached feeds promise for feed_id : ", item.feed_id);
               cached_feeds[item.feed_id] = new Promise((resolve, reject) => {

diff --git a/test/src/schema/types/enclosure.test.js b/test/src/schema/types/enclosure.test.js
@@ -12,6 +12,7 @@ describe("Enclosure Graph Object", () => {
 
   const enclosureObject = {
     item: {
+      id: "this_is_my_id",
       _slugs: ["toto", "tata"],
       feed: { identifier: "blog-de-toto" },
       updated_at: new Date(1337 * 1000)
@@ -23,7 +24,7 @@ describe("Enclosure Graph Object", () => {
     mime_type: "audio/mpeg+test",
     filename: "afile.ext",
     meta_url: {
-      path: "http://anurl.test/afile.mp3?p=f"
+      path: "http://anurl.test/afile.mp3"
     }
   };
 
@@ -111,6 +112,68 @@ describe("Enclosure Graph Object", () => {
     );
   });
 
+  it("should resolve url with default purpose", () => {
+    expect(enclosureFields.url.resolve(enclosureObject, {}, context)).to.equals(
+      "https://" +
+        context.hosts.stats +
+        "/blog-de-toto/tata/enclosure.blabla.ext?p=dl"
+    );
+  });
+
+  it("should resolve url with custom purpose", () => {
+    expect(
+      enclosureFields.url.resolve(enclosureObject, { purpose: "f" }, context)
+    ).to.equals(
+      "https://" +
+        context.hosts.stats +
+        "/blog-de-toto/tata/enclosure.blabla.ext?p=f"
+    );
+  });
+
+  it("should resolve url without preview", () => {
+    expect(enclosureFields.url.resolve(enclosureObject, {}, context)).to.equals(
+      "https://" +
+        context.hosts.stats +
+        "/blog-de-toto/tata/enclosure.blabla" +
+        ".ext?p=dl"
+    );
+
+    expect(
+      enclosureFields.url.resolve(
+        {
+          ...enclosureObject,
+          item: { ...enclosureObject.item, preview: false }
+        },
+        {},
+        context
+      )
+    ).to.equals(
+      "https://" +
+        context.hosts.stats +
+        "/blog-de-toto/tata/enclosure.blabla" +
+        ".ext?p=dl"
+    );
+  });
+
+  it("should resolve url with preview", () => {
+    expect(
+      enclosureFields.url.resolve(
+        {
+          ...enclosureObject,
+          item: { ...enclosureObject.item, preview: true }
+        },
+        {},
+        context
+      )
+    ).to.equals(
+      "https://" +
+        context.hosts.stats +
+        "/blog-de-toto/tata/enclosure.blabla" +
+        ".ext?p=dl&preview=" +
+        enclosureObject.item.id
+    );
+  });
+
   it("should resolve url with correct media_type", () => {
     expect(
       enclosureFields.url.resolve(
@@ -126,7 +189,7 @@ describe("Enclosure Graph Object", () => {
         context.hosts.stats +
         "/blog-de-toto/tata/enclosure." +
         "blabla" +
-        ".pouet?p=f"
+        ".pouet?p=dl"
     );
   });
 
@@ -145,7 +208,7 @@ describe("Enclosure Graph Object", () => {
         context.hosts.stats +
         "/blog-de-toto/tata/enclosure." +
         "blabla" +
-        ".ext?p=f"
+        ".ext?p=dl"
     );
   });
 
@@ -165,7 +228,7 @@ describe("Enclosure Graph Object", () => {
         context.hosts.stats +
         "/blog-de-toto/tata/enclosure." +
         "blabla" +
-        ".mp3?p=f"
+        ".mp3?p=dl"
     );
   });
 
@@ -192,7 +255,7 @@ describe("Enclosure Graph Object", () => {
         context.hosts.stats +
         "/blog-de-toto/tata/enclosure." +
         "blabla" +
-        ".mp3?p=f"
+        ".mp3?p=dl"
     );
   });
 
@@ -211,8 +274,8 @@ describe("Enclosure Graph Object", () => {
         context.hosts.stats +
         "/blog-de-toto/tata/enclosure." +
         // this is meta_url.path sha256
-        "85e551c61511d36350535b2688a6bdb40845301414e630e2f8a03c252ccf37de" +
-        ".ext?p=f"
+        "d281e6f02163d971e1218a178ad09fbf09deb41d8e9aaed19ff1a440674221b2" +
+        ".ext?p=dl"
     );
   });
 });