Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding ability to removecam and prevent mods from switching back #24

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+27 −18
Open

Adding ability to removecam and prevent mods from switching back #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da6a7b2
Adding ability to blacklist a cam and ability to remove time restrict…
Chrille0100 Aug 31, 2024
5b4e1b8
timeRestrictionDisabled fix
Chrille0100 Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/config/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@ const commandPermissionsCamera = {
//Extra Commands
const commandPermissionsExtra = {
commandAdmins: ["testadminextra"],
commandSuperUsers: ["testsuperextra", "resetcloudsource", "resetcloudsourcef", "setalveusscene", "setcloudscene", "changeserver", "setmute", "camclear"],
commandSuperUsers: ["testsuperextra", "resetcloudsource", "resetcloudsourcef", "setalveusscene", "setcloudscene", "changeserver", "setmute", "camclear", "setrestricted"],
commandMods: ["testmodextra", "resetsource","resetsourcef","camload", "camlist", "camsave", "camrename", "campresetremove", "customcams", "customcamsbig", "customcamstl", "customcamstr", "customcamsbl", "customcamsbr",
"unmutecam", "unmuteallcams", "nightcams", "nightcamsbig", "indoorcams", "addcam"],
"unmutecam", "unmuteallcams", "nightcams", "nightcamsbig", "indoorcams", "addcam", "removecam"],
commandOperator: [],
commandVips: ["getvolume", "setvolume", "resetvolume", "removecam", "swapcam", "scenecams", "mutecam", "muteallcams", "musicvolume", "musicnext", "musicprev", "mutemusic", "unmutemusic", "mutemusiclocal", "unmutemusiclocal", "resetbackpack", "resetpc", "resetlivecam", "resetbackpackf", "resetpcf", "resetlivecamf", "resetcam", "resetextra","resetphone", "resetphonef"],
commandVips: ["getvolume", "setvolume", "resetvolume", "swapcam", "scenecams", "mutecam", "muteallcams", "musicvolume", "musicnext", "musicprev", "mutemusic", "unmutemusic", "mutemusiclocal", "unmutemusiclocal", "resetbackpack", "resetpc", "resetlivecam", "resetbackpackf", "resetpcf", "resetlivecamf", "resetcam", "resetextra","resetphone", "resetphonef"],
commandUsers: []
}
timeRestrictedCommands = timeRestrictedCommands.concat(["unmutecam", "unmuteallcams"]);
Expand Down
39 changes: 24 additions & 15 deletions src/modules/legacy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,20 +418,20 @@ function checkTimeAccess(controller, userCommand, accessProfile, channel, messag
hasAccess = true;
}
//not directly allowed
if (!hasAccess) {
//check time
let now = new Date();
// var minutes = now.getUTCMinutes();
var hour = now.getUTCHours();
// console.log("check time",now,hour,config.restrictedHours);
if (hour >= config.restrictedHours.start && hour < config.restrictedHours.end) {
//restricted time
hasAccess = false;
} else {
//allow access to mods
hasAccess = true;
}
}
// if (!hasAccess) {
// //check time
// let now = new Date();
// // var minutes = now.getUTCMinutes();
// var hour = now.getUTCHours();
// // console.log("check time",now,hour,config.restrictedHours);
// if (hour >= config.restrictedHours.start && hour < config.restrictedHours.end) {
// //restricted time
// hasAccess = false;
// } else {
// //allow access to mods
// hasAccess = true;
// }
// }
} else {
hasAccess = true;
}
Expand Down Expand Up @@ -1654,6 +1654,8 @@ async function checkExtraCommand(controller, userCommand, accessProfile, channel
camName = overrideArgs;
}


controller.connections.database[camName].blacklist = true;
//camName = "fullcam"+camName;

//remove cam
Expand Down Expand Up @@ -2177,9 +2179,11 @@ async function switchToCustomCams(controller, channel, accessProfile, userComman
//Admin
if (config.userPermissions.commandPriority[0] == accessProfile.accessLevel) {
hasAccess = true;
controller.connections.database[camName].blacklist = false;
//Superuser
} else if (config.userPermissions.commandPriority[1] == accessProfile.accessLevel) {
hasAccess = true;
controller.connections.database[camName].blacklist = false;
//Mod
} else if (!config.timeRestrictedScenes.includes(camName)) {
logger.log("Reached Regular Access", "Non time restricted", camName);
Expand All @@ -2189,7 +2193,12 @@ async function switchToCustomCams(controller, channel, accessProfile, userComman
//not directly allowed
//check if allowed access to cam
//specific mod time restrictions
if (config.timeRestrictedScenes.includes(camName)) {
if (controller.connections.database[camName].blacklist == true){
// Cam is blacklisted and can't be swapped too
hasAccess = false;
break;
}
else if (config.timeRestrictedScenes.includes(camName) && controller.connections.database.timeRestrictionDisabled == false) {
//check time
let now = new Date();
var minutes = now.getUTCMinutes();
Expand Down