Skip to content

Commit

Permalink
Removed subscribers from the codebase (#11153)
Browse files Browse the repository at this point in the history
refs #11152

- Added subscribers table drop migration
- Removed subscribers from schema
- Removed subscribers controllers/routes/regression tests
- Removed subscriber related API code
- Removed subscribers from internal apps
- Removed subscriber importer
- Removed subscriber model
- Removed subscriber related permissions
- Removed webhook code related to subscribers
- When upgrading to v3 it is on the site admin to migrate all zapps or any other webhook clients to use members
- Removed subscriber-specific translation
- Removed subscriber lab flag
  • Loading branch information
naz committed Oct 9, 2019
1 parent 6028fde commit 0225936
Show file tree
Hide file tree
Showing 42 changed files with 45 additions and 2,072 deletions.
21 changes: 0 additions & 21 deletions core/frontend/apps/subscribers/index.js

This file was deleted.

19 changes: 0 additions & 19 deletions core/frontend/apps/subscribers/lib/helpers/index.js

This file was deleted.

44 changes: 0 additions & 44 deletions core/frontend/apps/subscribers/lib/helpers/input_email.js

This file was deleted.

56 changes: 0 additions & 56 deletions core/frontend/apps/subscribers/lib/helpers/subscribe_form.js

This file was deleted.

121 changes: 0 additions & 121 deletions core/frontend/apps/subscribers/lib/router.js

This file was deleted.

76 changes: 0 additions & 76 deletions core/frontend/apps/subscribers/lib/views/subscribe.hbs

This file was deleted.

15 changes: 0 additions & 15 deletions core/frontend/helpers/tpl/subscribe_form.hbs

This file was deleted.

11 changes: 1 addition & 10 deletions core/frontend/services/routing/helpers/context.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
* 2. req.params.page - always has the page parameter, regardless of if the URL contains a keyword
* 3. data - used for telling the difference between posts and pages
*/
const labs = require('../../../../server/services/labs'),
// @TODO: fix this!! These regexes are app specific and should be dynamic. They should not belong here....
const // @TODO: fix this!! These regexes are app specific and should be dynamic. They should not belong here....
// routeKeywords.private: 'private'
privatePattern = new RegExp('^\\/private\\/'),
// routeKeywords.subscribe: 'subscribe'
subscribePattern = new RegExp('^\\/subscribe\\/'),
// routeKeywords.amp: 'amp'
ampPattern = new RegExp('\\/amp\\/$'),
homePattern = new RegExp('^\\/$');
Expand Down Expand Up @@ -58,12 +55,6 @@ function setResponseContext(req, res, data) {
}
}

if (subscribePattern.test(res.locals.relativeUrl) && labs.isSet('subscribers') === true) {
if (!res.locals.context.includes('subscribe')) {
res.locals.context.push('subscribe');
}
}

if (data && data.post) {
if (!res.locals.context.includes('post')) {
res.locals.context.push('post');
Expand Down
4 changes: 0 additions & 4 deletions core/server/api/canary/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ module.exports = {
return shared.pipeline(require('./settings'), localUtils);
},

get subscribers() {
return shared.pipeline(require('./subscribers'), localUtils);
},

get members() {
return shared.pipeline(require('./members'), localUtils);
},
Expand Down
Loading

0 comments on commit 0225936

Please sign in to comment.