modulatingforce/forcebot_rs
1
0
Fork 0
Code Issues 33 Pull requests 11 Projects 2 Activity

rsp only to elevated users
Some checks failed
ci/woodpecker/pr/cargo-checks Pipeline failed
Details

Browse source
This commit is contained in:
ModulatingForce 2024-03-22 19:07:19 -04:00
parent 582702fab2
commit 2c298663b1
1 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/core/botinstance.rs
View file

@ -19,7 +19,7 @@ use crate::core::ratelimiter::RateLimiter;
use crate::core::bot_actions::actions_util::BotAR; use crate::core::bot_actions::actions_util::BotAR;
use crate::core::botmodules::ModulesManager; use crate::core::botmodules::ModulesManager;
use crate::core::identity::{IdentityManager, Permissible}; use crate::core::identity::{IdentityManager, Permissible,self};
use crate::core::botlog; use crate::core::botlog;
use crate::core::chat::Chat; use crate::core::chat::Chat;
@ -295,7 +295,7 @@ impl BotInstance {
let botlock = bot.read().await; let botlock = bot.read().await;
let id = botlock.get_identity(); let id = botlock.get_identity();
// [ ] Check first if the Module for that Given Command is Enabled or Disabled on the given Channel // [x] Check first if the Module for that Given Command is Enabled or Disabled on the given Channel
let modmgr = Arc::clone(&botlock.botmodules); let modmgr = Arc::clone(&botlock.botmodules);
let modstatus = modmgr.modstatus( let modstatus = modmgr.modstatus(
c.module.clone(), c.module.clone(),
@ -303,10 +303,35 @@ impl BotInstance {
if let StatusType::Disabled(a) = modstatus { if let StatusType::Disabled(a) = modstatus {
// [x] Should only respond if a BotAdmin , Mod , SupMod , BroadCaster
// - Specifically it should respond only to those who may be able to enable the module
const OF_CMD_CHANNEL:ChType = Channel(String::new());
let elevated_access = {
let mut idlock = id.write().await;
let (permissability, _) = idlock
.can_user_run_prvmsg(msg,
vec![
identity::UserRole::BotAdmin,
identity::UserRole::Mod(OF_CMD_CHANNEL),
identity::UserRole::SupMod(OF_CMD_CHANNEL),
identity::UserRole::Broadcaster,
])
.await;
permissability
};
if let Permissible::Allow = elevated_access {
let botlock = bot.read().await; let botlock = bot.read().await;
let outstr = let outstr =
format!("sadg Module is disabled : {:?}",a); format!("sadg Module is disabled : {:?}",a);
botlock.botmgrs.chat.say_in_reply_to(msg, outstr).await; botlock.botmgrs.chat.say_in_reply_to(msg, outstr).await;
}
return; return;
}; };
@ -350,7 +375,7 @@ impl BotInstance {
match eval { match eval {
Permissible::Allow => { Permissible::Allow => {
botlog::debug( botlog::debug(
"Executed as permissible", "Executing as permissible",
Some("BotInstance > listener_main_prvmsg()".to_string()), Some("BotInstance > listener_main_prvmsg()".to_string()),
Some(msg), Some(msg),
); );