wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-12 12:30:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests.

Browse Source
This commit is contained in:
gaba
2017-05-08 13:12:24 -07:00
parent 6310528804
commit c4c0ee79cd
8 changed files with 106 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/comments.js
+27 -16
View File
@@ -4,6 +4,9 @@ const ActionModel = require('../models/action');
const ActionsService = require('./actions');
const SettingModel = require('../models/setting');
const SettingsService = require('./settings');
const UsersService = require('./users');
const errors = require('../errors');
const STATUSES = [
'ACCEPTED',
@@ -58,29 +61,37 @@ module.exports = class CommentsService {
return SettingsService.retrieve()
.then((settings) => {
// Moderators or ADMIN can add any tag automatically.
if (added_by != null && (added_by.hasRoles('ADMIN') || added_by.hasRoles('MODERATOR'))) {
SettingModel.findOneAndUpdate({id: settings.id}, {
$push: {
tags: {
id: name,
models: ['COMMENTS']
UsersService.findById(added_by)
.then((user) => {
// Moderators or ADMIN can add any tag automatically.
if (user != null && (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR'))) {
SettingModel.findOneAndUpdate({id: settings.id}, {
$push: {
tags: {
id: name,
models: ['COMMENTS']
}
}
}
});
}
else if (!ALLOWED_TAGS.includes(name) || settings.tags.findIndex((t) => {return t.id === name & t.models.include('COMMENTS');}) === -1) {
return Promise.reject(new Error('tag not allowed'));
}
});
}
else if (!ALLOWED_TAGS.includes(name) || settings.tags.findIndex((t) => {return t.id === name & t.models.include('COMMENTS');}) === -1) {
return Promise.reject(errors.ErrorTagNotAllowed);
}
});
return CommentModel.findOneAndUpdate({id}, {
$push: {
tags: {
id: name,
added_by: added_by.id
added_by: added_by
}
}
});
},
},
{
new: false,
upsert: false
});
});
}