ghost 5.62.0 → 5.63.0

package/core/built/admin/assets/{vendor-b50a3e5c2079b8a35d9122a1a4c34ef6.js → vendor-f8ce8bd43cf5dad6608f828ab48cee9b.js}

@@ -7559,7 +7559,7 @@ e.LIST_SECTION_TYPE=3
 e.CARD_SECTION_TYPE=10})),
 /**
   reframe.js - Reframe.js: responsive iframes for embedded content
-  @version v4.0.1
+  @version v4.0.2
   @link https://github.com/yowainwright/reframe.ts#readme
   @author Jeff Wainwright <yowainwright@gmail.com> (http://jeffry.in)
   @license MIT
@@ -13616,4 +13616,4 @@ e.default=class{constructor(e){if(this._data=new t.default,e)for(let t=0;t<e.len
 return this}get(e){let t=this._data[e]
 return t===r.UNDEFINED_KEY?void 0:t}set(e,t){return this._data[e]=t,this}delete(e){return this._data[e]=r.UNDEFINED_KEY,!0}}}))
 
-//# sourceMappingURL=vendor-b50a3e5c2079b8a35d9122a1a4c34ef6.map
+//# sourceMappingURL=vendor-f8ce8bd43cf5dad6608f828ab48cee9b.map

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.62%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.63%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-3e6947aa681f0fb82b193090e520dc73.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-8a4e981c272f793157133814ca7c7e84.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-33664cad4cd6664a8b5fa56e62c5005f.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-b50a3e5c2079b8a35d9122a1a4c34ef6.js"></script>
-<script src="assets/chunk.853.f743ed975e8838475532.js"></script>
-<script src="assets/chunk.143.5b5502a550ce35005d0f.js"></script>
-    <script src="assets/ghost-d804aba7bca07fa75d308ab892c508fc.js"></script>
+    <script src="assets/vendor-f8ce8bd43cf5dad6608f828ab48cee9b.js"></script>
+<script src="assets/chunk.237.9b7032162949850f6c76.js"></script>
+<script src="assets/chunk.143.1c5d21facf1f9b9beef9.js"></script>
+    <script src="assets/ghost-7c3f2de2ec83e591ad9f9db5165b2733.js"></script>
 </body>
 </html>

package/core/frontend/helpers/foreach.js

@@ -31,6 +31,14 @@ module.exports = function foreach(items, options) {
         if (Object.values(items).length > 0 && checks.isPost(Object.values(items)[0])) {
             visibility = visibility || 'all';
         }
+    } 
+
+    if (_.isArray(items) && items.length > 0 && checks.isNewsletter(items[0])) {
+        visibility = visibility || 'all';
+    } else if (_.isObject(items) && _.isArray(Object.values(items))) {
+        if (Object.values(items).length > 0 && checks.isNewsletter(Object.values(items)[0])) {
+            visibility = visibility || 'all';
+        }
     }
     // Exclude items which should not be visible in the theme
     items = ghostHelperUtils.visibility.filter(items, visibility);

package/core/frontend/helpers/get.js

@@ -33,6 +33,9 @@ const RESOURCES = {
     },
     tiers: {
         alias: 'tiersPublic'
+    },
+    newsletters: {
+        alias: 'newslettersPublic'
     }
 };
 

package/core/frontend/meta/schema.js

@@ -152,7 +152,7 @@ function getAuthorSchema(metaData, data) {
         sameAs: trimSameAs(data, 'author'),
         name: escapeExpression(data.author.name),
         url: metaData.authorUrl,
-        image: schemaImageObject(metaData.coverImage),
+        image: schemaImageObject(metaData.authorImage) || schemaImageObject(metaData.coverImage),
         mainEntityOfPage: metaData.authorUrl,
         description: metaData.metaDescription ?
             escapeExpression(metaData.metaDescription) :

package/core/frontend/services/data/checks.js

@@ -3,6 +3,11 @@ function isPost(jsonData) {
         Object.prototype.hasOwnProperty.call(jsonData, 'title') && Object.prototype.hasOwnProperty.call(jsonData, 'slug');
 }
 
+function isNewsletter(jsonData) {
+    return Object.prototype.hasOwnProperty.call(jsonData, 'name') &&
+        Object.prototype.hasOwnProperty.call(jsonData, 'subscribe_on_signup') && Object.prototype.hasOwnProperty.call(jsonData, 'visibility');
+}
+
 function isPage(jsonData = {}) {
     return Object.prototype.hasOwnProperty.call(jsonData, 'show_title_and_feature_image');
 }
@@ -24,6 +29,7 @@ function isNav(jsonData) {
 
 module.exports = {
     isPost,
+    isNewsletter,
     isPage,
     isTag,
     isUser,

package/core/frontend/src/cards/css/collection.css

@@ -0,0 +1,186 @@
+.kg-collection-card {
+    width: 100%;
+}
+
+.kg-collection-card-title {
+    padding: .8rem 0 1.6rem 0;
+    font-size: 1.5rem;
+    text-transform: uppercase;
+}
+
+.kg-collection-card-post {
+    display: flex;
+    gap: 2rem;
+}
+
+.kg-collection-card-img {
+    position: relative;
+    aspect-ratio: 3/2;
+}
+
+.kg-collection-card-img img {
+    position: absolute;
+    inset: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+.kg-collection-card-content {
+    display: flex;
+    flex-direction: column;
+    font-size: 1.45rem;
+}
+
+h2.kg-collection-card-post-title {
+    font-size: 1.9rem;
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+}
+
+p.kg-collection-card-post-excerpt {
+    margin-top: .8rem;
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    line-height: 1.4;
+}
+
+.kg-collection-card-post-meta {
+    display: flex;
+    opacity: .5;
+    margin-top: .8rem;
+}
+
+/* List layout */
+
+.kg-collection-card-list {
+    display: flex;
+    flex-direction: column;
+    gap: 2rem;
+}
+
+@media (max-width: 767px) {
+    .kg-collection-card-list .kg-collection-card-post {
+        flex-direction: column;
+    }
+}
+
+.kg-collection-card-list .kg-collection-card-img {
+    flex: 0 0 30%;
+}
+
+/* Grid layout */
+
+.kg-collection-card-grid {
+    display: grid;
+    grid-template-columns: repeat(1,minmax(0,1fr));
+    gap: 2.4rem;
+}
+
+@media (min-width: 640px) {
+    .kg-collection-card-grid:not(.columns-1) {
+        grid-template-columns: repeat(2,minmax(0,1fr));
+    }
+}
+
+@media (min-width: 1024px) {
+    .kg-collection-card-grid:not(.columns-1):not(.columns-2) {
+        grid-template-columns: repeat(3,minmax(0,1fr));
+        gap: 3.2rem
+    }
+
+    .kg-collection-card-grid.columns-1 {
+        gap: 4.8rem
+    }
+
+    .kg-collection-card-grid.columns-2 {
+        gap: 4rem
+    }
+}
+
+@media (min-width: 1280px) {
+    .kg-collection-card-grid:not(.columns-1):not(.columns-2):not(.columns-3) {
+        grid-template-columns: repeat(4,minmax(0,1fr));
+    }
+}
+
+.kg-collection-card-grid .kg-collection-card-post {
+    flex-direction: column;
+    gap: 1.2rem;
+}
+
+@media (min-width: 1024px) {
+    .kg-collection-card-grid.columns-1 .kg-collection-card-post {
+        gap: 2rem
+    }
+
+    .kg-collection-card-grid.columns-2 .kg-collection-card-post {
+        gap: 1.6rem
+    }
+}
+
+.kg-collection-card-grid.columns-1 .kg-collection-card-img,
+.kg-collection-card-grid.columns-2 .kg-collection-card-img {
+    aspect-ratio: 16/9;
+}
+
+.kg-collection-card-grid .kg-collection-card-content {
+    font-size: 1.5rem;
+}
+
+@media (min-width: 640px) {
+    .kg-collection-card-grid .kg-collection-card-content {
+        font-size: 1.6rem;
+    }
+}
+
+@media (min-width: 1024px) {
+    .kg-collection-card-grid.columns-1 .kg-collection-card-content {
+        font-size: 1.8rem;
+    }
+
+    .kg-collection-card-grid.columns-3 .kg-collection-card-content,
+    .kg-collection-card-grid.columns-4 .kg-collection-card-content {
+        font-size: 1.5rem;
+    }
+}
+
+.kg-collection-card-grid h2.kg-collection-card-post-title {
+    font-size: 1.7rem;
+}
+
+@media (min-width: 640px) {
+    .kg-collection-card-grid h2.kg-collection-card-post-title {
+        font-size: 1.9rem;
+    }
+
+    .kg-collection-card-grid.columns-1 h2.kg-collection-card-post-title {
+        font-size: 2.4rem;
+    }
+}
+
+/* @media (min-width: 768px) {
+    .kg-collection-card-grid.columns-1 h2.kg-collection-card-post-title {
+        font-size: 2.4rem;
+    }
+} */
+
+@media (min-width: 1024px) {
+    .kg-collection-card-grid.columns-1 h2.kg-collection-card-post-title {
+        font-size: 3.6rem;
+    }
+
+    .kg-collection-card-grid.columns-2 h2.kg-collection-card-post-title {
+        font-size: 2.4rem;
+    }
+}
+
+@media (min-width: 1280px) {
+    .kg-collection-card-grid.columns-4 h2.kg-collection-card-post-title {
+        font-size: 1.7rem;
+    }
+}

package/core/frontend/src/cards/css/header_v2.css

@@ -71,7 +71,7 @@
 }
 
 .kg-header-card.kg-style-image h2.kg-header-card-heading,
-.kg-header-card.kg-style-image h3.kg-header-card-subheading,
+.kg-header-card.kg-style-image .kg-header-card-subheading,
 .kg-header-card.kg-style-image.kg-v2 .kg-header-card-button {
     z-index: 999;
 }
@@ -112,26 +112,22 @@
 
 .kg-header-card h2.kg-header-card-heading {
     margin: 0;
-    font-size: clamp(2.8rem, 4vw, 4rem);
+    font-size: clamp(2.4rem, 4vw, 3.6rem);
     font-weight: 700;
     line-height: 1em;
     letter-spacing: -0.01em;
 }
 
 .kg-header-card.kg-width-wide h2.kg-header-card-heading {
-    font-size: clamp(2.8rem, 5vw, 5.2rem);
+    font-size: clamp(2.4rem, 5vw, 4.8rem);
 }
 
 .kg-header-card.kg-width-full h2.kg-header-card-heading {
-    font-size: clamp(3.6rem, 5.6vw, 6.4rem);
+    font-size: clamp(2.8rem, 5.6vw, 6rem);
 }
 
 .kg-header-card.kg-width-full.kg-layout-split h2.kg-header-card-heading {
-    font-size: clamp(3.2rem, 4vw, 5.6rem);
-}
-
-.kg-header-card.kg-width-full.kg-layout-split.kg-content-wide h2.kg-header-card-heading {
-    font-size: clamp(2.8rem, 4vw, 5.2rem);
+    font-size: clamp(2.8rem, 4vw, 4.8rem);
 }
 
 /* Subheading */
@@ -140,33 +136,33 @@
     margin: 0 0 2em;
 }
 
-.kg-header-card h3.kg-header-card-subheading {
+.kg-header-card .kg-header-card-subheading {
     max-width: 40em;
     margin: 0;
     font-size: clamp(1.05em, 2vw, 2rem);
     font-weight: 500;
-    line-height: 1.4em;
+    line-height: 1.2em;
 }
 
-.kg-header-card h2 + h3.kg-header-card-subheading {
+.kg-header-card h2 + .kg-header-card-subheading {
     margin: 0.6em 0 0;
 }
 
-.kg-header-card h3.kg-header-card-subheading strong {
+.kg-header-card .kg-header-card-subheading strong {
     font-weight: 600;
 }
 
-.kg-header-card.kg-width-wide h3.kg-header-card-subheading {
-    font-size: clamp(1.05em, 2vw, 2.4rem);
+.kg-header-card.kg-width-wide .kg-header-card-subheading {
+    font-size: clamp(1.05em, 2vw, 2.2rem);
 }
 
-.kg-header-card.kg-width-full h3.kg-header-card-subheading:not(.kg-layout-split h3.kg-header-card-subheading) {
+.kg-header-card.kg-width-full .kg-header-card-subheading:not(.kg-layout-split .kg-header-card-subheading) {
     max-width: min(65vmax, 1200px);
-    font-size: clamp(1.05em, 2vw, 2.6rem);
+    font-size: clamp(1.05em, 2vw, 2.4rem);
 }
 
-.kg-header-card.kg-width-full.kg-layout-split h3.kg-header-card-subheading {
-    font-size: clamp(1.05em, 2vw, 2.4rem);
+.kg-header-card.kg-width-full.kg-layout-split .kg-header-card-subheading {
+    font-size: clamp(1.05em, 2vw, 2.2rem);
 }
 
 .kg-header-card.kg-v2 .kg-header-card-button {
@@ -194,7 +190,7 @@
 }
 
 .kg-header-card.kg-v2 h2 + .kg-header-card-button,
-.kg-header-card.kg-v2 h3 + .kg-header-card-button {
+.kg-header-card.kg-v2 p + .kg-header-card-button {
     margin: 1.5em 0 0;
 }
 
@@ -207,7 +203,7 @@
 }
 
 .kg-header-card.kg-v2.kg-width-wide h2 + .kg-header-card-button,
-.kg-header-card.kg-v2.kg-width-wide h3 + .kg-header-card-button {
+.kg-header-card.kg-v2.kg-width-wide p + .kg-header-card-button {
     margin-top: 1.75em;
 }
 
@@ -216,7 +212,7 @@
 }
 
 .kg-header-card.kg-v2.kg-width-full h2 + .kg-header-card-button,
-.kg-header-card.kg-v2.kg-width-full h3 + .kg-header-card-button {
+.kg-header-card.kg-v2.kg-width-full p + .kg-header-card-button {
     margin-top: 2em;
 }
 
@@ -236,7 +232,7 @@
         padding: min(9.6vmax, 180px) 0;
     }
 
-    .kg-header-card.kg-width-full h3.kg-header-card-subheading:not(.kg-layout-split h3.kg-header-card-subheading) {
+    .kg-header-card.kg-width-full .kg-header-card-subheading:not(.kg-layout-split .kg-header-card-subheading) {
         max-width: unset;
     }
 

package/core/frontend/src/cards/css/signup.css

@@ -64,7 +64,7 @@
 }
 
 .kg-signup-card.kg-style-image h2.kg-signup-card-heading,
-.kg-signup-card.kg-style-image h3.kg-signup-card-subheading,
+.kg-signup-card.kg-style-image .kg-signup-card-subheading,
 .kg-signup-card.kg-style-image .kg-signup-card-button {
     z-index: 999;
 }
@@ -105,26 +105,22 @@
 
 .kg-signup-card h2.kg-signup-card-heading {
     margin: 0;
-    font-size: clamp(2.8rem, 4vw, 4rem);
+    font-size: clamp(2.4rem, 4vw, 3.6rem);
     font-weight: 700;
     line-height: 1em;
     letter-spacing: -0.01em;
 }
 
 .kg-signup-card.kg-width-wide h2.kg-signup-card-heading {
-    font-size: clamp(2.8rem, 5vw, 5.2rem);
+    font-size: clamp(2.4rem, 5vw, 4.8rem);
 }
 
 .kg-signup-card.kg-width-full h2.kg-signup-card-heading {
-    font-size: clamp(3.6rem, 5.6vw, 6.4rem);
+    font-size: clamp(2.8rem, 5.6vw, 6rem);
 }
 
 .kg-signup-card.kg-width-full.kg-layout-split h2.kg-signup-card-heading {
-    font-size: clamp(3.2rem, 4vw, 5.6rem);
-}
-
-.kg-signup-card.kg-width-full.kg-layout-split.kg-content-wide h2.kg-signup-card-heading {
-    font-size: clamp(2.8rem, 4vw, 5.2rem);
+    font-size: clamp(2.8rem, 4vw, 4.8rem);
 }
 
 /* Subheading */
@@ -133,33 +129,33 @@
     margin: 0 0 2em;
 }
 
-.kg-signup-card h3.kg-signup-card-subheading {
+.kg-signup-card .kg-signup-card-subheading {
     max-width: 40em;
     margin: 0;
     font-size: clamp(1.05em, 2vw, 2rem);
     font-weight: 500;
-    line-height: 1.4em;
+    line-height: 1.2em;
 }
 
-.kg-signup-card h2 + h3.kg-signup-card-subheading {
+.kg-signup-card h2 + .kg-signup-card-subheading {
     margin: 0.6em 0 0;
 }
 
-.kg-signup-card h3.kg-signup-card-subheading strong {
+.kg-signup-card .kg-signup-card-subheading strong {
     font-weight: 600;
 }
 
-.kg-signup-card.kg-width-wide h3.kg-signup-card-subheading {
-    font-size: clamp(1.05em, 2vw, 2.4rem);
+.kg-signup-card.kg-width-wide .kg-signup-card-subheading {
+    font-size: clamp(1.05em, 2vw, 2.2rem);
 }
 
-.kg-signup-card.kg-width-full h3.kg-signup-card-subheading:not(.kg-layout-split h3.kg-signup-card-subheading) {
+.kg-signup-card.kg-width-full .kg-signup-card-subheading:not(.kg-layout-split .kg-signup-card-subheading) {
     max-width: min(65vmax, 1200px);
-    font-size: clamp(1.05em, 2vw, 2.6rem);
+    font-size: clamp(1.05em, 2vw, 2.4rem);
 }
 
-.kg-signup-card.kg-width-full.kg-layout-split h3.kg-signup-card-subheading {
-    font-size: clamp(1.05em, 2vw, 2.4rem);
+.kg-signup-card.kg-width-full.kg-layout-split .kg-signup-card-subheading {
+    font-size: clamp(1.05em, 2vw, 2.2rem);
 }
 
 /* Subscribe form */
@@ -238,6 +234,7 @@
     text-overflow: ellipsis;
     border-radius: 3px;
     transition: opacity .2s ease;
+    cursor: pointer;
 }
 
 .kg-signup-card-button.kg-style-accent {
@@ -245,7 +242,7 @@
 }
 
 .kg-signup-card h2 + .kg-signup-card-button,
-.kg-signup-card h3 + .kg-signup-card-button {
+.kg-signup-card p + .kg-signup-card-button {
     margin: 1.5em 0 0;
 }
 
@@ -258,7 +255,7 @@
 }
 
 .kg-signup-card.kg-width-wide h2 + .kg-signup-card-button,
-.kg-signup-card.kg-width-wide h3 + .kg-signup-card-button {
+.kg-signup-card.kg-width-wide p + .kg-signup-card-button {
     margin-top: 1.75em;
 }
 
@@ -267,7 +264,7 @@
 }
 
 .kg-signup-card.kg-width-full h2 + .kg-signup-card-button,
-.kg-signup-card.kg-width-full h3 + .kg-signup-card-button {
+.kg-signup-card.kg-width-full p + .kg-signup-card-button {
     margin-top: 2em;
 }
 
@@ -347,7 +344,7 @@
         padding: min(9.6vmax, 180px) 0;
     }
 
-    .kg-signup-card.kg-width-full h3.kg-signup-card-subheading:not(.kg-layout-split h3.kg-signup-card-subheading) {
+    .kg-signup-card.kg-width-full .kg-signup-card-subheading:not(.kg-layout-split .kg-signup-card-subheading) {
         max-width: unset;
     }
 

package/core/server/api/endpoints/recommendations-public.js

@@ -17,5 +17,47 @@ module.exports = {
         async query(frame) {
             return await recommendations.controller.listRecommendations(frame);
         }
+    },
+
+    trackClicked: {
+        headers: {
+            cacheInvalidate: false
+        },
+        options: [
+            'id'
+        ],
+        validation: {
+            options: {
+                id: {
+                    required: true
+                }
+            }
+        },
+        permissions: true,
+        statusCode: 204,
+        async query(frame) {
+            await recommendations.controller.trackClicked(frame);
+        }
+    },
+
+    trackSubscribed: {
+        headers: {
+            cacheInvalidate: false
+        },
+        options: [
+            'id'
+        ],
+        validation: {
+            options: {
+                id: {
+                    required: true
+                }
+            }
+        },
+        permissions: true,
+        statusCode: 204,
+        async query(frame) {
+            await recommendations.controller.trackSubscribed(frame);
+        }
     }
 };

package/core/server/api/endpoints/recommendations.js

@@ -9,7 +9,8 @@ module.exports = {
         },
         options: [
             'limit',
-            'page'
+            'page',
+            'include'
         ],
         permissions: true,
         validation: {},

package/core/server/api/endpoints/utils/serializers/output/members.js

@@ -1,4 +1,5 @@
 //@ts-check
+const _ = require('lodash');
 const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:output:members');
 const {unparse} = require('@tryghost/members-csv');
 const mappers = require('./mappers');
@@ -113,6 +114,26 @@ function serializeAttribution(attribution) {
     };
 }
 
+function serializeNewsletter(newsletter) {
+    const newsletterFields = [
+        'id',
+        'name',
+        'description',
+        'status'
+    ];
+
+    return _.pick(newsletter, newsletterFields);
+}
+
+function serializeNewsletters(newsletters) {
+    return newsletters
+        .filter(newsletter => newsletter.status === 'active')
+        .sort((a, b) => {
+            return a.sort_order - b.sort_order;
+        })
+        .map(newsletter => serializeNewsletter(newsletter));
+}
+
 /**
  * @param {import('bookshelf').Model} member
  * @param {object} options
@@ -174,11 +195,7 @@ function serializeMember(member, options) {
     serialized.email_suppression = json.email_suppression;
 
     if (json.newsletters) {
-        serialized.newsletters = json.newsletters
-            .filter(newsletter => newsletter.status === 'active')
-            .sort((a, b) => {
-                return a.sort_order - b.sort_order;
-            });
+        serialized.newsletters = serializeNewsletters(json.newsletters);
     }
     // override the `subscribed` param to mean "subscribed to any active newsletter"
     serialized.subscribed = false;

package/core/server/data/exporter/table-lists.js

@@ -51,7 +51,9 @@ const BACKUP_TABLES = [
     'milestones',
     'collections',
     'collections_posts',
-    'recommendations'
+    'recommendations',
+    'recommendation_click_events',
+    'recommendation_subscribe_events'
 ];
 
 // NOTE: exposing only tables which are going to be included in a "default" export file

package/core/server/data/migrations/versions/5.63/2023-09-12-11-22-10-add-recommendation-click-events-table.js

@@ -0,0 +1,8 @@
+const {addTable} = require('../../utils');
+
+module.exports = addTable('recommendation_click_events', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    recommendation_id: {type: 'string', maxlength: 24, nullable: false, references: 'recommendations.id', unique: false, cascadeDelete: true},
+    member_id: {type: 'string', maxlength: 24, nullable: true, references: 'members.id', unique: false, setNullDelete: true},
+    created_at: {type: 'dateTime', nullable: false}
+});

package/core/server/data/migrations/versions/5.63/2023-09-12-11-22-11-add-recommendation-subscribe-events-table.js

@@ -0,0 +1,8 @@
+const {addTable} = require('../../utils');
+
+module.exports = addTable('recommendation_subscribe_events', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    recommendation_id: {type: 'string', maxlength: 24, nullable: false, references: 'recommendations.id', unique: false, cascadeDelete: true},
+    member_id: {type: 'string', maxlength: 24, nullable: true, references: 'members.id', unique: false, setNullDelete: true},
+    created_at: {type: 'dateTime', nullable: false}
+});