Switch banning to use a new banned property on users

Author: tiennou

lib/common.js

@@ -155,10 +155,10 @@ module.exports = (config) => {
 
       const _id = user._id
       if (!remove) {
-        if (user.active === 0) {
+        if (user.banned) {
           return `User "${username}" ${_id} is already banned.`
         }
-        await db.users.update({ _id }, { $set: { active: 0 } })
+        await db.users.update({ _id }, { $set: { active: 0, banned: true } })
         console.log(`Suspended user "${username}" ${_id}`)
         return `Suspended user "${username}" ${_id}`
       } else {
@@ -180,7 +180,7 @@ module.exports = (config) => {
         return `User "${username}" ${user._id} is not banned.`
       }
 
-      await db.users.update({ _id: user._id }, { $set: { active: 10000 } })
+      await db.users.update({ _id: user._id }, { $set: { active: 10000, banned: false } })
       console.log(`Unbanned user "${username}" ${user._id}`)
       return `Unbanned user "${username}" ${user._id}`
     }

lib/services/whitelist/cronjobs.js

@@ -5,7 +5,7 @@ module.exports = (config) => {
     const WHITELIST = JSON.parse(await env.get(env.keys.WHITELIST) || '[]').map(u => u.toLowerCase())
     const users = await db.users.find()
     for (const user of users) {
-      const blocked = !(user.allowed || WHITELIST.length === 0 || (user.username && WHITELIST.includes(user.username.toLowerCase())))
+      const blocked = !(user.allowed || !user.banned || WHITELIST.length === 0 || (user.username && WHITELIST.includes(user.username.toLowerCase())))
       db.users.update({ _id: user._id }, { $set: { blocked } })
     }
   }]