ghost 6.64.0 → 6.65.0

package/core/server/data/schema/schema.js

@@ -933,6 +933,32 @@ module.exports = {
     },
     created_at: { type: 'dateTime', nullable: false },
   },
+  // A member's metafields changing, as an entry in their activity feed. Which fields,
+  // not what they now hold: the values are on the member already, and an old address
+  // has no business outliving the member's change of it in a history table.
+  members_metafield_change_events: {
+    id: { type: 'string', maxlength: 24, nullable: false, primary: true },
+    member_id: {
+      type: 'string',
+      maxlength: 24,
+      nullable: false,
+      references: 'members.id',
+      cascadeDelete: true,
+    },
+    // Who made the change, in the vocabulary `members_metafield_values` uses for who
+    // wrote a value, so an entry can name any writer that table can.
+    written_by_type: { type: 'string', maxlength: 50, nullable: false },
+    written_by_id: { type: 'string', maxlength: 24, nullable: true },
+    // Where the change was made, such as `portal`. Separate from who made it: a member
+    // can supply their own values somewhere other than their account.
+    source: { type: 'string', maxlength: 50, nullable: false },
+    // The fields changed, as a JSON list of each field's namespace, key and the name it had at the
+    // time. Names are copied rather than joined so an entry still reads after a field is
+    // renamed or deleted. MEDIUMTEXT because a write can name every field a site
+    // defines, and that many names can outgrow TEXT's 65,535 bytes.
+    metafields: { type: 'text', maxlength: 16777215, fieldtype: 'medium', nullable: false },
+    created_at: { type: 'dateTime', nullable: false },
+  },
   members_status_events: {
     id: { type: 'string', maxlength: 24, nullable: false, primary: true },
     member_id: {

package/core/server/data/schema/validator.js

@@ -1,16 +1,21 @@
-const _ = require('lodash');
-const tpl = require('@tryghost/tpl');
-const errors = require('@tryghost/errors');
-const validator = require('@tryghost/validator');
-
-const schema = require('./schema');
-
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSchema = validateSchema;
+const errors_1 = __importDefault(require("@tryghost/errors"));
+const tpl_1 = __importDefault(require("@tryghost/tpl"));
+const lodash_1 = __importDefault(require("lodash"));
+// @ts-expect-error This module lacks type definitions.
+const validator_1 = __importDefault(require("@tryghost/validator"));
+// @ts-expect-error This module lacks type definitions.
+const schema_1 = __importDefault(require("./schema"));
 const messages = {
-  valueCannotBeBlank: 'Value in [{tableName}.{columnKey}] cannot be blank.',
-  valueMustBeBoolean: 'Value in [{tableName}.{columnKey}] must be one of true, false, 0 or 1.',
-  valueExceedsMaxLength:
-    'Value in [{tableName}.{columnKey}] exceeds maximum length of {maxlength} characters.',
-  valueIsNotInteger: 'Value in [{tableName}.{columnKey}] is not an integer.',
+    valueCannotBeBlank: 'Value in [{tableName}.{columnKey}] cannot be blank.',
+    valueMustBeBoolean: 'Value in [{tableName}.{columnKey}] must be one of true, false, 0 or 1.',
+    valueExceedsMaxLength: 'Value in [{tableName}.{columnKey}] exceeds maximum length of {maxlength} characters.',
+    valueIsNotInteger: 'Value in [{tableName}.{columnKey}] is not an integer.',
 };
 /**
  * Validate model against schema.
@@ -28,118 +33,86 @@ const messages = {
  * - validate everything to catch required fields
  */
 function validateSchema(tableName, model, options) {
-  options = options || {};
-
-  const columns = _.keys(schema[tableName]);
-  let validationErrors = [];
-
-  _.each(columns, function each(columnKey) {
-    let message = ''; // KEEP: Validator.js only validates strings.
-    const strVal = _.toString(model.get(columnKey));
-
-    if (options.method !== 'insert' && !_.has(model.changed, columnKey)) {
-      return;
-    }
-
-    // check nullable
-    if (
-      Object.prototype.hasOwnProperty.call(schema[tableName][columnKey], 'nullable') &&
-      schema[tableName][columnKey].nullable !== true &&
-      Object.prototype.hasOwnProperty.call(schema[tableName][columnKey], 'type') &&
-      schema[tableName][columnKey].type !== 'text' &&
-      !Object.prototype.hasOwnProperty.call(schema[tableName][columnKey], 'defaultTo')
-    ) {
-      if (validator.isEmpty(strVal)) {
-        message = tpl(messages.valueCannotBeBlank, {
-          tableName: tableName,
-          columnKey: columnKey,
-        });
-        validationErrors.push(
-          new errors.ValidationError({
-            message: message,
-            context: tableName + '.' + columnKey,
-          }),
-        );
-      }
-    }
-
-    // validate boolean columns
-    if (
-      Object.prototype.hasOwnProperty.call(schema[tableName][columnKey], 'type') &&
-      schema[tableName][columnKey].type === 'boolean'
-    ) {
-      if (!(validator.isBoolean(strVal) || validator.isEmpty(strVal))) {
-        message = tpl(messages.valueMustBeBoolean, {
-          tableName: tableName,
-          columnKey: columnKey,
-        });
-        validationErrors.push(
-          new errors.ValidationError({
-            message: message,
-            context: tableName + '.' + columnKey,
-          }),
-        );
-      }
-
-      // CASE: ensure we transform 0|1 to false|true
-      if (!validator.isEmpty(strVal)) {
-        model.set(columnKey, !!model.get(columnKey));
-      }
-    }
-
-    // TODO: check if mandatory values should be enforced
-    if (model.get(columnKey) !== null && model.get(columnKey) !== undefined) {
-      // check length
-      if (Object.prototype.hasOwnProperty.call(schema[tableName][columnKey], 'maxlength')) {
-        if (!validator.isLength(strVal, 0, schema[tableName][columnKey].maxlength)) {
-          message = tpl(messages.valueExceedsMaxLength, {
-            tableName: tableName,
-            columnKey: columnKey,
-            maxlength: schema[tableName][columnKey].maxlength,
-          });
-          validationErrors.push(
-            new errors.ValidationError({
-              message: message,
-              context: tableName + '.' + columnKey,
-            }),
-          );
+    options = options || {};
+    const columns = lodash_1.default.keys(schema_1.default[tableName]);
+    let validationErrors = [];
+    lodash_1.default.each(columns, function each(columnKey) {
+        let message = ''; // KEEP: Validator.js only validates strings.
+        const strVal = lodash_1.default.toString(model.get(columnKey));
+        if (options.method !== 'insert' && !lodash_1.default.has(model.changed, columnKey)) {
+            return;
+        }
+        // check nullable
+        if (Object.prototype.hasOwnProperty.call(schema_1.default[tableName][columnKey], 'nullable') &&
+            schema_1.default[tableName][columnKey].nullable !== true &&
+            Object.prototype.hasOwnProperty.call(schema_1.default[tableName][columnKey], 'type') &&
+            schema_1.default[tableName][columnKey].type !== 'text' &&
+            !Object.prototype.hasOwnProperty.call(schema_1.default[tableName][columnKey], 'defaultTo')) {
+            if (validator_1.default.isEmpty(strVal)) {
+                message = (0, tpl_1.default)(messages.valueCannotBeBlank, {
+                    tableName: tableName,
+                    columnKey: columnKey,
+                });
+                validationErrors.push(new errors_1.default.ValidationError({
+                    message: message,
+                    context: tableName + '.' + columnKey,
+                }));
+            }
+        }
+        // validate boolean columns
+        if (Object.prototype.hasOwnProperty.call(schema_1.default[tableName][columnKey], 'type') &&
+            schema_1.default[tableName][columnKey].type === 'boolean') {
+            if (!(validator_1.default.isBoolean(strVal) || validator_1.default.isEmpty(strVal))) {
+                message = (0, tpl_1.default)(messages.valueMustBeBoolean, {
+                    tableName: tableName,
+                    columnKey: columnKey,
+                });
+                validationErrors.push(new errors_1.default.ValidationError({
+                    message: message,
+                    context: tableName + '.' + columnKey,
+                }));
+            }
+            // CASE: ensure we transform 0|1 to false|true
+            if (!validator_1.default.isEmpty(strVal)) {
+                model.set(columnKey, !!model.get(columnKey));
+            }
         }
-      }
-
-      // check validations objects
-      if (Object.prototype.hasOwnProperty.call(schema[tableName][columnKey], 'validations')) {
-        validationErrors = validationErrors.concat(
-          validator.validate(
-            strVal,
-            columnKey,
-            schema[tableName][columnKey].validations,
-            tableName,
-          ),
-        );
-      }
-
-      // check type
-      if (Object.prototype.hasOwnProperty.call(schema[tableName][columnKey], 'type')) {
-        if (schema[tableName][columnKey].type === 'integer' && !validator.isInt(strVal)) {
-          message = tpl(messages.valueIsNotInteger, {
-            tableName: tableName,
-            columnKey: columnKey,
-          });
-          validationErrors.push(
-            new errors.ValidationError({
-              message: message,
-              context: tableName + '.' + columnKey,
-            }),
-          );
+        // TODO: check if mandatory values should be enforced
+        if (model.get(columnKey) !== null && model.get(columnKey) !== undefined) {
+            // check length
+            if (Object.prototype.hasOwnProperty.call(schema_1.default[tableName][columnKey], 'maxlength')) {
+                if (!validator_1.default.isLength(strVal, 0, schema_1.default[tableName][columnKey].maxlength)) {
+                    message = (0, tpl_1.default)(messages.valueExceedsMaxLength, {
+                        tableName: tableName,
+                        columnKey: columnKey,
+                        maxlength: schema_1.default[tableName][columnKey].maxlength,
+                    });
+                    validationErrors.push(new errors_1.default.ValidationError({
+                        message: message,
+                        context: tableName + '.' + columnKey,
+                    }));
+                }
+            }
+            // check validations objects
+            if (Object.prototype.hasOwnProperty.call(schema_1.default[tableName][columnKey], 'validations')) {
+                validationErrors = validationErrors.concat(validator_1.default.validate(strVal, columnKey, schema_1.default[tableName][columnKey].validations, tableName));
+            }
+            // check type
+            if (Object.prototype.hasOwnProperty.call(schema_1.default[tableName][columnKey], 'type')) {
+                if (schema_1.default[tableName][columnKey].type === 'integer' && !validator_1.default.isInt(strVal)) {
+                    message = (0, tpl_1.default)(messages.valueIsNotInteger, {
+                        tableName: tableName,
+                        columnKey: columnKey,
+                    });
+                    validationErrors.push(new errors_1.default.ValidationError({
+                        message: message,
+                        context: tableName + '.' + columnKey,
+                    }));
+                }
+            }
         }
-      }
+    });
+    if (validationErrors.length !== 0) {
+        throw validationErrors;
     }
-  });
-
-  if (validationErrors.length !== 0) {
-    return Promise.reject(validationErrors);
-  }
-
-  return Promise.resolve();
 }
-module.exports = validateSchema;

package/core/server/data/seeders/importers/email-recipients-importer.js

@@ -18,7 +18,7 @@ function findFirstHigherIndex(arr, target) {
   let result = -1;
 
   while (start <= end) {
-    let mid = Math.floor((start + end) / 2);
+    const mid = Math.floor((start + end) / 2);
 
     if (arr[mid] >= target) {
       result = mid;
@@ -162,7 +162,7 @@ class EmailRecipientsImporter extends TableImporter {
       failedCount: this.model.failed_count,
     };
 
-    let offset = this.batchIndex * 1000;
+    const offset = this.batchIndex * 1000;
 
     // We always first create the failures, then the opened, then the delivered, so we need to remove those from the meta so we don't generate them multiple times
     this.emailMeta = {

package/core/server/data/seeders/importers/members-login-events-importer.js

@@ -17,7 +17,7 @@ class MembersLoginEventsImporter extends TableImporter {
     }
 
     let offset = 0;
-    let limit = 100000;
+    const limit = 100000;
 
     while (true) {
       const members = await this.transaction

package/core/server/data/seeders/importers/members-newsletters-importer.js

@@ -10,7 +10,7 @@ class MembersNewslettersImporter extends TableImporter {
 
   async import(quantity) {
     let offset = 0;
-    let limit = 100000;
+    const limit = 100000;
 
     while (true) {
       const membersSubscribeEvents = await this.transaction

package/core/server/data/seeders/importers/members-paid-subscription-events-importer.js

@@ -10,7 +10,7 @@ class MembersPaidSubscriptionEventsImporter extends TableImporter {
 
   async import() {
     let offset = 0;
-    let limit = 1000;
+    const limit = 1000;
 
     while (true) {
       const subscriptions = await this.transaction

package/core/server/data/seeders/importers/members-status-events-importer.js

@@ -12,7 +12,7 @@ class MembersStatusEventsImporter extends TableImporter {
 
   async import(quantity) {
     let offset = 0;
-    let limit = 100000;
+    const limit = 100000;
 
     while (true) {
       const members = await this.transaction

package/core/server/data/seeders/importers/members-stripe-customers-importer.js

@@ -16,7 +16,7 @@ class MembersStripeCustomersImporter extends TableImporter {
     }
 
     let offset = 0;
-    let limit = 100000;
+    const limit = 100000;
 
     while (true) {
       const members = await this.transaction

package/core/server/data/seeders/importers/members-stripe-customers-subscriptions-importer.js

@@ -21,7 +21,7 @@ class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
 
   async import() {
     let offset = 0;
-    let limit = 5000;
+    const limit = 5000;
     this.products = await this.transaction
       .select('id', 'name')
       .from('products')

package/core/server/data/seeders/importers/members-subscribe-events-importer.js

@@ -16,7 +16,7 @@ class MembersSubscribeEventsImporter extends TableImporter {
     }
 
     let offset = 0;
-    let limit = 100000;
+    const limit = 100000;
     this.newsletters = await this.transaction
       .select('id')
       .from('newsletters')
@@ -54,7 +54,7 @@ class MembersSubscribeEventsImporter extends TableImporter {
       return null;
     }
 
-    let subscribed = luck(80);
+    const subscribed = luck(80);
 
     if (!subscribed) {
       return null;

package/core/server/data/seeders/importers/members-subscription-created-events-importer.js

@@ -18,7 +18,7 @@ class MembersSubscriptionCreatedEventsImporter extends TableImporter {
 
   async import(quantity) {
     let offset = 0;
-    let limit = 1000;
+    const limit = 1000;
     this.posts = await this.transaction
       .select('id', 'published_at', 'visibility', 'type', 'slug')
       .from('posts')

package/core/server/data/tinybird/pipes/mv_hits.pipe

@@ -2,6 +2,11 @@ TOKEN "axis" READ
 
 NODE mv_hits_0
 SQL >
+    WITH
+        JSONExtract(
+            payload,
+            'Tuple(meta Tuple(received_timestamp String, referrerSource String), locale String, location String, referrerSource String, pathname String, href String, member_uuid String, member_status String, post_uuid String, post_type String, gift_link String, `user-agent` String, device String, utm_source String, utm_medium String, utm_campaign String, utm_term String, utm_content String)'
+        ) AS payload_json
     SELECT
         timestamp,
         inserted_at,
@@ -9,33 +14,33 @@ SQL >
         -- Nullable fields incur performance penalty in clickhouse, so we default to zero (unix epoch)
         -- instead of null.
         parseDateTime64BestEffortOrZero(
-            JSONExtractString(payload, 'meta', 'received_timestamp'), 3
+            getSubcolumn(payload_json, 'meta.received_timestamp'), 3
         ) as received_at,
         action,
         version,
         coalesce(session_id, '0') as session_id,
-        JSONExtractString(payload, 'locale') as locale,
-        JSONExtractString(payload, 'location') as location,
+        getSubcolumn(payload_json, 'locale') as locale,
+        getSubcolumn(payload_json, 'location') as location,
         case
-            when JSONExtractString(payload, 'referrerSource') = ''
-            then JSONExtractString(payload, 'meta', 'referrerSource')
-            else JSONExtractString(payload, 'referrerSource')
+            when getSubcolumn(payload_json, 'referrerSource') = ''
+            then getSubcolumn(payload_json, 'meta.referrerSource')
+            else getSubcolumn(payload_json, 'referrerSource')
         end as referrer,
-        JSONExtractString(payload, 'pathname') as pathname,
-        JSONExtractString(payload, 'href') as href,
+        getSubcolumn(payload_json, 'pathname') as pathname,
+        getSubcolumn(payload_json, 'href') as href,
         site_uuid,
-        JSONExtractString(payload, 'member_uuid') as member_uuid,
-        JSONExtractString(payload, 'member_status') as member_status,
-        JSONExtractString(payload, 'post_uuid') as post_uuid,
-        JSONExtractString(payload, 'post_type') as post_type,
-        JSONExtractString(payload, 'gift_link') as gift_link,
-        lower(JSONExtractString(payload, 'user-agent')) as user_agent,
-        JSONExtractString(payload, 'device') as device,
-        JSONExtractString(payload, 'utm_source') as utm_source,
-        JSONExtractString(payload, 'utm_medium') as utm_medium,
-        JSONExtractString(payload, 'utm_campaign') as utm_campaign,
-        JSONExtractString(payload, 'utm_term') as utm_term,
-        JSONExtractString(payload, 'utm_content') as utm_content
+        getSubcolumn(payload_json, 'member_uuid') as member_uuid,
+        getSubcolumn(payload_json, 'member_status') as member_status,
+        getSubcolumn(payload_json, 'post_uuid') as post_uuid,
+        getSubcolumn(payload_json, 'post_type') as post_type,
+        getSubcolumn(payload_json, 'gift_link') as gift_link,
+        lower(getSubcolumn(payload_json, 'user-agent')) as user_agent,
+        getSubcolumn(payload_json, 'device') as device,
+        getSubcolumn(payload_json, 'utm_source') as utm_source,
+        getSubcolumn(payload_json, 'utm_medium') as utm_medium,
+        getSubcolumn(payload_json, 'utm_campaign') as utm_campaign,
+        getSubcolumn(payload_json, 'utm_term') as utm_term,
+        getSubcolumn(payload_json, 'utm_content') as utm_content
     FROM analytics_events
     where action = 'page_hit'
 

package/core/server/data/tinybird/scripts/docker-analytics-manager.js

@@ -361,7 +361,7 @@ class DockerAnalyticsManager {
 
     const userSessionData = this.userSessions.get(userKey);
 
-    for (let session of userSessionData) {
+    for (const session of userSessionData) {
       const timeDiff = (timestamp.getTime() - session.startTime.getTime()) / (1000 * 60 * 60);
       if (timeDiff <= 3 && timeDiff >= 0) {
         return session.sessionId;
@@ -571,7 +571,7 @@ class DockerAnalyticsManager {
 
     // Generate base timestamp for this session
     const firstContent = this.selectContent();
-    let baseTimestamp = this.generateTimestamp(firstContent.published_at);
+    const baseTimestamp = this.generateTimestamp(firstContent.published_at);
 
     // Generate consistent session attributes
     const memberStatus = this.weightedChoice(this.memberStatusWeights);

package/core/server/ghost-server.js

@@ -75,7 +75,7 @@ class GhostServer {
     start(rootApp) {
         debug('Starting...');
         this.rootApp = rootApp;
-        const { host, port, testmode, shutdownTimeout } = this.serverConfig;
+        const { host, port, shutdownTimeout } = this.serverConfig;
         return new Promise((resolve, reject) => {
             const httpServer = rootApp.listen(port, host);
             httpServer.on('error', (error) => {
@@ -104,10 +104,6 @@ class GhostServer {
             httpServer.on('listening', () => {
                 debug('...Started');
                 this._logStartMessages();
-                // Debug logs output in testmode only
-                if (testmode) {
-                    this._startTestMode();
-                }
                 debug('Notifying server ready (success)');
                 return notify_1.default.notifyServerStarted().finally(() => {
                     resolve(this);
@@ -273,20 +269,6 @@ class GhostServer {
             });
         }
     }
-    /**
-     * Internal Method for TestMode.
-     */
-    _startTestMode() {
-        // Output how many connections are open every 5 seconds
-        const connectionInterval = setInterval(() => this.httpServer?.getConnections((_err, connections) => logging_1.default.warn(`${connections} connections currently open`)), 5000);
-        // Output a notice when the server closes
-        const { httpServer } = this;
-        (0, node_assert_1.default)(httpServer, 'httpServer must be set before starting test mode');
-        httpServer.on('close', function () {
-            clearInterval(connectionInterval);
-            logging_1.default.warn('Server has fully closed');
-        });
-    }
     /**
      * Log Start Messages
      */

package/core/server/lib/image/image-size.js

@@ -273,12 +273,10 @@ class ImageSize {
    * @returns {object} imageObject or error
    */
   getImageSizeFromStoragePath(imagePath) {
-    let filePath;
-
     imagePath = this.urlUtils.urlFor('image', { image: imagePath }, true);
 
     // get the storage readable filePath
-    filePath = this.storageUtils.getLocalImagesStoragePath(imagePath);
+    const filePath = this.storageUtils.getLocalImagesStoragePath(imagePath);
 
     return this.imageStore
       .read({ path: filePath })