Date format in newsletter and fix newsletter on modify #3543 (#3544)

Author: padms

web/lib/queries/common/publishDateTime.ts

@@ -9,11 +9,3 @@ export const publishDateTimeQuery = /* groq */ `
 export const lastUpdatedTimeQuery = /* groq */ `
   coalesce(lastModifiedAt,_updatedAt)
 `
-
-export const newsletterPublishDateTimeQuery = /* groq */ `
-  select(
-    customPublicationDate == true =>
-      publishDateTime,
-      coalesce(_updatedAt, firstPublishedAt, _createdAt)
-  )
-`

web/pages/api/newsletter-rss/groq.global.ts

@@ -1,9 +1,10 @@
-import { ImageWithCaptionData } from '../../../types'
+
+import { functions } from '../../../lib/queries/common/functions'
 import { ingressForNewsQuery } from '../../../lib/queries/common/newsSubqueries'
-import { newsletterPublishDateTimeQuery } from '../../../lib/queries/common/publishDateTime'
-import { PortableTextBlock } from '@portabletext/types'
+import { publishDateTimeQuery } from '../../../lib/queries/common/publishDateTime'
 import { noDrafts, sameLang } from '../../../lib/queries/common/langAndDrafts'
-import { functions } from '../../../lib/queries/common/functions'
+import type { ImageWithCaptionData } from '../../../types'
+import type { PortableTextBlock } from '@portabletext/types'
 
 export type LatestNewsType = {
   _id: string
@@ -21,27 +22,27 @@ export type LatestNewsType = {
 
 export const latestNews = /* groq */ `
 ${functions}
-  *[_type == "news" && defined(subscriptionType) && ${sameLang} && ${noDrafts}] | order(${newsletterPublishDateTimeQuery} desc)[0...5] {
+  *[_type == "news" && defined(subscriptionType) && ${sameLang} && ${noDrafts}] | order(${publishDateTimeQuery} desc)[0...5] {
     _id,
     "type":_type,
     "slug": slug.current,
     title,
     "hero": heroImage,
     subscriptionType,
-    "publishDateTime": ${newsletterPublishDateTimeQuery},
+    "publishDateTime": ${publishDateTimeQuery},
     ${ingressForNewsQuery},
     lang
   }
 `
 export const latestMagazine = /* groq */ `
 ${functions}
-  *[_type == "magazine" && shouldDistributeMagazine && ${sameLang} && ${noDrafts}] | order(${newsletterPublishDateTimeQuery} desc)[0...5] {
+  *[_type == "magazine" && shouldDistributeMagazine && ${sameLang} && ${noDrafts}] | order(${publishDateTimeQuery} desc)[0...5] {
     _id,
     "type":_type,
     "slug": slug.current,
     title,
     "hero": heroFigure,
-    "publishDateTime": ${newsletterPublishDateTimeQuery},
+    "publishDateTime": ${publishDateTimeQuery},
     ${ingressForNewsQuery},
     lang
   }

web/pages/api/newsletter-rss/index.global.ts

@@ -49,6 +49,19 @@ const generateRssFeed = async (locale: 'en_GB' | 'nb_NO') => {
       const publishDate = new Date(article.publishDateTime).toUTCString()
       console.log('article.publishDateTime', article.publishDateTime)
       console.log('publishDate', publishDate)
+      const dateFormat = article.lang === 'nb_NO' ? 'd. MMMM yyyy hh:mm' : 'd MMMM yyyy hh:mm'
+
+      const getTimezoneAbbreviation = (date: Date, timeZone: string) => {
+        const parts = new Intl.DateTimeFormat('en-GB', {
+          timeZone,
+          timeZoneName: 'short',
+        }).formatToParts(date)
+
+        const tzPart = parts.find((p) => p.type === 'timeZoneName')
+
+        // TS-safe: fallback in case it's undefined
+        return tzPart?.value ?? ''
+      }
 
       // Format the main pubDate
       //const formattedPubDate =  //format(new TZDate(publishDate, 'Europe/Oslo'), 'EEE, dd MMM yyyy HH:mm:ss xxxx')
@@ -64,9 +77,14 @@ const generateRssFeed = async (locale: 'en_GB' | 'nb_NO') => {
           <pubDate>${publishDate}</pubDate>
           <description>${toPlainText(article.ingress)}</description>
           ${categoryTag ? `<category>${mapCategoryToId(categoryTag, locale)}</category>` : '<category />'}
-          <nl:extra1>${format(new TZDate(publishDate, 'Europe/Oslo'), "d.MMMM yyyy hh:mm ('CEST')", {
-            locale: article.lang === 'nb_NO' ? nb : enGB,
-          })}</nl:extra1>
+          <nl:extra1>${
+            format(new TZDate(publishDate, 'Europe/Oslo'), dateFormat, {
+              locale: article.lang === 'nb_NO' ? nb : enGB,
+            }) +
+            ' (' +
+            getTimezoneAbbreviation(new TZDate(publishDate, 'Europe/Oslo'), 'Europe/Oslo') +
+            ')'
+          }</nl:extra1>
           ${
             hero?.image?.asset
               ? `<media:content medium="image" type="image/jpeg" url="${encodedUrl}">