Move 304 Freshness check for holiday pages after redirects

hebcal · Nov 26, 2024 · 1148408 · 1148408
1 parent 524dae7
commit 1148408
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/src/holidayApp.js b/src/holidayApp.js
@@ -4,12 +4,6 @@ import {holidayPdf} from './holidayPdf.js';
 import {holidayYearIndex} from './holidayYearIndex.js';
 
 export async function holidayApp(ctx) {
-  ctx.lastModified = ctx.launchDate;
-  ctx.status = 200;
-  if (ctx.fresh) {
-    ctx.status = 304;
-    return;
-  }
   const rpath = ctx.request.path;
   ctx.state.il = ctx.request.query.i === 'on';
   if (rpath === '/holidays/') {

diff --git a/src/holidayDetail.js b/src/holidayDetail.js
@@ -124,6 +124,12 @@ export async function holidayDetail(ctx) {
     httpRedirect(ctx, `/holidays/${holidayAnchor}`);
     return;
   }
+  ctx.lastModified = ctx.launchDate;
+  ctx.status = 200;
+  if (ctx.fresh) {
+    ctx.status = 304;
+    return;
+  }
   const idx = year ? multiYearBegin.findIndex((ev) => ev === next.event) : -1;
   const prevNext = {};
   if (idx !== -1) {

diff --git a/src/holidayIndex.js b/src/holidayIndex.js
@@ -182,6 +182,12 @@ export async function holidayMainIndex(ctx) {
   if (hyear < 3762 || hyear > 9995) {
     return httpRedirect(ctx, `/holidays/?redir=year`);
   }
+  ctx.lastModified = ctx.launchDate;
+  ctx.status = 200;
+  if (ctx.fresh) {
+    ctx.status = 304;
+    return;
+  }
   const tishrei1 = new HDate(1, 'Tishrei', hyear);
   const items = {};
   for (const catId of Object.keys(categories)) {

diff --git a/src/holidayYearIndex.js b/src/holidayYearIndex.js
@@ -126,6 +126,12 @@ export async function holidayYearIndex(ctx) {
   } else if (yearNum < 1 || yearNum > 9999) {
     throw createError(400, `Sorry, can't display holidays for year ${year}`);
   }
+  ctx.lastModified = ctx.launchDate;
+  ctx.status = 200;
+  if (ctx.fresh) {
+    ctx.status = 304;
+    return;
+  }
   const isHebrewYear = yearNum >= 3761 || year.indexOf('-') !== -1;
   const calendarYear = makeCalendarYear(isHebrewYear, yearNum);
   const il = ctx.state.il;