From 74733a421bac04e1819af95f1328b3f55a7a0da9 Mon Sep 17 00:00:00 2001
From: phaneendra <58028287+cricket-lover@users.noreply.github.com>
Date: Thu, 29 Feb 2024 17:27:00 +0530
Subject: [PATCH 1/7] fix: visual stories throwing 404

---
 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 a1bfe3f6..2932ab34 100644
--- a/server/amp/handlers/story-page.js
+++ b/server/amp/handlers/story-page.js
@@ -41,7 +41,7 @@ async function ampStoryPageHandler(
 ) {
   try {
     const opts = cloneDeep(rest);
-    const isCorrectAmpPath = req.path.startsWith(`${getAmpPageBasePath(opts, config)}/`);
+    const isCorrectAmpPath = req.path.startsWith(`${getAmpPageBasePath(opts, config)}/`) || isVisualStory;
     if (!isCorrectAmpPath) {
       return next();
     }

From cd61a93afadd221a02c6881bb7c34ffa0f41a58e Mon Sep 17 00:00:00 2001
From: phaneendra <58028287+cricket-lover@users.noreply.github.com>
Date: Tue, 5 Mar 2024 12:49:41 +0530
Subject: [PATCH 2/7] ignore visual stories in disable amp

---
 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 2932ab34..c4e93af9 100644
--- a/server/amp/handlers/story-page.js
+++ b/server/amp/handlers/story-page.js
@@ -55,7 +55,7 @@ async function ampStoryPageHandler(
     const story = await Story.getStoryBySlug(client, req.params["0"]);
     const isAmpDisabled = get(story, ["metadata", "story-attributes", "disable-amp-for-single-story", "0"], "false");
 
-    if ((!isVisualStory && !enableAmp) || isAmpDisabled === "true") {
+    if (!isVisualStory && (!enableAmp || isAmpDisabled === "true")) {
       const ampPageBasePath = getAmpPageBasePath(opts, config);
       const redirectUrl = `/${req.params[0]}`.startsWith(ampPageBasePath)
         ? `/${req.params[0]}`.replace(ampPageBasePath, "")

From 2422ab0fa8ebb6b3d5a306c1a20d3ac833d78cff Mon Sep 17 00:00:00 2001
From: phaneendra <58028287+cricket-lover@users.noreply.github.com>
Date: Tue, 5 Mar 2024 13:09:31 +0530
Subject: [PATCH 3/7] chore(release): 7.25.1-fix-ampstories-404.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 acc1ff2f..bb618a0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quintype/framework",
-  "version": "7.25.0",
+  "version": "7.25.1-fix-ampstories-404.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quintype/framework",
-      "version": "7.25.0",
+      "version": "7.25.1-fix-ampstories-404.0",
       "license": "ISC",
       "dependencies": {
         "@ampproject/toolbox-optimizer": "2.8.3",
diff --git a/package.json b/package.json
index 49f82d21..49d2616b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.25.0",
+  "version": "7.25.1-fix-ampstories-404.0",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {

From 2c8c76a44db67094d164e25bc045c99d4baee406 Mon Sep 17 00:00:00 2001
From: phaneendra <58028287+cricket-lover@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:14:17 +0530
Subject: [PATCH 4/7] change condition for visual stories

---
 server/amp/handlers/story-page.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/amp/handlers/story-page.js b/server/amp/handlers/story-page.js
index c4e93af9..0f5e4c35 100644
--- a/server/amp/handlers/story-page.js
+++ b/server/amp/handlers/story-page.js
@@ -41,8 +41,8 @@ async function ampStoryPageHandler(
 ) {
   try {
     const opts = cloneDeep(rest);
-    const isCorrectAmpPath = req.path.startsWith(`${getAmpPageBasePath(opts, config)}/`) || isVisualStory;
-    if (!isCorrectAmpPath) {
+    const isCorrectAmpPath = req.path.startsWith(`${getAmpPageBasePath(opts, config)}/`);
+    if (!(isCorrectAmpPath || isVisualStory)) {
       return next();
     }
     const redirectUrls = opts && opts.redirectUrls;

From 431708b6a770d90f6e5008804e7f9b3208bcd4f3 Mon Sep 17 00:00:00 2001
From: phaneendra <58028287+cricket-lover@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:18:11 +0530
Subject: [PATCH 5/7] chore(release): 7.25.1-fix-ampstories-404.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 bb618a0c..04a2455c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quintype/framework",
-  "version": "7.25.1-fix-ampstories-404.0",
+  "version": "7.25.1-fix-ampstories-404.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quintype/framework",
-      "version": "7.25.1-fix-ampstories-404.0",
+      "version": "7.25.1-fix-ampstories-404.1",
       "license": "ISC",
       "dependencies": {
         "@ampproject/toolbox-optimizer": "2.8.3",
diff --git a/package.json b/package.json
index 49d2616b..3ba0aab8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.25.1-fix-ampstories-404.0",
+  "version": "7.25.1-fix-ampstories-404.1",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {

From 3581950182862904a62ebb38f50c7976748ec3b2 Mon Sep 17 00:00:00 2001
From: phaneendra <58028287+cricket-lover@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:41:34 +0530
Subject: [PATCH 6/7] change condition for visual stories

---
 server/amp/handlers/story-page.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/amp/handlers/story-page.js b/server/amp/handlers/story-page.js
index 0f5e4c35..b92e84f9 100644
--- a/server/amp/handlers/story-page.js
+++ b/server/amp/handlers/story-page.js
@@ -41,10 +41,12 @@ async function ampStoryPageHandler(
 ) {
   try {
     const opts = cloneDeep(rest);
-    const isCorrectAmpPath = req.path.startsWith(`${getAmpPageBasePath(opts, config)}/`);
-    if (!(isCorrectAmpPath || isVisualStory)) {
-      return next();
-    }
+    const isCorrectAmpPath = isVisualStory
+      ? req.path.startsWith(`/ampstories`)
+      : req.path.startsWith(`${getAmpPageBasePath(opts, config)}/`);
+
+    if (!isCorrectAmpPath) return next();
+
     const redirectUrls = opts && opts.redirectUrls;
     const getEnableAmp = get(opts, ["enableAmp"], true);
     const enableAmp = typeof getEnableAmp === "function" ? opts.enableAmp(config) : getEnableAmp;

From fe0a8db4f61260556206b95d78314bc2d97e3583 Mon Sep 17 00:00:00 2001
From: phaneendra <58028287+cricket-lover@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:42:22 +0530
Subject: [PATCH 7/7] chore(release): 7.25.1-fix-ampstories-404.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 04a2455c..93663c1e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quintype/framework",
-  "version": "7.25.1-fix-ampstories-404.1",
+  "version": "7.25.1-fix-ampstories-404.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quintype/framework",
-      "version": "7.25.1-fix-ampstories-404.1",
+      "version": "7.25.1-fix-ampstories-404.2",
       "license": "ISC",
       "dependencies": {
         "@ampproject/toolbox-optimizer": "2.8.3",
diff --git a/package.json b/package.json
index 3ba0aab8..bb665539 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.25.1-fix-ampstories-404.1",
+  "version": "7.25.1-fix-ampstories-404.2",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {