ghost 5.3.0 → 5.4.1

package/core/built/assets/{vendor.min-4076498ccd6c8412365f43b156084ed8.js → vendor.min-be0129c9c6897c9f10425e2402881d77.js}

@@ -12611,20 +12611,21 @@ Object.keys(t).forEach((n=>{e.registerKeyCommand({str:n,run:()=>t[n](e,n)})})),t
 let e=this._calloutTextEditor.post.tailPosition().toRange()
 this._calloutTextEditor.selectRange(e)}_updatePayloadAttr(e,t){let n=this.args.payload
 Ember.set(n,e,t),this.args.saveCard?.(n,!1)}},w=C(_.prototype,"config",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=C(_.prototype,"feature",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=C(_.prototype,"store",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=C(_.prototype,"membersUtils",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=C(_.prototype,"ui",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=C(_.prototype,"isPickerVisible",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),C(_.prototype,"registerElement",[d],Object.getOwnPropertyDescriptor(_.prototype,"registerElement"),_.prototype),C(_.prototype,"setCalloutText",[h],Object.getOwnPropertyDescriptor(_.prototype,"setCalloutText"),_.prototype),C(_.prototype,"setCalloutEmoji",[p],Object.getOwnPropertyDescriptor(_.prototype,"setCalloutEmoji"),_.prototype),C(_.prototype,"setBackgroundColor",[f],Object.getOwnPropertyDescriptor(_.prototype,"setBackgroundColor"),_.prototype),C(_.prototype,"leaveEditMode",[m],Object.getOwnPropertyDescriptor(_.prototype,"leaveEditMode"),_.prototype),C(_.prototype,"focusElement",[g],Object.getOwnPropertyDescriptor(_.prototype,"focusElement"),_.prototype),C(_.prototype,"registerEditor",[b],Object.getOwnPropertyDescriptor(_.prototype,"registerEditor"),_.prototype),C(_.prototype,"changeEmoji",[v],Object.getOwnPropertyDescriptor(_.prototype,"changeEmoji"),_.prototype),C(_.prototype,"toggleEmoji",[y],Object.getOwnPropertyDescriptor(_.prototype,"toggleEmoji"),_.prototype),_)
-e.default=P,Ember._setComponentTemplate(T,P)})),define("koenig-editor/components/koenig-card-code",["exports","@tryghost/helpers"],(function(e,t){"use strict"
-var n,r,i,o,a,s,l,u,c,d,h,p
-function f(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function m(e,t,n,r,i){var o={}
+e.default=P,Ember._setComponentTemplate(T,P)})),define("koenig-editor/components/koenig-card-code",["exports","@glimmer/component","@tryghost/helpers"],(function(e,t,n){"use strict"
+var r,i,o,a,s,l,u,c
+function d(e,t,n,r,i){var o={}
 return Object.keys(r).forEach((function(e){o[e]=r[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const g=Ember.HTMLBars.template({id:"TWAJ6MUL",block:'{"symbols":["card"],"statements":[[8,"koenig-card",[],[["@class","@style","@headerOffset","@toolbar","@payload","@isSelected","@isEditing","@selectCard","@deselectCard","@editCard","@saveCard","@saveAsSnippet","@onEnterEdit","@onLeaveEdit","@addParagraphAfterCard","@moveCursorToPrevSection","@moveCursorToNextSection","@editor"],[[30,[36,1],["ba b--white relative kg-card-hover miw-100",[30,[36,2],[[32,0,["isEditing"]]," bw2 pt1 pb1 pl2 nl6 pr6 nr6"],null]],null],[32,0,["cardStyle"]],[32,0,["headerOffset"]],[32,0,["toolbar"]],[32,0,["payload"]],[32,0,["isSelected"]],[32,0,["isEditing"]],[30,[36,0],[[32,0],[32,0,["selectCard"]]],null],[30,[36,0],[[32,0],[32,0,["deselectCard"]]],null],[30,[36,0],[[32,0],[32,0,["editCard"]]],null],[30,[36,0],[[32,0],[32,0,["saveCard"]]],null],[32,0,["saveAsSnippet"]],[30,[36,0],[[32,0],"enterEditMode"],null],[30,[36,0],[[32,0],"leaveEditMode"],null],[32,0,["addParagraphAfterCard"]],[32,0,["moveCursorToPrevSection"]],[32,0,["moveCursorToNextSection"]],[32,0,["editor"]]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[32,0,["isEditing"]]],null,[["default","else"],[{"statements":[[2,"        "],[8,"gh-cm-editor",[],[["@value","@class","@textareaClass","@autofocus","@lineWrapping","@update","@mode"],[[32,0,["payload","code"]],"koenig-card-code--editor koenig-card-html--editor","o-0",true,true,[30,[36,0],[[32,0],"updateCode"],null],[32,0,["cmMode"]]]],null],[2,"\\n        "],[10,"input"],[15,2,[30,[36,3],[[32,0,["payload","language"]]],null]],[15,"onblur",[30,[36,0],[[32,0],[30,[36,4],[[32,0,["payload","language"]]],null]],[["value"],["target.value"]]]],[14,"placeholder","Language..."],[14,0,"absolute w-20 pa1 ba b--lightgrey br2 f8 tracked-2 fw4 z-999 outline-0 anim-normal"],[15,5,[32,0,["languageInputStyle"]]],[14,4,"text"],[12],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[10,"div"],[14,0,"koenig-card-html-rendered"],[12],[2,"\\n            "],[10,"pre"],[12],[10,"code"],[15,0,[31,["line-numbers ",[30,[36,2],[[32,0,["payload","language"]],[30,[36,1],["language-",[32,0,["payload","language"]]],null]],null]]]],[12],[1,[32,0,["escapedCode"]]],[13],[13],[2,"\\n        "],[13],[2,"\\n"],[6,[37,2],[[32,0,["payload","language"]]],null,[["default"],[{"statements":[[2,"            "],[10,"div"],[14,0,"absolute top-2 right-2 flex justify-center items-center pa2"],[12],[2,"\\n                "],[10,"span"],[14,0,"db nudge-top--2 fw5 f8 midlightgrey"],[12],[1,[32,0,["payload","language"]]],[13],[2,"\\n            "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[10,"div"],[14,0,"koenig-card-click-overlay"],[12],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,2],[[30,[36,8],[[30,[36,7],[[32,0,["isEditing"]]],null],[30,[36,6],[[32,0,["isSelected"]],[30,[36,5],[[32,0,["payload","caption"]]],null]],null]],null]],null,[["default"],[{"statements":[[2,"        "],[8,[32,1,["CaptionInput"]],[],[["@class","@caption","@update","@placeholder"],["z-999",[32,0,["payload","caption"]],[30,[36,0],[[32,0],"updateCaption"],null],"Type caption for code block (optional)"]],null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["action","concat","if","readonly","mut","clean-basic-html","or","not","and"]}',moduleName:"koenig-editor/components/koenig-card-code.hbs"}),{Handlebars:b}=Ember,{countWords:v}=t.utils,y={html:"htmlmixed",xhtml:"htmlmixed",hbs:"handlebars",js:"javascript"}
-let _=(n=Ember.computed("payload.code"),r=Ember.computed("payload.code"),i=Ember.computed("isEditing"),o=Ember.computed("payload.code"),a=Ember.computed("payload.language"),s=Ember.computed("isEditing"),l=Ember.computed("showLanguageInput"),u=Ember._action,c=Ember._action,d=Ember._action,h=Ember._action,p=class extends Ember.Component{constructor(){super(...arguments),f(this,"payload",null),f(this,"isSelected",!1),f(this,"isEditing",!1),f(this,"headerOffset",0),f(this,"showLanguageInput",!0)}editCard(){}saveCard(){}selectCard(){}deselectCard(){}deleteCard(){}registerComponent(){}moveCursorToNextSection(){}moveCursorToPrevSection(){}addParagraphAfterCard(){}get isEmpty(){return Ember.isBlank(this.payload.code)}get counts(){return{wordCount:v(this.payload.code)}}get toolbar(){return!this.isEditing&&{items:[{buttonClass:"fw4 flex items-center white",icon:"koenig/kg-edit",iconClass:"fill-white",title:"Edit",text:"",action:Ember.run.bind(this,this.editCard)}]}}get escapedCode(){let e=b.Utils.escapeExpression(this.payload.code)
-return Ember.String.htmlSafe(e)}get cmMode(){let{language:e}=this.payload
-return y[e]||e}get cardStyle(){let e=this.isEditing?"background-color: #f4f8fb; border-color: #f4f8fb":""
+const h=Ember.HTMLBars.template({id:"cPsBaPAv",block:'{"symbols":["card","@payload","@isEditing","@headerOffset","@isSelected","@selectCard","@deselectCard","@editCard","@saveCard","@saveAsSnippet","@addParagraphAfterCard","@moveCursorToPrevSection","@moveCursorToNextSection","@editor"],"statements":[[8,"koenig-card",[],[["@class","@style","@headerOffset","@toolbar","@payload","@isSelected","@isEditing","@selectCard","@deselectCard","@editCard","@saveCard","@saveAsSnippet","@onEnterEdit","@onLeaveEdit","@addParagraphAfterCard","@moveCursorToPrevSection","@moveCursorToNextSection","@editor"],[[30,[36,0],["ba b--white relative kg-card-hover miw-100",[30,[36,1],[[32,3]," bw2 pt1 pb1 pl2 nl6 pr6 nr6"],null]],null],[32,0,["cardStyle"]],[32,4],[32,0,["toolbar"]],[32,2],[32,5],[32,3],[32,6],[32,7],[32,8],[32,9],[32,10],[32,0,["enterEditMode"]],[32,0,["leaveEditMode"]],[32,11],[32,12],[32,13],[32,14]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[32,3]],null,[["default","else"],[{"statements":[[2,"        "],[8,"gh-cm-editor",[],[["@value","@class","@textareaClass","@autofocus","@lineWrapping","@update","@mode"],[[32,2,["code"]],"koenig-card-code--editor koenig-card-html--editor","o-0",true,true,[32,0,["updateCode"]],[32,0,["cmMode"]]]],null],[2,"\\n        "],[11,"input"],[24,"aria-label","Code card language"],[16,2,[32,2,["language"]]],[24,"placeholder","Language..."],[24,0,"absolute w-20 pa1 ba b--lightgrey br2 f8 tracked-2 fw4 z-999 outline-0 anim-normal"],[16,5,[32,0,["languageInputStyle"]]],[24,4,"text"],[4,[38,2],["blur",[32,0,["updateLanguage"]]],null],[12],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[10,"div"],[14,0,"koenig-card-html-rendered"],[12],[2,"\\n            "],[10,"pre"],[12],[10,"code"],[15,0,[31,["line-numbers ",[30,[36,1],[[32,2,["language"]],[30,[36,0],["language-",[32,2,["language"]]],null]],null]]]],[12],[1,[32,0,["escapedCode"]]],[13],[13],[2,"\\n        "],[13],[2,"\\n"],[6,[37,1],[[32,2,["language"]]],null,[["default"],[{"statements":[[2,"            "],[10,"div"],[14,0,"absolute top-2 right-2 flex justify-center items-center pa2"],[12],[2,"\\n                "],[10,"span"],[14,0,"db nudge-top--2 fw5 f8 midlightgrey"],[12],[1,[32,2,["language"]]],[13],[2,"\\n            "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[10,"div"],[14,0,"koenig-card-click-overlay"],[12],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,1],[[30,[36,6],[[30,[36,5],[[32,3]],null],[30,[36,4],[[32,5],[30,[36,3],[[32,2,["caption"]]],null]],null]],null]],null,[["default"],[{"statements":[[2,"        "],[8,[32,1,["CaptionInput"]],[],[["@class","@caption","@update","@placeholder"],["z-999",[32,2,["caption"]],[32,0,["updateCaption"]],"Type caption for code block (optional)"]],null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["concat","if","on","clean-basic-html","or","not","and"]}',moduleName:"koenig-editor/components/koenig-card-code.hbs"}),{Handlebars:p}=Ember,{countWords:f}=n.utils,m={html:"htmlmixed",xhtml:"htmlmixed",hbs:"handlebars",js:"javascript"}
+let g=(r=Ember._tracked,i=Ember._action,o=Ember._action,a=Ember._action,s=Ember._action,l=Ember._action,u=class extends t.default{get isEmpty(){return Ember.isBlank(this.args.payload.code)}get counts(){return{wordCount:f(this.args.payload.code)}}get toolbar(){return!this.args.isEditing&&{items:[{buttonClass:"fw4 flex items-center white",icon:"koenig/kg-edit",iconClass:"fill-white",title:"Edit",text:"",action:this.args.editCard}]}}get escapedCode(){let e=p.Utils.escapeExpression(this.args.payload.code)
+return Ember.String.htmlSafe(e)}get cmMode(){let{language:e}=this.args.payload
+return m[e]||e}get cardStyle(){let e=this.args.isEditing?"background-color: #f4f8fb; border-color: #f4f8fb":""
 return Ember.String.htmlSafe(e)}get languageInputStyle(){let e=["top: 6px","right: 6px"]
-return this.showLanguageInput||e.push("opacity: 0"),Ember.String.htmlSafe(e.join("; "))}init(){super.init(...arguments)
-let e=this.payload||{}
-e.code||Ember.set(e,"code",""),this.set("payload",e),this.registerComponent(this)}updateCode(e){this._hideLanguageInput(),this._updatePayloadAttr("code",e)}updateCaption(e){this._updatePayloadAttr("caption",e)}enterEditMode(){this._addMousemoveHandler()}leaveEditMode(){this._removeMousemoveHandler(),this.isEmpty&&Ember.run.scheduleOnce("afterRender",this,this.deleteCard)}_updatePayloadAttr(e,t){let n=this.payload,r=this.saveCard
-Ember.set(n,e,t),r(n,!1)}_hideLanguageInput(){this.set("showLanguageInput",!1)}_showLanguageInput(){this.set("showLanguageInput",!0)}_addMousemoveHandler(){this._mousemoveHandler=Ember.run.bind(this,this._showLanguageInput),window.addEventListener("mousemove",this._mousemoveHandler)}_removeMousemoveHandler(){window.removeEventListener("mousemove",this._mousemoveHandler)}},m(p.prototype,"isEmpty",[n],Object.getOwnPropertyDescriptor(p.prototype,"isEmpty"),p.prototype),m(p.prototype,"counts",[r],Object.getOwnPropertyDescriptor(p.prototype,"counts"),p.prototype),m(p.prototype,"toolbar",[i],Object.getOwnPropertyDescriptor(p.prototype,"toolbar"),p.prototype),m(p.prototype,"escapedCode",[o],Object.getOwnPropertyDescriptor(p.prototype,"escapedCode"),p.prototype),m(p.prototype,"cmMode",[a],Object.getOwnPropertyDescriptor(p.prototype,"cmMode"),p.prototype),m(p.prototype,"cardStyle",[s],Object.getOwnPropertyDescriptor(p.prototype,"cardStyle"),p.prototype),m(p.prototype,"languageInputStyle",[l],Object.getOwnPropertyDescriptor(p.prototype,"languageInputStyle"),p.prototype),m(p.prototype,"updateCode",[u],Object.getOwnPropertyDescriptor(p.prototype,"updateCode"),p.prototype),m(p.prototype,"updateCaption",[c],Object.getOwnPropertyDescriptor(p.prototype,"updateCaption"),p.prototype),m(p.prototype,"enterEditMode",[d],Object.getOwnPropertyDescriptor(p.prototype,"enterEditMode"),p.prototype),m(p.prototype,"leaveEditMode",[h],Object.getOwnPropertyDescriptor(p.prototype,"leaveEditMode"),p.prototype),p)
-e.default=_,Ember._setComponentTemplate(g,_)})),define("koenig-editor/components/koenig-card-email-cta",["exports","mobiledoc-kit/utils/browser","@glimmer/component","koenig-editor/components/koenig-text-replacement-html-input","ember-concurrency"],(function(e,t,n,r,i){"use strict"
+return this.showLanguageInput||e.push("opacity: 0"),Ember.String.htmlSafe(e.join("; "))}constructor(){var e,t,n,r
+super(...arguments),e=this,t="showLanguageInput",r=this,(n=c)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})
+let i=this.args.payload||{}
+i.code||(i.code=""),this.payload=i,this.args.registerComponent(this)}updateCode(e){this._hideLanguageInput(),this._updatePayloadAttr("code",e)}updateCaption(e){this._updatePayloadAttr("caption",e)}updateLanguage(e){this._updatePayloadAttr("language",e.target.value)}enterEditMode(){this._addMousemoveHandler()}leaveEditMode(){this._removeMousemoveHandler(),this.isEmpty&&Ember.run.scheduleOnce("afterRender",this,this.args.deleteCard)}_updatePayloadAttr(e,t){let n=this.args.payload,r=this.args.saveCard
+n[e]=t,r(n,!1)}_hideLanguageInput(){this.showLanguageInput=!1}_showLanguageInput(){this.showLanguageInput=!0}_addMousemoveHandler(){this._mousemoveHandler=Ember.run.bind(this,this._showLanguageInput),window.addEventListener("mousemove",this._mousemoveHandler)}_removeMousemoveHandler(){window.removeEventListener("mousemove",this._mousemoveHandler)}},c=d(u.prototype,"showLanguageInput",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!0}}),d(u.prototype,"updateCode",[i],Object.getOwnPropertyDescriptor(u.prototype,"updateCode"),u.prototype),d(u.prototype,"updateCaption",[o],Object.getOwnPropertyDescriptor(u.prototype,"updateCaption"),u.prototype),d(u.prototype,"updateLanguage",[a],Object.getOwnPropertyDescriptor(u.prototype,"updateLanguage"),u.prototype),d(u.prototype,"enterEditMode",[s],Object.getOwnPropertyDescriptor(u.prototype,"enterEditMode"),u.prototype),d(u.prototype,"leaveEditMode",[l],Object.getOwnPropertyDescriptor(u.prototype,"leaveEditMode"),u.prototype),u)
+e.default=g,Ember._setComponentTemplate(h,g)})),define("koenig-editor/components/koenig-card-email-cta",["exports","mobiledoc-kit/utils/browser","@glimmer/component","koenig-editor/components/koenig-text-replacement-html-input","ember-concurrency"],(function(e,t,n,r,i){"use strict"
 var o,a,s,l,u,c,d,h,p,f,m,g,b,v,y,_,w,M,k,E,A,j,O,x,C,T,S,P,L,D
 function z(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function N(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function R(e,t,n,r,i){var o={}
 return Object.keys(r).forEach((function(e){o[e]=r[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
@@ -20865,4 +20866,4 @@ if(!i)return v(e)
 if(!b(i)||v(i).isOlderThan(4)){var o=v(e).getStackTop()
 y(i,new p(o.client,c.a.clone(o.scope)))}return v(i)}catch(t){return v(e)}}(e):v(e)}function b(e){return!!(e&&e.__SENTRY__&&e.__SENTRY__.hub)}function v(e){return e&&e.__SENTRY__&&e.__SENTRY__.hub||(e.__SENTRY__=e.__SENTRY__||{},e.__SENTRY__.hub=new p),e.__SENTRY__.hub}function y(e,t){return!!e&&(e.__SENTRY__=e.__SENTRY__||{},e.__SENTRY__.hub=t,!0)}}]])
 
-//# sourceMappingURL=vendor.min-4076498ccd6c8412365f43b156084ed8.map
+//# sourceMappingURL=vendor.min-be0129c9c6897c9f10425e2402881d77.map

package/core/frontend/helpers/total_members.js

@@ -0,0 +1,17 @@
+// # Total Members Helper
+// Usage: `{{total_members}}`
+
+const {SafeString} = require('../services/handlebars');
+const {memberCountRounding, getMemberStats} = require('../utils/member-count');
+
+module.exports = async function total_members () { //eslint-disable-line
+    if (this.total) {
+        return new SafeString(memberCountRounding(this.total));
+    } else {
+        let memberStats = await getMemberStats();
+        const {total} = memberStats;
+        return new SafeString(total > 0 ? memberCountRounding(total) : 0);
+    }
+};
+
+module.exports.async = true;

package/core/frontend/helpers/total_paid_members.js

@@ -0,0 +1,16 @@
+// {{total_paid_members}} helper
+
+const {SafeString} = require('../services/handlebars');
+const {memberCountRounding, getMemberStats} = require('../utils/member-count');
+
+module.exports = async function total_paid_members () { //eslint-disable-line
+    if (this.paid) {
+        return new SafeString(memberCountRounding(this.paid));
+    } else {
+        let memberStats = await getMemberStats();
+        const {paid} = memberStats;
+        return new SafeString(paid > 0 ? memberCountRounding(paid) : 0);
+    }
+};
+
+module.exports.async = true;

package/core/frontend/utils/member-count.js

@@ -0,0 +1,50 @@
+const humanNumber = require('human-number');
+const {api} = require('../services/proxy');
+
+async function getMemberStats() {
+    let memberStats = this.data || await api.stats.memberCountHistory.query();
+    const {free, paid, comped} = memberStats.meta.totals;
+    let total = free + paid + comped;
+    return {free, paid, comped, total};
+}
+
+const numberWithCommas = (n) => {
+    return n.toLocaleString();
+};
+
+const rounding = (n, roundTo) => {
+    return Math.floor(n / roundTo) * roundTo;
+};
+
+// Rounding https://github.com/TryGhost/Team/issues/1667
+const memberCountRounding = (memberCount) => {
+    if (memberCount <= 50) {
+        return memberCount;
+    }
+
+    if (memberCount > 50 && memberCount <= 100) {
+        return `${numberWithCommas(rounding(memberCount, 10))}+`;
+    }
+
+    if (memberCount > 100 && memberCount <= 1000) {
+        return `${numberWithCommas(rounding(memberCount, 50))}+`;
+    }
+
+    if (memberCount > 1000 && memberCount <= 10000) {
+        return `${numberWithCommas(rounding(memberCount, 100))}+`;
+    }
+
+    if (memberCount > 10000 && memberCount <= 100000) {
+        return `${numberWithCommas(rounding(memberCount, 1000))}+`;
+    }
+
+    if (memberCount > 100000 && memberCount <= 1000000) {
+        return `${humanNumber(rounding(memberCount, 10000)).toLowerCase()}+`;
+    }
+
+    if (memberCount > 1000000) {
+        return `${humanNumber(rounding(memberCount, 100000)).toLowerCase()}+`;
+    }
+};
+
+module.exports = {memberCountRounding, getMemberStats};

package/core/frontend/web/middleware/cors.js

@@ -13,7 +13,8 @@ function corsOptionsDelegate(req, callback) {
     const origin = req.header('Origin');
     const corsOptions = {
         origin: false, // disallow cross-origin requests by default
-        credentials: true // required to allow admin-client to login to private sites
+        credentials: true, // required to allow admin-client to login to private sites
+        maxAge: config.get('caching:cors:maxAge')
     };
 
     if (!origin || origin === 'null') {

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

@@ -20,8 +20,8 @@ module.exports = {
                 });
             }
 
-            frame.response = {
-                offers: [offer]
+            return {
+                data: [offer]
             };
         }
     }

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

@@ -16,8 +16,8 @@ module.exports = {
         permissions: true,
         async query(frame) {
             const offers = await offersService.api.listOffers(frame.options);
-            frame.response = {
-                offers
+            return {
+                data: offers
             };
         }
     },
@@ -33,8 +33,8 @@ module.exports = {
                 });
             }
 
-            frame.response = {
-                offers: [offer]
+            return {
+                data: [offer]
             };
         }
     },
@@ -57,8 +57,8 @@ module.exports = {
                 });
             }
 
-            frame.response = {
-                offers: [offer]
+            return {
+                data: [offer]
             };
         }
     },
@@ -70,8 +70,8 @@ module.exports = {
         },
         async query(frame) {
             const offer = await offersService.api.createOffer(frame.data.offers[0]);
-            frame.response = {
-                offers: [offer]
+            return {
+                data: [offer]
             };
         }
     }

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

@@ -2,17 +2,15 @@ const Promise = require('bluebird');
 const _ = require('lodash');
 const models = require('../../models');
 const routeSettings = require('../../services/route-settings');
-const tpl = require('@tryghost/tpl');
 const {BadRequestError} = require('@tryghost/errors');
 const settingsService = require('../../services/settings/settings-service');
 const membersService = require('../../services/members');
 const stripeService = require('../../services/stripe');
-
+const tpl = require('@tryghost/tpl');
 const settingsBREADService = settingsService.getSettingsBREADServiceInstance();
 
 const messages = {
     failedSendingEmail: 'Failed Sending Email'
-
 };
 
 async function getStripeConnectData(frame) {
@@ -59,6 +57,65 @@ module.exports = {
         }
     },
 
+    verifyKeyUpdate: {
+        headers: {
+            cacheInvalidate: true
+        },
+        permissions: {
+            method: 'edit'
+        },
+        data: [
+            'token'
+        ],
+        async query(frame) {
+            await settingsBREADService.verifyKeyUpdate(frame.data.token);
+            
+            // We need to return all settings here, because we have calculated settings that might change
+            const browse = await settingsBREADService.browse(frame.options.context);
+
+            return browse;
+        }
+    },
+
+    /**
+     * @deprecated
+     */
+    updateMembersEmail: {
+        statusCode: 204,
+        permissions: {
+            method: 'edit'
+        },
+        data: [
+            'email',
+            'type'
+        ],
+        async query(frame) {
+            const {email, type} = frame.data;
+
+            try {
+                // Mapped internally to the newer method of changing emails
+                const actionToKeyMapping = {
+                    supportAddressUpdate: 'members_support_address'
+                };
+                const edit = {
+                    key: actionToKeyMapping[type],
+                    value: email
+                };
+
+                await settingsBREADService.edit([edit], frame.options, null);
+            } catch (err) {
+                throw new BadRequestError({
+                    err,
+                    message: tpl(messages.failedSendingEmail)
+                });
+            }
+        }
+    },
+
+    /**
+     * @todo can get removed, since this is moved to verifyKeyUpdate
+     * @deprecated: keep to not break existing email verification links, but remove after 1 - 2 releases
+     */
     validateMembersEmailUpdate: {
         options: [
             'token',
@@ -108,33 +165,6 @@ module.exports = {
         }
     },
 
-    updateMembersEmail: {
-        statusCode: 204,
-        permissions: {
-            method: 'edit'
-        },
-        data: [
-            'email',
-            'type'
-        ],
-        async query(frame) {
-            const {email, type} = frame.data;
-
-            try {
-                // Send magic link to update fromAddress
-                await membersService.settings.sendEmailAddressUpdateMagicLink({
-                    email,
-                    type
-                });
-            } catch (err) {
-                throw new BadRequestError({
-                    err,
-                    message: tpl(messages.failedSendingEmail)
-                });
-            }
-        }
-    },
-
     disconnectStripeConnectIntegration: {
         statusCode: 204,
         permissions: {
@@ -197,6 +227,8 @@ module.exports = {
 
             // We need to return all settings here, because we have calculated settings that might change
             const browse = await settingsBREADService.browse(frame.options.context);
+            browse.meta = result.meta || {};
+
             return browse;
         }
     },

package/core/server/api/endpoints/utils/serializers/input/settings.js

@@ -31,6 +31,7 @@ const EDITABLE_SETTINGS = [
     'default_content_visibility',
     'default_content_visibility_tiers',
     'members_signup_access',
+    'members_support_address',
     'stripe_secret_key',
     'stripe_publishable_key',
     'stripe_connect_integration_token',

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

@@ -125,10 +125,6 @@ module.exports = {
         return require('./session');
     },
 
-    get offers() {
-        return require('./offers');
-    },
-
     get members_stripe_connect() {
         return require('./members-stripe-connect');
     }

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

@@ -10,6 +10,7 @@ module.exports = {
     settings: require('./settings'),
     snippets: require('./snippets'),
     tags: require('./tags'),
+    offers: require('./offers'),
     newsletters: require('./newsletters'),
     users: require('./users')
 };

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

@@ -0,0 +1,28 @@
+const utils = require('../../../index');
+
+module.exports = (model, frame) => {
+    // Offer data is already returned as json via members service
+    const jsonModel = model;
+
+    if (utils.isContentAPI(frame)) {
+        const serialized = {
+            id: jsonModel.id,
+            name: jsonModel.name,
+            display_title: jsonModel.display_title,
+            display_description: jsonModel.display_description,
+            type: jsonModel.type,
+            cadence: jsonModel.cadence,
+            amount: jsonModel.amount,
+            duration: jsonModel.duration,
+            duration_in_months: jsonModel.duration_in_months,
+            currency_restriction: jsonModel.currency_restriction,
+            currency: jsonModel.currency,
+            status: jsonModel.status,
+            tier: jsonModel.tier
+        };
+
+        return serialized;
+    }
+
+    return jsonModel;
+};

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

@@ -52,7 +52,7 @@ function serializeSettings(models, apiConfig, frame) {
 
     frame.response = {
         settings: mappers.settings(filteredSettings),
-        meta: {}
+        meta: models.meta ?? {}
     };
 
     if (frame.options.group) {
@@ -89,6 +89,7 @@ module.exports = {
     browse: serializeSettings,
     read: serializeSettings,
     edit: serializeSettings,
+    verifyKeyUpdate: serializeSettings,
 
     download: serializeData,
     upload: serializeData,

package/core/server/api/endpoints/utils/validators/input/settings.js

@@ -2,11 +2,12 @@ const Promise = require('bluebird');
 const _ = require('lodash');
 const {ValidationError, BadRequestError} = require('@tryghost/errors');
 const validator = require('@tryghost/validator');
+const tpl = require('@tryghost/tpl');
 
 const messages = {
     invalidEmailReceived: 'Please send a valid email',
-    invalidEmailTypeReceived: 'Invalid email type received',
-    problemFindingSetting: 'Problem finding setting: {key}'
+    invalidEmailValueReceived: 'Please enter a valid email address.',
+    invalidEmailTypeReceived: 'Invalid email type received'
 };
 
 module.exports = {
@@ -22,6 +23,10 @@ module.exports = {
                 'secondary_navigation'
             ];
 
+            const emailTypeSettings = [
+                'members_support_address'
+            ];
+
             if (arrayTypeSettings.includes(setting.key)) {
                 const typeError = new ValidationError({
                     message: `Value in ${setting.key} should be an array.`,
@@ -43,6 +48,18 @@ module.exports = {
                     }
                 }
             }
+
+            if (emailTypeSettings.includes(setting.key)) {
+                const email = setting.value;
+
+                if (typeof email !== 'string' || (!validator.isEmail(email) && email !== 'noreply')) {
+                    const typeError = new ValidationError({
+                        message: tpl(messages.invalidEmailValueReceived),
+                        property: setting.key
+                    });
+                    errors.push(typeError);
+                }
+            }
         });
 
         // Prevent setting icon to the resized one when sending all settings received from browse again in the edit endpoint
@@ -56,6 +73,9 @@ module.exports = {
         }
     },
 
+    /**
+     * @deprecated
+     */
     updateMembersEmail(apiConfig, frame) {
         const {email, type} = frame.data;
 

package/core/server/models/tag.js

@@ -154,6 +154,10 @@ Tag = ghostBookshelf.Model.extend({
             actor_id: actor.id,
             actor_type: actor.type
         };
+    },
+
+    defaultColumnsToFetch() {
+        return ['id'];
     }
 }, {
     orderDefaultOptions: function orderDefaultOptions() {

package/core/server/services/auth/session/express-session.js

@@ -23,7 +23,7 @@ function getExpressSessionMiddleware() {
                 maxAge: constants.SIX_MONTH_MS,
                 httpOnly: true,
                 path: urlUtils.getSubdir() + '/ghost',
-                sameSite: 'none',
+                sameSite: urlUtils.isSSL(config.get('url')) ? 'none' : 'lax',
                 secure: urlUtils.isSSL(config.get('url'))
             }
         });

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

@@ -1,5 +1,5 @@
 // @ts-check
-const {UnauthorizedError} = require('@tryghost/errors');
+const {ValidationError} = require('@tryghost/errors');
 
 class SingleUseTokenProvider {
     /**
@@ -41,7 +41,7 @@ class SingleUseTokenProvider {
         const model = await this.model.findOne({token});
 
         if (!model) {
-            throw new UnauthorizedError({
+            throw new ValidationError({
                 message: 'Invalid token provided'
             });
         }
@@ -51,7 +51,7 @@ class SingleUseTokenProvider {
         const tokenLifetimeMilliseconds = Date.now() - createdAtEpoch;
 
         if (tokenLifetimeMilliseconds > this.validity) {
-            throw new UnauthorizedError({
+            throw new ValidationError({
                 message: 'Token expired'
             });
         }

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

@@ -154,11 +154,14 @@ class MembersConfigProvider {
         };
     }
 
-    getSigninURL(token, type) {
+    getSigninURL(token, type, referrer) {
         const siteUrl = this._urlUtils.urlFor({relativeUrl: '/members/'}, true);
         const signinURL = new URL(siteUrl);
         signinURL.searchParams.set('token', token);
         signinURL.searchParams.set('action', type);
+        if (referrer) {
+            signinURL.searchParams.set('r', referrer);
+        }
         return signinURL.toString();
     }
 }

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

@@ -143,8 +143,8 @@ const createSessionFromMagicLink = async function (req, res, next) {
     // req.query is a plain object, copy it to a URLSearchParams object so we can call toString()
     const searchParams = new URLSearchParams('');
     Object.keys(req.query).forEach((param) => {
-        // don't copy the token param
-        if (param !== 'token') {
+        // don't copy the "token" or "r" params
+        if (param !== 'token' && param !== 'r') {
             searchParams.set(param, req.query[param]);
         }
     });
@@ -182,6 +182,18 @@ const createSessionFromMagicLink = async function (req, res, next) {
             }
         }
 
+        if (action === 'signin') {
+            const referrer = req.query.r;
+            const siteUrl = urlUtils.getSiteUrl();
+
+            if (referrer && referrer.startsWith(siteUrl)) {
+                const redirectUrl = new URL(referrer);
+                redirectUrl.searchParams.set('success', true);
+                redirectUrl.searchParams.set('action', 'signin');
+                return res.redirect(redirectUrl.pathname + redirectUrl.search);
+            }
+        }
+
         // Do a standard 302 redirect to the homepage, with success=true
         searchParams.set('success', true);
         res.redirect(`${urlUtils.getSubdir()}/?${searchParams.toString()}`);