ghost 5.127.0 → 5.127.1

package/core/built/admin/index.html

@@ -6,7 +6,7 @@
     <title>Ghost</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%22editorUrl%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.127%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%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%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%227d866f08ab%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22e88f88275d%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%227521263a1d%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%22cae0cdf6ea%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%22b19a2b4f38%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%22%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%22editorUrl%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.127%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%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%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%2237bd1e3e4d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22e88f88275d%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22b86ef128c6%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%22c196eec61d%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%22c734781f94%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%22%7D" />
 
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1, minimal-ui, viewport-fit=cover" />
     <meta name="pinterest" content="nopin" />
@@ -49,7 +49,7 @@
 
     <script src="assets/vendor-48a1d3c3b32e8a313b8162c4cac00106.js"></script>
 <script src="assets/chunk.383.69412a1ddeb7c0341d15.js"></script>
-<script src="assets/chunk.524.26236112ccb590199030.js"></script>
-    <script src="assets/ghost-f22a17dd4f8592f0bf6ae28d6d454d9b.js"></script>
+<script src="assets/chunk.524.e6b0293eefcd2d23848f.js"></script>
+    <script src="assets/ghost-71ab6cab4367841fc79ac68cd664b0de.js"></script>
 </body>
 </html>

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

@@ -110,36 +110,6 @@ const controller = {
             return await statsService.api.getReferrersHistory();
         }
     },
-    referrersHistoryWithRange: {
-        headers: {
-            cacheInvalidate: false
-        },
-        options: [
-            'date_from',
-            'date_to',
-            'timezone',
-            'member_status'
-        ],
-        permissions: {
-            docName: 'posts',
-            method: 'browse'
-        },
-        cache: statsService.cache,
-        generateCacheKeyData(frame) {
-            return {
-                method: 'referrersHistoryWithRange',
-                options: {
-                    date_from: frame.options.date_from,
-                    date_to: frame.options.date_to,
-                    timezone: frame.options.timezone,
-                    member_status: frame.options.member_status
-                }
-            };
-        },
-        async query(frame) {
-            return await statsService.api.getReferrersHistoryWithRange(frame.options.date_from, frame.options.date_to);
-        }
-    },
     topContent: {
         headers: {
             cacheInvalidate: false
@@ -531,7 +501,47 @@ const controller = {
                 data: [memberCounts]
             };
         }
+    },
+    topSourcesGrowth: {
+        headers: {
+            cacheInvalidate: false
+        },
+        options: [
+            'order',
+            'limit', 
+            'date_from',
+            'date_to',
+            'timezone',
+            'member_status'
+        ],
+        permissions: {
+            docName: 'posts',
+            method: 'browse'
+        },
+        cache: statsService.cache,
+        generateCacheKeyData(frame) {
+            return {
+                method: 'topSourcesGrowth',
+                options: {
+                    order: frame.options.order,
+                    limit: frame.options.limit,
+                    date_from: frame.options.date_from,
+                    date_to: frame.options.date_to,
+                    timezone: frame.options.timezone,
+                    member_status: frame.options.member_status
+                }
+            };
+        },
+        async query(frame) {
+            return await statsService.api.getTopSourcesWithRange(
+                frame.options.date_from, 
+                frame.options.date_to, 
+                frame.options.order || 'free_members desc',
+                frame.options.limit || 50
+            );
+        }
     }
+
 };
 
 module.exports = controller;

package/core/server/services/email-service/email-templates/partials/styles.hbs

@@ -25,11 +25,7 @@ body {
     font-family: -apple-system, BlinkMacSystemFont, Roboto, Helvetica, Arial, sans-serif;
     -webkit-font-smoothing: antialiased;
     font-size: 18px;
-    {{#hasFeature "emailCustomization"}}
     line-height: 0;
-    {{else}}
-    line-height: 1.4;
-    {{/hasFeature}}
     margin: 0;
     padding: 0;
     -ms-text-size-adjust: 100%;
@@ -56,16 +52,12 @@ table td {
 ------------------------------------- */
 .body {
     width: 100%;
-    {{#hasFeature "emailCustomization"}}
     line-height: 1.4;
-    {{/hasFeature}}
     background-color: {{backgroundColor}} !important;
 }
 
 .header {
-    {{#hasFeature "emailCustomization"}}
     line-height: 1.4;
-    {{/hasFeature}}
     {{#if headerBackgroundColor}}
     background-color: {{headerBackgroundColor}};
     {{else}}

package/core/server/services/koenig/node-renderers/call-to-action-renderer.js

@@ -86,7 +86,7 @@ function emailCTATemplate(dataset, options = {}) {
     const isBlackButton = dataset.buttonColor === 'black' || dataset.buttonColor === '#000000' || dataset.buttonColor === '#000';
 
     if (isTransparentCTA && isDarkBackground && isBlackButton) {
-        dataset.buttonColor = 'white';
+        dataset.buttonColor = '#ffffff';
     }
 
     const buttonHtml = renderEmailButton({

package/core/server/services/koenig/render-partials/email-button.js

@@ -78,12 +78,16 @@ function _isColoredOutline({color, style}) {
     return color && color !== 'accent' && style === 'outline';
 }
 
+function _isValidHexColor(color) {
+    return /^#([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$/.test(color);
+}
+
 /**
  * @param {EmailButtonOptions} options
  * @returns {string}
  */
 function _getTextColor({color, style}) {
-    if (_isColoredFill({color, style})) {
+    if (_isColoredFill({color, style}) && _isValidHexColor(color)) {
         return textColorForBackgroundColor(color).hex();
     }