public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use the new module and uninstall shortid

Browse source
This commit is contained in:
joker-x 2020-08-25 23:03:35 +02:00
parent 8b900c94ba
commit 62f6ef4559
14 changed files with 17 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/models/campaigns.js
View file

@ -4,7 +4,7 @@ const knex = require('../lib/knex');
const hasher = require('node-object-hash')();
const dtHelpers = require('../lib/dt-helpers');
const interoperableErrors = require('../../shared/interoperable-errors');
const shortid = require('shortid');
const shortid = require('../lib/shortid');
const { enforce, filterObject } = require('../lib/helpers');
const shares = require('./shares');
const namespaceHelpers = require('../lib/namespace-helpers');
@ -1163,4 +1163,4 @@ module.exports.getStatisticsOpened = getStatisticsOpened;
module.exports.fetchRssCampaign = fetchRssCampaign;
module.exports.testSend = testSend;
module.exports.getRssPreview = getRssPreview;
module.exports.getRssPreview = getRssPreview;

2
server/models/channels.js
View file

@ -4,7 +4,7 @@ const knex = require('../lib/knex');
const hasher = require('node-object-hash')();
const dtHelpers = require('../lib/dt-helpers');
const interoperableErrors = require('../../shared/interoperable-errors');
const shortid = require('shortid');
const shortid = require('../lib/shortid');
const { enforce, filterObject } = require('../lib/helpers');
const shares = require('./shares');
const namespaceHelpers = require('../lib/namespace-helpers');

2
server/models/confirmations.js
View file

@ -1,7 +1,7 @@
'use strict';
const knex = require('../lib/knex');
const shortid = require('shortid');
const shortid = require('../lib/shortid');
async function addConfirmation(listId, action, ip, data) {
const cid = shortid.generate();

2
server/models/fields.js
View file

@ -7,7 +7,7 @@ const dtHelpers = require('../lib/dt-helpers');
const interoperableErrors = require('../../shared/interoperable-errors');
const shares = require('./shares');
const validators = require('../../shared/validators');
const shortid = require('shortid');
const shortid = require('../lib/shortid');
const slugify = require('slugify');
const segments = require('./segments');
const { formatDate, formatBirthday, parseDate, parseBirthday } = require('../../shared/date');

2
server/models/links.js
View file

@ -10,7 +10,7 @@ const uaParser = require('device');
const he = require('he');
const { getPublicUrl } = require('../lib/urls');
const tools = require('../lib/tools');
const shortid = require('shortid');
const shortid = require('../lib/shortid');
const {enforce} = require('../lib/helpers');
const LinkId = {

2
server/models/lists.js
View file

@ -3,7 +3,7 @@
const knex = require('../lib/knex');
const hasher = require('node-object-hash')();
const dtHelpers = require('../lib/dt-helpers');
const shortid = require('shortid');
const shortid = require('../lib/shortid');
const { enforce, filterObject } = require('../lib/helpers');
const interoperableErrors = require('../../shared/interoperable-errors');
const shares = require('./shares');

2
server/models/send-configurations.js
View file

@ -3,7 +3,7 @@
const knex = require('../lib/knex');
const hasher = require('node-object-hash')();
const dtHelpers = require('../lib/dt-helpers');
const shortid = require('shortid');
const shortid = require('../lib/shortid');
const { enforce, filterObject } = require('../lib/helpers');
const interoperableErrors = require('../../shared/interoperable-errors');
const shares = require('./shares');

2
server/models/subscriptions.js
View file

@ -3,7 +3,7 @@
const config = require('../lib/config');
const knex = require('../lib/knex');
const hasher = require('node-object-hash')();
const shortid = require('shortid');
const shortid = require('../lib/shortid');
const dtHelpers = require('../lib/dt-helpers');
const interoperableErrors = require('../../shared/interoperable-errors');
const shares = require('./shares');