ghost 5.19.1 → 5.19.2

package/core/built/admin/assets/{chunk.143.af6972210ca7d2bfdcff.js → chunk.143.8078863bc263cc4f6733.js}

@@ -9,8 +9,8 @@ return Array.isArray(e.tiers)&&(s=e.tiers.map((e=>e.name)).join(",")),{id:e.id,e
 return s.unparse(t,{columns:r})}},96616:(e,r,t)=>{var n={"./af":21516,"./af.js":21516,"./ar":14874,"./ar-dz":83760,"./ar-dz.js":83760,"./ar-kw":73410,"./ar-kw.js":73410,"./ar-ly":27521,"./ar-ly.js":27521,"./ar-ma":54215,"./ar-ma.js":54215,"./ar-sa":67839,"./ar-sa.js":67839,"./ar-tn":15676,"./ar-tn.js":15676,"./ar.js":14874,"./az":90189,"./az.js":90189,"./be":97510,"./be.js":97510,"./bg":49715,"./bg.js":49715,"./bm":53263,"./bm.js":53263,"./bn":86751,"./bn.js":86751,"./bo":22257,"./bo.js":22257,"./br":66699,"./br.js":66699,"./bs":46338,"./bs.js":46338,"./ca":75498,"./ca.js":75498,"./cs":36471,"./cs.js":36471,"./cv":12500,"./cv.js":12500,"./cy":621,"./cy.js":621,"./da":82493,"./da.js":82493,"./de":56272,"./de-at":70500,"./de-at.js":70500,"./de-ch":71393,"./de-ch.js":71393,"./de.js":56272,"./dv":90967,"./dv.js":90967,"./el":85716,"./el.js":85716,"./en-SG":72902,"./en-SG.js":72902,"./en-au":32645,"./en-au.js":32645,"./en-ca":10280,"./en-ca.js":10280,"./en-gb":31961,"./en-gb.js":31961,"./en-ie":19065,"./en-ie.js":19065,"./en-il":5628,"./en-il.js":5628,"./en-nz":81286,"./en-nz.js":81286,"./eo":37600,"./eo.js":37600,"./es":62109,"./es-do":94611,"./es-do.js":94611,"./es-us":86896,"./es-us.js":86896,"./es.js":62109,"./et":2962,"./et.js":2962,"./eu":30384,"./eu.js":30384,"./fa":35676,"./fa.js":35676,"./fi":18080,"./fi.js":18080,"./fo":99493,"./fo.js":99493,"./fr":59714,"./fr-ca":29035,"./fr-ca.js":29035,"./fr-ch":47594,"./fr-ch.js":47594,"./fr.js":59714,"./fy":10798,"./fy.js":10798,"./ga":62396,"./ga.js":62396,"./gd":95213,"./gd.js":95213,"./gl":85410,"./gl.js":85410,"./gom-latn":88448,"./gom-latn.js":88448,"./gu":97920,"./gu.js":97920,"./he":21797,"./he.js":21797,"./hi":35546,"./hi.js":35546,"./hr":17034,"./hr.js":17034,"./hu":80081,"./hu.js":80081,"./hy-am":2143,"./hy-am.js":2143,"./id":84909,"./id.js":84909,"./is":8002,"./is.js":8002,"./it":59658,"./it-ch":19126,"./it-ch.js":19126,"./it.js":59658,"./ja":47e3,"./ja.js":47e3,"./jv":97205,"./jv.js":97205,"./ka":31706,"./ka.js":31706,"./kk":34894,"./kk.js":34894,"./km":34679,"./km.js":34679,"./kn":89203,"./kn.js":89203,"./ko":87538,"./ko.js":87538,"./ku":62808,"./ku.js":62808,"./ky":95378,"./ky.js":95378,"./lb":12396,"./lb.js":12396,"./lo":90732,"./lo.js":90732,"./lt":59313,"./lt.js":59313,"./lv":8909,"./lv.js":8909,"./me":75539,"./me.js":75539,"./mi":7384,"./mi.js":7384,"./mk":75114,"./mk.js":75114,"./ml":12586,"./ml.js":12586,"./mn":66423,"./mn.js":66423,"./mr":27128,"./mr.js":27128,"./ms":45547,"./ms-my":38106,"./ms-my.js":38106,"./ms.js":45547,"./mt":20114,"./mt.js":20114,"./my":11573,"./my.js":11573,"./nb":49022,"./nb.js":49022,"./ne":88212,"./ne.js":88212,"./nl":47862,"./nl-be":19116,"./nl-be.js":19116,"./nl.js":47862,"./nn":34010,"./nn.js":34010,"./pa-in":80815,"./pa-in.js":80815,"./pl":18099,"./pl.js":18099,"./pt":14527,"./pt-br":81180,"./pt-br.js":81180,"./pt.js":14527,"./ro":74683,"./ro.js":74683,"./ru":41760,"./ru.js":41760,"./sd":79717,"./sd.js":79717,"./se":84167,"./se.js":84167,"./si":72568,"./si.js":72568,"./sk":13702,"./sk.js":13702,"./sl":49968,"./sl.js":49968,"./sq":77303,"./sq.js":77303,"./sr":4993,"./sr-cyrl":98961,"./sr-cyrl.js":98961,"./sr.js":4993,"./ss":6870,"./ss.js":6870,"./sv":92034,"./sv.js":92034,"./sw":51481,"./sw.js":51481,"./ta":208,"./ta.js":208,"./te":36006,"./te.js":36006,"./tet":68816,"./tet.js":68816,"./tg":77378,"./tg.js":77378,"./th":69125,"./th.js":69125,"./tl-ph":43406,"./tl-ph.js":43406,"./tlh":53361,"./tlh.js":53361,"./tr":84119,"./tr.js":84119,"./tzl":47778,"./tzl.js":47778,"./tzm":12617,"./tzm-latn":97187,"./tzm-latn.js":97187,"./tzm.js":12617,"./ug-cn":10438,"./ug-cn.js":10438,"./uk":38128,"./uk.js":38128,"./ur":15367,"./ur.js":15367,"./uz":51582,"./uz-latn":70009,"./uz-latn.js":70009,"./uz.js":51582,"./vi":49036,"./vi.js":49036,"./x-pseudo":11950,"./x-pseudo.js":11950,"./yo":48249,"./yo.js":48249,"./zh-cn":39512,"./zh-cn.js":39512,"./zh-hk":74792,"./zh-hk.js":74792,"./zh-tw":23931,"./zh-tw.js":23931}
 function s(e){var r=o(e)
 return t(r)}function o(e){if(!t.o(n,e)){var r=new Error("Cannot find module '"+e+"'")
-throw r.code="MODULE_NOT_FOUND",r}return n[e]}s.keys=function(){return Object.keys(n)},s.resolve=o,e.exports=s,s.id=96616},96601:(e,r,t)=>{var n,s
-e.exports=(n=_eai_d,s=_eai_r,window.emberAutoImportDynamic=function(e){return 1===arguments.length?s("_eai_dyn_"+e):s("_eai_dynt_"+e)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(e){return s("_eai_sync_"+e)(Array.prototype.slice.call(arguments,1))},n("@joeattardi/emoji-button",[],(function(){return t(28936)})),n("@sentry/browser",[],(function(){return t(85568)})),n("@sentry/utils",[],(function(){return t(59517)})),n("@tryghost/color-utils",[],(function(){return t(82485)})),n("@tryghost/helpers",[],(function(){return t(74752)})),n("@tryghost/kg-clean-basic-html",[],(function(){return t(89096)})),n("@tryghost/kg-parser-plugins",[],(function(){return t(3199)})),n("@tryghost/kg-parser-plugins/lib/cards/softReturn",[],(function(){return t(74557)})),n("@tryghost/limit-service",[],(function(){return t(12336)})),n("@tryghost/members-csv/lib/unparse",[],(function(){return t(91883)})),n("@tryghost/nql-lang",[],(function(){return t(75420)})),n("@tryghost/string",[],(function(){return t(57348)})),n("@tryghost/timezone-data",[],(function(){return t(28961)})),n("element-resize-detector",[],(function(){return t(87381)})),n("ember-css-transitions/modifiers/css-transition.js",[],(function(){return t(56112)})),n("ember-keyboard",[],(function(){return t(86771)})),n("ember-keyboard/helpers/if-key.js",[],(function(){return t(43481)})),n("ember-keyboard/helpers/on-key.js",[],(function(){return t(66415)})),n("ember-keyboard/modifiers/on-key.js",[],(function(){return t(4146)})),n("ember-keyboard/services/keyboard.js",[],(function(){return t(35466)})),n("ember-moment/helpers/-base.js",[],(function(){return t(76465)})),n("ember-moment/helpers/is-after.js",[],(function(){return t(876)})),n("ember-moment/helpers/is-before.js",[],(function(){return t(13971)})),n("ember-moment/helpers/is-between.js",[],(function(){return t(2063)})),n("ember-moment/helpers/is-same-or-after.js",[],(function(){return t(12915)})),n("ember-moment/helpers/is-same-or-before.js",[],(function(){return t(46102)})),n("ember-moment/helpers/is-same.js",[],(function(){return t(71465)})),n("ember-moment/helpers/moment-add.js",[],(function(){return t(64462)})),n("ember-moment/helpers/moment-calendar.js",[],(function(){return t(69021)})),n("ember-moment/helpers/moment-diff.js",[],(function(){return t(95198)})),n("ember-moment/helpers/moment-duration.js",[],(function(){return t(17216)})),n("ember-moment/helpers/moment-format.js",[],(function(){return t(99152)})),n("ember-moment/helpers/moment-from-now.js",[],(function(){return t(16396)})),n("ember-moment/helpers/moment-from.js",[],(function(){return t(48478)})),n("ember-moment/helpers/moment-subtract.js",[],(function(){return t(4647)})),n("ember-moment/helpers/moment-to-date.js",[],(function(){return t(18351)})),n("ember-moment/helpers/moment-to-now.js",[],(function(){return t(94612)})),n("ember-moment/helpers/moment-to.js",[],(function(){return t(91857)})),n("ember-moment/helpers/moment.js",[],(function(){return t(26852)})),n("ember-moment/helpers/now.js",[],(function(){return t(67842)})),n("ember-moment/helpers/unix.js",[],(function(){return t(29700)})),n("ember-moment/helpers/utc.js",[],(function(){return t(71755)})),n("ember-moment/services/moment.js",[],(function(){return t(27475)})),n("fast-deep-equal",[],(function(){return t(64710)})),n("focus-trap",[],(function(){return t(10755)})),n("intersection-observer-admin",[],(function(){return t(77577)})),n("markdown-it",[],(function(){return t(77647)})),n("markdown-it-footnote",[],(function(){return t(41297)})),n("markdown-it-lazy-headers",[],(function(){return t(72553)})),n("markdown-it-mark",[],(function(){return t(76519)})),n("markdown-it-sub",[],(function(){return t(8830)})),n("markdown-it-sup",[],(function(){return t(55977)})),n("moment-timezone",[],(function(){return t(19127)})),n("papaparse",[],(function(){return t(99112)})),n("raf-pool",[],(function(){return t(42586)})),n("react",[],(function(){return t(36058)})),n("react-dom",[],(function(){return t(18971)})),n("react-dom/client",[],(function(){return t(79793)})),n("tooltip.js",[],(function(){return t(15028)})),n("validator",[],(function(){return t(2228)})),void n("_eai_dyn_@sentry/tracing",[],(function(){return t.e(174).then(t.bind(t,43174))})))},37974:function(e,r){window._eai_r=require,window._eai_d=define},25831:e=>{"use strict"
+throw r.code="MODULE_NOT_FOUND",r}return n[e]}s.keys=function(){return Object.keys(n)},s.resolve=o,e.exports=s,s.id=96616},83515:(e,r,t)=>{var n,s
+e.exports=(n=_eai_d,s=_eai_r,window.emberAutoImportDynamic=function(e){return 1===arguments.length?s("_eai_dyn_"+e):s("_eai_dynt_"+e)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(e){return s("_eai_sync_"+e)(Array.prototype.slice.call(arguments,1))},n("@joeattardi/emoji-button",[],(function(){return t(28936)})),n("@sentry/browser",[],(function(){return t(85568)})),n("@sentry/utils",[],(function(){return t(59517)})),n("@tryghost/color-utils",[],(function(){return t(82485)})),n("@tryghost/helpers",[],(function(){return t(74752)})),n("@tryghost/kg-clean-basic-html",[],(function(){return t(89096)})),n("@tryghost/kg-parser-plugins",[],(function(){return t(3199)})),n("@tryghost/kg-parser-plugins/lib/cards/softReturn",[],(function(){return t(74557)})),n("@tryghost/limit-service",[],(function(){return t(12336)})),n("@tryghost/members-csv/lib/unparse",[],(function(){return t(91883)})),n("@tryghost/nql-lang",[],(function(){return t(75420)})),n("@tryghost/string",[],(function(){return t(57348)})),n("@tryghost/timezone-data",[],(function(){return t(28961)})),n("element-resize-detector",[],(function(){return t(87381)})),n("ember-css-transitions/modifiers/css-transition.js",[],(function(){return t(56112)})),n("ember-keyboard",[],(function(){return t(86771)})),n("ember-keyboard/helpers/if-key.js",[],(function(){return t(43481)})),n("ember-keyboard/helpers/on-key.js",[],(function(){return t(66415)})),n("ember-keyboard/modifiers/on-key.js",[],(function(){return t(4146)})),n("ember-keyboard/services/keyboard.js",[],(function(){return t(35466)})),n("ember-moment/helpers/-base.js",[],(function(){return t(76465)})),n("ember-moment/helpers/is-after.js",[],(function(){return t(876)})),n("ember-moment/helpers/is-before.js",[],(function(){return t(13971)})),n("ember-moment/helpers/is-between.js",[],(function(){return t(2063)})),n("ember-moment/helpers/is-same-or-after.js",[],(function(){return t(12915)})),n("ember-moment/helpers/is-same-or-before.js",[],(function(){return t(46102)})),n("ember-moment/helpers/is-same.js",[],(function(){return t(71465)})),n("ember-moment/helpers/moment-add.js",[],(function(){return t(64462)})),n("ember-moment/helpers/moment-calendar.js",[],(function(){return t(69021)})),n("ember-moment/helpers/moment-diff.js",[],(function(){return t(95198)})),n("ember-moment/helpers/moment-duration.js",[],(function(){return t(17216)})),n("ember-moment/helpers/moment-format.js",[],(function(){return t(99152)})),n("ember-moment/helpers/moment-from-now.js",[],(function(){return t(16396)})),n("ember-moment/helpers/moment-from.js",[],(function(){return t(48478)})),n("ember-moment/helpers/moment-subtract.js",[],(function(){return t(4647)})),n("ember-moment/helpers/moment-to-date.js",[],(function(){return t(18351)})),n("ember-moment/helpers/moment-to-now.js",[],(function(){return t(94612)})),n("ember-moment/helpers/moment-to.js",[],(function(){return t(91857)})),n("ember-moment/helpers/moment.js",[],(function(){return t(26852)})),n("ember-moment/helpers/now.js",[],(function(){return t(67842)})),n("ember-moment/helpers/unix.js",[],(function(){return t(29700)})),n("ember-moment/helpers/utc.js",[],(function(){return t(71755)})),n("ember-moment/services/moment.js",[],(function(){return t(27475)})),n("fast-deep-equal",[],(function(){return t(64710)})),n("focus-trap",[],(function(){return t(10755)})),n("intersection-observer-admin",[],(function(){return t(77577)})),n("markdown-it",[],(function(){return t(77647)})),n("markdown-it-footnote",[],(function(){return t(41297)})),n("markdown-it-lazy-headers",[],(function(){return t(72553)})),n("markdown-it-mark",[],(function(){return t(76519)})),n("markdown-it-sub",[],(function(){return t(8830)})),n("markdown-it-sup",[],(function(){return t(55977)})),n("moment-timezone",[],(function(){return t(19127)})),n("papaparse",[],(function(){return t(99112)})),n("raf-pool",[],(function(){return t(42586)})),n("react",[],(function(){return t(36058)})),n("react-dom",[],(function(){return t(18971)})),n("react-dom/client",[],(function(){return t(79793)})),n("tooltip.js",[],(function(){return t(15028)})),n("validator",[],(function(){return t(2228)})),void n("_eai_dyn_@sentry/tracing",[],(function(){return t.e(174).then(t.bind(t,43174))})))},59678:function(e,r){window._eai_r=require,window._eai_d=define},25831:e=>{"use strict"
 e.exports=require("ember-modifier")},11975:()=>{}},s={}
 function o(e){var r=s[e]
 if(void 0!==r)return r.exports
@@ -42,8 +42,8 @@ var r=(r,t)=>{var n,s,[i,u,a]=t,m=0
 if(i.some((r=>0!==e[r]))){for(n in u)o.o(u,n)&&(o.m[n]=u[n])
 if(a)var l=a(o)}for(r&&r(t);m<i.length;m++)s=i[m],o.o(e,s)&&e[s]&&e[s][0](),e[s]=0
 return o.O(l)},t=globalThis.webpackChunk_ember_auto_import_=globalThis.webpackChunk_ember_auto_import_||[]
-t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),o.O(void 0,[613],(()=>o(o.s=37974)))
-var i=o.O(void 0,[613],(()=>o(o.s=96601)))
+t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),o.O(void 0,[613],(()=>o(o.s=59678)))
+var i=o.O(void 0,[613],(()=>o(o.s=83515)))
 i=o.O(i),__ember_auto_import__=i})()
 
-//# sourceMappingURL=chunk.143.af6972210ca7d2bfdcff.map
+//# sourceMappingURL=chunk.143.8078863bc263cc4f6733.map

package/core/built/admin/assets/{chunk.178.6f68a314b66338b41c62.js → chunk.178.9fefc93ddb2cc6df6d29.js}

@@ -1,11 +1,11 @@
-var __ember_auto_import__;(()=>{var r={37974:function(r,e){window._eai_r=require,window._eai_d=define},40555:r=>{r.exports=function(){_eai_d
+var __ember_auto_import__;(()=>{var r={59678:function(r,e){window._eai_r=require,window._eai_d=define},63192:r=>{r.exports=function(){_eai_d
 var r=_eai_r
 window.emberAutoImportDynamic=function(e){return 1===arguments.length?r("_eai_dyn_"+e):r("_eai_dynt_"+e)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(e){return r("_eai_sync_"+e)(Array.prototype.slice.call(arguments,1))}}()}},e={}
 function t(_){var o=e[_]
 if(void 0!==o)return o.exports
 var i=e[_]={exports:{}}
-return r[_].call(i.exports,i,i.exports,t),i.exports}t(37974)
-var _=t(40555)
+return r[_].call(i.exports,i,i.exports,t),i.exports}t(59678)
+var _=t(63192)
 __ember_auto_import__=_})()
 
-//# sourceMappingURL=chunk.178.6f68a314b66338b41c62.map
+//# sourceMappingURL=chunk.178.9fefc93ddb2cc6df6d29.map

package/core/built/admin/index.html

@@ -58,7 +58,7 @@
 
     <script src="assets/vendor-5c7d7063620bec13668c4370145cd4b4.js"></script>
 <script src="assets/chunk.613.f1d519ad47e7f9024263.js"></script>
-<script src="assets/chunk.143.af6972210ca7d2bfdcff.js"></script>
+<script src="assets/chunk.143.8078863bc263cc4f6733.js"></script>
     <script src="assets/ghost-5ce6f5a730c83c91fc258b12c537ea35.js"></script>
 </body>
 </html>

package/core/server/api/endpoints/utils/serializers/output/mappers/emails.js

@@ -8,7 +8,7 @@ module.exports = (model, frame) => {
     const replacements = mega.postEmailSerializer.parseReplacements(jsonModel);
     replacements.forEach((replacement) => {
         jsonModel[replacement.format] = jsonModel[replacement.format].replace(
-            replacement.match,
+            replacement.regexp,
             replacement.fallback || ''
         );
     });

package/core/server/services/bulk-email/bulk-email-processor.js

@@ -11,7 +11,6 @@ const debug = require('@tryghost/debug')('mega');
 const postEmailSerializer = require('../mega/post-email-serializer');
 const configService = require('../../../shared/config');
 const settingsCache = require('../../../shared/settings-cache');
-const labs = require('../../../shared/labs');
 
 const messages = {
     error: 'The email service received an error from mailgun and was unable to send.'
@@ -223,6 +222,10 @@ module.exports = {
         const startTime = Date.now();
         debug(`sending message to ${recipients.length} recipients`);
 
+        // Update email content for this segment before searching replacements
+        emailData = postEmailSerializer.renderEmailForSegment(emailData, memberSegment);
+
+        // Check all the used replacements in this email
         const replacements = postEmailSerializer.parseReplacements(emailData);
 
         // collate static and dynamic data for each recipient ready for provider
@@ -235,11 +238,6 @@ module.exports = {
                 unsubscribe_url: postEmailSerializer.createUnsubscribeUrl(recipient.member_uuid, {newsletterUuid})
             };
 
-            if (labs.isSet('audienceFeedback')) {
-                // create unique urls for every recipient (for example, for feedback buttons)
-                emailData = postEmailSerializer.createUserLinks(emailData, recipient.member_uuid);
-            }
-
             // computed properties on recipients - TODO: better way of handling these
             recipient.member_first_name = (recipient.member_name || '').split(' ')[0];
 
@@ -251,8 +249,6 @@ module.exports = {
             recipientData[recipient.member_email] = data;
         });
 
-        emailData = postEmailSerializer.renderEmailForSegment(emailData, memberSegment);
-
         try {
             const response = await mailgunClient.send(emailData, recipientData, replacements);
             debug(`sent message (${Date.now() - startTime}ms)`);

package/core/server/services/mega/email-preview.js

@@ -32,7 +32,7 @@ class EmailPreview {
 
         replacements.forEach((replacement) => {
             emailContent[replacement.format] = emailContent[replacement.format].replace(
-                replacement.match,
+                replacement.regexp,
                 replacement.fallback || ''
             );
         });

package/core/server/services/mega/post-email-serializer.js

@@ -17,6 +17,7 @@ const linkReplacer = require('@tryghost/link-replacer');
 const linkTracking = require('../link-tracking');
 const memberAttribution = require('../member-attribution');
 const feedbackButtons = require('./feedback-buttons');
+const labs = require('../../../shared/labs');
 
 const ALLOWED_REPLACEMENTS = ['first_name', 'uuid'];
 
@@ -109,20 +110,16 @@ const PostEmailSerializer = {
     },
 
     /**
-     * createUserLinks
+     * replaceFeedbackLinks
      *
-     * Generate personalised links for each user
+     * Replace the button template links with real links
      *
-     * @param {string} memberUuid member uuid
-     * @param {Object} email
+     * @param {string} html
+     * @param {string} postId (will be url encoded)
+     * @param {string} memberUuid member uuid to use in the URL (will be url encoded)
      */
-    createUserLinks(email, memberUuid) {
-        const result = {...email};
-
-        result.html = feedbackButtons.generateLinks(result.post.id, memberUuid, result.html);
-        result.plaintext = htmlToPlaintext.email(result.html);
-
-        return result;
+    replaceFeedbackLinks(html, postId, memberUuid) {
+        return feedbackButtons.generateLinks(postId, memberUuid, html);
     },
 
     // NOTE: serialization is needed to make sure we do post transformations such as image URL transformation from relative to absolute
@@ -181,12 +178,21 @@ const PostEmailSerializer = {
         const EMAIL_REPLACEMENT_REGEX = /%%(\{.*?\})%%/g;
         const REPLACEMENT_STRING_REGEX = /\{(?<recipientProperty>\w*?)(?:,? *(?:"|&quot;)(?<fallback>.*?)(?:"|&quot;))?\}/;
 
+        function escapeRegExp(string) {
+            return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        }
+
         const replacements = [];
 
         ['html', 'plaintext'].forEach((format) => {
             let result;
             while ((result = EMAIL_REPLACEMENT_REGEX.exec(email[format])) !== null) {
                 const [replacementMatch, replacementStr] = result;
+
+                // Did we already found this match and added it to the replacements array?
+                if (replacements.find(r => r.match === replacementMatch && r.format === format)) {
+                    continue;
+                }
                 const match = replacementStr.match(REPLACEMENT_STRING_REGEX);
 
                 if (match) {
@@ -199,6 +205,7 @@ const PostEmailSerializer = {
                             format,
                             id,
                             match: replacementMatch,
+                            regexp: new RegExp(escapeRegExp(replacementMatch), 'g'),
                             recipientProperty: `member_${recipientProperty}`,
                             fallback
                         });
@@ -395,6 +402,14 @@ const PostEmailSerializer = {
             });
         }
 
+        // Add buttons
+        if (labs.isSet('audienceFeedback')) {
+            // create unique urls for every recipient (for example, for feedback buttons)
+            // Note, we need to use a different member uuid in the links because `%%{uuid}%%` would get escaped by the URL object when set as a search param
+            const urlSafeToken = '--' + new Date().getTime() + 'url-safe-uuid--';
+            result.html = this.replaceFeedbackLinks(result.html, post.id, urlSafeToken).replace(new RegExp(urlSafeToken, 'g'), '%%{uuid}%%');
+        }
+
         // Clean up any unknown replacements strings to get our final content
         const {html, plaintext} = this.normalizeReplacementStrings(result);
         const data = {
@@ -520,7 +535,6 @@ module.exports = {
     serialize: PostEmailSerializer.serialize.bind(PostEmailSerializer),
     createUnsubscribeUrl: PostEmailSerializer.createUnsubscribeUrl.bind(PostEmailSerializer),
     createPostSignupUrl: PostEmailSerializer.createPostSignupUrl.bind(PostEmailSerializer),
-    createUserLinks: PostEmailSerializer.createUserLinks.bind(PostEmailSerializer),
     renderEmailForSegment: PostEmailSerializer.renderEmailForSegment.bind(PostEmailSerializer),
     parseReplacements: PostEmailSerializer.parseReplacements.bind(PostEmailSerializer),
     // Export for tests

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "5.19.1",
+  "version": "5.19.2",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -54,77 +54,77 @@
   "dependencies": {
     "@sentry/node": "7.15.0",
     "@tryghost/adapter-base-cache": "0.1.2",
-    "@tryghost/adapter-manager": "file:components/tryghost-adapter-manager-5.19.1.tgz",
+    "@tryghost/adapter-manager": "file:components/tryghost-adapter-manager-5.19.2.tgz",
     "@tryghost/admin-api-schema": "4.2.0",
-    "@tryghost/api-framework": "file:components/tryghost-api-framework-5.19.1.tgz",
-    "@tryghost/api-version-compatibility-service": "file:components/tryghost-api-version-compatibility-service-5.19.1.tgz",
-    "@tryghost/audience-feedback": "file:components/tryghost-audience-feedback-5.19.1.tgz",
+    "@tryghost/api-framework": "file:components/tryghost-api-framework-5.19.2.tgz",
+    "@tryghost/api-version-compatibility-service": "file:components/tryghost-api-version-compatibility-service-5.19.2.tgz",
+    "@tryghost/audience-feedback": "file:components/tryghost-audience-feedback-5.19.2.tgz",
     "@tryghost/bookshelf-plugins": "0.5.4",
-    "@tryghost/bootstrap-socket": "file:components/tryghost-bootstrap-socket-5.19.1.tgz",
+    "@tryghost/bootstrap-socket": "file:components/tryghost-bootstrap-socket-5.19.2.tgz",
     "@tryghost/color-utils": "0.1.21",
     "@tryghost/config-url-helpers": "1.0.3",
-    "@tryghost/constants": "file:components/tryghost-constants-5.19.1.tgz",
-    "@tryghost/custom-theme-settings-service": "file:components/tryghost-custom-theme-settings-service-5.19.1.tgz",
+    "@tryghost/constants": "file:components/tryghost-constants-5.19.2.tgz",
+    "@tryghost/custom-theme-settings-service": "file:components/tryghost-custom-theme-settings-service-5.19.2.tgz",
     "@tryghost/database-info": "0.3.11",
     "@tryghost/debug": "0.1.18",
-    "@tryghost/domain-events": "file:components/tryghost-domain-events-5.19.1.tgz",
-    "@tryghost/email-analytics-provider-mailgun": "file:components/tryghost-email-analytics-provider-mailgun-5.19.1.tgz",
-    "@tryghost/email-analytics-service": "file:components/tryghost-email-analytics-service-5.19.1.tgz",
-    "@tryghost/email-content-generator": "file:components/tryghost-email-content-generator-5.19.1.tgz",
+    "@tryghost/domain-events": "file:components/tryghost-domain-events-5.19.2.tgz",
+    "@tryghost/email-analytics-provider-mailgun": "file:components/tryghost-email-analytics-provider-mailgun-5.19.2.tgz",
+    "@tryghost/email-analytics-service": "file:components/tryghost-email-analytics-service-5.19.2.tgz",
+    "@tryghost/email-content-generator": "file:components/tryghost-email-content-generator-5.19.2.tgz",
     "@tryghost/errors": "1.2.18",
-    "@tryghost/express-dynamic-redirects": "file:components/tryghost-express-dynamic-redirects-5.19.1.tgz",
+    "@tryghost/express-dynamic-redirects": "file:components/tryghost-express-dynamic-redirects-5.19.2.tgz",
     "@tryghost/helpers": "1.1.74",
-    "@tryghost/html-to-plaintext": "file:components/tryghost-html-to-plaintext-5.19.1.tgz",
+    "@tryghost/html-to-plaintext": "file:components/tryghost-html-to-plaintext-5.19.2.tgz",
     "@tryghost/http-cache-utils": "0.1.4",
     "@tryghost/image-transform": "1.2.2",
-    "@tryghost/job-manager": "file:components/tryghost-job-manager-5.19.1.tgz",
+    "@tryghost/job-manager": "file:components/tryghost-job-manager-5.19.2.tgz",
     "@tryghost/kg-card-factory": "3.1.5",
     "@tryghost/kg-default-atoms": "3.1.4",
     "@tryghost/kg-default-cards": "5.18.3",
     "@tryghost/kg-lexical-html-renderer": "0.0.8",
     "@tryghost/kg-mobiledoc-html-renderer": "5.3.7",
     "@tryghost/limit-service": "1.2.3",
-    "@tryghost/link-redirects": "file:components/tryghost-link-redirects-5.19.1.tgz",
-    "@tryghost/link-replacer": "file:components/tryghost-link-replacer-5.19.1.tgz",
-    "@tryghost/link-tracking": "file:components/tryghost-link-tracking-5.19.1.tgz",
+    "@tryghost/link-redirects": "file:components/tryghost-link-redirects-5.19.2.tgz",
+    "@tryghost/link-replacer": "file:components/tryghost-link-replacer-5.19.2.tgz",
+    "@tryghost/link-tracking": "file:components/tryghost-link-tracking-5.19.2.tgz",
     "@tryghost/logging": "2.3.2",
-    "@tryghost/magic-link": "file:components/tryghost-magic-link-5.19.1.tgz",
-    "@tryghost/mailgun-client": "file:components/tryghost-mailgun-client-5.19.1.tgz",
-    "@tryghost/member-attribution": "file:components/tryghost-member-attribution-5.19.1.tgz",
-    "@tryghost/member-events": "file:components/tryghost-member-events-5.19.1.tgz",
-    "@tryghost/members-api": "file:components/tryghost-members-api-5.19.1.tgz",
-    "@tryghost/members-csv": "file:components/tryghost-members-csv-5.19.1.tgz",
-    "@tryghost/members-events-service": "file:components/tryghost-members-events-service-5.19.1.tgz",
-    "@tryghost/members-importer": "file:components/tryghost-members-importer-5.19.1.tgz",
-    "@tryghost/members-offers": "file:components/tryghost-members-offers-5.19.1.tgz",
-    "@tryghost/members-ssr": "file:components/tryghost-members-ssr-5.19.1.tgz",
-    "@tryghost/members-stripe-service": "file:components/tryghost-members-stripe-service-5.19.1.tgz",
+    "@tryghost/magic-link": "file:components/tryghost-magic-link-5.19.2.tgz",
+    "@tryghost/mailgun-client": "file:components/tryghost-mailgun-client-5.19.2.tgz",
+    "@tryghost/member-attribution": "file:components/tryghost-member-attribution-5.19.2.tgz",
+    "@tryghost/member-events": "file:components/tryghost-member-events-5.19.2.tgz",
+    "@tryghost/members-api": "file:components/tryghost-members-api-5.19.2.tgz",
+    "@tryghost/members-csv": "file:components/tryghost-members-csv-5.19.2.tgz",
+    "@tryghost/members-events-service": "file:components/tryghost-members-events-service-5.19.2.tgz",
+    "@tryghost/members-importer": "file:components/tryghost-members-importer-5.19.2.tgz",
+    "@tryghost/members-offers": "file:components/tryghost-members-offers-5.19.2.tgz",
+    "@tryghost/members-ssr": "file:components/tryghost-members-ssr-5.19.2.tgz",
+    "@tryghost/members-stripe-service": "file:components/tryghost-members-stripe-service-5.19.2.tgz",
     "@tryghost/metrics": "1.0.16",
-    "@tryghost/minifier": "file:components/tryghost-minifier-5.19.1.tgz",
-    "@tryghost/mw-api-version-mismatch": "file:components/tryghost-mw-api-version-mismatch-5.19.1.tgz",
-    "@tryghost/mw-cache-control": "file:components/tryghost-mw-cache-control-5.19.1.tgz",
-    "@tryghost/mw-error-handler": "file:components/tryghost-mw-error-handler-5.19.1.tgz",
-    "@tryghost/mw-session-from-token": "file:components/tryghost-mw-session-from-token-5.19.1.tgz",
-    "@tryghost/mw-vhost": "file:components/tryghost-mw-vhost-5.19.1.tgz",
+    "@tryghost/minifier": "file:components/tryghost-minifier-5.19.2.tgz",
+    "@tryghost/mw-api-version-mismatch": "file:components/tryghost-mw-api-version-mismatch-5.19.2.tgz",
+    "@tryghost/mw-cache-control": "file:components/tryghost-mw-cache-control-5.19.2.tgz",
+    "@tryghost/mw-error-handler": "file:components/tryghost-mw-error-handler-5.19.2.tgz",
+    "@tryghost/mw-session-from-token": "file:components/tryghost-mw-session-from-token-5.19.2.tgz",
+    "@tryghost/mw-vhost": "file:components/tryghost-mw-vhost-5.19.2.tgz",
     "@tryghost/nodemailer": "0.3.29",
     "@tryghost/nql": "0.9.2",
-    "@tryghost/oembed-service": "file:components/tryghost-oembed-service-5.19.1.tgz",
-    "@tryghost/package-json": "file:components/tryghost-package-json-5.19.1.tgz",
+    "@tryghost/oembed-service": "file:components/tryghost-oembed-service-5.19.2.tgz",
+    "@tryghost/package-json": "file:components/tryghost-package-json-5.19.2.tgz",
     "@tryghost/pretty-cli": "1.2.31",
     "@tryghost/promise": "0.1.22",
     "@tryghost/request": "0.1.31",
-    "@tryghost/security": "file:components/tryghost-security-5.19.1.tgz",
-    "@tryghost/session-service": "file:components/tryghost-session-service-5.19.1.tgz",
-    "@tryghost/settings-path-manager": "file:components/tryghost-settings-path-manager-5.19.1.tgz",
+    "@tryghost/security": "file:components/tryghost-security-5.19.2.tgz",
+    "@tryghost/session-service": "file:components/tryghost-session-service-5.19.2.tgz",
+    "@tryghost/settings-path-manager": "file:components/tryghost-settings-path-manager-5.19.2.tgz",
     "@tryghost/social-urls": "0.1.33",
-    "@tryghost/staff-service": "file:components/tryghost-staff-service-5.19.1.tgz",
-    "@tryghost/stats-service": "file:components/tryghost-stats-service-5.19.1.tgz",
+    "@tryghost/staff-service": "file:components/tryghost-staff-service-5.19.2.tgz",
+    "@tryghost/stats-service": "file:components/tryghost-stats-service-5.19.2.tgz",
     "@tryghost/string": "0.2.1",
     "@tryghost/tpl": "0.1.18",
-    "@tryghost/update-check-service": "file:components/tryghost-update-check-service-5.19.1.tgz",
+    "@tryghost/update-check-service": "file:components/tryghost-update-check-service-5.19.2.tgz",
     "@tryghost/url-utils": "4.2.0",
     "@tryghost/validator": "0.1.29",
-    "@tryghost/verification-trigger": "file:components/tryghost-verification-trigger-5.19.1.tgz",
+    "@tryghost/verification-trigger": "file:components/tryghost-verification-trigger-5.19.2.tgz",
     "@tryghost/version": "0.1.16",
     "@tryghost/zip": "1.1.29",
     "amperize": "0.6.1",
@@ -217,55 +217,55 @@
     "@tryghost/logging": "2.3.2",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23",
-    "@tryghost/adapter-manager": "file:components/tryghost-adapter-manager-5.19.1.tgz",
-    "@tryghost/api-framework": "file:components/tryghost-api-framework-5.19.1.tgz",
-    "@tryghost/api-version-compatibility-service": "file:components/tryghost-api-version-compatibility-service-5.19.1.tgz",
-    "@tryghost/audience-feedback": "file:components/tryghost-audience-feedback-5.19.1.tgz",
-    "@tryghost/bootstrap-socket": "file:components/tryghost-bootstrap-socket-5.19.1.tgz",
-    "@tryghost/constants": "file:components/tryghost-constants-5.19.1.tgz",
-    "@tryghost/custom-theme-settings-service": "file:components/tryghost-custom-theme-settings-service-5.19.1.tgz",
-    "@tryghost/domain-events": "file:components/tryghost-domain-events-5.19.1.tgz",
-    "@tryghost/email-analytics-provider-mailgun": "file:components/tryghost-email-analytics-provider-mailgun-5.19.1.tgz",
-    "@tryghost/email-analytics-service": "file:components/tryghost-email-analytics-service-5.19.1.tgz",
-    "@tryghost/email-content-generator": "file:components/tryghost-email-content-generator-5.19.1.tgz",
-    "@tryghost/express-dynamic-redirects": "file:components/tryghost-express-dynamic-redirects-5.19.1.tgz",
-    "@tryghost/extract-api-key": "file:components/tryghost-extract-api-key-5.19.1.tgz",
-    "@tryghost/html-to-plaintext": "file:components/tryghost-html-to-plaintext-5.19.1.tgz",
-    "@tryghost/job-manager": "file:components/tryghost-job-manager-5.19.1.tgz",
-    "@tryghost/link-redirects": "file:components/tryghost-link-redirects-5.19.1.tgz",
-    "@tryghost/link-replacer": "file:components/tryghost-link-replacer-5.19.1.tgz",
-    "@tryghost/link-tracking": "file:components/tryghost-link-tracking-5.19.1.tgz",
-    "@tryghost/magic-link": "file:components/tryghost-magic-link-5.19.1.tgz",
-    "@tryghost/mailgun-client": "file:components/tryghost-mailgun-client-5.19.1.tgz",
-    "@tryghost/member-analytics-service": "file:components/tryghost-member-analytics-service-5.19.1.tgz",
-    "@tryghost/member-attribution": "file:components/tryghost-member-attribution-5.19.1.tgz",
-    "@tryghost/member-events": "file:components/tryghost-member-events-5.19.1.tgz",
-    "@tryghost/members-analytics-ingress": "file:components/tryghost-members-analytics-ingress-5.19.1.tgz",
-    "@tryghost/members-api": "file:components/tryghost-members-api-5.19.1.tgz",
-    "@tryghost/members-csv": "file:components/tryghost-members-csv-5.19.1.tgz",
-    "@tryghost/members-events-service": "file:components/tryghost-members-events-service-5.19.1.tgz",
-    "@tryghost/members-importer": "file:components/tryghost-members-importer-5.19.1.tgz",
-    "@tryghost/members-ssr": "file:components/tryghost-members-ssr-5.19.1.tgz",
-    "@tryghost/minifier": "file:components/tryghost-minifier-5.19.1.tgz",
-    "@tryghost/mw-api-version-mismatch": "file:components/tryghost-mw-api-version-mismatch-5.19.1.tgz",
-    "@tryghost/mw-cache-control": "file:components/tryghost-mw-cache-control-5.19.1.tgz",
-    "@tryghost/mw-error-handler": "file:components/tryghost-mw-error-handler-5.19.1.tgz",
-    "@tryghost/mw-session-from-token": "file:components/tryghost-mw-session-from-token-5.19.1.tgz",
-    "@tryghost/mw-update-user-last-seen": "file:components/tryghost-mw-update-user-last-seen-5.19.1.tgz",
-    "@tryghost/mw-vhost": "file:components/tryghost-mw-vhost-5.19.1.tgz",
-    "@tryghost/oembed-service": "file:components/tryghost-oembed-service-5.19.1.tgz",
-    "@tryghost/members-offers": "file:components/tryghost-members-offers-5.19.1.tgz",
-    "@tryghost/package-json": "file:components/tryghost-package-json-5.19.1.tgz",
-    "@tryghost/members-payments": "file:components/tryghost-members-payments-5.19.1.tgz",
-    "@tryghost/referrers": "file:components/tryghost-referrers-5.19.1.tgz",
-    "@tryghost/security": "file:components/tryghost-security-5.19.1.tgz",
-    "@tryghost/session-service": "file:components/tryghost-session-service-5.19.1.tgz",
-    "@tryghost/settings-path-manager": "file:components/tryghost-settings-path-manager-5.19.1.tgz",
-    "@tryghost/staff-service": "file:components/tryghost-staff-service-5.19.1.tgz",
-    "@tryghost/stats-service": "file:components/tryghost-stats-service-5.19.1.tgz",
-    "@tryghost/members-stripe-service": "file:components/tryghost-members-stripe-service-5.19.1.tgz",
-    "@tryghost/update-check-service": "file:components/tryghost-update-check-service-5.19.1.tgz",
-    "@tryghost/verification-trigger": "file:components/tryghost-verification-trigger-5.19.1.tgz",
-    "@tryghost/version-notifications-data-service": "file:components/tryghost-version-notifications-data-service-5.19.1.tgz"
+    "@tryghost/adapter-manager": "file:components/tryghost-adapter-manager-5.19.2.tgz",
+    "@tryghost/api-framework": "file:components/tryghost-api-framework-5.19.2.tgz",
+    "@tryghost/api-version-compatibility-service": "file:components/tryghost-api-version-compatibility-service-5.19.2.tgz",
+    "@tryghost/audience-feedback": "file:components/tryghost-audience-feedback-5.19.2.tgz",
+    "@tryghost/bootstrap-socket": "file:components/tryghost-bootstrap-socket-5.19.2.tgz",
+    "@tryghost/constants": "file:components/tryghost-constants-5.19.2.tgz",
+    "@tryghost/custom-theme-settings-service": "file:components/tryghost-custom-theme-settings-service-5.19.2.tgz",
+    "@tryghost/domain-events": "file:components/tryghost-domain-events-5.19.2.tgz",
+    "@tryghost/email-analytics-provider-mailgun": "file:components/tryghost-email-analytics-provider-mailgun-5.19.2.tgz",
+    "@tryghost/email-analytics-service": "file:components/tryghost-email-analytics-service-5.19.2.tgz",
+    "@tryghost/email-content-generator": "file:components/tryghost-email-content-generator-5.19.2.tgz",
+    "@tryghost/express-dynamic-redirects": "file:components/tryghost-express-dynamic-redirects-5.19.2.tgz",
+    "@tryghost/extract-api-key": "file:components/tryghost-extract-api-key-5.19.2.tgz",
+    "@tryghost/html-to-plaintext": "file:components/tryghost-html-to-plaintext-5.19.2.tgz",
+    "@tryghost/job-manager": "file:components/tryghost-job-manager-5.19.2.tgz",
+    "@tryghost/link-redirects": "file:components/tryghost-link-redirects-5.19.2.tgz",
+    "@tryghost/link-replacer": "file:components/tryghost-link-replacer-5.19.2.tgz",
+    "@tryghost/link-tracking": "file:components/tryghost-link-tracking-5.19.2.tgz",
+    "@tryghost/magic-link": "file:components/tryghost-magic-link-5.19.2.tgz",
+    "@tryghost/mailgun-client": "file:components/tryghost-mailgun-client-5.19.2.tgz",
+    "@tryghost/member-analytics-service": "file:components/tryghost-member-analytics-service-5.19.2.tgz",
+    "@tryghost/member-attribution": "file:components/tryghost-member-attribution-5.19.2.tgz",
+    "@tryghost/member-events": "file:components/tryghost-member-events-5.19.2.tgz",
+    "@tryghost/members-analytics-ingress": "file:components/tryghost-members-analytics-ingress-5.19.2.tgz",
+    "@tryghost/members-api": "file:components/tryghost-members-api-5.19.2.tgz",
+    "@tryghost/members-csv": "file:components/tryghost-members-csv-5.19.2.tgz",
+    "@tryghost/members-events-service": "file:components/tryghost-members-events-service-5.19.2.tgz",
+    "@tryghost/members-importer": "file:components/tryghost-members-importer-5.19.2.tgz",
+    "@tryghost/members-ssr": "file:components/tryghost-members-ssr-5.19.2.tgz",
+    "@tryghost/minifier": "file:components/tryghost-minifier-5.19.2.tgz",
+    "@tryghost/mw-api-version-mismatch": "file:components/tryghost-mw-api-version-mismatch-5.19.2.tgz",
+    "@tryghost/mw-cache-control": "file:components/tryghost-mw-cache-control-5.19.2.tgz",
+    "@tryghost/mw-error-handler": "file:components/tryghost-mw-error-handler-5.19.2.tgz",
+    "@tryghost/mw-session-from-token": "file:components/tryghost-mw-session-from-token-5.19.2.tgz",
+    "@tryghost/mw-update-user-last-seen": "file:components/tryghost-mw-update-user-last-seen-5.19.2.tgz",
+    "@tryghost/mw-vhost": "file:components/tryghost-mw-vhost-5.19.2.tgz",
+    "@tryghost/oembed-service": "file:components/tryghost-oembed-service-5.19.2.tgz",
+    "@tryghost/members-offers": "file:components/tryghost-members-offers-5.19.2.tgz",
+    "@tryghost/package-json": "file:components/tryghost-package-json-5.19.2.tgz",
+    "@tryghost/members-payments": "file:components/tryghost-members-payments-5.19.2.tgz",
+    "@tryghost/referrers": "file:components/tryghost-referrers-5.19.2.tgz",
+    "@tryghost/security": "file:components/tryghost-security-5.19.2.tgz",
+    "@tryghost/session-service": "file:components/tryghost-session-service-5.19.2.tgz",
+    "@tryghost/settings-path-manager": "file:components/tryghost-settings-path-manager-5.19.2.tgz",
+    "@tryghost/staff-service": "file:components/tryghost-staff-service-5.19.2.tgz",
+    "@tryghost/stats-service": "file:components/tryghost-stats-service-5.19.2.tgz",
+    "@tryghost/members-stripe-service": "file:components/tryghost-members-stripe-service-5.19.2.tgz",
+    "@tryghost/update-check-service": "file:components/tryghost-update-check-service-5.19.2.tgz",
+    "@tryghost/verification-trigger": "file:components/tryghost-verification-trigger-5.19.2.tgz",
+    "@tryghost/version-notifications-data-service": "file:components/tryghost-version-notifications-data-service-5.19.2.tgz"
   }
 }