ghost 6.58.0 → 6.59.0

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

@@ -1,7 +1,7 @@
 const {TableImporter} = require('./table-importer');
 const {faker} = require('@faker-js/faker');
 const {luck} = require('../utils/random');
-const databaseDate = require('../utils/database-date');
+const {fromDatabaseDate, toDatabaseDate} = require('../../../lib/db-date');
 
 class MembersCreatedEventsImporter extends TableImporter {
     static table = 'members_created_events';
@@ -13,22 +13,23 @@ class MembersCreatedEventsImporter extends TableImporter {
 
     async import(quantity) {
         const members = await this.transaction.select('id', 'created_at').from('members');
-        this.posts = await this.transaction.select('id', 'published_at', 'visibility', 'type', 'slug').from('posts').orderBy('published_at', 'desc');
+        this.posts = await this.transaction.select('id', 'published_at', 'visibility', 'type', 'slug').from('posts').whereNotNull('published_at').orderBy('published_at', 'desc');
         this.incomingRecommendations = await this.transaction.select('id', 'source', 'created_at').from('mentions');
 
         await this.importForEach(members, quantity ? quantity / members.length : 1);
     }
 
     generateSource() {
-        let source = 'member';
         if (luck(10)) {
-            source = 'admin';
-        } else if (luck(5)) {
-            source = 'api';
-        } else if (luck(5)) { // eslint-disable-line no-dupe-else-if
-            source = 'import';
+            return 'admin';
         }
-        return source;
+        if (luck(5)) {
+            return 'api';
+        }
+        if (luck(5)) {
+            return 'import';
+        }
+        return 'member';
     }
 
     generate() {
@@ -47,8 +48,8 @@ class MembersCreatedEventsImporter extends TableImporter {
         };
 
         if (source === 'member' && luck(30)) {
-            const memberCreatedAt = databaseDate.parse(this.model.created_at);
-            const post = this.posts.find(p => p.visibility === 'public' && databaseDate.parse(p.published_at) < memberCreatedAt);
+            const memberCreatedAt = fromDatabaseDate(this.model.created_at);
+            const post = this.posts.find(p => p.visibility === 'public' && fromDatabaseDate(p.published_at) < memberCreatedAt);
             if (post) {
                 attribution = {
                     attribution_id: post.id,
@@ -92,7 +93,7 @@ class MembersCreatedEventsImporter extends TableImporter {
 
         return {
             id: this.fastFakeObjectId(),
-            created_at: databaseDate.dateToDatabaseString(this.model.created_at),
+            created_at: toDatabaseDate(this.model.created_at),
             member_id: this.model.id,
             source,
             ...attribution,

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

@@ -1,6 +1,6 @@
 const {TableImporter} = require('./table-importer');
-const {luck} = require('../utils/random');
-const databaseDate = require('../utils/database-date');
+const {luck, randomDateBetween} = require('../utils/random');
+const {fromDatabaseDate, toDatabaseDate} = require('../../../lib/db-date');
 
 class MembersFeedbackImporter extends TableImporter {
     static table = 'members_feedback';
@@ -24,10 +24,10 @@ class MembersFeedbackImporter extends TableImporter {
             return null;
         }
 
-        const openedAt = databaseDate.parse(this.model.opened_at);
-        const laterOn = databaseDate.parse(this.model.opened_at);
+        const openedAt = fromDatabaseDate(this.model.opened_at);
+        const laterOn = new Date(openedAt);
         laterOn.setMinutes(laterOn.getMinutes() + 60);
-        const feedbackTime = databaseDate.randomBetween(openedAt, laterOn);
+        const feedbackTime = randomDateBetween(openedAt, laterOn);
 
         const postId = this.emails.find(email => email.id === this.model.email_id).post_id;
         return {
@@ -35,8 +35,8 @@ class MembersFeedbackImporter extends TableImporter {
             score: luck(70) ? 1 : 0,
             member_id: this.model.member_id,
             post_id: postId,
-            created_at: databaseDate.dateToDatabaseString(feedbackTime),
-            updated_at: databaseDate.dateToDatabaseString(feedbackTime)
+            created_at: toDatabaseDate(feedbackTime),
+            updated_at: toDatabaseDate(feedbackTime)
         };
     }
 }

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

@@ -4,7 +4,7 @@ const {faker: americanFaker} = require('@faker-js/faker/locale/en_US');
 const {blogStartDate: startTime} = require('../utils/blog-info');
 const generateEvents = require('../utils/event-generator');
 const {luck} = require('../utils/random');
-const databaseDate = require('../utils/database-date');
+const {toDatabaseDate} = require('../../../lib/db-date');
 const debug = require('@tryghost/debug')('MembersImporter');
 
 class MembersImporter extends TableImporter {
@@ -88,9 +88,9 @@ class MembersImporter extends TableImporter {
             email_opened_count: 0,
             email_open_rate: null,
             // 40% of users logged in within a week, 60% sometime since registering
-            last_seen_at: luck(40) ? databaseDate.dateToDatabaseString(faker.date.recent({days: 7})) : databaseDate.dateToDatabaseString(faker.date.between({from: timestamp, to: new Date()})),
-            created_at: databaseDate.dateToDatabaseString(timestamp),
-            updated_at: databaseDate.dateToDatabaseString(timestamp)
+            last_seen_at: luck(40) ? toDatabaseDate(faker.date.recent({days: 7})) : toDatabaseDate(faker.date.between({from: timestamp, to: new Date()})),
+            created_at: toDatabaseDate(timestamp),
+            updated_at: toDatabaseDate(timestamp)
         };
     }
 }

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

@@ -1,7 +1,7 @@
 const {TableImporter} = require('./table-importer');
 const {luck} = require('../utils/random');
 const generateEvents = require('../utils/event-generator');
-const databaseDate = require('../utils/database-date');
+const {fromDatabaseDate, toDatabaseDate} = require('../../../lib/db-date');
 
 class MembersLoginEventsImporter extends TableImporter {
     static table = 'members_login_events';
@@ -34,7 +34,7 @@ class MembersLoginEventsImporter extends TableImporter {
 
     setReferencedModel(model) {
         this.model = model;
-        const memberCreatedAt = databaseDate.parse(model.created_at);
+        const memberCreatedAt = fromDatabaseDate(model.created_at);
 
         const endDate = new Date();
         const daysBetween = Math.ceil((endDate.valueOf() - memberCreatedAt.valueOf()) / (1000 * 60 * 60 * 24));
@@ -60,7 +60,7 @@ class MembersLoginEventsImporter extends TableImporter {
         }
         return {
             id: this.fastFakeObjectId(),
-            created_at: databaseDate.dateToDatabaseString(timestamp),
+            created_at: toDatabaseDate(timestamp),
             member_id: this.model.id
         };
     }

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

@@ -1,7 +1,7 @@
 const {faker} = require('@faker-js/faker');
 const {TableImporter} = require('./table-importer');
 const {luck} = require('../utils/random');
-const databaseDate = require('../utils/database-date');
+const {toDatabaseDate} = require('../../../lib/db-date');
 
 class MembersProductsImporter extends TableImporter {
     static table = 'members_products';
@@ -34,7 +34,7 @@ class MembersProductsImporter extends TableImporter {
             member_id: this.model.id,
             product_id: this.getProduct().id,
             sort_order: 0,
-            expiry_at: this.model.status === 'paid' ? null : (luck(50) ? null : databaseDate.dateToDatabaseString(faker.date.future()))
+            expiry_at: this.model.status === 'paid' ? null : (luck(50) ? null : toDatabaseDate(faker.date.future()))
         };
     }
 }

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

@@ -1,5 +1,6 @@
 const {TableImporter} = require('./table-importer');
-const databaseDate = require('../utils/database-date');
+const {randomDateBetween} = require('../utils/random');
+const {toDatabaseDate} = require('../../../lib/db-date');
 
 class MembersStatusEventsImporter extends TableImporter {
     static table = 'members_status_events';
@@ -31,7 +32,7 @@ class MembersStatusEventsImporter extends TableImporter {
             member_id: model.id,
             from_status: null,
             to_status: 'free',
-            created_at: databaseDate.dateToDatabaseString(model.created_at)
+            created_at: toDatabaseDate(model.created_at)
         }];
         if (model.status !== 'free') {
             this.events.push({
@@ -39,7 +40,7 @@ class MembersStatusEventsImporter extends TableImporter {
                 member_id: model.id,
                 from_status: 'free',
                 to_status: model.status,
-                created_at: databaseDate.dateToDatabaseString(databaseDate.randomBetween(model.created_at, new Date()))
+                created_at: toDatabaseDate(randomDateBetween(model.created_at, new Date()))
             });
         }
     }

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

@@ -1,6 +1,6 @@
 const {faker} = require('@faker-js/faker');
 const {TableImporter} = require('./table-importer');
-const databaseDate = require('../utils/database-date');
+const {fromDatabaseDate} = require('../../../lib/db-date');
 
 class MembersStripeCustomersImporter extends TableImporter {
     static table = 'members_stripe_customers';
@@ -35,7 +35,7 @@ class MembersStripeCustomersImporter extends TableImporter {
             // Only 30% of free members should have a stripe customer = have had a subscription in the past or tried to subscribe
             // The number should increase the older the member is
 
-            const daysSinceMemberCreated = Math.floor((new Date() - databaseDate.parse(this.model.created_at)) / (1000 * 60 * 60 * 24));
+            const daysSinceMemberCreated = Math.floor((new Date() - fromDatabaseDate(this.model.created_at)) / (1000 * 60 * 60 * 24));
             const shouldHaveStripeCustomer = faker.number.int({min: 0, max: 100}) < Math.max(Math.min(daysSinceMemberCreated / 60, 15), 2);
 
             if (!shouldHaveStripeCustomer) {

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

@@ -1,8 +1,8 @@
 const {faker} = require('@faker-js/faker');
 const {TableImporter} = require('./table-importer');
-const databaseDate = require('../utils/database-date');
 const generateEvents = require('../utils/event-generator');
 const {luck} = require('../utils/random');
+const {fromDatabaseDate, toDatabaseDate} = require('../../../lib/db-date');
 
 class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
     static table = 'members_stripe_customers_subscriptions';
@@ -95,7 +95,7 @@ class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
                 (isMonthly ? price.interval === 'month' : price.interval === 'year');
         });
         const mrr = createValid ? (isMonthly ? stripePrice.amount : Math.floor(stripePrice.amount / 12)) : 0;
-        const memberCreatedAt = databaseDate.parse(member.created_at);
+        const memberCreatedAt = fromDatabaseDate(member.created_at);
 
         const referenceEndDate = this.lastSubscriptionStart ?? new Date();
 
@@ -193,8 +193,8 @@ class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
             validStatusses.push({
                 status: 'trialing',
                 cancel_at_period_end: false,
-                trial_end_at: databaseDate.dateToDatabaseString(endDate),
-                trial_start_at: databaseDate.dateToDatabaseString(startDate)
+                trial_end_at: toDatabaseDate(endDate),
+                trial_start_at: toDatabaseDate(startDate)
             });
         }
 
@@ -236,8 +236,8 @@ class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
             customer_id: customer.customer_id,
             subscription_id: `sub_${faker.string.alphanumeric(14)}`,
             stripe_price_id: stripePrice.stripe_price_id,
-            start_date: databaseDate.dateToDatabaseString(startDate),
-            created_at: databaseDate.dateToDatabaseString(startDate),
+            start_date: toDatabaseDate(startDate),
+            created_at: toDatabaseDate(startDate),
             mrr,
             plan_id: stripeProduct.stripe_product_id,
             plan_nickname: `${ghostProduct.name} - ${stripePrice.nickname}`,
@@ -248,7 +248,7 @@ class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
             // Defaults
             status: 'active',
             cancel_at_period_end: false,
-            current_period_end: databaseDate.dateToDatabaseString(endDate),
+            current_period_end: toDatabaseDate(endDate),
 
             // Override
             ...status

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

@@ -1,6 +1,6 @@
 const {TableImporter} = require('./table-importer');
-const {luck} = require('../utils/random');
-const databaseDate = require('../utils/database-date');
+const {luck, randomDateBetween} = require('../utils/random');
+const {toDatabaseDate} = require('../../../lib/db-date');
 
 class MembersSubscribeEventsImporter extends TableImporter {
     static table = 'members_subscribe_events';
@@ -50,7 +50,7 @@ class MembersSubscribeEventsImporter extends TableImporter {
             return null;
         }
 
-        const createdAt = databaseDate.dateToDatabaseString(databaseDate.randomBetween(this.model.created_at, new Date()));
+        const createdAt = toDatabaseDate(randomDateBetween(this.model.created_at, new Date()));
         const newsletterId = this.newsletters[count % this.newsletters.length].id;
 
         return {

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

@@ -1,7 +1,7 @@
 const {TableImporter} = require('./table-importer');
 const {faker} = require('@faker-js/faker');
 const {luck} = require('../utils/random');
-const databaseDate = require('../utils/database-date');
+const {fromDatabaseDate} = require('../../../lib/db-date');
 
 class MembersSubscriptionCreatedEventsImporter extends TableImporter {
     static table = 'members_subscription_created_events';
@@ -48,8 +48,8 @@ class MembersSubscriptionCreatedEventsImporter extends TableImporter {
         };
 
         if (luck(30)) {
-            const createdAt = databaseDate.parse(this.model.created_at);
-            const post = this.posts.find(p => p.visibility === 'public' && databaseDate.parse(p.published_at) < createdAt);
+            const createdAt = fromDatabaseDate(this.model.created_at);
+            const post = this.posts.find(p => p.visibility === 'public' && fromDatabaseDate(p.published_at) < createdAt);
             if (post) {
                 attribution = {
                     attribution_id: post.id,

package/core/server/data/seeders/importers/offer-redemptions-importer.js

@@ -1,7 +1,8 @@
 const {faker} = require('@faker-js/faker');
 const errors = require('@tryghost/errors');
 const {TableImporter} = require('./table-importer');
-const databaseDate = require('../utils/database-date');
+const {randomDateBetween} = require('../utils/random');
+const {fromDatabaseDate, toDatabaseDate} = require('../../../lib/db-date');
 
 class OfferRedemptionsImporter extends TableImporter {
     static table = 'offer_redemptions';
@@ -53,7 +54,7 @@ class OfferRedemptionsImporter extends TableImporter {
             this.subscriptionPool.push({
                 memberId,
                 subscriptionId: subscription.id,
-                subscriptionCreatedAt: databaseDate.parse(subscription.created_at),
+                subscriptionCreatedAt: fromDatabaseDate(subscription.created_at),
                 redemptionEndAt: this.getRedemptionEndDate(subscription.current_period_end),
                 availableOffers: [...matchingOffers],
                 lastRedeemedAt: null
@@ -78,7 +79,7 @@ class OfferRedemptionsImporter extends TableImporter {
 
     getRedemptionEndDate(currentPeriodEnd) {
         const now = new Date();
-        const endDate = currentPeriodEnd ? databaseDate.parse(currentPeriodEnd) : now;
+        const endDate = currentPeriodEnd ? fromDatabaseDate(currentPeriodEnd) : now;
 
         return endDate > now ? now : endDate;
     }
@@ -86,19 +87,18 @@ class OfferRedemptionsImporter extends TableImporter {
     getCreatedAt(subscriptionState, offer) {
         const candidateEarliest = new Date(Math.max(
             subscriptionState.subscriptionCreatedAt.valueOf(),
-            databaseDate.parse(offer.created_at).valueOf(),
+            fromDatabaseDate(offer.created_at).valueOf(),
             subscriptionState.lastRedeemedAt ? subscriptionState.lastRedeemedAt.valueOf() + 1000 : 0
         ));
         const earliest = new Date(Math.min(
             candidateEarliest.valueOf(),
             subscriptionState.redemptionEndAt.valueOf()
         ));
-        const latest = subscriptionState.redemptionEndAt > earliest ? subscriptionState.redemptionEndAt : earliest;
-        const createdAt = latest.valueOf() === earliest.valueOf() ? earliest : faker.date.between({from: earliest, to: latest});
+        const createdAt = randomDateBetween(earliest, subscriptionState.redemptionEndAt);
 
         subscriptionState.lastRedeemedAt = createdAt;
 
-        return databaseDate.dateToDatabaseString(createdAt);
+        return toDatabaseDate(createdAt);
     }
 
     generate() {

package/core/server/data/seeders/importers/offers-importer.js

@@ -1,7 +1,7 @@
 const {TableImporter} = require('./table-importer');
 const {slugify} = require('@tryghost/string');
 const {blogStartDate} = require('../utils/blog-info');
-const databaseDate = require('../utils/database-date');
+const {toDatabaseDate} = require('../../../lib/db-date');
 
 const offerTemplates = [{
     name: 'Black Friday',
@@ -107,8 +107,8 @@ class OffersImporter extends TableImporter {
             portal_title: name,
             portal_description: template.description,
             redemption_type: 'signup',
-            created_at: databaseDate.dateToDatabaseString(blogStartDate),
-            updated_at: databaseDate.dateToDatabaseString(blogStartDate)
+            created_at: toDatabaseDate(blogStartDate),
+            updated_at: toDatabaseDate(blogStartDate)
         };
     }
 }

package/core/server/data/seeders/importers/posts-importer.js

@@ -2,7 +2,7 @@ const {faker} = require('@faker-js/faker');
 const {slugify} = require('@tryghost/string');
 const {luck} = require('../utils/random');
 const {TableImporter} = require('./table-importer');
-const databaseDate = require('../utils/database-date');
+const {toDatabaseDate} = require('../../../lib/db-date');
 
 class PostsImporter extends TableImporter {
     static table = 'posts';
@@ -53,9 +53,9 @@ class PostsImporter extends TableImporter {
 
         return {
             id,
-            created_at: databaseDate.dateToDatabaseString(timestamp),
-            updated_at: databaseDate.dateToDatabaseString(timestamp),
-            published_at: status === 'published' ? databaseDate.dateToDatabaseString(timestamp) : status === 'scheduled' ? databaseDate.dateToDatabaseString(faker.date.soon({days: 5, refDate: timestamp})) : null,
+            created_at: toDatabaseDate(timestamp),
+            updated_at: toDatabaseDate(timestamp),
+            published_at: status === 'published' ? toDatabaseDate(timestamp) : status === 'scheduled' ? toDatabaseDate(faker.date.soon({days: 5, refDate: timestamp})) : null,
             uuid: faker.string.uuid(),
             comment_id: this.type === 'post' ? id : null,
             title: title,

package/core/server/data/seeders/importers/table-importer.js

@@ -1,44 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableImporter = void 0;
 const debug_1 = __importDefault(require("@tryghost/debug"));
-const databaseDate = __importStar(require("../utils/database-date"));
+const db_date_1 = require("../../../lib/db-date");
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const papaparse_1 = __importDefault(require("papaparse"));
@@ -134,7 +101,7 @@ class TableImporter {
                             mutableObj[key] = value ? 1 : 0;
                         }
                         else if (value instanceof Date) {
-                            mutableObj[key] = databaseDate.dateToDatabaseString(value);
+                            mutableObj[key] = (0, db_date_1.toDatabaseDate)(value);
                         }
                         else if (value === null) {
                             mutableObj[key] = '\\N';

package/core/server/data/seeders/importers/tags-importer.js

@@ -1,7 +1,7 @@
 const {faker} = require('@faker-js/faker');
 const {slugify} = require('@tryghost/string');
 const {TableImporter} = require('./table-importer');
-const databaseDate = require('../utils/database-date');
+const {toDatabaseDate} = require('../../../lib/db-date');
 
 class TagsImporter extends TableImporter {
     static table = 'tags';
@@ -32,7 +32,7 @@ class TagsImporter extends TableImporter {
             name: name,
             slug: slugify(name),
             description: faker.lorem.sentence(),
-            created_at: databaseDate.dateToDatabaseString(faker.date.between({from: threeYearsAgo, to: twoYearsAgo}))
+            created_at: toDatabaseDate(faker.date.between({from: threeYearsAgo, to: twoYearsAgo}))
         };
     }
 }

package/core/server/data/seeders/importers/users-importer.js

@@ -2,7 +2,7 @@ const {TableImporter} = require('./table-importer');
 const {faker} = require('@faker-js/faker');
 const {slugify} = require('@tryghost/string');
 const security = require('@tryghost/security');
-const databaseDate = require('../utils/database-date');
+const {toDatabaseDate} = require('../../../lib/db-date');
 
 class UsersImporter extends TableImporter {
     static table = 'users';
@@ -24,7 +24,7 @@ class UsersImporter extends TableImporter {
             password: await security.password.hash(faker.color.human()),
             email: faker.internet.email({firstName, lastName}),
             profile_image: faker.image.avatar(),
-            created_at: databaseDate.dateToDatabaseString(faker.date.between({from: new Date(2016, 0), to: new Date()}))
+            created_at: toDatabaseDate(faker.date.between({from: new Date(2016, 0), to: new Date()}))
         };
     }
 }

package/core/server/data/seeders/importers/web-mentions-importer.js

@@ -1,6 +1,6 @@
 const {TableImporter} = require('./table-importer');
 const {faker} = require('@faker-js/faker');
-const databaseDate = require('../utils/database-date');
+const {toDatabaseDate} = require('../../../lib/db-date');
 
 class WebMentionsImporter extends TableImporter {
     static table = 'mentions';
@@ -31,7 +31,7 @@ class WebMentionsImporter extends TableImporter {
             target: `${this.baseUrl}`,
             resource_id: null,
             resource_type: null,
-            created_at: databaseDate.dateToDatabaseString(faker.date.past()),
+            created_at: toDatabaseDate(faker.date.past()),
             payload: JSON.stringify({}),
             deleted: 0,
             verified: 1

package/core/server/data/seeders/utils/random.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.luck = void 0;
+exports.randomDateBetween = randomDateBetween;
 const faker_1 = require("@faker-js/faker");
+const db_date_1 = require("../../../lib/db-date");
 /**
  * Adds another degree of randomness into some decisions
  * @param lowerThan Only this % of people will achieve this luck
@@ -12,3 +14,8 @@ const luck = (lowerThan) => faker_1.faker.number.int({
     max: 100
 }) <= lowerThan;
 exports.luck = luck;
+function randomDateBetween(start, end) {
+    const earliest = (0, db_date_1.fromDatabaseDate)(start);
+    const latest = (0, db_date_1.fromDatabaseDate)(end);
+    return latest > earliest ? faker_1.faker.date.between({ from: earliest, to: latest }) : earliest;
+}

package/core/server/ghost-server.js

@@ -200,9 +200,11 @@ class GhostServer {
 
     /**
      * Add a task that should be called on shutdown
+     * @param {() => Promise<any>} task
+     * @param {string} [label] - name used in shutdown timing logs
      */
-    registerCleanupTask(task) {
-        this.cleanupTasks.push(task);
+    registerCleanupTask(task, label) {
+        this.cleanupTasks.push({task, label: label || `cleanup task #${this.cleanupTasks.length + 1}`});
     }
 
     /**
@@ -217,12 +219,24 @@ class GhostServer {
      */
     async _stopServer() {
         const util = require('util');
-        return util.promisify(this.httpServer.stop)();
+        const startTime = Date.now();
+        try {
+            return await util.promisify(this.httpServer.stop)();
+        } finally {
+            logging.info(`Shutdown: stopped HTTP server in ${Date.now() - startTime}ms`);
+        }
     }
 
     async _cleanup() {
-        // Wait for all cleanup tasks to finish
-        return Promise.all(this.cleanupTasks.map(task => task()));
+        // Wait for all cleanup tasks to finish, timing each so a slow one is identifiable
+        return Promise.all(this.cleanupTasks.map(async ({task, label}) => {
+            const startTime = Date.now();
+            try {
+                return await task();
+            } finally {
+                logging.info(`Shutdown: ${label} finished in ${Date.now() - startTime}ms`);
+            }
+        }));
     }
 
     /**

package/core/server/lib/db-date.js

@@ -1,10 +1,79 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DbDate = void 0;
+exports.DbDate = exports.fromDatabaseDate = exports.toDatabaseDate = void 0;
+const luxon_1 = require("luxon");
+const errors = __importStar(require("@tryghost/errors"));
 const zod_1 = require("zod");
+const DATABASE_DATE_FORMAT = 'yyyy-MM-dd HH:mm:ss';
+const databaseDateInput = zod_1.z.union([zod_1.z.date(), zod_1.z.string(), zod_1.z.number()]);
+const parseDatabaseDateString = (value) => {
+    const sql = luxon_1.DateTime.fromSQL(value, { zone: 'utc' });
+    return sql.isValid ? sql : luxon_1.DateTime.fromISO(value, { zone: 'utc' });
+};
+const parseDatabaseDate = (date) => {
+    const input = databaseDateInput.safeParse(date);
+    if (!input.success) {
+        throw new errors.InternalServerError({ message: 'Invalid database date' });
+    }
+    let parsed;
+    if (typeof input.data === 'string') {
+        parsed = parseDatabaseDateString(input.data);
+    }
+    else if (typeof input.data === 'number') {
+        parsed = luxon_1.DateTime.fromMillis(input.data, { zone: 'utc' });
+    }
+    else {
+        parsed = luxon_1.DateTime.fromJSDate(input.data, { zone: 'utc' });
+    }
+    if (!parsed.isValid) {
+        throw new errors.InternalServerError({ message: 'Invalid database date' });
+    }
+    return parsed;
+};
+// Raw Knex queries need this UTC datetime format for consistent MySQL and SQLite behavior.
+const toDatabaseDate = (date) => parseDatabaseDate(date).toFormat(DATABASE_DATE_FORMAT);
+exports.toDatabaseDate = toDatabaseDate;
+const fromDatabaseDate = (date) => parseDatabaseDate(date).toJSDate();
+exports.fromDatabaseDate = fromDatabaseDate;
 // A zod codec for datetime columns: MySQL returns a Date, SQLite a string/number;
 // normalise to a Date on read and pass a Date through on write.
-exports.DbDate = zod_1.z.codec(zod_1.z.union([zod_1.z.date(), zod_1.z.string(), zod_1.z.number()]), zod_1.z.date(), {
-    decode: value => new Date(value),
+// On SQLite, Knex binds the Date that DbDate passes through as epoch milliseconds (stored as
+// INTEGER) while toDatabaseDate writes TEXT; SQLite orders INTEGER before TEXT, so never compare
+// or order those two representations.
+exports.DbDate = zod_1.z.codec(databaseDateInput, zod_1.z.date(), {
+    decode: exports.fromDatabaseDate,
     encode: date => date
 });