krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolving conflicts

Browse Source
This commit is contained in:
Victor Piousbox
2016-04-04 16:37:51 +00:00
parent 14b0ec8b03 68ff26e6d6
commit 4c0f9ed1c8
20 changed files with 582 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/script/ops/updateWebhook.js
View File

@@ -1,16 +1,16 @@
import _ from 'lodash';
import validator from 'validator';
import i18n from '../i18n';
import {
NotFound,
BadRequest,
} from '../libs/errors';
module.exports = function(user, req) {
if(!validator.isURL(req.body.url)) throw new BadRequest(i18n.t('invalidUrl', req.language));
if(!validator.isBoolean(req.body.enabled)) throw new BadRequest(i18n.t('invalidEnabled', req.language));
module.exports = function updateWebhook (user, req) {
if (!validator.isURL(req.body.url)) throw new BadRequest(i18n.t('invalidUrl', req.language));
if (!validator.isBoolean(req.body.enabled)) throw new BadRequest(i18n.t('invalidEnabled', req.language));
user.markModified('preferences.webhooks');
user.preferences.webhooks[req.params.id].url = req.body.url;
user.preferences.webhooks[req.params.id].enabled = req.body.enabled;
return user.preferences.webhooks[req.params.id];
};