diff --git a/src/app/channel/channelManager.js b/src/app/channel/channelManager.js
index d786e50..d915aa3 100644
--- a/src/app/channel/channelManager.js
+++ b/src/app/channel/channelManager.js
@@ -16,7 +16,7 @@ along with this program. If not, see .*/
//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');
diff --git a/src/app/channel/chatHandler.js b/src/app/channel/chatHandler.js
index 688ee15..1b1a6f4 100644
--- a/src/app/channel/chatHandler.js
+++ b/src/app/channel/chatHandler.js
@@ -17,7 +17,7 @@ along with this program. If not, see .*/
//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){
diff --git a/src/app/channel/tokebot.js b/src/app/channel/tokebot.js
index a48b335..c441908 100644
--- a/src/app/channel/tokebot.js
+++ b/src/app/channel/tokebot.js
@@ -16,7 +16,7 @@ along with this program. If not, see .*/
//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');
diff --git a/src/controllers/adminPanelController.js b/src/controllers/adminPanelController.js
index d126eba..3842eab 100644
--- a/src/controllers/adminPanelController.js
+++ b/src/controllers/adminPanelController.js
@@ -16,7 +16,7 @@ along with this program. If not, see .*/
//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");
diff --git a/src/controllers/api/account/deleteController.js b/src/controllers/api/account/deleteController.js
index e71ce3a..c88178a 100644
--- a/src/controllers/api/account/deleteController.js
+++ b/src/controllers/api/account/deleteController.js
@@ -18,7 +18,7 @@ along with this program. If not, see .*/
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');
diff --git a/src/controllers/api/account/registerController.js b/src/controllers/api/account/registerController.js
index 1ea0d2c..c273c27 100644
--- a/src/controllers/api/account/registerController.js
+++ b/src/controllers/api/account/registerController.js
@@ -18,7 +18,7 @@ along with this program. If not, see .*/
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');
diff --git a/src/controllers/api/account/updateController.js b/src/controllers/api/account/updateController.js
index de7bb3e..3e67b04 100644
--- a/src/controllers/api/account/updateController.js
+++ b/src/controllers/api/account/updateController.js
@@ -18,7 +18,7 @@ along with this program. If not, see .*/
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');
diff --git a/src/controllers/api/admin/banController.js b/src/controllers/api/admin/banController.js
index bd5d85b..9160009 100644
--- a/src/controllers/api/admin/banController.js
+++ b/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){
diff --git a/src/controllers/api/admin/changeRankController.js b/src/controllers/api/admin/changeRankController.js
index 503ec89..aa6a72e 100644
--- a/src/controllers/api/admin/changeRankController.js
+++ b/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){
diff --git a/src/controllers/api/admin/listUsersController.js b/src/controllers/api/admin/listUsersController.js
index be58b48..4fad97a 100644
--- a/src/controllers/api/admin/listUsersController.js
+++ b/src/controllers/api/admin/listUsersController.js
@@ -16,7 +16,7 @@ along with this program. If not, see .*/
//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){
diff --git a/src/controllers/api/channel/banController.js b/src/controllers/api/channel/banController.js
index 1bcda0c..2de6a89 100644
--- a/src/controllers/api/channel/banController.js
+++ b/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')
diff --git a/src/controllers/api/channel/rankController.js b/src/controllers/api/channel/rankController.js
index 14ed882..f8fc0e5 100644
--- a/src/controllers/api/channel/rankController.js
+++ b/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
diff --git a/src/controllers/api/channel/registerController.js b/src/controllers/api/channel/registerController.js
index 977e7ec..664da8f 100644
--- a/src/controllers/api/channel/registerController.js
+++ b/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
diff --git a/src/controllers/profileController.js b/src/controllers/profileController.js
index 4097154..d3eb8de 100644
--- a/src/controllers/profileController.js
+++ b/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 .*/
//Local Imports
-const {userModel} = require('../schemas/userSchema');
+const userModel = require('../schemas/userSchema');
const {exceptionHandler, errorHandler} = require('../utils/loggerUtils');
//Config
diff --git a/src/schemas/channel/channelSchema.js b/src/schemas/channel/channelSchema.js
index 4b21de6..1852ecc 100644
--- a/src/schemas/channel/channelSchema.js
+++ b/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');
diff --git a/src/schemas/permissionSchema.js b/src/schemas/permissionSchema.js
index 9e3782e..8607e4e 100644
--- a/src/schemas/permissionSchema.js
+++ b/src/schemas/permissionSchema.js
@@ -18,8 +18,7 @@ along with this program. If not, see .*/
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);
diff --git a/src/schemas/userBanSchema.js b/src/schemas/userBanSchema.js
index 31c6909..7d7279b 100644
--- a/src/schemas/userBanSchema.js
+++ b/src/schemas/userBanSchema.js
@@ -18,7 +18,7 @@ along with this program. If not, see .*/
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],
diff --git a/src/schemas/userSchema.js b/src/schemas/userSchema.js
index b445bb4..b2a7346 100644
--- a/src/schemas/userSchema.js
+++ b/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);
\ No newline at end of file
+module.exports = mongoose.model("user", userSchema);
\ No newline at end of file
diff --git a/src/utils/sessionUtils.js b/src/utils/sessionUtils.js
index b71a3b0..ea67ceb 100644
--- a/src/utils/sessionUtils.js
+++ b/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 .*/
//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.