npm - ghost - Versions diffs - 5.7.0 → 5.8.1 - Mend

ghost 5.7.0 → 5.8.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (451) hide show

package/core/built/{assets/vendor.min-4a6661c574707ceca220aa2e76558995.css → admin/assets/vendor-bc9d2c9e5c8a33f0c92e81189d48e04c.css} RENAMED Viewed

@@ -1,20 +1,27 @@
 .ember-basic-dropdown {
-  position: relative; }
+  position: relative;
+}
-.ember-basic-dropdown, .ember-basic-dropdown-content, .ember-basic-dropdown-content * {
-  box-sizing: border-box; }
+.ember-basic-dropdown,
+.ember-basic-dropdown-content,
+.ember-basic-dropdown-content * {
+  box-sizing: border-box;
+}
 .ember-basic-dropdown-content {
   position: absolute;
   width: auto;
   z-index: 1000;
-  background-color: #FFF; }
+  background-color: #fff;
+}
 .ember-basic-dropdown-content--left {
-  left: 0; }
+  left: 0;
+}
 .ember-basic-dropdown-content--right {
-  right: 0; }
+  right: 0;
+}
 .ember-basic-dropdown-overlay {
   position: fixed;
@@ -24,11 +31,12 @@
   z-index: 10;
   top: 0;
   left: 0;
-  pointer-events: none; }
+  pointer-events: none;
+}
 .ember-basic-dropdown-content-wormhole-origin {
-  display: inline; }
+  display: inline;
+}
 .ember-basic-dropdown {
   position: relative; }

package/core/{server/web/admin/views/default.html → built/admin/index.html} RENAMED Viewed

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.7%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.8%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -36,28 +36,26 @@
         }
     </style>
-                <link rel="stylesheet" href="assets/vendor.min-4a6661c574707ceca220aa2e76558995.css">
-                <link rel="stylesheet" href="assets/ghost.min-8f5c061e0892b93adecc2b9e37ad2f3a.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/vendor-bc9d2c9e5c8a33f0c92e81189d48e04c.css">
+    <link integrity="" rel="stylesheet" href="assets/ghost-b469423d0fbe5e40af17b560f7e3cead.css" title="light">
 </head>
 <body>
-<div class="ember-load-indicator">
-    <div class="gh-loading-content">
-        <div class="gh-loading-spinner"></div>
+    <div class="ember-load-indicator">
+        <div class="gh-loading-content">
+            <div class="gh-loading-spinner"></div>
+        </div>
     </div>
-</div>
-<div id="ember-basic-dropdown-wormhole"></div>
+    <div id="ember-basic-dropdown-wormhole"></div>
-                <script src="assets/vendor.min-3dd40d3052381526f38fd290d13baa47.js"></script>
-                <script src="assets/ghost.min-ff9ba089fd81cb40831f4b62e63a2ca9.js"></script>
+    <script src="assets/vendor-46baf13852f545c6c89756c8e0ccbff2.js"></script>
+<script src="assets/chunk.351.cbc224ca65c14ef5322d.js"></script>
+<script src="assets/chunk.143.904e017ad397bb681e9d.js"></script>
+    <script src="assets/ghost-a66a04418efe85083a3adca0fb16bb52.js"></script>
 </body>
 </html>

package/core/frontend/helpers/comment_count.js CHANGED Viewed

@@ -1,25 +1,31 @@
 const {SafeString} = require('../services/handlebars');
 const {labs} = require('../services/proxy');
+const {html} = require('common-tags');
 function commentCount(options) {
-    return new SafeString(`
-       <span data-ghost-comment-count="${this.id}" style="display:none">
-           ${options.fn(this)}
-       </span>`
-    );
+    const empty = options.hash.empty === undefined ? '' : options.hash.empty;
+    const singular = options.hash.singular === undefined ? 'comment' : options.hash.singular;
+    const plural = options.hash.plural === undefined ? 'comments' : options.hash.plural;
+    return new SafeString(html`
+        <script
+            data-ghost-comment-count="${this.id}"
+            data-ghost-comment-count-empty="${empty}"
+            data-ghost-comment-count-singular="${singular}"
+            data-ghost-comment-count-plural="${plural}"
+        >
+        </script>
+    `);
 }
-module.exports = async function commentsLabsWrapper() {
+module.exports = function commentsLabsWrapper() {
     const self = this;
     const args = arguments;
     return labs.enabledHelper({
         flagKey: 'comments',
         flagName: 'Comments',
-        helperName: 'comments'
+        helperName: 'comment_count'
     }, () => {
         return commentCount.apply(self, args);
     });
 };
-module.exports.async = true;

package/core/frontend/helpers/title.js CHANGED Viewed

@@ -1,7 +1,7 @@
 // # Title Helper
 // Usage: `{{title}}`
 //
-// Overrides the standard behaviour of `{[title}}` to ensure the content is correctly escaped
+// Overrides the standard behavior of `{[title}}` to ensure the content is correctly escaped
 const {SafeString, escapeExpression} = require('../services/handlebars');

package/core/frontend/services/admin-auth-assets/service.js CHANGED Viewed

@@ -4,6 +4,7 @@ const path = require('path');
 const fs = require('fs').promises;
 const logging = require('@tryghost/logging');
 const config = require('../../../shared/config');
+const urlUtils = require('../../../shared/url-utils');
 class AdminAuthAssetsService {
     constructor(options = {}) {
@@ -24,13 +25,27 @@ class AdminAuthAssetsService {
         };
     }
+    /**
+     * @private
+     */
+    generateReplacements() {
+        // Clean the URL, only keep schema, host and port (without trailing slashes or subdirectory)
+        const url = new URL(urlUtils.getSiteUrl());
+        const origin = url.origin;
+        return {
+            // Properly encode the origin
+            '\'{{SITE_ORIGIN}}\'': JSON.stringify(origin)
+        };
+    }
     /**
      * @private
      * @returns {Promise<void>}
      */
-    async minify(globs) {
+    async minify(globs, options) {
         try {
-            await this.minifier.minify(globs);
+            await this.minifier.minify(globs, options);
         } catch (error) {
             if (error.code === 'EACCES') {
                 logging.error('Ghost was not able to write admin-auth asset files due to permissions.');
@@ -84,8 +99,9 @@ class AdminAuthAssetsService {
      */
     async load() {
         const globs = this.generateGlobs();
+        const replacements = this.generateReplacements();
         await this.clearFiles();
-        await this.minify(globs);
+        await this.minify(globs, {replacements});
         await this.copyStatic();
     }
 }

package/core/frontend/src/admin-auth/message-handler.js CHANGED Viewed

@@ -1,8 +1,12 @@
 const adminUrl = window.location.href.replace('auth-frame/', '');
+// At compile time, we'll replace the value with the actual origin.
+const siteOrigin = '{{SITE_ORIGIN}}';
 window.addEventListener('message', async function (event) {
-    if (event.origin !== '*') {
-        // return;
+    if (event.origin !== siteOrigin) {
+        console.warn('Ignored message to admin auth iframe because of mismatch in origin', 'expected', siteOrigin, 'got', event.origin, 'with data', event.data);
+        return;
     }
     let data = null;
     try {
@@ -16,7 +20,7 @@ window.addEventListener('message', async function (event) {
             uid: data.uid,
             error: error,
             result: result
-        }), '*');
+        }), siteOrigin);
     }
     if (data.action === 'getUser') {

package/core/frontend/src/comment-counts/js/comment-counts.js CHANGED Viewed

@@ -27,8 +27,23 @@
         for (const [id, count] of Object.entries(countsMap)) {
             const countElems = document.querySelectorAll(`[data-ghost-comment-count="${id}"]`);
             countElems.forEach((e) => {
-                e.innerHTML = e.innerHTML.replace('#', count);
-                e.style.display = '';
+                let text = e.dataset.ghostCommentCountEmpty;
+                if (count === 1) {
+                    if (e.dataset.ghostCommentCountSingular) {
+                        text = `${count} ${e.dataset.ghostCommentCountSingular}`;
+                    } else {
+                        text = count;
+                    }
+                }
+                if (count > 1) {
+                    if (e.dataset.ghostCommentCountPlural) {
+                        text = `${count} ${e.dataset.ghostCommentCountPlural}`;
+                    } else {
+                        text = count;
+                    }
+                }
+                e.insertAdjacentText('afterend', text);
+                e.remove();
             });
         }
     };

package/core/server/adapters/cache/Base.js ADDED Viewed

@@ -0,0 +1,12 @@
+class Cache {
+    constructor() {
+        Object.defineProperty(this, 'requiredFns', {
+            // NOTE: "keys" method is only here to provide smooth migration from deprecated "getAll" method
+            //       once use of "getAll" is eradicated, can also remove the "keys" method form the interface
+            value: ['get', 'set', 'reset', 'keys'],
+            writable: false
+        });
+    }
+}
+module.exports = Cache;

package/core/server/adapters/cache/Memory.js ADDED Viewed

@@ -0,0 +1,36 @@
+const Base = require('./Base');
+class MemoryCache extends Base {
+    constructor() {
+        super();
+        this._data = {};
+    }
+    get(key) {
+        return this._data[key];
+    }
+    /**
+     *
+     * @param {String} key
+     * @param {*} value
+     */
+    set(key, value) {
+        this._data[key] = value;
+    }
+    reset() {
+        this._data = {};
+    }
+    /**
+     * Helper method to assist "getAll" type of operations
+     * @returns {Array<String>} all keys present in the cache
+     */
+    keys() {
+        return Object.keys(this._data);
+    }
+}
+module.exports = MemoryCache;

package/core/server/adapters/cache/index.js ADDED Viewed

@@ -0,0 +1,17 @@
+const adapterManager = require('../../services/adapter-manager');
+/**
+ * @param {'settings'|'theme'|'urls'} [feature] - name for the "feature" to enable through adapter, e.g.: settings cache
+ * @returns {Object} cache adapter instance
+ */
+function getCache(feature) {
+    let adapterName = 'cache';
+    if (feature) {
+        adapterName += `:${feature}`;
+    }
+    return adapterManager.getAdapter(adapterName);
+}
+module.exports.getCache = getCache;

package/core/server/api/endpoints/comments-members.js CHANGED Viewed

@@ -2,9 +2,8 @@ const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
-const db = require('../../data/db');
 const commentsService = require('../../services/comments');
-const ALLOWED_INCLUDES = ['post', 'member', 'likes', 'replies'];
+const ALLOWED_INCLUDES = ['post', 'member', 'likes', 'replies', 'parent'];
 const UNSAFE_ATTRS = ['status'];
 const messages = {
@@ -123,23 +122,7 @@ module.exports = {
     counts: {
         permissions: false,
         async query(frame) {
-            const query = db.knex('comments')
-                .select(db.knex.raw(`COUNT(*) AS count, post_id`))
-                .groupBy('post_id');
-            if (Array.isArray(frame?.data?.ids)) {
-                query.whereIn('post_id', frame.data.ids);
-            }
-            const results = await query;
-            const counts = {};
-            for (const row of results) {
-                counts[row.post_id] = row.count;
-            }
-            return counts;
+            return commentsService.controller.count(frame);
         }
     },

package/core/server/api/endpoints/index.js CHANGED Viewed

@@ -226,6 +226,6 @@ module.exports = {
     },
     get commentsMembers() {
-        return shared.pipeline(require('./comments-members'), localUtils, 'comments');
+        return shared.pipeline(require('./comments-members'), localUtils, 'members');
     }
 };

package/core/server/api/endpoints/integrations.js CHANGED Viewed

@@ -53,10 +53,12 @@ module.exports = {
         },
         query({data, options}) {
             return models.Integration.findOne(data, Object.assign(options, {require: true}))
-                .catch(models.Integration.NotFoundError, () => {
-                    throw new errors.NotFoundError({
-                        message: tpl(messages.resourceNotFound, {resource: 'Integration'})
-                    });
+                .catch((e) => {
+                    if (e instanceof models.Integration.NotFoundError) {
+                        throw new errors.NotFoundError({
+                            message: tpl(messages.resourceNotFound, {resource: 'Integration'})
+                        });
+                    }
                 });
         }
     },
@@ -136,10 +138,12 @@ module.exports = {
         },
         query({options}) {
             return models.Integration.destroy(Object.assign(options, {require: true}))
-                .catch(models.Integration.NotFoundError, () => {
-                    return Promise.reject(new errors.NotFoundError({
-                        message: tpl(messages.resourceNotFound, {resource: 'Integration'})
-                    }));
+                .catch((e) => {
+                    if (e instanceof models.Integration.NotFoundError) {
+                        return Promise.reject(new errors.NotFoundError({
+                            message: tpl(messages.resourceNotFound, {resource: 'Integration'})
+                        }));
+                    }
                 });
         }
     }

package/core/server/api/endpoints/utils/index.js CHANGED Viewed

@@ -26,6 +26,10 @@ module.exports = {
         return frame.apiType === 'content';
     },
+    isMembersAPI: (frame) => {
+        return frame.apiType === 'members';
+    },
     isInternal: (frame) => {
         return frame.options.context && frame.options.context.internal;
     }

package/core/server/api/endpoints/utils/serializers/input/tiers.js CHANGED Viewed

@@ -1,4 +1,5 @@
 const localUtils = require('../../index');
+const labs = require('../../../../../../shared/labs');
 const forceActiveFilter = (frame) => {
     if (frame.options.filter) {
@@ -22,6 +23,10 @@ function convertTierInput(input) {
         visibility: input.visibility
     };
+    if (labs.isSet('freeTrial')) {
+        converted.trial_days = input.trial_days;
+    }
     if (input.monthly_price && input.currency) {
         converted.monthly_price = {
             amount: input.monthly_price,

package/core/server/api/endpoints/utils/serializers/output/mappers/comments.js CHANGED Viewed

@@ -1,4 +1,5 @@
 const _ = require('lodash');
+const utils = require('../../..');
 const url = require('../utils/url');
 const commentFields = [
@@ -50,7 +51,7 @@ const commentMapper = (model, frame) => {
     }
     if (jsonModel.post) {
-        // We could use the post mapper here, but we need less field + don't need al the async behaviour support
+        // We could use the post mapper here, but we need less field + don't need al the async behavior support
         url.forPost(jsonModel.post.id, jsonModel.post, frame);
         response.post = _.pick(jsonModel.post, postFields);
     }
@@ -62,6 +63,12 @@ const commentMapper = (model, frame) => {
         response.liked = !!jsonModel.likes.find(l => l.member_id === id);
     }
+    if (utils.isMembersAPI(frame)) {
+        if (jsonModel.status !== 'published') {
+            response.html = null;
+        }
+    }
     return response;
 };

package/core/server/api/endpoints/utils/serializers/output/tiers.js CHANGED Viewed

@@ -4,6 +4,7 @@ const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:output
 const allowedIncludes = ['monthly_price', 'yearly_price'];
 const localUtils = require('../../index');
 const utils = require('../../../../shared/utils');
+const labs = require('../../../../../../shared/labs');
 module.exports = {
     browse: createSerializer('browse', paginatedTiers),
@@ -69,6 +70,10 @@ function serializeTier(tier, options, frame) {
         benefits: null
     };
+    if (labs.isSet('freeTrial')) {
+        serialized.trial_days = json.trial_days;
+    }
     if (Array.isArray(json.benefits)) {
         serialized.benefits = json.benefits.map(benefit => benefit.name);
     } else {

package/core/server/api/endpoints/utils/serializers/output/utils/post-gating.js CHANGED Viewed

@@ -1,5 +1,5 @@
 const membersService = require('../../../../../../services/members');
-const htmlToPlaintext = require('../../../../../../../shared/html-to-plaintext');
+const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 // @TODO: reconsider the location of this - it's part of members and adds a property to the API
 const forPost = (attrs, frame) => {

package/core/server/data/migrations/versions/4.0/23-regenerate-posts-html.js CHANGED Viewed

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const {createIrreversibleMigration} = require('../../utils');
 const mobiledocLib = require('../../../../lib/mobiledoc');
-const htmlToPlaintext = require('../../../../../shared/html-to-plaintext');
+const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 module.exports = createIrreversibleMigration(async (knex) => {
     logging.info('Starting re-generation of posts html.');

package/core/server/data/migrations/versions/4.9/05-fix-missed-mobiledoc-url-transforms.js CHANGED Viewed

@@ -1,6 +1,6 @@
 const logging = require('@tryghost/logging');
 const urlUtils = require('../../../../../shared/url-utils');
-const htmlToPlaintext = require('../../../../../shared/html-to-plaintext');
+const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 const mobiledocLib = require('../../../../lib/mobiledoc');
 const {createTransactionalMigration} = require('../../utils');

package/core/server/data/migrations/versions/5.0/2022-05-21-00-00-regenerate-posts-html.js CHANGED Viewed

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const {createIrreversibleMigration} = require('../../utils');
 const mobiledocLib = require('../../../../lib/mobiledoc');
-const htmlToPlaintext = require('../../../../../shared/html-to-plaintext');
+const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 module.exports = createIrreversibleMigration(async (knex) => {
     logging.info(`Starting regeneration of posts HTML`);

package/core/server/data/migrations/versions/5.8/2022-08-02-06-09-add-trial-period-days-column-to-tiers.js ADDED Viewed

@@ -0,0 +1,8 @@
+const {createAddColumnMigration} = require('../../utils');
+module.exports = createAddColumnMigration('products', 'trial_days', {
+    type: 'integer',
+    unsigned: true,
+    nullable: false,
+    defaultTo: 0
+});

package/core/server/data/migrations/versions/5.8/2022-08-03-15-28-add-trial-start-column-to-stripe-subscriptions.js ADDED Viewed

@@ -0,0 +1,6 @@
+const {createAddColumnMigration} = require('../../utils');
+module.exports = createAddColumnMigration('members_stripe_customers_subscriptions', 'trial_start_at', {
+    type: 'dateTime',
+    nullable: true
+});

package/core/server/data/migrations/versions/5.8/2022-08-03-15-29-add-trial-end-column-to-stripe-subscriptions.js ADDED Viewed

@@ -0,0 +1,6 @@
+const {createAddColumnMigration} = require('../../utils');
+module.exports = createAddColumnMigration('members_stripe_customers_subscriptions', 'trial_end_at', {
+    type: 'dateTime',
+    nullable: true
+});

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

@@ -422,6 +422,7 @@ module.exports = {
             defaultTo: 'none',
             validations: {isIn: [['public', 'none']]}
         },
+        trial_days: {type: 'integer', unsigned: true, nullable: false, defaultTo: 0},
         monthly_price_id: {type: 'string', maxlength: 24, nullable: true},
         yearly_price_id: {type: 'string', maxlength: 24, nullable: true},
         description: {type: 'string', maxlength: 191, nullable: true},
@@ -584,6 +585,8 @@ module.exports = {
         updated_by: {type: 'string', maxlength: 24, nullable: true},
         mrr: {type: 'integer', unsigned: true, nullable: false, defaultTo: 0},
         offer_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'offers.id'},
+        trial_start_at: {type: 'dateTime', nullable: true},
+        trial_end_at: {type: 'dateTime', nullable: true},
         /* Below fields are now redundant as we link prie_id to stripe_prices table */
         plan_id: {type: 'string', maxlength: 255, nullable: false, unique: false},
         plan_nickname: {type: 'string', maxlength: 50, nullable: false},

package/core/server/ghost-server.js CHANGED Viewed

@@ -137,7 +137,14 @@ class GhostServer {
      * Called on SIGINT or SIGTERM
      */
     async shutdown(code = 0) {
+        // Prevent this function being run multiple times by checking whether we're
+        // already shutting down
+        if (this.isShuttingDown) {
+            return;
+        }
         try {
+            this.isShuttingDown = true;
             logging.warn(tpl(messages.ghostIsShuttingDown));
             await this.stop();
             setTimeout(() => {

package/core/server/models/base/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
 // # Base Model
 // This is the model from which all other Ghost models extend. The model is based on Bookshelf.Model, and provides
-// several basic behaviours such as UUIDs, as well as a set of Data methods for accessing information from the database.
+// several basic behaviors such as UUIDs, as well as a set of Data methods for accessing information from the database.
 //
 // The models are internal to Ghost, only the API and some internal functions such as migration and import/export
 // accesses the models directly.

package/core/server/models/base/plugins/filtered-collection.js CHANGED Viewed

@@ -6,13 +6,13 @@ module.exports = function (Bookshelf) {
         getFilteredCollection: function getFilteredCollection(options) {
             const filteredCollection = this.forge();
-            // Apply model-specific query behaviour
+            // Apply model-specific query behavior
             filteredCollection.applyCustomQuery(options);
-            // Add Filter behaviour
+            // Add Filter behavior
             filteredCollection.applyDefaultAndCustomFilters(options);
-            // Apply model-specific search behaviour
+            // Apply model-specific search behavior
             filteredCollection.applySearchQuery(options);
             return filteredCollection;