dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify quota logic

This commit is contained in:
ansuz 2020-03-03 16:55:40 -05:00
parent 53ed247bc2
commit b126e4456b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/commands/quota.js
View File

@ -35,12 +35,8 @@ Quota.applyCustomLimits = function (Env) {
};
Quota.updateCachedLimits = function (Env, cb) {
if (Env.adminEmail === false) {
Quota.applyCustomLimits(Env);
if (Env.allowSubscriptions === false) { return; }
if (Env.blockDailyCheck === true) { return; }
throw new Error("allowSubscriptions must be false if adminEmail is false");
}
Quota.applyCustomLimits(Env);
if (Env.allowSubscriptions === false || Env.blockDailyCheck === true) { return void cb(); }
var body = JSON.stringify({
domain: Env.myDomain,
@ -82,8 +78,8 @@ Quota.updateCachedLimits = function (Env, cb) {
req.on('error', function (e) {
Quota.applyCustomLimits(Env);
// FIXME this is always falsey. Maybe we just suppress errors?
if (!Env.domain) { return cb(); }
if (!Env.myDomain) { return cb(); }
// only return an error if your server allows subscriptions
cb(e);
});