Cleaning up User Model.

src/app/channel/channelManager.js

@@ -16,7 +16,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //Local Imports
 const channelModel = require('../../schemas/channel/channelSchema');
-const {userModel} = require('../../schemas/userSchema');
+const userModel = require('../../schemas/userSchema');
 const loggerUtils = require('../../utils/loggerUtils');
 const activeChannel = require('./activeChannel');
 const chatHandler = require('./chatHandler');

src/app/channel/chatHandler.js

@@ -17,7 +17,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 //local imports
 const commandPreprocessor = require('./commandPreprocessor');
 const loggerUtils = require('../../utils/loggerUtils');
-const {userModel} = require('../../schemas/userSchema');
+const userModel = require('../../schemas/userSchema');
 
 module.exports = class{
     constructor(server){

src/app/channel/tokebot.js

@@ -16,7 +16,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //Local Imports
 const tokeCommandModel = require('../../schemas/tokebot/tokeCommandSchema');
-const {userModel} = require('../../schemas/userSchema');
+const userModel = require('../../schemas/userSchema');
 const statModel = require('../../schemas/statSchema');
 const statSchema = require('../../schemas/statSchema');
 

src/controllers/adminPanelController.js

@@ -16,7 +16,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //Config
 const config = require('../../config.json');
-const {userModel} = require('../schemas/userSchema');
+const userModel = require('../schemas/userSchema');
 const permissionModel = require('../schemas/permissionSchema');
 const channelModel = require('../schemas/channel/channelSchema');
 const {exceptionHandler, errorHandler} = require("../utils/loggerUtils");

src/controllers/api/account/deleteController.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const {userModel} = require('../../../schemas/userSchema');
+const userModel = require('../../../schemas/userSchema');
 const accountUtils = require('../../../utils/sessionUtils');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 

src/controllers/api/account/registerController.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const {userModel} = require('../../../schemas/userSchema');
+const userModel = require('../../../schemas/userSchema');
 const userBanModel = require('../../../schemas/userBanSchema');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 

src/controllers/api/account/updateController.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const {userModel} = require('../../../schemas/userSchema');
+const userModel = require('../../../schemas/userSchema');
 const accountUtils = require('../../../utils/sessionUtils');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 

src/controllers/api/admin/banController.js

@@ -20,7 +20,7 @@ const {validationResult, matchedData} = require('express-validator');
 //local imports
 const banModel = require('../../../schemas/userBanSchema');
 const permissionModel = require('../../../schemas/permissionSchema');
-const {userModel} = require('../../../schemas/userSchema');
+const userModel = require('../../../schemas/userSchema');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 
 module.exports.get = async function(req, res){

src/controllers/api/admin/changeRankController.js

@@ -20,7 +20,7 @@ const {validationResult, matchedData} = require('express-validator');
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 const permissionModel = require('../../../schemas/permissionSchema');
-const {userModel} = require('../../../schemas/userSchema');
+const userModel = require('../../../schemas/userSchema');
 
 //api change rank functions
 module.exports.post = async function(req, res){

src/controllers/api/admin/listUsersController.js

@@ -16,7 +16,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
-const {userModel} = require('../../../schemas/userSchema');
+const userModel = require('../../../schemas/userSchema');
 
 //api list account functions
 module.exports.get = async function(req, res){

src/controllers/api/channel/banController.js

@@ -19,7 +19,7 @@ const {validationResult, matchedData} = require('express-validator');
 
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
-const {userModel} = require('../../../schemas/userSchema');
+const userModel = require('../../../schemas/userSchema');
 const channelModel = require('../../../schemas/channel/channelSchema');
 const permissionModel = require('../../../schemas/permissionSchema')
 

src/controllers/api/channel/rankController.js

@@ -20,7 +20,7 @@ const {validationResult, matchedData} = require('express-validator');
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 const permissionModel = require('../../../schemas/permissionSchema');
-const {userModel} = require('../../../schemas/userSchema');
+const userModel = require('../../../schemas/userSchema');
 const channelModel = require('../../../schemas/channel/channelSchema');
 
 //api channel rank functions

src/controllers/api/channel/registerController.js

@@ -19,7 +19,7 @@ const {validationResult, matchedData} = require('express-validator');
 
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
-const {userModel} = require('../../../schemas/userSchema');
+const userModel = require('../../../schemas/userSchema');
 const channelModel = require('../../../schemas/channel/channelSchema');
 
 //api account functions

src/controllers/profileController.js

@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //Local Imports
-const {userModel} = require('../schemas/userSchema');
+const userModel = require('../schemas/userSchema');
 const {exceptionHandler, errorHandler} = require('../utils/loggerUtils');
 
 //Config

src/schemas/channel/channelSchema.js

@@ -21,7 +21,7 @@ const {validationResult, matchedData} = require('express-validator');
 //Local Imports
 const server = require('../../server');
 const statModel = require('../statSchema');
-const {userModel} = require('../userSchema');
+const userModel = require('../userSchema');
 const permissionModel = require('../permissionSchema');
 const channelPermissionSchema = require('./channelPermissionSchema');
 const channelBanSchema = require('./channelBanSchema');

src/schemas/permissionSchema.js

@@ -18,8 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {mongoose} = require('mongoose');
 
 //Local Imports
-//const {userModel} = require('./userSchema');
-const userSchema = require('./userSchema');
+const userModel = require('./userSchema');
 const channelPermissionSchema = require('./channel/channelPermissionSchema');
 const {errorHandler} = require('../utils/loggerUtils');
 
@@ -121,7 +120,7 @@ permissionSchema.statics.rankToNum = function(rank){
 
 permissionSchema.statics.permCheck = async function(user, perm){
     if(user != null){
-        const userDB = await userSchema.userModel.findOne({user: user.user});
+        const userDB = await userModel.findOne({user: user.user});
         return await this.permCheckByUserDoc(userDB, perm);
     }else{
         return await this.permCheckByUserDoc(null, perm);

src/schemas/userBanSchema.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {mongoose} = require('mongoose');
 
 //Local Imports
-const {userModel, userSchema} = require('./userSchema');
+const userModel = require('./userSchema');
 
 const userBanSchema = new mongoose.Schema({
     user: {
@@ -32,8 +32,8 @@ const userBanSchema = new mongoose.Schema({
     },
     //To be used in future when alt-detection has been implemented
     alts: {
-        type: [userSchema],
-        required: false
+        type: mongoose.SchemaTypes.ObjectID,
+        ref: "user"
     },
     deletedNames: {
         type: [mongoose.SchemaTypes.String],

src/schemas/userSchema.js

@@ -22,7 +22,6 @@ const server = require('../server');
 const statModel = require('./statSchema');
 const flairModel = require('./flairSchema');
 const permissionModel = require('./permissionSchema');
-const statsModel = require('./statSchema');
 const hashUtil = require('../utils/hashUtils');
 
 
@@ -203,7 +202,7 @@ userSchema.statics.findProfile = async function(user){
         }
 
         //return the profile
-        return userDB.findProfile();
+        return userDB.getProfile();
     }
 
 }
@@ -403,5 +402,4 @@ userSchema.methods.nuke = async function(pass){
     }
 }
 
-module.exports.userSchema = userSchema;
-module.exports.userModel = mongoose.model("user", userSchema);
+module.exports = mongoose.model("user", userSchema);

src/utils/sessionUtils.js

@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //local imports
-const {userModel} = require('../schemas/userSchema');
+const userModel = require('../schemas/userSchema');
 const userBanModel = require('../schemas/userBanSchema')
 
 //this module is good for keeping wrappers for userModel and other shit in that does more session handling than database access/modification.