-
-
diff --git a/ghost/staff-service/lib/email-templates/new-mention-received.txt.js b/ghost/staff-service/lib/email-templates/new-mention-received.txt.js
deleted file mode 100644
index 042bb0666d..0000000000
--- a/ghost/staff-service/lib/email-templates/new-mention-received.txt.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = function (data) {
- // Be careful when you indent the email, because whitespaces are visible in emails!
- return `
- You have been mentioned by ${data.sourceUrl}.
-
----
-
-Sent to ${data.toEmail} from ${data.siteDomain}.
-If you would no longer like to receive these notifications you can adjust your settings at ${data.staffUrl}.
- `;
-};
diff --git a/ghost/staff-service/lib/emails.js b/ghost/staff-service/lib/emails.js
index 4fe62a44a4..2aaefc6148 100644
--- a/ghost/staff-service/lib/emails.js
+++ b/ghost/staff-service/lib/emails.js
@@ -162,58 +162,6 @@ class StaffServiceEmails {
}
}
- async notifyMentionReceived({mention}) {
- const users = await this.models.User.getEmailAlertUsers('mention-received');
- let resource = null;
- if (mention.resourceId) {
- try {
- const postModel = await this.models.Post.findOne({id: mention.resourceId.toString()});
- // console.log(postModel.toJSON());
- if (postModel) {
- resource = {
- id: postModel.id,
- name: postModel.get('title'),
- type: postModel.get('type') || 'post'
- };
- }
- } catch (err) {
- this.logging.error(err);
- }
- }
- for (const user of users) {
- const to = user.email;
- const subject = `π New mention from: ${mention.sourceSiteTitle}`;
-
- const templateData = {
- targetUrl: mention.target,
- sourceUrl: mention.source,
- sourceTitle: mention.sourceTitle,
- sourceExcerpt: mention.sourceExcerpt,
- sourceSiteTitle: mention.sourceSiteTitle,
- sourceFavicon: mention.sourceFavicon,
- sourceAuthor: mention.sourceAuthor,
- sourceFeaturedImage: mention.sourceFeaturedImage,
- resource,
- siteTitle: this.settingsCache.get('title'),
- siteUrl: this.urlUtils.getSiteUrl(),
- siteDomain: this.siteDomain,
- accentColor: this.settingsCache.get('accent_color'),
- fromEmail: this.fromEmailAddress,
- toEmail: to,
- staffUrl: this.urlUtils.urlJoin(this.urlUtils.urlFor('admin', true), '#', `/settings/staff/${user.slug}`)
- };
-
- const {html, text} = await this.renderEmailTemplate('new-mention-received', templateData);
-
- await this.sendMail({
- to,
- subject,
- html,
- text
- });
- }
- }
-
/**
*
* @param {object} eventData
diff --git a/ghost/staff-service/lib/staff-service.js b/ghost/staff-service/lib/staff-service.js
index 8502a24d61..8614350585 100644
--- a/ghost/staff-service/lib/staff-service.js
+++ b/ghost/staff-service/lib/staff-service.js
@@ -1,5 +1,4 @@
const {MemberCreatedEvent, SubscriptionCancelledEvent, SubscriptionActivatedEvent} = require('@tryghost/member-events');
-const {MentionCreatedEvent} = require('@tryghost/webmentions');
const {MilestoneCreatedEvent} = require('@tryghost/milestones');
// @NOTE: 'StaffService' is a vague name that does not describe what it's actually doing.
@@ -79,10 +78,6 @@ class StaffService {
/** @private */
async handleEvent(type, event) {
- if (type === MentionCreatedEvent && event.data.mention && this.labs.isSet('webmentions') && this.labs.isSet('webmentionEmails')) {
- return await this.emails.notifyMentionReceived(event.data);
- }
-
if (type === MilestoneCreatedEvent && event.data.milestone && this.labs.isSet('milestoneEmails')) {
await this.emails.notifyMilestoneReceived(event.data);
}
@@ -161,15 +156,6 @@ class StaffService {
}
});
- // Trigger email when a new webmention is received
- this.DomainEvents.subscribe(MentionCreatedEvent, async (event) => {
- try {
- await this.handleEvent(MentionCreatedEvent, event);
- } catch (e) {
- this.logging.error(e, `Failed to notify webmention`);
- }
- });
-
// Trigger email when a new milestone is reached
this.DomainEvents.subscribe(MilestoneCreatedEvent, async (event) => {
try {
diff --git a/ghost/staff-service/test/staff-service.test.js b/ghost/staff-service/test/staff-service.test.js
index 4a312a9e4e..4b61a44b21 100644
--- a/ghost/staff-service/test/staff-service.test.js
+++ b/ghost/staff-service/test/staff-service.test.js
@@ -2,7 +2,6 @@
// const testUtils = require('./utils');
const sinon = require('sinon');
const {MemberCreatedEvent, SubscriptionCancelledEvent, SubscriptionActivatedEvent} = require('@tryghost/member-events');
-const {MentionCreatedEvent} = require('@tryghost/webmentions');
const {MilestoneCreatedEvent} = require('@tryghost/milestones');
require('./utils');
@@ -186,11 +185,10 @@ describe('StaffService', function () {
describe('subscribeEvents', function () {
it('subscribes to events', async function () {
service.subscribeEvents();
- subscribeStub.callCount.should.eql(5);
+ subscribeStub.callCount.should.eql(4);
subscribeStub.calledWith(SubscriptionActivatedEvent).should.be.true();
subscribeStub.calledWith(SubscriptionCancelledEvent).should.be.true();
subscribeStub.calledWith(MemberCreatedEvent).should.be.true();
- subscribeStub.calledWith(MentionCreatedEvent).should.be.true();
subscribeStub.calledWith(MilestoneCreatedEvent).should.be.true();
});
});
@@ -336,21 +334,6 @@ describe('StaffService', function () {
).should.be.true();
});
- it('handles new mention notification', async function () {
- await service.handleEvent(MentionCreatedEvent, {
- data: {
- mention: {
- source: 'https://exmaple.com/some-post',
- target: 'https://exmaple.com/some-mentioned-post',
- sourceSiteTitle: 'Exmaple'
- }
- }
- });
- mailStub.calledWith(
- sinon.match({subject: `π New mention from: Exmaple`})
- ).should.be.true();
- });
-
it('handles milestone created event', async function () {
await service.handleEvent(MilestoneCreatedEvent, {
data: {