Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-01 02:41:39 -05:00
Code Issues Activity

Removed usage of membersActivityFeed flag

Browse source 
refs https://github.com/TryGhost/Team/issues/1616
This commit is contained in:
Simon Backx 2022-05-25 10:36:29 +02:00
parent 9b0259dc6f
commit b8e43ba675
1 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ghost/members-api/lib/repositories/event.js
View file

@ -360,7 +360,7 @@ module.exports = class EventRepository {
{type: 'payment_event', action: 'getPaymentEvents'},
{type: 'signup_event', action: 'getSignupEvents'}
];
if (this._labsService.isSet('membersActivityFeed') && this._EmailRecipient) {
if (this._EmailRecipient) {
pageActions.push({type: 'email_delivered_event', action: 'getEmailDeliveredEvents'});
pageActions.push({type: 'email_opened_event', action: 'getEmailOpenedEvents'});
pageActions.push({type: 'email_failed_event', action: 'getEmailFailedEvents'});
@ -380,32 +380,8 @@ module.exports = class EventRepository {
return allEvents.sort((a, b) => {
return new Date(b.data.created_at) - new Date(a.data.created_at);
}).reduce((memo, event, i) => {
if (this._labsService.isSet('membersActivityFeed')) {
//disable the event filtering
return memo.concat(event);
}
if (event.type === 'newsletter_event' && event.data.subscribed) {
const previousEvent = allEvents[i - 1];
const nextEvent = allEvents[i + 1];
const currentMember = event.data.member_id;
if (previousEvent && previousEvent.type === 'signup_event') {
const previousMember = previousEvent.data.member_id;
if (currentMember === previousMember) {
return memo;
}
}
if (nextEvent && nextEvent.type === 'signup_event') {
const nextMember = nextEvent.data.member_id;
if (currentMember === nextMember) {
return memo;
}
}
}
}).reduce((memo, event) => {
//disable the event filtering
return memo.concat(event);
}, []).slice(0, options.limit);
}