merge master

This commit is contained in:
riley
2017-05-19 11:05:46 -06:00
61 changed files with 1222 additions and 245 deletions
+7 -6
View File
@@ -1,9 +1,10 @@
module.exports = {
checkRoles: function (user /* , perm*/) {
module.exports = (user /* , perm*/) => {
// this runs before everything
if (user.status === 'BANNED') {
return false;
}
// this runs before everything
if (
user.status === 'BANNED' ||
(user.suspension.until && user.suspension.until > new Date())
) {
return false;
}
};