ghost 5.33.7 → 5.34.0

package/core/server/services/email-analytics/jobs/fetch-latest/run.js

@@ -1,57 +0,0 @@
-const debug = require('@tryghost/debug')('jobs:email-analytics:fetch-latest');
-
-async function run({domainEvents}) {
-    const config = require('../../../../../shared/config');
-    const db = require('../../../../data/db');
-
-    const settingsRows = await db.knex('settings')
-        .whereIn('key', ['mailgun_api_key', 'mailgun_domain', 'mailgun_base_url']);
-
-    const settingsCache = {};
-
-    settingsRows.forEach((row) => {
-        settingsCache[row.key] = row.value;
-    });
-
-    const settings = {
-        get(key) {
-            return settingsCache[key];
-        }
-    };
-
-    const {EmailAnalyticsService} = require('@tryghost/email-analytics-service');
-    const MailgunProvider = require('@tryghost/email-analytics-provider-mailgun');
-    const queries = require('../../lib/queries');
-    const {EmailEventProcessor} = require('@tryghost/email-service');
-
-    // Since this is running in a worker thread, we cant dispatch directly
-    // So we post the events as a message to the job manager
-    const eventProcessor = new EmailEventProcessor({
-        domainEvents,
-        db
-    });
-
-    const emailAnalyticsService = new EmailAnalyticsService({
-        config,
-        settings,
-        eventProcessor,
-        providers: [
-            new MailgunProvider({config, settings})
-        ],
-        queries
-    });
-
-    const fetchStartDate = new Date();
-    debug('Starting email analytics fetch of latest events');
-    const eventStats = await emailAnalyticsService.fetchLatest();
-    const fetchEndDate = new Date();
-    debug(`Finished fetching ${eventStats.totalEvents} analytics events in ${fetchEndDate - fetchStartDate}ms`);
-
-    const aggregateStartDate = new Date();
-    debug(`Starting email analytics aggregation for ${eventStats.emailIds.length} emails`);
-    await emailAnalyticsService.aggregateStats(eventStats);
-    const aggregateEndDate = new Date();
-    debug(`Finished aggregating email analytics in ${aggregateEndDate - aggregateStartDate}ms`);
-    return {eventStats, fetchStartDate, fetchEndDate, aggregateStartDate, aggregateEndDate};
-}
-module.exports.run = run;

package/core/server/web/api/middleware/normalize-image.js

@@ -1,42 +0,0 @@
-const cloneDeep = require('lodash/cloneDeep');
-const config = require('../../../../shared/config');
-const logging = require('@tryghost/logging');
-const imageTransform = require('@tryghost/image-transform');
-
-module.exports = function normalize(req, res, next) {
-    const imageOptimizationOptions = config.get('imageOptimization');
-
-    // CASE: image transform is not capable of transforming file (e.g. .gif)
-    if (!imageTransform.shouldResizeFileExtension(req.file.ext) || !imageOptimizationOptions.resize) {
-        return next();
-    }
-
-    const out = `${req.file.path}_processed`;
-    const originalPath = req.file.path;
-
-    const options = Object.assign({
-        in: originalPath,
-        out,
-        ext: req.file.ext,
-        width: config.get('imageOptimization:defaultMaxWidth')
-    }, imageOptimizationOptions);
-
-    imageTransform.resizeFromPath(options)
-        .then(() => {
-            req.files = [];
-
-            // CASE: push the processed/optimized image
-            req.files.push(Object.assign(req.file, {path: out}));
-
-            // CASE: push original image, we keep a copy of it
-            const newName = imageTransform.generateOriginalImageName(req.file.name);
-            req.files.push(Object.assign(cloneDeep(req.file), {path: originalPath, name: newName}));
-
-            next();
-        })
-        .catch((err) => {
-            err.context = `${req.file.name} / ${req.file.type}`;
-            logging.error(err);
-            next();
-        });
-};