rainbownapkin/canopy
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Cleaning up User Model.

Browse source
This commit is contained in:
rainbow napkin 2024-12-15 19:59:00 -05:00
parent 1bf89e62e7
commit 5ad1c99ead
19 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/schemas/channel/channelSchema.js
View file

@ -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');

5
src/schemas/permissionSchema.js
View file

@ -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);

6
src/schemas/userBanSchema.js
View file

@ -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],

6
src/schemas/userSchema.js
View file

@ -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);