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

Imrpoved IP Ban Messages

Browse source
This commit is contained in:
rainbow napkin 2025-04-28 17:44:07 -04:00
parent 730d816c45
commit 8305494915
2 changed files with 40 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/app/channel/channelManager.js
View file

@ -101,8 +101,20 @@ module.exports = class{
//If this ip is randy bobandy //If this ip is randy bobandy
if(ipBanDB != null){ if(ipBanDB != null){
//tell it to fuck off //Make the number a little prettier despite the lack of precision since we're not doing calculations here :P
socket.emit("kick", {type: "kicked", reason: "The IP address you are trying to connect from has been banned!"}); const expiration = ipBanDB.getDaysUntilExpiration() < 1 ? 0 : ipBanDB.getDaysUntilExpiration();
//If the ban is permanent
if(ipBanDB.permanent){
//tell it to fuck off
socket.emit("kick", {type: "kicked", reason: `The IP address you are trying to connect from has been permanently banned. Your cleartext IP has been saved to the database. Any associated accounts will be nuked in ${expiration} day(s).`});
//Otherwise
}else{
//tell it to fuck off
socket.emit("kick", {type: "kicked", reason: `The IP address you are trying to connect from has been temporarily banned. Your cleartext IP has been saved to the database until the ban expires in ${expiration} day(s).`});
}
return false; return false;
} }

32
src/controllers/api/account/registerController.js
View file

@ -61,12 +61,32 @@ module.exports.post = async function(req, res){
//If this ip is randy bobandy //If this ip is randy bobandy
if(ipBanDB != null){ if(ipBanDB != null){
//Make the code and message look pretty (kinda) at the same time
const banMsg = [ //Make the number a little prettier despite the lack of precision since we're not doing calculations here :P
'The IP address you are trying to register an account from has been banned.', const expiration = ipBanDB.getDaysUntilExpiration() < 1 ? 0 : ipBanDB.getDaysUntilExpiration();
'If you beleive this to be an error feel free to reach out to your server administrator.', let banMsg = [];
'Otherwise, fuck off :)'
]; //If the ban is permanent
if(ipBanDB.permanent){
//tell it to fuck off
//Make the code and message look pretty (kinda) at the same time
banMsg = [
'The IP address you are trying to register an account from has been permanently banned.',
'Your cleartext IP has been saved to the database.',
`Any associated accounts will be nuked in ${expiration} day(s).`,
'If you beleive this to be an error feel free to reach out to your server administrator.',
'Otherwise, fuck off :)'
];
}else{
//tell it to fuck off
//Make the code and message look pretty (kinda) at the same time
banMsg = [
'The IP address you are trying to register an account from has been temporarily banned.',
`Your cleartext IP has been saved to the database until the ban expires in ${expiration} day(s).`,
'If you beleive this to be an error feel free to reach out to your server administrator.',
'Otherwise, fuck off :)'
];
}
//tell it to fuck off //tell it to fuck off
return errorHandler(res, banMsg.join('<br>'), 'unauthorized'); return errorHandler(res, banMsg.join('<br>'), 'unauthorized');