Add v2.21.0

Author: YannickRe

content/settings/routes.yaml

@@ -0,0 +1,10 @@
+routes:
+
+collections:
+  /:
+    permalink: /{slug}/
+    template: index
+
+taxonomies:
+  tag: /tag/{slug}/
+  author: /author/{slug}/

content/themes/casper/SECURITY.md

@@ -2,7 +2,7 @@
     "name": "casper",
     "description": "The default personal blogging theme for Ghost. Beautiful, minimal and responsive.",
     "demo": "https://demo.ghost.io",
-    "version": "2.9.10",
+    "version": "2.9.11",
     "engines": {
         "ghost": ">=2.0.0",
         "ghost-api": "v2"

content/themes/casper/config.example.json

@@ -1,22 +1,9 @@
 {
   "extends": [
-    "config:base",
-    ":maintainLockFilesWeekly",
-    "schedule:earlyMondays",
-    ":automergeMinor"
+    "@tryghost:theme"
   ],
   "travis": { "enabled": true },
   "node": {
     "supportPolicy": ["lts_latest"]
-  },
-  "packageRules": [
-    {
-      "packagePatterns": ["^postcss", "css", "autoprefixer"],
-      "groupName": "css processors"
-    },
-    {
-      "packagePatterns": ["gulp"],
-      "groupName": "gulp"
-    }
-  ]
+  }
 }

content/themes/casper/package.json

@@ -54,11 +54,11 @@ themes = {
                 if (!loadedTheme) {
                     return Promise.reject(new common.errors.ValidationError({
                         message: common.i18n.t('notices.data.validation.index.themeCannotBeActivated', {themeName: themeName}),
-                        context: 'active_theme'
+                        errorDetails: newSettings
                     }));
                 }
 
-                return themeUtils.validate.check(loadedTheme);
+                return themeUtils.validate.checkSafe(loadedTheme);
             })
             // Update setting
             .then((_checkedTheme) => {
@@ -100,7 +100,7 @@ themes = {
             .handlePermissions('themes', 'add')(options)
             // Validation
             .then(() => {
-                return themeUtils.validate.check(zip, true);
+                return themeUtils.validate.checkSafe(zip, true);
             })
             // More validation (existence check)
             .then((_checkedTheme) => {

content/themes/casper/renovate.json

@@ -20,12 +20,20 @@ _private.fetchAllNotifications = () => {
     return allNotifications;
 };
 
+_private.wasSeen = (notification, user) => {
+    if (notification.seenBy === undefined) {
+        return notification.seen;
+    } else {
+        return notification.seenBy.includes(user.id);
+    }
+};
+
 module.exports = {
     docName: 'notifications',
 
     browse: {
         permissions: true,
-        query() {
+        query(frame) {
             let allNotifications = _private.fetchAllNotifications();
             allNotifications = _.orderBy(allNotifications, 'addedAt', 'desc');
 
@@ -55,7 +63,7 @@ module.exports = {
                     }
                 }
 
-                return notification.seen !== true;
+                return !_private.wasSeen(notification, frame.user);
             });
 
             return allNotifications;
@@ -85,7 +93,7 @@ module.exports = {
             };
 
             let notificationsToCheck = frame.data.notifications;
-            let addedNotifications = [];
+            let notificationsToAdd = [];
 
             const allNotifications = _private.fetchAllNotifications();
 
@@ -95,7 +103,7 @@ module.exports = {
                 });
 
                 if (!isDuplicate) {
-                    addedNotifications.push(Object.assign({}, defaults, notification, overrides));
+                    notificationsToAdd.push(Object.assign({}, defaults, notification, overrides));
                 }
             });
 
@@ -111,29 +119,30 @@ module.exports = {
             }
 
             // CASE: nothing to add, skip
-            if (!addedNotifications.length) {
+            if (!notificationsToAdd.length) {
                 return Promise.resolve();
             }
 
-            const addedReleaseNotifications = addedNotifications.filter((notification) => {
+            const releaseNotificationsToAdd = notificationsToAdd.filter((notification) => {
                 return !notification.custom;
             });
 
-            // CASE: only latest release notification
-            if (addedReleaseNotifications.length > 1) {
-                addedNotifications = addedNotifications.filter((notification) => {
+            // CASE: reorder notifications before save
+            if (releaseNotificationsToAdd.length > 1) {
+                notificationsToAdd = notificationsToAdd.filter((notification) => {
                     return notification.custom;
                 });
-                addedNotifications.push(_.orderBy(addedReleaseNotifications, 'created_at', 'desc')[0]);
+                notificationsToAdd.push(_.orderBy(releaseNotificationsToAdd, 'created_at', 'desc')[0]);
             }
 
             return api.settings.edit({
                 settings: [{
                     key: 'notifications',
-                    value: allNotifications.concat(addedNotifications)
+                    // @NOTE: We always need to store all notifications!
+                    value: allNotifications.concat(notificationsToAdd)
                 }]
             }, internalContext).then(() => {
-                return addedNotifications;
+                return notificationsToAdd;
             });
         }
     },
@@ -171,12 +180,19 @@ module.exports = {
                 }));
             }
 
-            if (notificationToMarkAsSeen.seen) {
+            if (_private.wasSeen(notificationToMarkAsSeen, frame.user)) {
                 return Promise.resolve();
             }
 
+            // @NOTE: We don't remove the notifications, because otherwise we will receive them again from the service.
             allNotifications[notificationToMarkAsSeenIndex].seen = true;
 
+            if (!allNotifications[notificationToMarkAsSeenIndex].seenBy) {
+                allNotifications[notificationToMarkAsSeenIndex].seenBy = [];
+            }
+
+            allNotifications[notificationToMarkAsSeenIndex].seenBy.push(frame.user.id);
+
             return api.settings.edit({
                 settings: [{
                     key: 'notifications',
@@ -186,6 +202,11 @@ module.exports = {
         }
     },
 
+    /**
+     * Clears all notifications. Method used in tests only
+     *
+     * @private Not exposed over HTTP
+     */
     destroyAll: {
         statusCode: 204,
         permissions: {
@@ -195,6 +216,7 @@ module.exports = {
             const allNotifications = _private.fetchAllNotifications();
 
             allNotifications.forEach((notification) => {
+                // @NOTE: We don't remove the notifications, because otherwise we will receive them again from the service.
                 notification.seen = true;
             });
 

core/built/assets/ghost.min-3d890d4d1611b7eaf06ea4a26d9a43a2.js core/built/assets/ghost.min-f923ac814b6331265e8d0232745ee53e.js

@@ -45,11 +45,11 @@ module.exports = {
             if (!loadedTheme) {
                 return Promise.reject(new common.errors.ValidationError({
                     message: common.i18n.t('notices.data.validation.index.themeCannotBeActivated', {themeName: themeName}),
-                    context: 'active_theme'
+                    errorDetails: newSettings
                 }));
             }
 
-            return themeService.validate.check(loadedTheme)
+            return themeService.validate.checkSafe(loadedTheme)
                 .then((_checkedTheme) => {
                     checkedTheme = _checkedTheme;
 
@@ -89,7 +89,7 @@ module.exports = {
                 });
             }
 
-            return themeService.validate.check(zip, true)
+            return themeService.validate.checkSafe(zip, true)
                 .then((_checkedTheme) => {
                     checkedTheme = _checkedTheme;
 

core/built/assets/vendor.min-2ce07d17c73fc244b5455ede58dc5990.js core/built/assets/vendor.min-b38dffaae3f716529300731eb3aaa8e0.js

@@ -16,6 +16,7 @@ module.exports = {
 
         response.forEach((notification) => {
             delete notification.seen;
+            delete notification.seenBy;
             delete notification.addedAt;
         });
 

core/server/api/v0.1/themes.js

@@ -76,7 +76,7 @@ DataImporter = {
         if (!semver.valid(importData.meta.version)) {
             return Promise.reject(new common.errors.InternalServerError({
                 message: 'Detected unsupported file structure.',
-                context: 'Please install Ghost 1.0, import the file and then update your blog to Ghost 2.0.\nVisit https://docs.ghost.org/faq/upgrade-to-ghost-1-0 or ask for help in our https://forum.ghost.org.'
+                help: 'Please install Ghost 1.0, import the file and then update your blog to Ghost 2.0.\nVisit https://docs.ghost.org/faq/upgrade-to-ghost-1-0 or ask for help in our https://forum.ghost.org.'
             }));
         }
 

core/server/api/v2/notifications.js

@@ -0,0 +1,51 @@
+const _ = require('lodash');
+const utils = require('../../../schema/fixtures/utils');
+const permissions = require('../../../../services/permissions');
+const logging = require('../../../../lib/common/logging');
+
+const resources = ['notification'];
+
+const _private = {};
+
+_private.getRelations = function getRelations(resource, role) {
+    return utils.findPermissionRelationsForObject(resource, role);
+};
+
+_private.printResult = function printResult(result, message) {
+    if (result.done === result.expected) {
+        logging.info(message);
+    } else {
+        logging.warn(`(${result.done}/${result.expected}) ${message}`);
+    }
+};
+
+module.exports.config = {
+    transaction: true
+};
+
+module.exports.up = (options) => {
+    const localOptions = _.merge({
+        context: {internal: true}
+    }, options);
+
+    return Promise.map(resources, (resource) => {
+        const relations = _private.getRelations(resource, 'Editor');
+
+        return Promise.resolve()
+            .then(() => utils.addFixturesForRelation(relations, localOptions))
+            .then(result => _private.printResult(result, `Adding permissions_roles fixtures for ${resource}s`))
+            .then(() => permissions.init(localOptions));
+    });
+};
+
+module.exports.down = (options) => {
+    const localOptions = _.merge({
+        context: {internal: true}
+    }, options);
+
+    return Promise.map(resources, (resource) => {
+        const relations = _private.getRelations(resource, 'Editor');
+
+        return utils.removeFixturesForRelation(relations, localOptions);
+    });
+};

core/server/api/v2/themes.js

@@ -624,6 +624,7 @@
                     "members": "all"
                 },
                 "Editor": {
+                    "notification": "all",
                     "post": "all",
                     "setting": ["browse", "read"],
                     "slug": "all",

core/server/api/v2/utils/serializers/output/notifications.js

@@ -20,6 +20,7 @@ var _ = require('lodash'),
     addFixturesForModel,
     addFixturesForRelation,
     removeFixturesForModel,
+    removeFixturesForRelation,
 
     findModelFixtureEntry,
     findModelFixtures,
@@ -251,19 +252,19 @@ findRelationFixture = function findRelationFixture(from, to) {
  * @param {String} objName
  * @returns {Object} fixture relation
  */
-findPermissionRelationsForObject = function findPermissionRelationsForObject(objName) {
+findPermissionRelationsForObject = function findPermissionRelationsForObject(objName, role) {
     // Make a copy and delete any entries we don't want
     var foundRelation = _.cloneDeep(findRelationFixture('Role', 'Permission'));
 
-    _.each(foundRelation.entries, function (entry, role) {
+    _.each(foundRelation.entries, function (entry, key) {
         _.each(entry, function (perm, obj) {
             if (obj !== objName) {
                 delete entry[obj];
             }
         });
 
-        if (_.isEmpty(entry)) {
-            delete foundRelation.entries[role];
+        if (_.isEmpty(entry) || (role && role !== key)) {
+            delete foundRelation.entries[key];
         }
     });
 
@@ -282,12 +283,41 @@ removeFixturesForModel = function removeFixturesForModel(modelFixture, options)
     });
 };
 
+removeFixturesForRelation = function removeFixturesForRelation(relationFixture, options) {
+    return fetchRelationData(relationFixture, options).then(function getRelationOps(data) {
+        const ops = [];
+
+        _.each(relationFixture.entries, function processEntries(entry, key) {
+            const fromItem = data.from.find(matchFunc(relationFixture.from.match, key));
+
+            _.each(entry, function processEntryValues(value, key) {
+                const toItems = data.to.filter(matchFunc(relationFixture.to.match, key, value));
+
+                if (toItems && toItems.length > 0) {
+                    ops.push(function detachRelation() {
+                        return baseUtils.detach(
+                            models[relationFixture.from.Model || relationFixture.from.model],
+                            fromItem.id,
+                            relationFixture.from.relation,
+                            toItems,
+                            options
+                        );
+                    });
+                }
+            });
+        });
+
+        return sequence(ops);
+    });
+};
+
 module.exports = {
     addFixturesForModel: addFixturesForModel,
     addFixturesForRelation: addFixturesForRelation,
     findModelFixtureEntry: findModelFixtureEntry,
     findModelFixtures: findModelFixtures,
     findRelationFixture: findRelationFixture,
     findPermissionRelationsForObject: findPermissionRelationsForObject,
-    removeFixturesForModel: removeFixturesForModel
+    removeFixturesForModel: removeFixturesForModel,
+    removeFixturesForRelation: removeFixturesForRelation
 };