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

Added optional alt-inclusion to channel-wide bans.

Browse source
This commit is contained in:
rainbow napkin 2024-12-31 20:03:25 -05:00
parent 40c004795b
commit 756c42ceaa
2 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -470,13 +470,27 @@ channelSchema.methods.permCheck = async function (user, perm){
channelSchema.methods.checkBanByUserDoc = async function(userDB){
var foundBan = null;
this.banList.forEach((ban) => {
if(ban.user != null){
if(ban.user.toString() == userDB._id.toString()){
foundBan = ban;
//this needs to be a for loop for async
//this.banList.forEach((ban) => {
for(banIndex in this.banList){
if(this.banList[banIndex].user != null){
if(this.banList[banIndex].user.toString() == userDB._id.toString()){
foundBan = this.banList[banIndex];
}
//If this bans alts are banned
if(this.banList[banIndex].banAlts){
//Populate the user of the current ban being checked
await this.populate(`banList.${banIndex}.user`);
//If this is an alt of the banned user
if(await this.banList[banIndex].user.altCheck(userDB)){
foundBan = this.banList[banIndex];
}
}
}
}
});
return foundBan;
}

15
src/schemas/user/userSchema.js
View file

@ -633,6 +633,21 @@ userSchema.methods.changePassword = async function(passChange){
}
userSchema.methods.altCheck = async function(userDB){
//Found alt flag
let foundAlt = false;
for(alt in this.alts){
//If we found a match
if(this.alts[alt]._id.toString() == userDB._id.toString()){
foundAlt = true;
}
}
//return the results
return foundAlt;
}
userSchema.methods.nuke = async function(pass){
//Check we have a confirmation password
if(pass == "" || pass == null){