ghost 5.88.3 → 5.89.1

package/core/built/admin/assets/{vendor-051d43ec47258b77ffd2fcc21a6d8c50.js → vendor-35f20b2f9b6201dcd4a00c8acac98aa6.js}

@@ -712,7 +712,7 @@ return{named:new Proxy(c,a),positional:new Proxy([],l)}}:(e,t)=>{var{named:r,pos
 Object.defineProperty(o,n.CUSTOM_TAG_FOR,{configurable:!1,enumerable:!1,value:e=>G(r,e)}),Object.keys(r).forEach((e=>{Object.defineProperty(o,e,{enumerable:!0,configurable:!0,get:()=>(0,u.valueForRef)(r[e])})}))
 var s=[]
 return Object.defineProperty(s,n.CUSTOM_TAG_FOR,{configurable:!1,enumerable:!1,value:e=>Y(i,e)}),i.forEach(((e,t)=>{Object.defineProperty(s,t,{enumerable:!0,configurable:!0,get:()=>(0,u.valueForRef)(e)})})),{named:o,positional:s}}
-function X(e){return(0,d.getValue)(e.argsCache)}class Z{constructor(e,t=(()=>c.EMPTY_ARGS)){var r=(0,d.createCache)((()=>t(e)))
+function X(e){return(0,d.getValue)(e.argsCache)}class Z{constructor(e,t=()=>c.EMPTY_ARGS){var r=(0,d.createCache)((()=>t(e)))
 this.argsCache=r}get named(){return X(this).named||c.EMPTY_NAMED}get positional(){return X(this).positional||c.EMPTY_POSITIONAL}}var ee=(0,s.symbol)("RECOMPUTE_TAG"),te=new b._WeakSet
 function re(e){return te.has(e)}var ne=e.Helper=o.FrameworkObject.extend({init(){this._super(...arguments),this[ee]=(0,d.createTag)()},recompute(){(0,g.join)((()=>(0,d.dirtyTag)(this[ee])))}})
 ne.isHelperFactory=!0
@@ -3085,7 +3085,7 @@ if(void 0!==r&&d(r,n))N(r)
 else{R()
 try{e[F]=t()}finally{r=j(),e[z]=r,e[B]=c(r),N(r)}}return e[F]},e.isConst=function(e){H(e,"isConst")
 var t=e[z]
-return function(e,t){0}(),v(t)},e.isConstTag=v,e.isTracking=function(){return null!==S},e.logTrackingStack=void 0,e.resetTracking=function(){for(;A.length>0;)A.pop()
+return function(){0}(),v(t)},e.isConstTag=v,e.isTracking=function(){return null!==S},e.logTrackingStack=void 0,e.resetTracking=function(){for(;A.length>0;)A.pop()
 S=null,!1},e.setTrackingTransactionEnv=e.runInTrackingTransaction=void 0,e.tagFor=T,e.tagMetaFor=P,e.track=function(e,t){var r
 R(t)
 try{e()}finally{r=j()}return r},e.trackedData=function(e,t){var r=new WeakMap,n="function"==typeof t
@@ -6090,14 +6090,14 @@ Object.keys(r).forEach((n=>{r[n].type&&e.call(t,n,r[n])}))}}function et(e,t,r,n,
 if(void 0===l)throw new Error("adapter.findMany returned undefined, this was very likely a mistake")
 return(l=U(l,t,u)).then((e=>{var n=$(t.serializerFor(r),t,a,e,null,"findMany")
 return t._push(n)}),null,`DS: Extract payload of ${r}`)}function tt(e,t,r,n){var i,o,s=(i=t.data,o=(t,i)=>{var{id:o,type:s}=t
-return function(e,t,r,n,i){var{id:o,type:s}=e
+return function(e,t,r,n){var{id:i,type:o}=e
 e.relationships||(e.relationships={})
-var{relationships:a}=e,l=function(e,t,r,n){return function({_storeWrapper:e},t,r,n){var{name:i}=r,{modelName:o}=t,s=e.inverseForRelationship(o,i)
+var{relationships:s}=e,a=function(e,t,r,n){return function({_storeWrapper:e},t,r,n){var{name:i}=r,{modelName:o}=t,s=e.inverseForRelationship(o,i)
 if(s){var{meta:{kind:a}}=e.relationshipsDefinitionFor(n)[s]
-return{inverseKey:s,kind:a}}}(e,t,r,n)}(r,t,n,s)
-if(l){var{inverseKey:u,kind:c}=l,d=a[u]&&a[u].data
-"hasMany"===c&&void 0===d||(a[u]=a[u]||{},a[u].data=function(e,t,{id:r,modelName:n}){var i,o={id:r,type:n}
-return"hasMany"===t?(i=e||[]).push(o):(i=e||{},Ember.assign(i,o)),i}(d,c,t))}}(t,r,e,n),{id:o,type:s}},Array.isArray(i)?i.map(o):o(i)),a={id:r.id,type:r.modelName,relationships:{[n.key]:{meta:t.meta,links:t.links,data:s}}}
+return{inverseKey:s,kind:a}}}(e,t,r,n)}(r,t,n,o)
+if(a){var{inverseKey:l,kind:u}=a,c=s[l]&&s[l].data
+"hasMany"===u&&void 0===c||(s[l]=s[l]||{},s[l].data=function(e,t,{id:r,modelName:n}){var i,o={id:r,type:n}
+return"hasMany"===t?(i=e||[]).push(o):(i=e||{},Ember.assign(i,o)),i}(c,u,t))}}(t,r,e,n),{id:o,type:s}},Array.isArray(i)?i.map(o):o(i)),a={id:r.id,type:r.modelName,relationships:{[n.key]:{meta:t.meta,links:t.links,data:s}}}
 return Array.isArray(t.included)||(t.included=[]),t.included.push(a),t}function rt(e,t,r,n){var i=t.modelFor(r),o=t.peekAll(r),s=o._createSnapshot(n),a=Ember.RSVP.Promise.resolve().then((()=>e.findAll(t,i,null,s)))
 return(a=U(a,t,"DS: Handle Adapter#findAll of "+i)).then((e=>{var n=$(t.serializerFor(r),t,i,e,null,"findAll")
 return t._push(n),t._didUpdateAll(r),o}),null,"DS: Extract payload of findAll ${modelName}")}var nt,it=a("DEBUG-ts-brand")
@@ -9514,4 +9514,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-1a4f8a4af6641461dc52cf7021eddd2f.map
+//# sourceMappingURL=vendor-bb6b765916d677a72aa5ce778360bb62.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%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.88%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%22eac6431ceb%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%22714b89ba9e%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22452dba3a8c%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22f3467942d6%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.89%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%22eac6431ceb%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%22a9802a6502%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%220ba469b121%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%222f4784ce5f%22%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-0ede59da8efb5e28fa929557f7ff7154.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-cb98187b163a0d8b42d752ab890e039a.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-87438e5801b7bb0f2e3497a68572a529.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-051d43ec47258b77ffd2fcc21a6d8c50.js"></script>
-<script src="assets/chunk.42.0879e40a4de3db25b177.js"></script>
-<script src="assets/chunk.524.4004209e970256976de7.js"></script>
-    <script src="assets/ghost-a9fa385e2a92cc3686349b2dea0249d2.js"></script>
+    <script src="assets/vendor-35f20b2f9b6201dcd4a00c8acac98aa6.js"></script>
+<script src="assets/chunk.42.a0b3ca84230d788d0e11.js"></script>
+<script src="assets/chunk.524.e09e59707739cbab5488.js"></script>
+    <script src="assets/ghost-b5e602d62644bd997ce54c647953f437.js"></script>
 </body>
 </html>

package/core/frontend/meta/blog-logo.js

@@ -11,7 +11,7 @@ function getBlogLogo() {
         // CASE: no publication logo is updated. We can try to use either an uploaded publication icon
         // or use the default one to make
         // Google happy with it. See https://github.com/TryGhost/Ghost/issues/7558
-        logo.url = blogIcon.getIconUrl(true);
+        logo.url = blogIcon.getIconUrl({absolute: true});
     }
 
     return logo;

package/core/frontend/services/rss/renderer.js

@@ -9,7 +9,7 @@ module.exports.render = function render(res, baseUrl, data) {
     return rssCache
         .getXML(baseUrl, rssData)
         .then(function then(feedXml) {
-            res.set('Content-Type', 'text/xml; charset=UTF-8');
+            res.set('Content-Type', 'application/rss+xml; charset=UTF-8');
             res.send(feedXml);
         });
 };

package/core/server/data/migrations/versions/5.89/2024-07-30-19-51-06-backfill-offer-redemptions.js

@@ -0,0 +1,64 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+
+const logging = require('@tryghost/logging');
+const DatabaseInfo = require('@tryghost/database-info');
+const {default: ObjectID} = require('bson-objectid');
+
+// For DML - data changes
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        // Backfill missing offer redemptions
+        try {
+            // Select all subscriptions that have an `offer_id` but don't have a matching row in the `offer_redemptions` table
+            logging.info('Selecting subscriptions with missing offer redemptions');
+            const result = await knex.raw(`
+                SELECT
+                    mscs.id AS subscription_id,
+                    mscs.offer_id,
+                    mscs.start_date AS created_at,
+                    m.id AS member_id
+                FROM
+                    members_stripe_customers_subscriptions mscs
+                        LEFT JOIN
+                    offer_redemptions r ON r.subscription_id = mscs.id
+                        INNER JOIN 
+                    members_stripe_customers msc ON mscs.customer_id = msc.customer_id
+                        INNER JOIN
+                    members m ON msc.member_id = m.id
+                WHERE
+                    mscs.offer_id IS NOT NULL and r.id IS NULL;
+            `);
+
+            // knex.raw() returns a different result depending on the database. We need to handle either case
+            let rows = [];
+            if (DatabaseInfo.isSQLite(knex)) {
+                rows = result;
+            } else {
+                rows = result[0];
+            }
+
+            // Do the backfil
+            if (rows && rows.length > 0) {
+                logging.info(`Backfilling ${rows.length} offer redemptions`);
+                // Generate IDs for each row
+                const offerRedemptions = rows.map((row) => {
+                    return {
+                        id: (new ObjectID()).toHexString(),
+                        ...row
+                    };
+                });
+                // Batch insert rows into the offer_redemptions table
+                await knex.batchInsert('offer_redemptions', offerRedemptions, 1000);
+            } else {
+                logging.info('No offer redemptions to backfill');
+            }
+        } catch (error) {
+            logging.error(`Error backfilling offer redemptions: ${error.message}`);
+        }
+    },
+    async function down() {
+        // We don't want to un-backfill data, so do nothing here.
+    }
+);

package/core/server/lib/image/BlogIcon.js

@@ -98,13 +98,17 @@ class BlogIcon {
     }
 
     /**
-     * Return URL for Blog icon: [subdirectory or not]favicon.[ico, jpeg, or png]
-     * Always returns {string} getIconUrl
-     * @returns {string} [subdirectory or not]favicon.[ico, jpeg, or png]
+     * Return URL for blog icon, if available: [subdirectory or not]favicon.[ico, jpeg, or png]
+     * Otherwise, fallbacks to the default Ghost favicon.ico file, if requested
+     * Otherwise, returns null
+     * @param {Object} [options]
+     * @param {boolean} [options.absolute] - if true, return absolute URL. Default: false
+     * @param {boolean} [options.fallbackToDefault] - if true, fallbacks to Ghost's default favicon.ico when no blog icon is found. Default: true
+     * @returns {string|null} [subdirectory or not]favicon.[ico, jpeg, or png] or null
      * @description Checks if we have a custom uploaded icon and the extension of it. If no custom uploaded icon
      * exists, we're returning the default `favicon.ico`
      */
-    getIconUrl(absolute) {
+    getIconUrl({absolute = false, fallbackToDefault = true} = {}) {
         const blogIcon = this.settingsCache.get('icon');
 
         if (blogIcon) {
@@ -124,9 +128,13 @@ class BlogIcon {
 
             const sizedIcon = blogIcon.replace(/\/content\/images\//, '/content/images/size/w256h256/');
             return this.urlUtils.urlFor({relativeUrl: sizedIcon}, absolute ? true : undefined);
-        } else {
+        }
+
+        if (fallbackToDefault) {
             return this.urlUtils.urlFor({relativeUrl: '/favicon.ico'}, absolute ? true : undefined);
         }
+
+        return null;
     }
 
     /**

package/core/server/services/members/middleware.js

@@ -110,7 +110,7 @@ const authMemberByUuid = async function authMemberByUuid(req, res, next) {
             }
 
             throw new errors.UnauthorizedError({
-                messsage: tpl(messages.missingUuid)
+                message: tpl(messages.missingUuid)
             });
         }
 

package/core/server/services/slack.js

@@ -110,7 +110,7 @@ function ping(post) {
                 // if it is a post or a test message to check webhook working.
                 text: `Notification from *${blogTitle}* :ghost:`,
                 unfurl_links: true,
-                icon_url: blogIcon.getIconUrl(true),
+                icon_url: blogIcon.getIconUrl({absolute: true}),
                 username: slackSettings.username,
                 // We don't want to send attachment if it is a test notification.
                 attachments: [
@@ -141,7 +141,7 @@ function ping(post) {
                             }
                         ],
                         footer: blogTitle,
-                        footer_icon: blogIcon.getIconUrl(true),
+                        footer_icon: blogIcon.getIconUrl({absolute: true}),
                         ts: moment().unix()
                     }
                 ]
@@ -150,7 +150,7 @@ function ping(post) {
             slackData = {
                 text: message,
                 unfurl_links: true,
-                icon_url: blogIcon.getIconUrl(true),
+                icon_url: blogIcon.getIconUrl({absolute: true}),
                 username: slackSettings.username
             };
         }

package/core/server/services/staff/index.js

@@ -17,6 +17,7 @@ class StaffServiceWrapper {
         const mailer = new GhostMailer();
         const settingsCache = require('../../../shared/settings-cache');
         const urlUtils = require('../../../shared/url-utils');
+        const {blogIcon} = require('../../../server/lib/image');
         const settingsHelpers = require('../settings-helpers');
 
         this.api = new StaffService({
@@ -26,6 +27,7 @@ class StaffServiceWrapper {
             settingsHelpers,
             settingsCache,
             urlUtils,
+            blogIcon,
             DomainEvents,
             memberAttributionService: memberAttribution.service,
             labs

package/core/shared/config/env/config.development.json

@@ -1,5 +1,17 @@
 {
     "url": "http://localhost:2368",
+    "mail": {
+        "from": "test@example.com",
+        "transport": "SMTP",
+        "options": {
+            "host": "127.0.0.1",
+            "port": 1025,
+            "auth": {
+                "user": "user",
+                "pass": "unsecure"
+            }
+        }
+    },
     "database": {
         "client": "sqlite3",
         "connection": {