From 9483cb222c62a1828bb72c48c2cee6dbd8a1cd32 Mon Sep 17 00:00:00 2001 From: nandap4790 Date: Tue, 22 Jul 2025 16:17:55 +0530 Subject: [PATCH 1/9] amp-ad-free: Include subscriber key when subscribe param is added --- server/amp/handlers/story-page.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/amp/handlers/story-page.js b/server/amp/handlers/story-page.js index 76ed7155..b6ae7576 100644 --- a/server/amp/handlers/story-page.js +++ b/server/amp/handlers/story-page.js @@ -144,6 +144,10 @@ async function ampStoryPageHandler( }); merge(mergedAdditionalConfig, additionalConfig, fetchedAdditionalConfig); } + // the query appending happens in the worker, this is needed for any publisher who needs ad-free in amp story + if(req?.query?.subscriber === "true") { + merge(mergedAdditionalConfig, { subscriber: true }) + } const optimizeAmpHtml = get(domainSpecificOpts, ["featureConfig", "optimizeAmpHtml"], true); const ampHtml = ampifyStory({ story, From 9e50ff7a4a9b0d8e1954be0d20308a7e3f8a09b4 Mon Sep 17 00:00:00 2001 From: nandap4790 Date: Tue, 22 Jul 2025 16:18:58 +0530 Subject: [PATCH 2/9] Remove optional chaining --- server/amp/handlers/story-page.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/amp/handlers/story-page.js b/server/amp/handlers/story-page.js index b6ae7576..c26102d2 100644 --- a/server/amp/handlers/story-page.js +++ b/server/amp/handlers/story-page.js @@ -145,7 +145,7 @@ async function ampStoryPageHandler( merge(mergedAdditionalConfig, additionalConfig, fetchedAdditionalConfig); } // the query appending happens in the worker, this is needed for any publisher who needs ad-free in amp story - if(req?.query?.subscriber === "true") { + if(req && req.query && req.query.subscriber === "true") { merge(mergedAdditionalConfig, { subscriber: true }) } const optimizeAmpHtml = get(domainSpecificOpts, ["featureConfig", "optimizeAmpHtml"], true); From 9233d73cb7a2af0504751673f8cf69e87e254fc5 Mon Sep 17 00:00:00 2001 From: nandap4790 Date: Tue, 22 Jul 2025 16:19:54 +0530 Subject: [PATCH 3/9] chore(release): 7.34.5-amp-ad-free.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9810617a..dc5e7f3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quintype/framework", - "version": "7.34.4", + "version": "7.34.5-amp-ad-free.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@quintype/framework", - "version": "7.34.4", + "version": "7.34.5-amp-ad-free.0", "license": "ISC", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", diff --git a/package.json b/package.json index 12763f93..e59a0c52 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@quintype/framework", - "version": "7.34.4", + "version": "7.34.5-amp-ad-free.0", "description": "Libraries to help build Quintype Node.js apps", "main": "index.js", "engines": { From 7c01cbf13ef0cfb9d17b2552eb77ee8c152d2a6f Mon Sep 17 00:00:00 2001 From: nandap4790 Date: Tue, 22 Jul 2025 20:21:28 +0530 Subject: [PATCH 4/9] Push subscriber state to additionalconfig --- server/amp/handlers/story-page.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/amp/handlers/story-page.js b/server/amp/handlers/story-page.js index c26102d2..40464ea4 100644 --- a/server/amp/handlers/story-page.js +++ b/server/amp/handlers/story-page.js @@ -146,7 +146,7 @@ async function ampStoryPageHandler( } // the query appending happens in the worker, this is needed for any publisher who needs ad-free in amp story if(req && req.query && req.query.subscriber === "true") { - merge(mergedAdditionalConfig, { subscriber: true }) + merge(additionalConfig, { subscriber: true }) } const optimizeAmpHtml = get(domainSpecificOpts, ["featureConfig", "optimizeAmpHtml"], true); const ampHtml = ampifyStory({ From 82d22721c6389218fdd432df597cab4e63900226 Mon Sep 17 00:00:00 2001 From: nandap4790 Date: Tue, 22 Jul 2025 20:22:54 +0530 Subject: [PATCH 5/9] chore(release): 7.34.5-amp-ad-free.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index dc5e7f3a..fbabedcc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quintype/framework", - "version": "7.34.5-amp-ad-free.0", + "version": "7.34.5-amp-ad-free.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@quintype/framework", - "version": "7.34.5-amp-ad-free.0", + "version": "7.34.5-amp-ad-free.1", "license": "ISC", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", diff --git a/package.json b/package.json index e59a0c52..98340df0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@quintype/framework", - "version": "7.34.5-amp-ad-free.0", + "version": "7.34.5-amp-ad-free.1", "description": "Libraries to help build Quintype Node.js apps", "main": "index.js", "engines": { From c3d7120a4ffc1e062b39411619fc5fe695b5e428 Mon Sep 17 00:00:00 2001 From: nandap4790 Date: Tue, 22 Jul 2025 23:11:13 +0530 Subject: [PATCH 6/9] Upgrade amp --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbabedcc..1797726f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@ampproject/toolbox-optimizer": "2.8.3", "@grpc/grpc-js": "^1.12.5", "@jsdoc/salty": "^0.2.9", - "@quintype/amp": "^2.22.0", + "@quintype/amp": "2.22.1-amp-feat-fortune.0", "@quintype/backend": "^2.7.0", "@quintype/components": "^3.5.0", "@quintype/prerender-node": "^3.2.26", @@ -3809,9 +3809,9 @@ "license": "BSD-3-Clause" }, "node_modules/@quintype/amp": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/@quintype/amp/-/amp-2.22.0.tgz", - "integrity": "sha512-Z904Bkf9EjiIPadDl4PYFVvRU5ZJ9PSRpmKXGe4COI8DonK0erqturmSo+Gw0cooBLR0FuWDN9hUv4ZH/jABbQ==", + "version": "2.22.1-amp-feat-fortune.0", + "resolved": "https://registry.npmjs.org/@quintype/amp/-/amp-2.22.1-amp-feat-fortune.0.tgz", + "integrity": "sha512-0iCZB6QVbMC64FkDHuYMtC4w4Ksfpp+mocEP/56aMnIlDSBzJnMH72/bywLpCkVn7XCkPTMk6aIdc3kB4yjhJw==", "dependencies": { "@rvgpl/get-youtube-id": "^1.0.0", "atob-utf-8": "^1.0.4", diff --git a/package.json b/package.json index 98340df0..1d555f79 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@ampproject/toolbox-optimizer": "2.8.3", "@grpc/grpc-js": "^1.12.5", "@jsdoc/salty": "^0.2.9", - "@quintype/amp": "^2.22.0", + "@quintype/amp": "2.22.1-amp-feat-fortune.0", "@quintype/backend": "^2.7.0", "@quintype/components": "^3.5.0", "@quintype/prerender-node": "^3.2.26", From d84ef3d031a89708024952aefb2adc5b4e68ebd8 Mon Sep 17 00:00:00 2001 From: nandap4790 Date: Tue, 22 Jul 2025 23:12:45 +0530 Subject: [PATCH 7/9] chore(release): 7.34.5-amp-ad-free.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1797726f..7b386b80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quintype/framework", - "version": "7.34.5-amp-ad-free.1", + "version": "7.34.5-amp-ad-free.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@quintype/framework", - "version": "7.34.5-amp-ad-free.1", + "version": "7.34.5-amp-ad-free.2", "license": "ISC", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", diff --git a/package.json b/package.json index 1d555f79..e2bb9d88 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@quintype/framework", - "version": "7.34.5-amp-ad-free.1", + "version": "7.34.5-amp-ad-free.2", "description": "Libraries to help build Quintype Node.js apps", "main": "index.js", "engines": { From 82c7a7b5058e67a798659c3e62af569a2415e14b Mon Sep 17 00:00:00 2001 From: VeenaYemmiganur Date: Fri, 25 Jul 2025 20:31:42 +0530 Subject: [PATCH 8/9] fix. add new beta for adfree-visual stories --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7b386b80..c38b9cf3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@ampproject/toolbox-optimizer": "2.8.3", "@grpc/grpc-js": "^1.12.5", "@jsdoc/salty": "^0.2.9", - "@quintype/amp": "2.22.1-amp-feat-fortune.0", + "@quintype/amp": "2.22.1-ad-free-visual-stories.0", "@quintype/backend": "^2.7.0", "@quintype/components": "^3.5.0", "@quintype/prerender-node": "^3.2.26", @@ -3809,9 +3809,9 @@ "license": "BSD-3-Clause" }, "node_modules/@quintype/amp": { - "version": "2.22.1-amp-feat-fortune.0", - "resolved": "https://registry.npmjs.org/@quintype/amp/-/amp-2.22.1-amp-feat-fortune.0.tgz", - "integrity": "sha512-0iCZB6QVbMC64FkDHuYMtC4w4Ksfpp+mocEP/56aMnIlDSBzJnMH72/bywLpCkVn7XCkPTMk6aIdc3kB4yjhJw==", + "version": "2.22.1-ad-free-visual-stories.0", + "resolved": "https://registry.npmjs.org/@quintype/amp/-/amp-2.22.1-ad-free-visual-stories.0.tgz", + "integrity": "sha512-JKmG0nXZ3viCMowvqTdk9Dwo9hKeTSgfgvs8bnB6AS2kYRc2s+fkODkwyjVxASa7TqWowlU+o8cZwRVRkIuong==", "dependencies": { "@rvgpl/get-youtube-id": "^1.0.0", "atob-utf-8": "^1.0.4", diff --git a/package.json b/package.json index e2bb9d88..dd6ea5d9 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@ampproject/toolbox-optimizer": "2.8.3", "@grpc/grpc-js": "^1.12.5", "@jsdoc/salty": "^0.2.9", - "@quintype/amp": "2.22.1-amp-feat-fortune.0", + "@quintype/amp": "2.22.1-ad-free-visual-stories.0", "@quintype/backend": "^2.7.0", "@quintype/components": "^3.5.0", "@quintype/prerender-node": "^3.2.26", From ccbbcf2de634faf8b2b2f10a8ab84a4f656bcfcf Mon Sep 17 00:00:00 2001 From: VeenaYemmiganur Date: Fri, 25 Jul 2025 20:32:11 +0530 Subject: [PATCH 9/9] chore(release): 7.34.5-amp-ad-free.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c38b9cf3..9d0324eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quintype/framework", - "version": "7.34.5-amp-ad-free.2", + "version": "7.34.5-amp-ad-free.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@quintype/framework", - "version": "7.34.5-amp-ad-free.2", + "version": "7.34.5-amp-ad-free.3", "license": "ISC", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", diff --git a/package.json b/package.json index dd6ea5d9..793c0053 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@quintype/framework", - "version": "7.34.5-amp-ad-free.2", + "version": "7.34.5-amp-ad-free.3", "description": "Libraries to help build Quintype Node.js apps", "main": "index.js", "engines": {