From 23c207cefc96a241316b0adf5788ca475bd2ddf2 Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Wed, 25 Aug 2021 12:44:34 +0200 Subject: [PATCH] Updated signature of Bookshelf model listeners - as per https://github.com/bookshelf/bookshelf/wiki/Migrating-from-0.15.1-to-1.0.0#different-arguments-on-after-save-event-listeners-saved-created-and-updated, the signature of saved, created and updated listeners has changed to remove the second argument - this commits updates our signatures too --- core/server/models/api-key.js | 2 +- core/server/models/base/plugins/events.js | 4 ++-- core/server/models/email.js | 4 ++-- core/server/models/integration.js | 2 +- core/server/models/label.js | 4 ++-- core/server/models/member.js | 4 ++-- core/server/models/post.js | 4 ++-- core/server/models/settings.js | 4 ++-- core/server/models/tag.js | 4 ++-- core/server/models/user.js | 4 ++-- core/server/models/webhook.js | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/core/server/models/api-key.js b/core/server/models/api-key.js index 4f6ec70853..f5be949bb5 100644 --- a/core/server/models/api-key.js +++ b/core/server/models/api-key.js @@ -72,7 +72,7 @@ const ApiKey = ghostBookshelf.Model.extend({ } } }, - onUpdated(model, attrs, options) { + onUpdated(model, options) { if (this.previous('secret') !== this.get('secret')) { this.addAction(model, 'refreshed', options); } diff --git a/core/server/models/base/plugins/events.js b/core/server/models/base/plugins/events.js index c416bc3a25..d86df14f46 100644 --- a/core/server/models/base/plugins/events.js +++ b/core/server/models/base/plugins/events.js @@ -128,7 +128,7 @@ module.exports = function (Bookshelf) { } }, - onCreated(model, attrs, options) { + onCreated(model, options) { this.addAction(model, 'added', options); }, @@ -189,7 +189,7 @@ module.exports = function (Bookshelf) { }); }, - onUpdated(model, attrs, options) { + onUpdated(model, options) { this.addAction(model, 'edited', options); }, diff --git a/core/server/models/email.js b/core/server/models/email.js index c990811b0d..4339936108 100644 --- a/core/server/models/email.js +++ b/core/server/models/email.js @@ -59,13 +59,13 @@ const Email = ghostBookshelf.Model.extend({ ghostBookshelf.Model.prototype.emitChange.bind(this)(this, eventToTrigger, options); }, - onCreated: function onCreated(model, attrs, options) { + onCreated: function onCreated(model, options) { ghostBookshelf.Model.prototype.onCreated.apply(this, arguments); model.emitChange('added', options); }, - onUpdated: function onUpdated(model, attrs, options) { + onUpdated: function onUpdated(model, options) { ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments); model.emitChange('edited', options); diff --git a/core/server/models/integration.js b/core/server/models/integration.js index c27ec3bfd3..40f4ac5a21 100644 --- a/core/server/models/integration.js +++ b/core/server/models/integration.js @@ -36,7 +36,7 @@ const Integration = ghostBookshelf.Model.extend({ } }, - onCreated: function onCreated(model, response, options) { + onCreated: function onCreated(model, options) { ghostBookshelf.Model.prototype.onCreated.apply(this, arguments); model.emitChange('added', options); diff --git a/core/server/models/label.js b/core/server/models/label.js index 7df67f0f28..4e1c622f97 100644 --- a/core/server/models/label.js +++ b/core/server/models/label.js @@ -14,13 +14,13 @@ Label = ghostBookshelf.Model.extend({ ghostBookshelf.Model.prototype.emitChange.bind(this)(this, eventToTrigger, options); }, - onCreated: function onCreated(model, attrs, options) { + onCreated: function onCreated(model, options) { ghostBookshelf.Model.prototype.onCreated.apply(this, arguments); model.emitChange('added', options); }, - onUpdated: function onUpdated(model, attrs, options) { + onUpdated: function onUpdated(model, options) { ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments); model.emitChange('edited', options); diff --git a/core/server/models/member.js b/core/server/models/member.js index ad92ba776b..e1a948f96f 100644 --- a/core/server/models/member.js +++ b/core/server/models/member.js @@ -140,13 +140,13 @@ const Member = ghostBookshelf.Model.extend({ ghostBookshelf.Model.prototype.emitChange.bind(this)(this, eventToTrigger, options); }, - onCreated: function onCreated(model, attrs, options) { + onCreated: function onCreated(model, options) { ghostBookshelf.Model.prototype.onCreated.apply(this, arguments); model.emitChange('added', options); }, - onUpdated: function onUpdated(model, attrs, options) { + onUpdated: function onUpdated(model, options) { ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments); model.emitChange('edited', options); diff --git a/core/server/models/post.js b/core/server/models/post.js index beb3d006cf..c29538b591 100644 --- a/core/server/models/post.js +++ b/core/server/models/post.js @@ -301,7 +301,7 @@ Post = ghostBookshelf.Model.extend({ * bookshelf-relations listens on `created` + `updated`. * We ensure that we are catching the event after bookshelf relations. */ - onSaved: function onSaved(model, response, options) { + onSaved: function onSaved(model, options) { ghostBookshelf.Model.prototype.onSaved.apply(this, arguments); if (options.method !== 'insert') { @@ -317,7 +317,7 @@ Post = ghostBookshelf.Model.extend({ } }, - onUpdated: function onUpdated(model, attrs, options) { + onUpdated: function onUpdated(model, options) { ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments); model.statusChanging = model.get('status') !== model.previous('status'); diff --git a/core/server/models/settings.js b/core/server/models/settings.js index abe1317ac7..2d9c003c6c 100644 --- a/core/server/models/settings.js +++ b/core/server/models/settings.js @@ -104,14 +104,14 @@ Settings = ghostBookshelf.Model.extend({ model.emitChange(model._previousAttributes.key + '.' + 'deleted', options); }, - onCreated: function onCreated(model, response, options) { + onCreated: function onCreated(model, options) { ghostBookshelf.Model.prototype.onCreated.apply(this, arguments); model.emitChange('added', options); model.emitChange(model.attributes.key + '.' + 'added', options); }, - onUpdated: function onUpdated(model, response, options) { + onUpdated: function onUpdated(model, options) { ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments); model.emitChange('edited', options); diff --git a/core/server/models/tag.js b/core/server/models/tag.js index 1b036ede06..1ac4df86d7 100644 --- a/core/server/models/tag.js +++ b/core/server/models/tag.js @@ -73,13 +73,13 @@ Tag = ghostBookshelf.Model.extend({ ghostBookshelf.Model.prototype.emitChange.bind(this)(this, eventToTrigger, options); }, - onCreated: function onCreated(model, attrs, options) { + onCreated: function onCreated(model, options) { ghostBookshelf.Model.prototype.onCreated.apply(this, arguments); model.emitChange('added', options); }, - onUpdated: function onUpdated(model, attrs, options) { + onUpdated: function onUpdated(model, options) { ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments); model.emitChange('edited', options); diff --git a/core/server/models/user.js b/core/server/models/user.js index 842dd40e43..2161db5237 100644 --- a/core/server/models/user.js +++ b/core/server/models/user.js @@ -98,7 +98,7 @@ User = ghostBookshelf.Model.extend({ model.emitChange('deleted', options); }, - onCreated: function onCreated(model, attrs, options) { + onCreated: function onCreated(model, options) { ghostBookshelf.Model.prototype.onCreated.apply(this, arguments); model.emitChange('added', options); @@ -109,7 +109,7 @@ User = ghostBookshelf.Model.extend({ } }, - onUpdated: function onUpdated(model, response, options) { + onUpdated: function onUpdated(model, options) { ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments); model.statusChanging = model.get('status') !== model.previous('status'); diff --git a/core/server/models/webhook.js b/core/server/models/webhook.js index 2d71c11a24..0adc1d52ab 100644 --- a/core/server/models/webhook.js +++ b/core/server/models/webhook.js @@ -22,13 +22,13 @@ Webhook = ghostBookshelf.Model.extend({ ghostBookshelf.Model.prototype.emitChange.bind(this)(this, eventToTrigger, options); }, - onCreated: function onCreated(model, response, options) { + onCreated: function onCreated(model, options) { ghostBookshelf.Model.prototype.onCreated.apply(this, arguments); model.emitChange('added', options); }, - onUpdated: function onUpdated(model, response, options) { + onUpdated: function onUpdated(model, options) { ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments); model.emitChange('edited', options);