2024.02.04 - LATEST PROBLEM
This commit is contained in:
parent
768bb5f03a
commit
8d4db0c657
8 changed files with 815 additions and 121 deletions
src/core
|
|
@ -1,4 +1,5 @@
|
|||
|
||||
use futures::lock::Mutex;
|
||||
use tokio::sync::mpsc::UnboundedReceiver;
|
||||
use twitch_irc::login::StaticLoginCredentials;
|
||||
use twitch_irc::ClientConfig;
|
||||
|
|
@ -8,6 +9,10 @@ use twitch_irc::message::PrivmsgMessage;
|
|||
use twitch_irc::message::ServerMessage;
|
||||
use twitch_irc::transport::tcp::TCPTransport;
|
||||
use twitch_irc::transport::tcp::TLS;
|
||||
// use std::borrow::Borrow;
|
||||
use std::borrow::BorrowMut;
|
||||
use std::boxed;
|
||||
use std::cell::Ref;
|
||||
use std::env;
|
||||
use dotenv::dotenv;
|
||||
|
||||
|
|
@ -21,9 +26,19 @@ use crate::core::ratelimiter::RateLimiter;
|
|||
use crate::core::ratelimiter;
|
||||
|
||||
use crate::core::botmodules;
|
||||
use crate::core::botmodules::ModulesManager;
|
||||
use crate::core::botmodules::{ModulesManager,BotAction};
|
||||
use crate::core::identity::{IdentityManager,Permissible};
|
||||
|
||||
use std::rc::Rc;
|
||||
use std::cell::RefCell;
|
||||
use std::sync::{Arc, RwLock};
|
||||
// use futures::lock::Mutex;
|
||||
|
||||
use std::pin::Pin;
|
||||
|
||||
//use std::borrow::Borrow;
|
||||
use core::borrow::Borrow;
|
||||
|
||||
|
||||
#[derive(Debug, PartialEq, Eq, Hash, Clone)]
|
||||
pub enum ChType {
|
||||
|
|
@ -41,7 +56,8 @@ pub use ModType::BotModule;
|
|||
|
||||
#[derive(Clone)]
|
||||
pub struct Chat {
|
||||
pub ratelimiters : HashMap<ChType,RateLimiter>, // used to limit messages sent per channel
|
||||
// pub ratelimiters : HashMap<ChType,RateLimiter>, // used to limit messages sent per channel
|
||||
pub ratelimiters : Arc<Mutex<HashMap<ChType,RateLimiter>>>, // used to limit messages sent per channel
|
||||
pub client : TwitchIRCClient<TCPTransport<TLS>,StaticLoginCredentials>,
|
||||
}
|
||||
|
||||
|
|
@ -51,19 +67,21 @@ impl Chat {
|
|||
pub fn init(ratelimiters:HashMap<ChType, RateLimiter>,
|
||||
client:TwitchIRCClient<TCPTransport<TLS>, StaticLoginCredentials>) -> Chat {
|
||||
Chat{
|
||||
ratelimiters : ratelimiters,
|
||||
ratelimiters : Arc::new(Mutex::new(ratelimiters)),
|
||||
client : client,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn init_channel(&mut self, chnl:ChType) -> () {
|
||||
// pub fn init_channel(&mut self, chnl:ChType) -> () {
|
||||
pub async fn init_channel(&mut self, chnl:ChType) -> () {
|
||||
let n = RateLimiter::new();
|
||||
self.ratelimiters.insert(chnl,n);
|
||||
self.ratelimiters.lock().await.insert(chnl,n);
|
||||
}
|
||||
|
||||
|
||||
|
||||
pub async fn say_in_reply_to(&mut self, msg:& PrivmsgMessage , mut outmsg:String) -> () {
|
||||
// pub async fn say_in_reply_to(&mut self, msg:& PrivmsgMessage , mut outmsg:String) -> () {
|
||||
pub async fn say_in_reply_to(&self, msg:& PrivmsgMessage , mut outmsg:String) -> () {
|
||||
/*
|
||||
formats message before sending to TwitchIRC
|
||||
|
||||
|
|
@ -76,7 +94,12 @@ impl Chat {
|
|||
// self.client.say_in_reply_to(msg,outmsg).await.unwrap();
|
||||
|
||||
// // let contextratelimiter = ratelimiters.get_mut(&msg.channel_login).expect("ERROR: Issue with Rate limiters");
|
||||
let contextratelimiter = self.ratelimiters
|
||||
let a = Arc::clone(&self.ratelimiters);
|
||||
let mut a = a.lock().await;
|
||||
|
||||
// let contextratelimiter = self.ratelimiters
|
||||
let contextratelimiter = a
|
||||
// .get_mut()
|
||||
.get_mut(&Channel(String::from(&msg.channel_login)))
|
||||
.expect("ERROR: Issue with Rate limiters");
|
||||
// let contextratelimiter = self.ratelimiters.get(&msg.channel_login).expect("ERROR: Issue with Rate limiters");
|
||||
|
|
@ -140,7 +163,7 @@ impl Chat {
|
|||
#[derive(Clone)]
|
||||
pub struct BotManagers {
|
||||
// pub botmodules : ModulesManager,
|
||||
pub identity : IdentityManager,
|
||||
pub identity : Arc<Mutex<IdentityManager>>,
|
||||
pub chat : Chat,
|
||||
}
|
||||
|
||||
|
|
@ -148,29 +171,49 @@ impl BotManagers {
|
|||
|
||||
pub fn init(ratelimiters:HashMap<ChType, RateLimiter>,
|
||||
client:TwitchIRCClient<TCPTransport<TLS>, StaticLoginCredentials>)
|
||||
-> BotManagers {
|
||||
BotManagers {
|
||||
-> Arc<Mutex<BotManagers>> {
|
||||
let a = Arc::new(Mutex::new(BotManagers {
|
||||
// botmodules : ModulesManager::init(),
|
||||
identity : IdentityManager::init(),
|
||||
identity : Arc::new(Mutex::new(IdentityManager::init())),
|
||||
chat : Chat::init(ratelimiters,client),
|
||||
}
|
||||
|
||||
}));
|
||||
a
|
||||
|
||||
}
|
||||
|
||||
pub fn rIdentity(self) -> Arc<Mutex<IdentityManager>> {
|
||||
self.identity
|
||||
}
|
||||
|
||||
pub fn rChat(&self) -> Arc<Mutex<Chat>> {
|
||||
Arc::new(Mutex::new(self.chat))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
pub struct ArcBox<T: Clone>(pub Arc<Mutex<T>>);
|
||||
|
||||
impl<T: Clone> ArcBox<T>{
|
||||
pub fn inst(&self) -> &Mutex<T> {
|
||||
&self.0
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//#[derive(Clone)]
|
||||
// #[derive(Copy)] // <-- Cannot be derived
|
||||
pub struct BotInstance
|
||||
{
|
||||
prefix : char,
|
||||
bot_channel : ChType,
|
||||
pub prefix : char,
|
||||
pub bot_channel : ChType,
|
||||
pub incoming_messages : UnboundedReceiver<ServerMessage>,
|
||||
// pub incoming_messages : RefCell<UnboundedReceiver<ServerMessage>>,
|
||||
// pub chat : Chat,
|
||||
pub botmodules : ModulesManager,
|
||||
twitch_oauth : String,
|
||||
pub botmodules : Arc<Mutex<ModulesManager>>,
|
||||
pub twitch_oauth : String,
|
||||
pub bot_channels : Vec<ChType>,
|
||||
// pub identity : IdentityManager,
|
||||
pub botmgrs : BotManagers,
|
||||
pub botmgrs : Arc<Mutex<BotManagers>>,
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -179,7 +222,8 @@ impl BotInstance
|
|||
{
|
||||
|
||||
|
||||
pub fn init() -> BotInstance
|
||||
// pub fn init() -> BotInstance
|
||||
pub fn init() -> Arc<BotInstance>
|
||||
{
|
||||
dotenv().ok();
|
||||
|
||||
|
|
@ -242,19 +286,113 @@ impl BotInstance
|
|||
};
|
||||
|
||||
|
||||
println!("{:?}",b.botmgrs.chat.ratelimiters);
|
||||
//println!("{:?}",b.botmgrs.chat.ratelimiters);
|
||||
|
||||
|
||||
b
|
||||
Arc::new(b)
|
||||
}
|
||||
|
||||
pub async fn runner(mut self) -> () {
|
||||
// async fn rcv_helper(self) -> Option<ServerMessage> {
|
||||
// // self.incoming_messages.get_mut().recv().await
|
||||
// let mut a = self.incoming_messages;
|
||||
// a.get_mut().recv().await
|
||||
// }
|
||||
|
||||
// pub async fn runner(mut self) -> () {
|
||||
pub async fn runner(mut self) -> () {
|
||||
|
||||
|
||||
// let mut boxed_bot = Arc::new(RefCell::new(self)); // <-- [ERROR] Future cannot be handled safely
|
||||
|
||||
|
||||
let join_handle = tokio::spawn(async move {
|
||||
|
||||
while let Some(message) = &self.incoming_messages.recv().await {
|
||||
// Below can be used to debug if I want to capture all messages
|
||||
// let boxed_bot = Arc::new(Mutex::new(self));
|
||||
// let mut boxed_bot = Arc::new(self);
|
||||
// let bot = Rc::new(RefCell::new(self));
|
||||
// let mut bot = Rc::new(RefCell::new(&self));
|
||||
//let bot = Arc::new(Mutex::new(&self));
|
||||
// let mut boxed_bot = Arc::new(RefCell::new(self));
|
||||
let mut boxed_bot = Arc::new(Mutex::new(self));
|
||||
|
||||
// while let Some(message) = bot.borrow_mut().incoming_messages.recv().await {
|
||||
|
||||
// let bot = Arc::clone(&botinit);
|
||||
|
||||
// while let Some(message) = bot.lock().unwrap().incoming_messages.recv().await {
|
||||
//let b = Arc::clone(&bot);
|
||||
|
||||
// let mut bot = RefCell::new(&self);
|
||||
|
||||
// let mut bota = bot.clone().borrow();
|
||||
|
||||
// let boxed_bot = Rc::new(RefCell::new(self));
|
||||
// let boxed_bot = Rc::new(self);
|
||||
// let boxed_bot = Pin::new(Rc::new(self));
|
||||
//let mut boxed_bot = Rc::new(RefCell::new(self));
|
||||
// let mut a = (*boxed_bot).clone().into_inner();
|
||||
// let mut a = Rc::clone(&boxed_bot).borrow_mut();
|
||||
//let mut a = Rc::<Rc<RefCell<BotInstance>>>::Borrow(Rc::clone(&boxed_bot));
|
||||
|
||||
|
||||
// while let Some(message) = Rc::clone(&boxed_bot).into_inner().incoming_messages.recv().await {
|
||||
// while let Some(message) = Rc::<BotInstance>::borrow(Rc::<BotInstance>::as_ref(boxed_bot)) {
|
||||
|
||||
// let a = boxed_bot.borrow();
|
||||
|
||||
// let boxed_bota = boxed_bot.borrow_mut();
|
||||
|
||||
// let a = Rc::try_unwrap(boxed_bot).ok().unwrap().into_inner();
|
||||
|
||||
// let boxed_bot = RefCell::new(Rc::new(self));
|
||||
//let boxed_bot = Rc::new(RefCell::new(self));
|
||||
// Rc::try_unwrap(boxed_bot).ok().unwrap().into_inner().incoming_messages.recv().await;
|
||||
|
||||
// let a:Borrowed = boxed_bot.borrow();
|
||||
// while let Some(message) = Rc::try_unwrap(boxed_bot).ok().unwrap().into_inner().incoming_messages.recv().await {
|
||||
// while let Some(message) = RefCell::new(self).borrow_mut().incoming_messages.recv().await {
|
||||
// while let Some(message) = Rc::try_unwrap(boxed_bot).ok().unwrap().into_inner().incoming_messages.recv().await {
|
||||
// while let Some(message) = Rc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner().rcv_helper().await {
|
||||
// while let Some(message) = Rc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner().incoming_messages.recv().await {
|
||||
// let mut a = Arc::try_unwrap(boxed_bot.clone())
|
||||
// .ok().unwrap()
|
||||
// .into_inner()
|
||||
// .ok().unwrap();
|
||||
// let a = Arc::clone(&boxed_bot).into_inner().unwrap().incoming_messages;
|
||||
// .into_inner()
|
||||
// .try_into().
|
||||
// .ok().unwrap();
|
||||
// while let Some(message) = a.lock().unwrap().incoming_messages.recv().await {
|
||||
// while let Some(message) = a.recv().await {
|
||||
// let a = Arc::try_unwrap(boxed_bot.clone()).ok().unwrap();
|
||||
// let mut a = Arc::try_unwrap(boxed_bot.clone())
|
||||
// .ok()
|
||||
// .unwrap();
|
||||
// .into_inner()
|
||||
// .get_mut()
|
||||
// .ok();
|
||||
// .unwrap();
|
||||
//let mut a = a.lock().unwrap();
|
||||
// let a = *a;
|
||||
// while let Some(message) = a.lock().ok().unwrap().incoming_messages.recv().await {
|
||||
// while let Some(message) = a.get_mut().expect("Error").incoming_messages.recv().await {
|
||||
//let tempbot = boxed_bot.clone();
|
||||
// while let Some(message) = Arc::try_unwrap(tempbot.clone()).ok().unwrap().into_inner().ok().unwrap().incoming_messages.recv().await {
|
||||
// while let Some(message) = Arc::try_unwrap(tempbot.clone()).ok().unwrap().incoming_messages.recv().await {
|
||||
// while let Some(message) = boxed_bot.to_owned().incoming_messages.recv().await {
|
||||
// while let Some(message) = self.incoming_messages.recv().await {
|
||||
// let a:Arc<RefCell<BotInstance>> = Arc::clone(&boxed_bot);
|
||||
// while let Some(message) = a.incoming_messages.recv().await {
|
||||
// let a = Arc::clone(&boxed_bot).into_inner();
|
||||
// while let Some(message) = a.incoming_messages.recv().await {
|
||||
let tempbot = boxed_bot.clone();
|
||||
while let Some(message) = Arc::try_unwrap(tempbot.clone()).ok().unwrap().into_inner().incoming_messages.recv().await {
|
||||
// while let Some(message) = tempbot.into_inner().incoming_messages.recv().await {
|
||||
//while let Some(message) = boxed_bot.borrow().incoming_messages.recv().await {
|
||||
// // Below can be used to debug if I want to capture all messages
|
||||
// println!("Received message: {:?}", message);
|
||||
|
||||
// let boxed_bot = Arc::new(self);
|
||||
|
||||
match message {
|
||||
ServerMessage::Notice(msg) => {
|
||||
|
|
@ -272,7 +410,35 @@ impl BotInstance
|
|||
println!("Privmsg section");
|
||||
|
||||
// b.listener_main_prvmsg(&msg);
|
||||
self.listener_main_prvmsg(&msg).await;
|
||||
// self.listener_main_prvmsg(&msg).await;
|
||||
// bot.into_inner().listener_main_prvmsg(&msg).await;
|
||||
//let bot = Rc::<RefCell<&BotInstance>>::clone(&bot);
|
||||
|
||||
// bot.borrow().listener_main_prvmsg(&msg).await;
|
||||
// let mut a = Rc::Clone(&bot);
|
||||
// a.borrow_mut().listener_main_prvmsg(&msg).await;
|
||||
// bot.borrow_mut().into_inner().listener_main_prvmsg(&msg).await;
|
||||
// bot.listener_main_prvmsg(&msg).await;
|
||||
// bot.lock().unwrap().listener_main_prvmsg(&msg).await;
|
||||
// bot.borrow_mut().listener_main_prvmsg(&msg).await;
|
||||
// Rc::clone(&boxed_bot).into_inner().listener_main_prvmsg(&msg).await;
|
||||
// boxed_bot.borrow().listener_main_prvmsg(&msg).await;
|
||||
// let bottemp = boxed_bot.borrow_mut();
|
||||
// let a = **bottemp;
|
||||
// Rc::try_unwrap(boxed_bot).ok().unwrap().into_inner().listener_main_prvmsg(&msg).await;
|
||||
// Rc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner().listener_main_prvmsg(&msg).await;
|
||||
// Arc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner().ok().unwrap().listener_main_prvmsg(&msg).await;
|
||||
// let a = Arc::try_unwrap(boxed_bot.clone()).ok().unwrap();
|
||||
// let mut a = a.lock().unwrap();
|
||||
// let a = Arc::try_unwrap(boxed_bot.clone()).ok().unwrap();
|
||||
// a.listener_main_prvmsg(&msg).await;
|
||||
|
||||
// (*a).listener_main_prvmsg(&msg).await;
|
||||
// let a:Arc<RefCell<BotInstance>> = Arc::clone(&boxed_bot);
|
||||
// a.into_inner().listener_main_prvmsg(&msg).await;
|
||||
let tempbot = boxed_bot.clone();
|
||||
Arc::try_unwrap(tempbot.clone()).ok().unwrap().into_inner().listener_main_prvmsg(&msg).await ;
|
||||
|
||||
// - BotCommand listener should likely need to be called within the above
|
||||
|
||||
|
||||
|
|
@ -296,24 +462,103 @@ impl BotInstance
|
|||
|
||||
|
||||
join_handle.await.unwrap();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
pub fn get_botmodules(self) -> Arc<Mutex<ModulesManager>> {
|
||||
// let a = self.botmodules;
|
||||
// Arc::clone(&Arc::new(Mutex::new(self.botmodules)))
|
||||
self.botmodules
|
||||
|
||||
}
|
||||
|
||||
pub fn get_botactions(&self) -> &HashMap<ModType,Vec<BotAction>> {
|
||||
self.get_botactions()
|
||||
}
|
||||
|
||||
pub async fn get_botmgrs(self) -> Arc<Mutex<BotManagers>> {
|
||||
// Arc::new(self.botmgrs)
|
||||
// Arc::clone(&Arc::new(Mutex::new(self.botmgrs)))
|
||||
let a = self.botmgrs;
|
||||
// let a = *a.lock().await;
|
||||
// let a = a.rIdentity();
|
||||
a
|
||||
}
|
||||
|
||||
pub async fn get_identity(self) -> Arc<Mutex<IdentityManager>> {
|
||||
// let a = self.botmgrs;
|
||||
// Arc::clone(&Arc::new(Mutex::new(a.rIdentity())))
|
||||
// let a = self.botmgrs;
|
||||
// Arc::clone(&Arc::new(Mutex::new(a.rIdentity())))
|
||||
let a = self.get_botmgrs().await;
|
||||
let a = a.lock().await;
|
||||
// let a = a.rIdentity();
|
||||
let a = a.clone().identity;
|
||||
a.clone()
|
||||
}
|
||||
|
||||
pub fn get_prefix(&self) -> String {
|
||||
self.prefix.to_string()
|
||||
}
|
||||
|
||||
// -----------------
|
||||
// PRIVATE FUNCTIONS
|
||||
|
||||
|
||||
// async fn listener_main_prvmsg(&mut self,msg:PrivmsgMessage) -> () {
|
||||
async fn listener_main_prvmsg(&self,msg:&PrivmsgMessage) -> () {
|
||||
async fn listener_main_prvmsg(self,msg:&PrivmsgMessage) -> () {
|
||||
|
||||
// println!("(#{}) {}: {}", msg.channel_login, msg.sender.name, msg.message_text);
|
||||
|
||||
// // [ ] Need to run through all Listener Bodies for Enabled Modules for the context of the message (e.g., ModStatus is Enabled in the context for the channel)
|
||||
|
||||
for (_m,acts) in &self.botmodules.botactions {
|
||||
// let botmgr = Rc::new(&self.botmgrs);
|
||||
|
||||
// let mut boxedbot = Rc::new(RefCell::new(self));
|
||||
// let boxed_bot = Rc::new(RefCell::new(self));
|
||||
// let boxed_bot = Arc::new(Mutex::new(self));
|
||||
// let boxed_bot = Arc::new(self);
|
||||
//let boxed_bot = Arc::clone(self);
|
||||
// let mut boxed_bot = Arc::new(RefCell::new(self));
|
||||
// let mut boxed_bot = Arc::new(RwLock::new(self));
|
||||
// let boxed_bot = Arc::new(RwLock::new(self));
|
||||
// let boxed_bot = Arc::new(Mutex::new(self));
|
||||
let boxed_bot = Arc::new(Mutex::new(self));
|
||||
|
||||
|
||||
// for (_m,acts) in &self.botmodules.botactions {
|
||||
// for (_m,acts) in &self.botmodules.botactions {
|
||||
// for (_m,acts) in bot.into_inner().botmodules.botactions {
|
||||
// let mut bot = Rc::clone(&bot);
|
||||
// for (_m,acts) in bot.into_inner().botmodules.botactions {
|
||||
// for (_m,acts) in bot.into_inner().botmodules.botactions {
|
||||
// for (_m,acts) in Rc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner().botmodules.botactions {
|
||||
// for (_m,acts) in Arc::try_unwrap(boxed_bot.clone()).ok() .unwrap().into_inner().ok().unwrap().botmodules.botactions {
|
||||
// for (_m,acts) in Arc::try_unwrap(boxed_bot.clone()).ok().unwrap().botmodules.botactions {
|
||||
// for (_m,acts) in Arc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner().botmodules.botactions {
|
||||
// let a = Arc::try_unwrap(boxed_bot).ok().unwrap().read().unwrap().botmodules.botactions
|
||||
// let a = Arc::try_unwrap(boxed_bot.clone()).ok().unwrap();
|
||||
// let b = a.read().unwrap();
|
||||
// for (_m,acts) in a.read().unwrap().botmodules.botactions {
|
||||
// for (_m,acts) in b.rbotmodules().botactions {
|
||||
// for (_m,acts) in b.rbotactions() {
|
||||
// for (_m,acts) in (*Arc::try_unwrap(boxed_bot.clone()).ok().unwrap().read().unwrap()).rbotactions() {
|
||||
// let a = boxed_bot.clone().into_inner();
|
||||
let a = boxed_bot.lock().await;
|
||||
//let a = a.lock().in
|
||||
// for (_m,acts) in self.rbotactions() {
|
||||
// for (_m,acts) in a.read().ok().unwrap().rbotactions() {
|
||||
// for (_m,acts) in a.into_inner().ok().unwrap().rbotactions() {
|
||||
for (_m,acts) in a.get_botactions() {
|
||||
|
||||
for a in acts {
|
||||
|
||||
match a {
|
||||
|
||||
|
||||
let _act = match a {
|
||||
|
||||
crate::core::botmodules::BotAction::C(c) => {
|
||||
/*
|
||||
|
|
@ -340,13 +585,43 @@ impl BotInstance
|
|||
// [x] prefix + command
|
||||
|
||||
let mut confirmed_bot_command = false;
|
||||
if inpt == self.prefix.to_string() + c.command.as_str() {
|
||||
|
||||
// if inpt == self.prefix.to_string() + c.command.as_str() {
|
||||
// if inpt == Rc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner().prefix.to_string() + c.command.as_str() {
|
||||
// let a = Rc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner().prefix.to_string();
|
||||
// let a = Arc::try_unwrap(boxed_bot.clone()).ok() .unwrap().into_inner().ok().unwrap().prefix.to_string();
|
||||
// let a = Arc::try_unwrap(boxed_bot.clone()).ok().unwrap().prefix.to_string();
|
||||
// let a = Arc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner().prefix.to_string();
|
||||
// let a = Arc::try_unwrap(boxed_bot.clone()).ok().unwrap();
|
||||
// let a = (*Arc::try_unwrap(boxed_bot.clone()).ok().unwrap().read().unwrap());
|
||||
// let a = (*Arc::try_unwrap(boxed_bot.clone()).ok().unwrap().read().unwrap()).prefix.to_string();
|
||||
// let a = self.prefix.to_string();
|
||||
// let a = boxed_bot.clone();
|
||||
|
||||
// if inpt == a.into_inner().ok().unwrap().prefix.to_string() + c.command.as_str() {
|
||||
// if inpt == a.into_inner().ok().unwrap().prefix.to_string() + c.command.as_str()
|
||||
let a = boxed_bot.lock().await;
|
||||
//
|
||||
// if inpt == a.into_inner().prefix.to_string() + c.command.as_str() {
|
||||
if inpt == a.get_prefix() + c.command.as_str() {
|
||||
confirmed_bot_command = true;
|
||||
}
|
||||
|
||||
// [x] prefix + alias
|
||||
for alias in &c.alias {
|
||||
if inpt == self.prefix.to_string() + alias.as_str() {
|
||||
// if inpt == self.prefix.to_string() + alias.as_str() {
|
||||
// if inpt == Rc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner().prefix.to_string() + alias.as_str() {
|
||||
//
|
||||
// if inpt == Arc::try_unwrap(boxed_bot.clone()).ok() .unwrap().into_inner().ok().unwrap().prefix.to_string() + alias.as_str() {
|
||||
// Arc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner()
|
||||
// if inpt == Arc::try_unwrap(boxed_bot.clone()).ok().unwrap().prefix.to_string() + alias.as_str() {
|
||||
// if inpt == Arc::try_unwrap(boxed_bot).ok().unwrap().read().unwrap().prefix.to_string() + alias.as_str() {
|
||||
// if inpt == self.prefix.to_string() + alias.as_str() {
|
||||
// let a = boxed_bot.clone();
|
||||
let a = boxed_bot.lock().await;
|
||||
// if inpt == a.into_inner().ok().unwrap().prefix.to_string() + alias.as_str() {
|
||||
// if inpt == a.into_inner().prefix.to_string() + alias.as_str() {
|
||||
if inpt == a.get_prefix() + alias.as_str() {
|
||||
confirmed_bot_command = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -364,24 +639,80 @@ impl BotInstance
|
|||
|
||||
// match self.botmgrs.identity.to_owned().can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
// match self.botmgrs.identity.can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
match self.botmgrs.identity.clone().can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
// match self.botmgrs.identity.clone().can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
|
||||
// let botref = Rc::clone(&botmgr);
|
||||
// if let Rc(botmgr) = botref {
|
||||
// ()
|
||||
// }
|
||||
|
||||
// match self.botmgrs.identity.clone().can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
// match boxed_bot.clone().into_inner().botmgrs.identity.clone().can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
// match Rc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner().botmgrs.identity.can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
//let boxed_bot1 = Arc::clone(&boxed_bot);
|
||||
//let a = boxed_bot1.into_inner().ok().unwrap();
|
||||
// match boxed_bot1.into_inner().ok().unwrap().botmgrs.identity.can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
// match Arc::try_unwrap(boxed_bot.clone())
|
||||
// .ok()
|
||||
// .unwrap().into_inner().ok().unwrap().botmgrs.identity.can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
// let a = Arc::try_unwrap(boxed_bot.clone()).ok() .unwrap().into_inner();
|
||||
// let a = Arc::try_unwrap(boxed_bot.clone()).ok().unwrap();
|
||||
// Arc::try_unwrap(boxed_bot.clone()).ok().unwrap().into_inner()
|
||||
// match a.botmgrs.identity.can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
// match Arc::try_unwrap(boxed_bot).ok().unwrap().read().unwrap().botmgrs.identity.can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
// match self.botmgrs.identity.can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
// match (boxed_bot.clone().into_inner().ok().unwrap()).botmgrs.identity.can_user_run_PRVMSG(&msg, c.required_roles.clone()) {
|
||||
// let a = boxed_bot.clone();
|
||||
// let a = boxed_bot.lock().await;
|
||||
// // let a = a.read().ok().unwrap().botmgrs.identity;
|
||||
// let a = a.get_identity();
|
||||
// // let a = a.lock().await.can_user_run_PRVMSG(&msg, c.required_roles.clone()) ;
|
||||
|
||||
// match a.lock().await.can_user_run_PRVMSG(&msg, c.required_roles.clone()).await {
|
||||
|
||||
{
|
||||
let le = boxed_bot.lock().await;
|
||||
// let le = le.lock().await;
|
||||
let le = le.get_identity().await;
|
||||
let le = *le;
|
||||
let le = le.lock().await;
|
||||
let le = le.clone();
|
||||
let le = le.can_user_run_PRVMSG(&msg, c.required_roles.clone()).await;
|
||||
match le {
|
||||
// Ok(Permissible::Allow) => (),
|
||||
Permissible::Allow => {
|
||||
println!("Executed as permissible");
|
||||
c.execute(self.botmgrs.clone(), msg.clone()).await;
|
||||
// c.execute(bot, msg.clone()).await;
|
||||
// if let bot = Rc::<RefCell<BotInstance>>::clone(*bot) {
|
||||
// c.execute(bot, msg.clone()).await;
|
||||
// }
|
||||
// let boxed_bot = Arc::new(RwLock::new(self));
|
||||
c.execute(boxed_bot.clone(), msg.clone()).await;
|
||||
|
||||
}
|
||||
Permissible::Block => println!("User Not allowed to run command"),
|
||||
Permissible::Block => {
|
||||
println!("User Not allowed to run command")
|
||||
},
|
||||
// _ => (),
|
||||
}
|
||||
};
|
||||
|
||||
// c.execute(self.chat.clone(), msg.clone()).await;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
crate::core::botmodules::BotAction::L(l) => l.execute(self.botmgrs.clone(), msg.clone()).await,
|
||||
crate::core::botmodules::BotAction::L(l) => {
|
||||
// if let bot = Rc::clone(&bot) {
|
||||
// l.into_inner().execute(bot, msg.clone()).await
|
||||
// }
|
||||
//let bot = Rc::clone(&bot).into_inner();
|
||||
// l.execute(boxed_bot.clone(), msg.clone()).await
|
||||
// let boxed_bot = Arc::new(RwLock::new(self));
|
||||
l.execute(boxed_bot.clone(), msg.clone()).await;
|
||||
},
|
||||
|
||||
_ => (),
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue