enh chat
This commit is contained in:
parent
8ed672fb3a
commit
e73bd75de9
10 changed files with 909 additions and 188 deletions
50
Cargo.lock
generated
50
Cargo.lock
generated
|
@ -47,6 +47,19 @@ version = "1.0.81"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
|
||||
|
||||
[[package]]
|
||||
name = "async-channel"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
|
||||
dependencies = [
|
||||
"concurrent-queue",
|
||||
"event-listener",
|
||||
"event-listener-strategy",
|
||||
"futures-core",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-recursion"
|
||||
version = "1.1.0"
|
||||
|
@ -323,6 +336,15 @@ dependencies = [
|
|||
"tracing-error",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "concurrent-queue"
|
||||
version = "2.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
|
||||
dependencies = [
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "console-api"
|
||||
version = "0.6.0"
|
||||
|
@ -486,6 +508,27 @@ dependencies = [
|
|||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-listener"
|
||||
version = "5.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91"
|
||||
dependencies = [
|
||||
"concurrent-queue",
|
||||
"parking",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-listener-strategy"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
|
||||
dependencies = [
|
||||
"event-listener",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "eyre"
|
||||
version = "0.6.12"
|
||||
|
@ -522,6 +565,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
|||
name = "forcebot_rs"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"async-recursion",
|
||||
"async-trait",
|
||||
"casual_logger",
|
||||
|
@ -1122,6 +1166,12 @@ version = "3.5.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
|
||||
|
||||
[[package]]
|
||||
name = "parking"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.12.1"
|
||||
|
|
|
@ -17,6 +17,7 @@ casual_logger = "0.6.5"
|
|||
chrono = "0.4.35"
|
||||
tokio-console = "0.1.10"
|
||||
console-subscriber = "0.2.0"
|
||||
async-channel = "2.2.0"
|
||||
|
||||
|
||||
[lib]
|
||||
|
|
|
@ -43,12 +43,12 @@ use super::botmodules::StatusType;
|
|||
#[derive(Clone, Debug)]
|
||||
pub struct BotManagers {
|
||||
pub identity: Arc<RwLock<IdentityManager>>,
|
||||
pub chat: Chat,
|
||||
pub chat: Arc<RwLock<Chat>>,
|
||||
}
|
||||
|
||||
impl BotManagers {
|
||||
pub fn init(
|
||||
ratelimiters: HashMap<Channel, RateLimiter>,
|
||||
ratelimiters: HashMap<Channel, Arc<RwLock<RateLimiter>>>,
|
||||
client: TwitchIRCClient<TCPTransport<TLS>, StaticLoginCredentials>,
|
||||
) -> BotManagers {
|
||||
BotManagers {
|
||||
|
@ -116,7 +116,7 @@ impl BotInstance {
|
|||
|
||||
client.join(chnl.to_owned()).unwrap();
|
||||
|
||||
let n = RateLimiter::new();
|
||||
let n = Arc::new(RwLock::new(RateLimiter::new()));
|
||||
ratelimiters.insert(Channel(String::from(chnl)), n);
|
||||
}
|
||||
|
||||
|
@ -201,7 +201,18 @@ impl BotInstance {
|
|||
);
|
||||
Log::flush();
|
||||
|
||||
BotInstance::listener_main_prvmsg(Arc::clone(&bot), &msg).await;
|
||||
let botarc = Arc::clone(&bot);
|
||||
// let msgarc = Arc::new(RwLock::new(msg.clone()));
|
||||
|
||||
let msgtext = msg.message_text.clone();
|
||||
|
||||
dbg!("will spawn listener_main_prvmsg from runner",msgtext.clone());
|
||||
tokio::spawn( async move {
|
||||
// let msgarc_c = msgarc.clone();
|
||||
BotInstance::listener_main_prvmsg(botarc, &msg.clone()).await;
|
||||
});
|
||||
// BotInstance::listener_main_prvmsg(Arc::clone(&bot), &msg).await;
|
||||
dbg!("completed spawn listener_main_prvmsg from runner", msgtext);
|
||||
}
|
||||
ServerMessage::Whisper(msg) => {
|
||||
botlog::debug(
|
||||
|
@ -367,13 +378,13 @@ impl BotInstance {
|
|||
Channel(msg.channel_login.to_string())).await;
|
||||
|
||||
|
||||
if let StatusType::Disabled(a) = modstatus {
|
||||
if let StatusType::Disabled(statuslvl) = 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
|
||||
|
||||
botlog::trace(
|
||||
&format!("Identified cmd is associated with Disabled Module : StatusLvl = {:?}", a),
|
||||
&format!("Identified cmd is associated with Disabled Module : StatusLvl = {:?}", statuslvl),
|
||||
Some("BotInstance > listener_main_prvmsg()".to_string()),
|
||||
Some(msg),
|
||||
);
|
||||
|
@ -397,9 +408,10 @@ impl BotInstance {
|
|||
);
|
||||
|
||||
// Only respond to those with th ebelow User Roles
|
||||
// [x] Need to add in Module as well
|
||||
|
||||
let outstr =
|
||||
format!("sadg Module is disabled : {:?}",a);
|
||||
format!("sadg Module is disabled : {:?} {:?}",c.module.clone(),statuslvl);
|
||||
|
||||
|
||||
let params = ExecBodyParams {
|
||||
|
@ -409,9 +421,11 @@ impl BotInstance {
|
|||
curr_act : Some(Arc::clone(&act_clone)),
|
||||
};
|
||||
|
||||
let params = Arc::new(RwLock::new(params));
|
||||
|
||||
// When sending a BotMsgTypeNotif, send_botmsg does Roles related validation as required
|
||||
|
||||
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
outstr
|
||||
),
|
||||
params,
|
||||
|
@ -468,7 +482,10 @@ impl BotInstance {
|
|||
|
||||
};
|
||||
|
||||
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
|
||||
let params = Arc::new(RwLock::new(params));
|
||||
|
||||
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
outstr.to_string()
|
||||
),
|
||||
params.clone(),
|
||||
|
@ -499,7 +516,10 @@ impl BotInstance {
|
|||
|
||||
};
|
||||
|
||||
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
|
||||
let params = Arc::new(RwLock::new(params));
|
||||
|
||||
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
outstr.to_string()
|
||||
),
|
||||
params.clone(),
|
||||
|
|
|
@ -193,10 +193,10 @@ pub async fn init(mgr: Arc<ModulesManager>) {
|
|||
let botclone = Arc::clone(&bot);
|
||||
let botlock = botclone.read().await;
|
||||
|
||||
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
outmsg.to_string()
|
||||
),
|
||||
params.clone(),
|
||||
Arc::new(RwLock::new(params.clone())),
|
||||
).await;
|
||||
|
||||
return;
|
||||
|
@ -236,10 +236,10 @@ pub async fn init(mgr: Arc<ModulesManager>) {
|
|||
ChangeResult::Success(a) => format!("YAAY Success : {}",a),
|
||||
};
|
||||
|
||||
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
outmsg.to_string()
|
||||
),
|
||||
params.clone(),
|
||||
Arc::new(RwLock::new(params.clone())),
|
||||
).await;
|
||||
|
||||
|
||||
|
@ -374,10 +374,10 @@ pub async fn init(mgr: Arc<ModulesManager>) {
|
|||
|
||||
// We should call a notification around here
|
||||
|
||||
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
outmsg.to_string()
|
||||
),
|
||||
params.clone(),
|
||||
Arc::new(RwLock::new(params.clone())),
|
||||
).await;
|
||||
|
||||
return;
|
||||
|
@ -421,10 +421,10 @@ pub async fn init(mgr: Arc<ModulesManager>) {
|
|||
|
||||
// We should call a notification around here
|
||||
|
||||
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
outmsg.to_string()
|
||||
),
|
||||
params.clone(),
|
||||
Arc::new(RwLock::new(params.clone())),
|
||||
).await;
|
||||
|
||||
}
|
||||
|
|
604
src/core/chat.rs
604
src/core/chat.rs
|
@ -1,8 +1,11 @@
|
|||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
use std::num::{self, Wrapping};
|
||||
|
||||
use tokio::sync::Mutex;
|
||||
use chrono::NaiveDateTime;
|
||||
use tokio::sync::{Mutex, RwLock};
|
||||
|
||||
use tokio::task::yield_now;
|
||||
use twitch_irc::login::StaticLoginCredentials;
|
||||
use twitch_irc::message::PrivmsgMessage;
|
||||
use twitch_irc::transport::tcp::{TCPTransport, TLS};
|
||||
|
@ -27,16 +30,53 @@ use super::identity;
|
|||
|
||||
use async_recursion::async_recursion;
|
||||
|
||||
use async_channel::{self, bounded, Receiver, Sender};
|
||||
|
||||
|
||||
|
||||
// pub mod chat_util {
|
||||
|
||||
// use super::*;
|
||||
|
||||
// use std::boxed::Box;
|
||||
// use std::future::Future;
|
||||
// use std::pin::Pin;
|
||||
|
||||
// // pub type MsgFuture = Box<
|
||||
// // dyn Fn(BotMsgType,ExecBodyParams) -> Pin<Box<dyn Future<Output = ()> + Send>> + Send + Sync,
|
||||
// // >;
|
||||
|
||||
// // pub fn msgbox<T>(f: fn(BotMsgType,ExecBodyParams) -> T) -> MsgFuture
|
||||
// // where
|
||||
// // T: Future<Output = ()> + Send + 'static,
|
||||
// // {
|
||||
// // Box::new(move |a,b| Box::pin(f(a,b)))
|
||||
// // }
|
||||
|
||||
// pub type MsgFuture = Pin<Box<dyn Future<Output =()> + Send + 'static>>;
|
||||
|
||||
// }
|
||||
|
||||
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct Chat {
|
||||
pub ratelimiters: Arc<Mutex<HashMap<Channel, RateLimiter>>>, // used to limit messages sent per channel
|
||||
// pub ratelimiters: Arc<Mutex<HashMap<Channel, RateLimiter>>>, // used to limit messages sent per channel
|
||||
pub ratelimiters: Arc<RwLock<HashMap<Channel,
|
||||
Arc<RwLock<RateLimiter>>>>>, // used to limit messages sent per channel
|
||||
pub client: TwitchIRCClient<TCPTransport<TLS>, StaticLoginCredentials>,
|
||||
// outqueue : Arc<RwLock<Vec<(BotMsgType,ExecBodyParams)>>>
|
||||
outqueue : (Sender<(BotMsgType,ExecBodyParams)>,
|
||||
Arc<RwLock<Receiver<(BotMsgType,ExecBodyParams)>>>),
|
||||
// https://doc.rust-lang.org/std/num/struct.Wrapping.html
|
||||
// spaceiter : Arc<Mutex<Wrapping<i64>>>,
|
||||
}
|
||||
|
||||
|
||||
#[derive(Clone,Debug)]
|
||||
pub enum BotMsgType<'a> {
|
||||
SayInReplyTo(&'a PrivmsgMessage,String),
|
||||
pub enum BotMsgType {
|
||||
// SayInReplyTo(&'a PrivmsgMessage,String),
|
||||
SayInReplyTo(Arc<PrivmsgMessage>,String),
|
||||
Say(String,String),
|
||||
Notif(String), // For Bot Sent Notifications
|
||||
}
|
||||
|
@ -44,22 +84,107 @@ pub enum BotMsgType<'a> {
|
|||
|
||||
impl Chat {
|
||||
pub fn init(
|
||||
ratelimiters: HashMap<Channel, RateLimiter>,
|
||||
ratelimiters: HashMap<Channel, Arc<RwLock<RateLimiter>>>,
|
||||
client: TwitchIRCClient<TCPTransport<TLS>, StaticLoginCredentials>,
|
||||
) -> Chat {
|
||||
Chat {
|
||||
ratelimiters: Arc::new(Mutex::new(ratelimiters)),
|
||||
) -> Arc<RwLock<Chat>> {
|
||||
|
||||
let (s,r) = bounded(100);
|
||||
|
||||
let r = Arc::new(RwLock::new(r));
|
||||
|
||||
// let spaceiter = Arc::new(Mutex::new(Wrapping(3)));
|
||||
|
||||
|
||||
let chat = Chat {
|
||||
ratelimiters: Arc::new(RwLock::new(ratelimiters)),
|
||||
client,
|
||||
// outqueue : Arc::new(RwLock::new(vec![])),
|
||||
outqueue : (s,r.clone()),
|
||||
// spaceiter ,
|
||||
};
|
||||
|
||||
let chat_ar = Arc::new(RwLock::new(chat));
|
||||
|
||||
let r_clone = r.clone();
|
||||
|
||||
// let chat_ar = Arc::new(RwLock::new(chat_clone));
|
||||
let chat_ar_clone = chat_ar.clone();
|
||||
|
||||
tokio::spawn(async move {
|
||||
// loop {
|
||||
// // tokio::spawn(async move {
|
||||
// // let r_clone = r_clone.clone();
|
||||
|
||||
// let r_clone = r_clone.clone();
|
||||
// let guard1 = r_clone.read().await;
|
||||
// match guard1.recv().await {
|
||||
// Ok(a) => {
|
||||
// // [ ] This should spawn it's own ideally, so it does not lock other messages
|
||||
// // chat_clone.send_botmsg(a.0, Arc::new(RwLock::new(a.1))).await
|
||||
// let params_ar = Arc::new(RwLock::new(a.1));
|
||||
// let chat_clone = chat_clone.clone();
|
||||
// dbg!(chrono::offset::Local::now(),"Message Spawned > Starting");
|
||||
// tokio::spawn( async move {
|
||||
// chat_clone.send_botmsg_inner(a.0, params_ar).await
|
||||
// });
|
||||
// dbg!(chrono::offset::Local::now(),"Message Spawned > Completed");
|
||||
// } ,
|
||||
// Err(err) => {
|
||||
// dbg!("ISSUE processing Receiver",err);
|
||||
// sleep(Duration::from_millis(10)).await;
|
||||
// }
|
||||
// }
|
||||
// // });
|
||||
// }
|
||||
|
||||
let r_cc = r_clone.clone();
|
||||
|
||||
loop {
|
||||
let r_ccc = r_cc.clone();
|
||||
let chat_c = chat_ar.clone();
|
||||
tokio::spawn(async move {
|
||||
let r_cc = r_ccc.clone();
|
||||
let chat_cc = chat_c.clone();
|
||||
let guard1 = r_cc.read().await;
|
||||
match guard1.recv().await {
|
||||
Ok(a) => {
|
||||
// [ ] This should spawn it's own ideally, so it does not lock other messages
|
||||
// chat_clone.send_botmsg(a.0, Arc::new(RwLock::new(a.1))).await
|
||||
let params_ar = Arc::new(RwLock::new(a.1));
|
||||
// let chat_clone = chat_cc.clone();
|
||||
dbg!(chrono::offset::Local::now(),"Message Spawned > Starting");
|
||||
tokio::spawn( async move {
|
||||
chat_cc.read().await.send_botmsg_inner(a.0, params_ar).await
|
||||
});
|
||||
dbg!(chrono::offset::Local::now(),"Message Spawned > Completed");
|
||||
} ,
|
||||
Err(err) => {
|
||||
dbg!("ISSUE processing Receiver",err);
|
||||
sleep(Duration::from_millis(10)).await;
|
||||
}
|
||||
}
|
||||
}
|
||||
);
|
||||
yield_now().await;
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
// chat
|
||||
chat_ar_clone
|
||||
}
|
||||
|
||||
pub async fn init_channel(&mut self, chnl: Channel) {
|
||||
let n = RateLimiter::new();
|
||||
self.ratelimiters.lock().await.insert(chnl, n);
|
||||
let n = Arc::new(RwLock::new(RateLimiter::new()));
|
||||
|
||||
let mut rguard = self.ratelimiters.write().await;
|
||||
rguard.insert(chnl, n);
|
||||
drop(rguard);
|
||||
}
|
||||
|
||||
#[async_recursion]
|
||||
pub async fn send_botmsg(&self, msginput: BotMsgType<'async_recursion>, params : ExecBodyParams) {
|
||||
// pub async fn send_botmsg(&self, msginput: BotMsgType<'async_recursion>, params : ExecBodyParams) {
|
||||
pub async fn send_botmsg_inner(&self, msginput: BotMsgType, params : Arc<RwLock<ExecBodyParams>>) {
|
||||
|
||||
|
||||
|
||||
|
@ -72,15 +197,17 @@ impl Chat {
|
|||
|
||||
*/
|
||||
|
||||
let chat_ar = Arc::new(RwLock::new((*self).clone()));
|
||||
|
||||
|
||||
botlog::trace(
|
||||
format!("send_bot_msg params : {:?}",msginput).as_str(),
|
||||
Some("chat.rs > send_botmsg ".to_string()),
|
||||
Some(¶ms.msg),
|
||||
Some(¶ms.read().await.msg),
|
||||
);
|
||||
Log::flush();
|
||||
|
||||
let (channel_login,mut outmsg) = match msginput.clone() {
|
||||
let (channel_login,outmsg) = match msginput.clone() {
|
||||
BotMsgType::SayInReplyTo(msg, outmsg) => {
|
||||
(msg.channel_login.clone(),outmsg)
|
||||
},
|
||||
|
@ -88,7 +215,7 @@ impl Chat {
|
|||
(a.clone(),b.clone())
|
||||
},
|
||||
BotMsgType::Notif(outmsg) => {
|
||||
(params.msg.channel_login.clone(),outmsg)
|
||||
(params.read().await.msg.channel_login.clone(),outmsg)
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -98,13 +225,13 @@ impl Chat {
|
|||
botlog::trace(
|
||||
"BEFORE parent_module call",
|
||||
Some("chat.rs > send_botmsg ".to_string()),
|
||||
Some(¶ms.msg),
|
||||
Some(¶ms.read().await.msg),
|
||||
);
|
||||
|
||||
let parent_module = params.get_module().await;
|
||||
let parent_module = params.read().await.get_module().await;
|
||||
|
||||
let params_clone = params.clone();
|
||||
let botclone = Arc::clone(¶ms_clone.bot);
|
||||
let botclone = Arc::clone(¶ms_clone.read().await.bot);
|
||||
let botlock = botclone.read().await;
|
||||
let modmgr = Arc::clone(&botlock.botmodules);
|
||||
let modstatus = (*modmgr).modstatus(
|
||||
|
@ -113,7 +240,7 @@ impl Chat {
|
|||
Channel(channel_login.clone())
|
||||
).await;
|
||||
|
||||
if !params.bot.read().await.bot_channels.contains(&Channel(channel_login.clone())) {
|
||||
if !params.read().await.bot.read().await.bot_channels.contains(&Channel(channel_login.clone())) {
|
||||
botlog::warn(
|
||||
&format!("A message attempted to send for a Non-Joined Channel : {}",channel_login.clone()),
|
||||
Some("Chat > send_botmsg".to_string()),
|
||||
|
@ -122,7 +249,7 @@ impl Chat {
|
|||
|
||||
if let BotMsgType::SayInReplyTo(_prvmsg,_outmsg) = msginput {
|
||||
|
||||
self.send_botmsg(BotMsgType::Notif(
|
||||
chat_ar.read().await.send_botmsg(BotMsgType::Notif(
|
||||
"uuh Bot can't send to a channel it isn't joined".to_string(),
|
||||
),
|
||||
params).await;
|
||||
|
@ -147,7 +274,7 @@ impl Chat {
|
|||
botlog::trace(
|
||||
format!("BEFORE modstatus check : modstatus = {:?}",modstatus).as_str(),
|
||||
Some("chat.rs > send_botmsg ".to_string()),
|
||||
Some(¶ms.msg),
|
||||
Some(¶ms.read().await.msg),
|
||||
);
|
||||
|
||||
|
||||
|
@ -161,7 +288,7 @@ impl Chat {
|
|||
botlog::trace(
|
||||
"BEFORE msginput check",
|
||||
Some("chat.rs > send_botmsg ".to_string()),
|
||||
Some(¶ms.msg),
|
||||
Some(¶ms.read().await.msg),
|
||||
);
|
||||
|
||||
Log::flush();
|
||||
|
@ -173,7 +300,7 @@ impl Chat {
|
|||
botlog::trace(
|
||||
"BEFORE potential Async recursion",
|
||||
Some("chat.rs > send_botmsg ".to_string()),
|
||||
Some(¶ms.clone().msg),
|
||||
Some(¶ms.read().await.clone().msg),
|
||||
);
|
||||
|
||||
Log::flush();
|
||||
|
@ -193,7 +320,7 @@ impl Chat {
|
|||
botlog::trace(
|
||||
"AFTER potential Async recursion",
|
||||
Some("chat.rs > send_botmsg ".to_string()),
|
||||
Some(¶ms.msg),
|
||||
Some(¶ms.read().await.msg),
|
||||
);
|
||||
|
||||
|
||||
|
@ -230,20 +357,20 @@ impl Chat {
|
|||
|
||||
// let params_clone = params.clone();
|
||||
|
||||
let botclone = Arc::clone(¶ms.bot);
|
||||
let botclone = Arc::clone(¶ms.read().await.bot);
|
||||
let botlock = botclone.read().await;
|
||||
let id = botlock.get_identity();
|
||||
let id = Arc::clone(&id);
|
||||
let idlock = id.read().await; // <-- [x] 03.24 - seems to work
|
||||
let user_roles = idlock.getspecialuserroles(
|
||||
params.get_sender(),
|
||||
params.read().await.get_sender(),
|
||||
Some(Channel(channel_login.clone()))
|
||||
).await;
|
||||
|
||||
botlog::trace(
|
||||
format!("BEFORE user roles check check : userroles = {:?}",user_roles).as_str(),
|
||||
Some("chat.rs > send_botmsg ".to_string()),
|
||||
Some(¶ms.msg),
|
||||
Some(¶ms.read().await.msg),
|
||||
);
|
||||
|
||||
Log::flush();
|
||||
|
@ -312,8 +439,11 @@ impl Chat {
|
|||
|
||||
*/
|
||||
|
||||
let rl = Arc::clone(&self.ratelimiters);
|
||||
let mut rllock = rl.lock().await;
|
||||
// let rl = chat_ar.read().await.ratelimiters.clone();
|
||||
// // let rl = Arc::clone(&chat_ar.clone().read().await.ratelimiters);
|
||||
// // let mut rllock = rl.read().await;
|
||||
// let rllock = rl.write().await;
|
||||
// // let mut hmap = (*rllock).clone();
|
||||
|
||||
botlog::debug(
|
||||
&format!("Ratelimiter being checked for channel : {}",channel_login.clone()),
|
||||
|
@ -321,49 +451,181 @@ impl Chat {
|
|||
None,
|
||||
);
|
||||
|
||||
let contextratelimiter = rllock
|
||||
// .get_mut()
|
||||
// let rllock_clone = Arc::new(RwLock::new((*rllock).clone()));
|
||||
// let guard = rllock_clone.read().await;
|
||||
// let contextratelimiter = (*guard).clone()
|
||||
// // .get_mut()
|
||||
// .get_mut(&Channel(channel_login.to_lowercase().clone()))
|
||||
// .expect("ERROR: Issue with Rate limiters");
|
||||
// // drop(guard);
|
||||
|
||||
// let a = rllock.get_mut(&Channel(channel_login.to_lowercase().clone())).expect("ERROR: Issue with Rate limiters");
|
||||
|
||||
let ratelimiters = chat_ar.read().await.ratelimiters.clone();
|
||||
|
||||
// let contextratelimiter = Arc::new(RwLock::new(contextratelimiter));
|
||||
|
||||
// // Continue to check the limiter and sleep if required if the minimum is not reached
|
||||
// while let ratelimiter::LimiterResp::Sleep(sleeptime) = contextratelimiter.check_limiter(outmsg.clone()) {
|
||||
// sleep(Duration::from_secs_f64(sleeptime)).await;
|
||||
// }
|
||||
|
||||
// match contextratelimiter.check_limiter(outmsg.clone()) {
|
||||
// ratelimiter::LimiterResp::Allow => {
|
||||
// // let maxblanks = rand::thread_rng().gen_range(1..=20);
|
||||
|
||||
// // let mut blanks_to_add_lock = self.spaceiter.lock().await;
|
||||
// // (*blanks_to_add_lock).0 += 1;
|
||||
|
||||
|
||||
// // for _i in 1..(*blanks_to_add_lock).0 {
|
||||
// // // let blankspace: &str = " ";
|
||||
// // // let blankspace: &str = " .";
|
||||
// // let blankspace: &str = ".";
|
||||
// // outmsg.push_str(blankspace);
|
||||
// // }
|
||||
|
||||
// // drop(blanks_to_add_lock);
|
||||
|
||||
// dbg!("[ ] PROBLEM AREA - If notificaiton triggered, need this checked");
|
||||
// dbg!(outmsg.clone());
|
||||
|
||||
// botlog::trace(
|
||||
// &format!("Out Message TO {} >> {}",channel_login.clone(),outmsg.clone()),
|
||||
// Some("Chat > send_botmsg".to_string()),
|
||||
// None,
|
||||
// );
|
||||
|
||||
// match msginput.clone() {
|
||||
// BotMsgType::SayInReplyTo(msg, _) => {
|
||||
// self.client.say_in_reply_to(&(*msg), outmsg.clone()).await.unwrap();
|
||||
// },
|
||||
// BotMsgType::Say(a, _) => {
|
||||
// self.client.say(a, outmsg.clone()).await.unwrap();
|
||||
// }
|
||||
// BotMsgType::Notif(outmsg) => {
|
||||
// self.client.say_in_reply_to(¶ms.read().await.msg, outmsg.clone()).await.unwrap();
|
||||
// }
|
||||
// }
|
||||
|
||||
// // contextratelimiter.increment_counter();
|
||||
// contextratelimiter.sent_msg(outmsg.clone());
|
||||
|
||||
// let logstr = format!(
|
||||
// "(#{}) > {} ; contextratelimiter : {:?}",
|
||||
// channel_login.clone(), "rate limit counter increase", contextratelimiter
|
||||
// );
|
||||
|
||||
// if let BotMsgType::SayInReplyTo(msg,_ ) = msginput {
|
||||
// botlog::trace(
|
||||
// logstr.as_str(),
|
||||
// Some("Chat > send_botmsg".to_string()),
|
||||
// Some(&(*msg)),
|
||||
// );
|
||||
// } else {
|
||||
// botlog::trace(
|
||||
// logstr.as_str(),
|
||||
// Some("Chat > send_botmsg".to_string()),
|
||||
// None,
|
||||
// );
|
||||
// }
|
||||
|
||||
|
||||
|
||||
// }
|
||||
// ratelimiter::LimiterResp::Skip => {
|
||||
// // (); // do nothing otherwise
|
||||
// }
|
||||
// ratelimiter::LimiterResp::Sleep(err_passed_sleep_time) => {
|
||||
// dbg!(err_passed_sleep_time);
|
||||
// // panic!("ISSUE : sleep was already awaited - Should not happen?");
|
||||
// botlog::warn(
|
||||
// format!(
|
||||
// "Warning : RATE LIMITERS returned Sleep Unexpectedly . This should not occur often . Rate Limiter passed Sleep({})",
|
||||
// err_passed_sleep_time
|
||||
// ).as_str(),
|
||||
// Some("Chat > send_botmsg".to_string()),
|
||||
// None,
|
||||
// );
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
|
||||
tokio::spawn(async move {
|
||||
let chat_clone = chat_ar.clone();
|
||||
let ratelimiters_clone = ratelimiters.clone();
|
||||
let rguard = ratelimiters_clone.read().await;
|
||||
let mut rclone = (*rguard).clone();
|
||||
drop(rguard);
|
||||
let contextratelimiter = (rclone
|
||||
.get_mut(&Channel(channel_login.to_lowercase().clone()))
|
||||
.expect("ERROR: Issue with Rate limiters");
|
||||
.expect("ERROR: Issue with Rate limiters")).clone();
|
||||
|
||||
// let mut contextlimiter_guard = contextratelimiter.write().await;
|
||||
|
||||
// Continue to check the limiter and sleep if required if the minimum is not reached
|
||||
while let ratelimiter::LimiterResp::Sleep(sleeptime) = contextratelimiter.check_limiter() {
|
||||
|
||||
let mut crl_lock = contextratelimiter.write().await;
|
||||
while let ratelimiter::LimiterResp::Sleep(sleeptime) = crl_lock.check_limiter(outmsg.clone()) {
|
||||
// dbg!(chrono::offset::Local::now(),"Message Spawned > Completed");
|
||||
dbg!("sleep loop start",chrono::offset::Local::now(), sleeptime);
|
||||
yield_now().await;
|
||||
dbg!("yield in just after loop start",chrono::offset::Local::now());
|
||||
sleep(Duration::from_secs_f64(sleeptime)).await;
|
||||
}
|
||||
|
||||
match contextratelimiter.check_limiter() {
|
||||
match crl_lock.check_limiter(outmsg.clone()) {
|
||||
ratelimiter::LimiterResp::Allow => {
|
||||
let maxblanks = rand::thread_rng().gen_range(1..=20);
|
||||
// let maxblanks = rand::thread_rng().gen_range(1..=20);
|
||||
|
||||
for _i in 1..maxblanks {
|
||||
let blankspace: &str = "";
|
||||
outmsg.push_str(blankspace);
|
||||
}
|
||||
// let mut blanks_to_add_lock = self.spaceiter.lock().await;
|
||||
// (*blanks_to_add_lock).0 += 1;
|
||||
|
||||
|
||||
// for _i in 1..(*blanks_to_add_lock).0 {
|
||||
// // let blankspace: &str = " ";
|
||||
// // let blankspace: &str = " .";
|
||||
// let blankspace: &str = ".";
|
||||
// outmsg.push_str(blankspace);
|
||||
// }
|
||||
|
||||
// drop(blanks_to_add_lock);
|
||||
|
||||
dbg!("[ ] PROBLEM AREA - If notificaiton triggered, need this checked");
|
||||
dbg!(outmsg.clone());
|
||||
|
||||
botlog::trace(
|
||||
&format!("Out Message TO {} >> {}",channel_login.clone(),outmsg.clone()),
|
||||
Some("Chat > send_botmsg".to_string()),
|
||||
None,
|
||||
);
|
||||
|
||||
match msginput.clone() {
|
||||
BotMsgType::SayInReplyTo(msg, _) => {
|
||||
self.client.say_in_reply_to(msg, outmsg).await.unwrap();
|
||||
chat_clone.read().await.client.say_in_reply_to(&(*msg), outmsg.clone()).await.unwrap();
|
||||
},
|
||||
BotMsgType::Say(a, _) => {
|
||||
self.client.say(a, outmsg).await.unwrap();
|
||||
chat_clone.read().await.client.say(a, outmsg.clone()).await.unwrap();
|
||||
}
|
||||
BotMsgType::Notif(outmsg) => {
|
||||
self.client.say_in_reply_to(¶ms.msg, outmsg).await.unwrap();
|
||||
chat_clone.read().await.client.say_in_reply_to(¶ms.read().await.msg, outmsg.clone()).await.unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
contextratelimiter.increment_counter();
|
||||
// contextratelimiter.increment_counter();
|
||||
crl_lock.sent_msg(outmsg.clone());
|
||||
|
||||
let logstr = format!(
|
||||
"(#{}) > {} ; contextratelimiter : {:?}",
|
||||
channel_login.clone(), "rate limit counter increase", contextratelimiter
|
||||
channel_login.clone(), "rate limit counter increase", crl_lock
|
||||
);
|
||||
|
||||
if let BotMsgType::SayInReplyTo(msg,_ ) = msginput {
|
||||
botlog::trace(
|
||||
logstr.as_str(),
|
||||
Some("Chat > send_botmsg".to_string()),
|
||||
Some(msg),
|
||||
Some(&(*msg)),
|
||||
);
|
||||
} else {
|
||||
botlog::trace(
|
||||
|
@ -379,20 +641,143 @@ impl Chat {
|
|||
ratelimiter::LimiterResp::Skip => {
|
||||
// (); // do nothing otherwise
|
||||
}
|
||||
ratelimiter::LimiterResp::Sleep(_) => {
|
||||
panic!("ISSUE : sleep was already awaited - Should not happen?");
|
||||
ratelimiter::LimiterResp::Sleep(err_passed_sleep_time) => {
|
||||
dbg!(err_passed_sleep_time);
|
||||
// panic!("ISSUE : sleep was already awaited - Should not happen?");
|
||||
botlog::warn(
|
||||
format!(
|
||||
"Warning : RATE LIMITERS returned Sleep Unexpectedly . This should not occur often . Rate Limiter passed Sleep({})",
|
||||
err_passed_sleep_time
|
||||
).as_str(),
|
||||
Some("Chat > send_botmsg".to_string()),
|
||||
None,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
drop(crl_lock);
|
||||
|
||||
});
|
||||
|
||||
|
||||
Log::flush();
|
||||
}
|
||||
|
||||
|
||||
pub async fn send_botmsg(&self, msginput: BotMsgType, params : Arc<RwLock<ExecBodyParams>>) {
|
||||
|
||||
// pub async fn say_in_reply_to(&self, msg: &PrivmsgMessage, outmsg: String) {
|
||||
// #[async_recursion]
|
||||
pub async fn say_in_reply_to(&self, msg: &PrivmsgMessage, outmsg: String , params : ExecBodyParams) {
|
||||
self.send_botmsg_inner(msginput, params).await;
|
||||
|
||||
// let chat = Arc::new(RwLock::new((*self).clone()));
|
||||
// let chat_clone = chat.clone();
|
||||
|
||||
// let cguard = chat_clone.read().await;
|
||||
// let outguard = cguard.outqueue.1.read().await;
|
||||
// // let r = (*outguard).clone();
|
||||
// match outguard.recv().await {
|
||||
// Ok(a) => {
|
||||
|
||||
// },
|
||||
// Err(err) => {
|
||||
// dbg!("ISSUE processing Receiver",err);
|
||||
// sleep(Duration::from_millis(10)).await;
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
// let msg_clone = Arc::new(msg.clone());
|
||||
// let blockingspawn = tokio::task::spawn_blocking( move || {
|
||||
// // let paramsguard = params.blocking_read();
|
||||
// // let params = (*paramsguard).clone();
|
||||
// // drop(paramsguard);
|
||||
// // chat_clone.blocking_read().outqueue.0.send_blocking((
|
||||
// // BotMsgType::SayInReplyTo(msg_clone, outmsg),
|
||||
// // params
|
||||
// // )).unwrap();
|
||||
// chat_clone.blocking_read().blocking_send_botmsg(
|
||||
// msginput,
|
||||
// params,
|
||||
// );
|
||||
// });
|
||||
|
||||
// blockingspawn.await.unwrap();
|
||||
|
||||
}
|
||||
|
||||
|
||||
pub fn blocking_send_botmsg(&self, msginput: BotMsgType, params : Arc<RwLock<ExecBodyParams>>) {
|
||||
|
||||
let chat = Arc::new(RwLock::new((*self).clone()));
|
||||
let chat_clone = chat.clone();
|
||||
// let msg_clone = Arc::new(msg.clone());
|
||||
let paramsguard = params.blocking_read();
|
||||
let params = (*paramsguard).clone();
|
||||
drop(paramsguard);
|
||||
dbg!("Called blocking_send_botmsg",msginput.clone());
|
||||
chat_clone.blocking_read().outqueue.0.send_blocking((
|
||||
msginput,
|
||||
params
|
||||
)).unwrap();
|
||||
|
||||
}
|
||||
|
||||
|
||||
pub async fn blocking_async_send_botmsg(&self, msginput: BotMsgType, params : Arc<RwLock<ExecBodyParams>>) {
|
||||
|
||||
let chat = Arc::new(RwLock::new((*self).clone()));
|
||||
let chat_clone = chat.clone();
|
||||
// let msg_clone = Arc::new(msg.clone());
|
||||
let blockingspawn = tokio::task::spawn_blocking( move || {
|
||||
// let paramsguard = params.blocking_read();
|
||||
// let params = (*paramsguard).clone();
|
||||
// drop(paramsguard);
|
||||
// chat_clone.blocking_read().outqueue.0.send_blocking((
|
||||
// BotMsgType::SayInReplyTo(msg_clone, outmsg),
|
||||
// params
|
||||
// )).unwrap();
|
||||
chat_clone.blocking_read().blocking_send_botmsg(
|
||||
msginput,
|
||||
params,
|
||||
);
|
||||
});
|
||||
|
||||
blockingspawn.await.unwrap();
|
||||
|
||||
}
|
||||
|
||||
|
||||
pub async fn say_in_reply_to(&self, msg: &PrivmsgMessage, outmsg: String , params : Arc<RwLock<ExecBodyParams>>) {
|
||||
// let a = Arc::new(RwLock::new(self));
|
||||
// let a_clone = a.clone();
|
||||
self.send_botmsg(
|
||||
BotMsgType::SayInReplyTo(
|
||||
Arc::new((*msg).clone()),
|
||||
outmsg) ,
|
||||
params
|
||||
).await;
|
||||
}
|
||||
|
||||
|
||||
pub fn blocking_say_in_reply_to(&self, msg: &PrivmsgMessage, outmsg: String , params : Arc<RwLock<ExecBodyParams>>) {
|
||||
|
||||
let chat = Arc::new(RwLock::new((*self).clone()));
|
||||
let chat_clone = chat.clone();
|
||||
let msg_clone = Arc::new(msg.clone());
|
||||
|
||||
let paramsguard = params.blocking_read();
|
||||
let params = (*paramsguard).clone();
|
||||
drop(paramsguard);
|
||||
chat_clone.blocking_read().outqueue.0.send_blocking((
|
||||
BotMsgType::SayInReplyTo(msg_clone, outmsg),
|
||||
params
|
||||
)).unwrap();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
pub async fn blocking_async_say_in_reply_to(&self, msg: &PrivmsgMessage, outmsg: String , params : Arc<RwLock<ExecBodyParams>>) {
|
||||
|
||||
// let params_clone = params.clone();
|
||||
|
||||
|
@ -445,17 +830,130 @@ impl Chat {
|
|||
// Log::flush();
|
||||
|
||||
|
||||
self.send_botmsg(BotMsgType::SayInReplyTo(msg, outmsg) , params).await;
|
||||
// self.send_botmsg(BotMsgType::SayInReplyTo(Arc::new(msg.clone()), outmsg) , params).await;
|
||||
// self.outqueue.write().await.push((
|
||||
// BotMsgType::SayInReplyTo(Arc::new(msg.clone()), outmsg),
|
||||
// params
|
||||
// ));
|
||||
// let paramsguard = params.blocking_read();
|
||||
// let a = (*paramsguard).clone();
|
||||
// drop(paramsguard);
|
||||
// self.outqueue.0.send_blocking((
|
||||
// BotMsgType::SayInReplyTo(Arc::new(msg.clone()), outmsg),
|
||||
// a
|
||||
// )).unwrap();
|
||||
|
||||
|
||||
// let a = Arc::new(RwLock::new(*self));
|
||||
|
||||
let chat = Arc::new(RwLock::new((*self).clone()));
|
||||
let chat_clone = chat.clone();
|
||||
let msg_clone = Arc::new(msg.clone());
|
||||
let blockingspawn = tokio::task::spawn_blocking( move || {
|
||||
// let paramsguard = params.blocking_read();
|
||||
// let params = (*paramsguard).clone();
|
||||
// drop(paramsguard);
|
||||
// chat_clone.blocking_read().outqueue.0.send_blocking((
|
||||
// BotMsgType::SayInReplyTo(msg_clone, outmsg),
|
||||
// params
|
||||
// )).unwrap();
|
||||
chat_clone.blocking_read().blocking_say_in_reply_to(
|
||||
&(*msg_clone),
|
||||
outmsg,
|
||||
params,
|
||||
);
|
||||
});
|
||||
|
||||
blockingspawn.await.unwrap();
|
||||
|
||||
|
||||
// let a = Arc::new(RwLock::new(self));
|
||||
// let a_clone = a.clone();
|
||||
// let b = self.send_botmsg(BotMsgType::SayInReplyTo(msg, outmsg) , params);
|
||||
|
||||
|
||||
// struct Tester {
|
||||
// queue : Vec<chat_util::MsgFuture>,
|
||||
// }
|
||||
|
||||
// let mut q = vec![];
|
||||
// q.push(b);
|
||||
|
||||
// let inst = Tester {
|
||||
// queue : q,
|
||||
// };
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
// pub async fn say(&self, channel_login: String, message: String) {
|
||||
pub async fn say(&self, channel_login: String, message: String , params : ExecBodyParams) {
|
||||
|
||||
pub async fn say(&self, channel_login: String, message: String , params : Arc<RwLock<ExecBodyParams>>) {
|
||||
self.send_botmsg(
|
||||
BotMsgType::Say(
|
||||
channel_login,
|
||||
message),
|
||||
params
|
||||
).await;
|
||||
}
|
||||
|
||||
pub fn blocking_say(&self, channel_login: String, message: String , params : Arc<RwLock<ExecBodyParams>>) {
|
||||
|
||||
let chat = Arc::new(RwLock::new((*self).clone()));
|
||||
let chat_clone = chat.clone();
|
||||
|
||||
let paramsguard = params.blocking_read();
|
||||
let params = (*paramsguard).clone();
|
||||
drop(paramsguard);
|
||||
chat_clone.blocking_read().outqueue.0.send_blocking((
|
||||
BotMsgType::Say(channel_login.to_lowercase(), message),
|
||||
params
|
||||
)).unwrap();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
pub async fn blocking_async_say(&self, channel_login: String, message: String , params : Arc<RwLock<ExecBodyParams>>) {
|
||||
// more info https://docs.rs/twitch-irc/latest/twitch_irc/client/struct.TwitchIRCClient.html#method.say
|
||||
|
||||
self.send_botmsg(BotMsgType::Say(channel_login.to_lowercase(), message), params).await;
|
||||
// self.send_botmsg(BotMsgType::Say(channel_login.to_lowercase(), message), params).await;
|
||||
|
||||
// let paramguard = params.blocking_read();
|
||||
// let a = (*paramguard).clone();
|
||||
// drop(paramguard);
|
||||
// self.outqueue.0.send_blocking((
|
||||
// BotMsgType::Say(channel_login.to_lowercase(), message),
|
||||
// a
|
||||
// )).unwrap();
|
||||
|
||||
|
||||
let chat = Arc::new(RwLock::new((*self).clone()));
|
||||
let chat_clone = chat.clone();
|
||||
// let msg_clone = Arc::new(msg.clone());
|
||||
let blockingspawn = tokio::task::spawn_blocking( move || {
|
||||
// let paramsguard = params.blocking_read();
|
||||
// let params = (*paramsguard).clone();
|
||||
// drop(paramsguard);
|
||||
// chat_clone.blocking_read().outqueue.0.send_blocking((
|
||||
// BotMsgType::Say(channel_login.to_lowercase(), message),
|
||||
// params
|
||||
// )).unwrap();
|
||||
chat_clone.blocking_read().blocking_say(
|
||||
channel_login,
|
||||
message,
|
||||
params,
|
||||
);
|
||||
});
|
||||
|
||||
blockingspawn.await.unwrap();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
async fn _me(&self, _: String, _: String) {
|
||||
// more info https://docs.rs/twitch-irc/latest/twitch_irc/client/struct.TwitchIRCClient.html#method.say
|
||||
|
||||
|
|
|
@ -214,11 +214,11 @@ async fn cmd_promote(params : ExecBodyParams) {
|
|||
{ arg2 }
|
||||
else if let Some(a) = arg1 {
|
||||
if a.starts_with('-') {
|
||||
botlock.botmgrs.chat.send_botmsg(
|
||||
botlock.botmgrs.chat.read().await.send_botmsg(
|
||||
super::chat::BotMsgType::Notif(
|
||||
"Invalid Argument Flag".to_string()
|
||||
),
|
||||
params.clone(),
|
||||
Arc::new(RwLock::new(params.clone())),
|
||||
).await;
|
||||
return
|
||||
} else { arg1 }
|
||||
|
@ -294,10 +294,10 @@ async fn cmd_promote(params : ExecBodyParams) {
|
|||
|
||||
// We should call a notification around here
|
||||
|
||||
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
outmsg.to_string()
|
||||
),
|
||||
params.clone(),
|
||||
Arc::new(RwLock::new(params.clone())),
|
||||
).await;
|
||||
|
||||
|
||||
|
@ -432,11 +432,11 @@ async fn cmd_demote(params : ExecBodyParams) {
|
|||
{ arg2 }
|
||||
else if let Some(a) = arg1 {
|
||||
if a.starts_with('-') {
|
||||
botlock.botmgrs.chat.send_botmsg(
|
||||
botlock.botmgrs.chat.read().await.send_botmsg(
|
||||
super::chat::BotMsgType::Notif(
|
||||
"Invalid Argument Flag".to_string()
|
||||
),
|
||||
params.clone(),
|
||||
Arc::new(RwLock::new(params.clone())),
|
||||
).await;
|
||||
return
|
||||
} else { arg1 }
|
||||
|
@ -519,10 +519,10 @@ async fn cmd_demote(params : ExecBodyParams) {
|
|||
Some(¶ms.msg),
|
||||
);
|
||||
|
||||
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
outmsg.to_string()
|
||||
),
|
||||
params.clone(),
|
||||
Arc::new(RwLock::new(params.clone())),
|
||||
).await;
|
||||
|
||||
|
||||
|
@ -669,10 +669,10 @@ async fn getroles(params : ExecBodyParams) {
|
|||
Some(¶ms.msg),
|
||||
);
|
||||
|
||||
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
|
||||
outmsg.to_string()
|
||||
),
|
||||
params.clone(),
|
||||
Arc::new(RwLock::new(params.clone())),
|
||||
).await;
|
||||
|
||||
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
// Related : https://dev.twitch.tv/docs/irc/#rate-limits
|
||||
|
||||
|
||||
const TIME_THRESHOLD_S: u64 = 30;
|
||||
const TIME_MIN_S_F64: f64 = 1.0;
|
||||
const MSG_THRESHOLD: u32 = 20;
|
||||
const DUPMSG_MIN_SEND_S: f64 = 30.0;
|
||||
|
||||
use std::time::Instant;
|
||||
use crate::core::botlog;
|
||||
|
@ -10,9 +14,10 @@ pub struct RateLimiter {
|
|||
timer: Instant,
|
||||
msgcounter: u32,
|
||||
lastmsgtimer : Instant,
|
||||
lastmsgdup : String,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug,Clone)]
|
||||
pub enum LimiterResp {
|
||||
Allow, // when it's evaluated to be within limits
|
||||
Skip, // as outside of rate limits
|
||||
|
@ -32,10 +37,19 @@ impl RateLimiter {
|
|||
timer: Instant::now(),
|
||||
msgcounter: 0,
|
||||
lastmsgtimer: Instant::now(),
|
||||
lastmsgdup : String::new(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn check_limiter(&mut self) -> LimiterResp {
|
||||
fn dupmsg(&self,inmsg : String) -> bool {
|
||||
if self.lastmsgdup == inmsg {
|
||||
// duplicate detected
|
||||
// self.lastmsgdup = String::new(); // update it as no longer duplicate
|
||||
return true;
|
||||
} else { return false; };
|
||||
}
|
||||
|
||||
pub fn check_limiter(&mut self,inmsg : String) -> LimiterResp {
|
||||
|
||||
|
||||
let logstr = format!(
|
||||
|
@ -49,6 +63,18 @@ impl RateLimiter {
|
|||
);
|
||||
|
||||
|
||||
/*
|
||||
Documented Thesholds from https://dev.twitch.tv/docs/irc/#rate-limits
|
||||
- [x] self.timer.elapsed().as_secs() >= TIME_THRESHOLD_S
|
||||
>> initialize with LimiterResp::Allow
|
||||
- [x] self.msgcounter < MSG_THRESHOLD &&
|
||||
self.lastmsgtimer.elapsed().as_secs_f64() >= TIME_MIN_S_F64
|
||||
>> LimiterResp::Allow
|
||||
- [x] else
|
||||
>> LimiterResp::Sleep(TIME_MIN_S_F64 - self.lastmsgtimer.elapsed().as_secs_f64() + 0.1)
|
||||
*/
|
||||
|
||||
|
||||
let rsp = if self.timer.elapsed().as_secs() >= TIME_THRESHOLD_S {
|
||||
self.timer = Instant::now();
|
||||
self.msgcounter = 0;
|
||||
|
@ -62,6 +88,21 @@ impl RateLimiter {
|
|||
LimiterResp::Sleep(TIME_MIN_S_F64 - self.lastmsgtimer.elapsed().as_secs_f64() + 0.1)
|
||||
};
|
||||
|
||||
// [ ] If rsp is still allow at this point, also do a dupcheck to adjust rsp to a sleep
|
||||
|
||||
dbg!(inmsg.clone());
|
||||
dbg!(self.dupmsg(inmsg.clone()));
|
||||
dbg!("Before Dup test",rsp.clone());
|
||||
dbg!(matches!(rsp.clone(),LimiterResp::Allow));
|
||||
|
||||
let rsp = if self.dupmsg(inmsg) && matches!(rsp,LimiterResp::Allow) {
|
||||
//self.lastmsgdup = String::new();
|
||||
// LimiterResp::Sleep(DUPMSG_MIN_SEND_S)
|
||||
LimiterResp::Sleep(DUPMSG_MIN_SEND_S - self.lastmsgtimer.elapsed().as_secs_f64() + 0.1)
|
||||
} else { rsp.clone() };
|
||||
|
||||
dbg!(rsp.clone());
|
||||
|
||||
botlog::trace(
|
||||
&format!("Limiter Response : {:?} ; Elapsed (as_sec_f64) : {}",
|
||||
rsp, self.lastmsgtimer.elapsed().as_secs_f64()),
|
||||
|
@ -73,7 +114,13 @@ impl RateLimiter {
|
|||
|
||||
}
|
||||
|
||||
pub fn increment_counter(&mut self) {
|
||||
// pub fn increment_counter(&mut self) {
|
||||
// self.msgcounter += 1;
|
||||
// self.lastmsgtimer = Instant::now();
|
||||
// }
|
||||
|
||||
pub fn sent_msg(&mut self,msgstr : String) {
|
||||
self.lastmsgdup = msgstr;
|
||||
self.msgcounter += 1;
|
||||
self.lastmsgtimer = Instant::now();
|
||||
}
|
||||
|
|
|
@ -15,6 +15,7 @@ const OF_CMD_CHANNEL:Channel = Channel(String::new());
|
|||
|
||||
|
||||
use rand::Rng;
|
||||
use tokio::sync::RwLock;
|
||||
use std::sync::Arc;
|
||||
|
||||
use crate::core::bot_actions::ExecBodyParams;
|
||||
|
@ -130,10 +131,11 @@ async fn good_girl(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
String::from("GoodGirl xdd "),
|
||||
params.clone()
|
||||
Arc::new(RwLock::new(params.clone()))
|
||||
).await;
|
||||
|
||||
|
||||
|
@ -170,22 +172,25 @@ async fn babygirl(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
String::from("16:13 notohh: cafdk"),
|
||||
params.clone()
|
||||
Arc::new(RwLock::new(params.clone()))
|
||||
).await;
|
||||
|
||||
|
||||
|
||||
sleep(Duration::from_secs_f64(0.5)).await;
|
||||
|
||||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
String::from("16:13 notohh: have fun eating princess"),
|
||||
params.clone()
|
||||
Arc::new(RwLock::new(params.clone()))
|
||||
).await;
|
||||
|
||||
|
||||
|
@ -194,10 +199,11 @@ async fn babygirl(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
String::from("16:13 notohh: baby girl"),
|
||||
params.clone()
|
||||
Arc::new(RwLock::new(params.clone()))
|
||||
).await;
|
||||
|
||||
|
||||
|
@ -225,5 +231,39 @@ async fn routinelike(params : ExecBodyParams) {
|
|||
|
||||
// lines are executed after in conjunction to the spawn
|
||||
|
||||
// spawn 5 independent spawns
|
||||
|
||||
let bot = Arc::clone(¶ms.bot);
|
||||
let params_ar = Arc::new(RwLock::new(params.clone()));
|
||||
let params_c = params_ar.clone();
|
||||
|
||||
for _ in 0..5 {
|
||||
let bot_clone = bot.clone();
|
||||
let params_cc = params_c.clone();
|
||||
tokio::spawn( async move {
|
||||
println!(">> SPAWNED Innterroutine triggered!");
|
||||
sleep(Duration::from_secs_f64(5.0)).await;
|
||||
|
||||
let botlock = bot_clone.read().await;
|
||||
let params_ccc = params_cc.clone();
|
||||
let paramsguard = params_ccc.read().await;
|
||||
|
||||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say_in_reply_to(
|
||||
¶msguard.msg,
|
||||
String::from("SPAWNED GoodGirl xdd "),
|
||||
params_cc,
|
||||
).await;
|
||||
|
||||
drop(botlock);
|
||||
drop(paramsguard);
|
||||
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@ const OF_CMD_CHANNEL:Channel = Channel(String::new());
|
|||
use std::sync::Arc;
|
||||
|
||||
use chrono::{TimeZone,Local};
|
||||
use tokio::sync::RwLock;
|
||||
|
||||
|
||||
use crate::core::bot_actions::ExecBodyParams;
|
||||
|
@ -116,7 +117,7 @@ async fn sayout(params : ExecBodyParams) {
|
|||
|
||||
botlog::trace(
|
||||
&format!("[TRACE] Evaluated status of {} : {:?}",
|
||||
trgchnl.to_string().clone(),botlock.botmgrs.chat.client.get_channel_status(trgchnl.to_string().clone()).await),
|
||||
trgchnl.to_string().clone(),botlock.botmgrs.chat.read().await.client.get_channel_status(trgchnl.to_string().clone()).await),
|
||||
Some("Chat > send_botmsg".to_string()),
|
||||
None,
|
||||
);
|
||||
|
@ -156,10 +157,11 @@ async fn sayout(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say(
|
||||
trgchnl.to_string(),
|
||||
newoutmsg.to_string(),
|
||||
params.clone(),
|
||||
Arc::new(RwLock::new(params.clone())),
|
||||
).await;
|
||||
|
||||
|
||||
|
@ -179,10 +181,11 @@ async fn sayout(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
String::from("Invalid arguments"),
|
||||
params.clone()
|
||||
Arc::new(RwLock::new(params.clone()))
|
||||
).await;
|
||||
|
||||
|
||||
|
|
|
@ -158,7 +158,7 @@ async fn countdown_chnl_v1(params : ExecBodyParams) {
|
|||
|
||||
let routine_attr = vec![
|
||||
// RoutineAttr::RunOnce
|
||||
RoutineAttr::MaxIterations(5),
|
||||
RoutineAttr::MaxIterations(10),
|
||||
RoutineAttr::LoopDuration(Duration::from_secs(1))
|
||||
];
|
||||
// let exec_body = actions_util::asyncbox(rtestbody);
|
||||
|
@ -289,12 +289,12 @@ async fn countdown_chnl_v1(params : ExecBodyParams) {
|
|||
// let chosen_channel_ar = Arc::new(RwLock::new(chosen_channel));
|
||||
|
||||
// let params_clone = params.clone();
|
||||
// let bot = Arc::clone(¶ms.blocking_read().bot);
|
||||
// // let bot = Arc::clone(¶ms.blocking_read().bot);
|
||||
|
||||
|
||||
// dbg!("in chat async function");
|
||||
// // dbg!("in chat async function");
|
||||
|
||||
// let botlock = bot.blocking_read();
|
||||
// // let botlock = bot.blocking_read();
|
||||
// let channel_ar_clone = chosen_channel_ar.clone();
|
||||
|
||||
// let outmsg = if iterleft <= 1 {
|
||||
|
@ -303,11 +303,24 @@ async fn countdown_chnl_v1(params : ExecBodyParams) {
|
|||
|
||||
// botlock.botmgrs.chat
|
||||
// .say(
|
||||
// channel_ar_clone.read().await.0.clone(),
|
||||
// channel_ar_clone.blocking_read().0.clone(),
|
||||
// outmsg,
|
||||
// params_clone.read().await.clone()
|
||||
// ).await;
|
||||
// params_clone,
|
||||
// );
|
||||
|
||||
let outmsg = if iterleft <= 1 {
|
||||
// format!("{} I love you uwu~",iterleft)
|
||||
let msgtxt = params.blocking_read().msg.message_text.clone();
|
||||
// format!("{} {} I love you uwu~",iterleft,msgtxt)
|
||||
format!("{} {}",iterleft,msgtxt)
|
||||
} else { format!("{} Tomfoolery Clap",iterleft) };
|
||||
|
||||
botlock.botmgrs.chat.blocking_read()
|
||||
.blocking_say(
|
||||
chosen_channel.0.clone(),
|
||||
outmsg,
|
||||
Arc::new(RwLock::new(params.blocking_read().clone())),
|
||||
);
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -343,23 +356,67 @@ async fn countdown_chnl_v1(params : ExecBodyParams) {
|
|||
|
||||
let bot = Arc::clone(¶ms_ar.read().await.bot);
|
||||
|
||||
let botlock = bot.read().await;
|
||||
// let botlock = bot.read().await;
|
||||
|
||||
// uses chat.say_in_reply_to() for the bot controls for messages
|
||||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.say_in_reply_to(
|
||||
¶ms_ar.read().await.msg,
|
||||
"Started Routine!".to_string(),
|
||||
params_ar.read().await.clone()
|
||||
).await;
|
||||
|
||||
// [ ] 04.01 - in an ASYNC context, ensure to raise a Blocking Spawn
|
||||
// botlock
|
||||
// .botmgrs
|
||||
// .chat
|
||||
// .say_in_reply_to(
|
||||
// ¶ms_ar.read().await.msg,
|
||||
// "Started Routine!".to_string(),
|
||||
// Arc::new(RwLock::new(params_ar.read().await.clone()))
|
||||
// );
|
||||
|
||||
// let jhandle = newr.clone().read().await.join_handle.clone().unwrap();
|
||||
// let a = jhandle.write().await;
|
||||
// a.
|
||||
// sleep(Duration::from_secs(300)).await;
|
||||
|
||||
|
||||
// let loopbodyspawn = tokio::task::spawn_blocking( move || {
|
||||
// let botlock = bot.blocking_read();
|
||||
// botlock
|
||||
// .botmgrs
|
||||
// .chat
|
||||
// .say_in_reply_to(
|
||||
// ¶ms_ar.blocking_read().msg,
|
||||
// "Started Routine!".to_string(),
|
||||
// Arc::new(RwLock::new(params_ar.blocking_read().clone()))
|
||||
// );
|
||||
// });
|
||||
|
||||
// loopbodyspawn.await.unwrap();
|
||||
|
||||
// let botlock = bot.read().await;
|
||||
// botlock
|
||||
// .botmgrs
|
||||
// .chat
|
||||
// .say_in_reply_to(
|
||||
// ¶ms_ar.blocking_read().msg,
|
||||
// "Started Routine!".to_string(),
|
||||
// Arc::new(RwLock::new(params_ar.blocking_read().clone()))
|
||||
// ).await;
|
||||
// drop(botlock);
|
||||
|
||||
|
||||
let botlock = bot.read().await;
|
||||
let params_guard = params_ar.read().await;
|
||||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say_in_reply_to(
|
||||
// ¶ms_ar.blocking_read().msg,
|
||||
¶ms_guard.msg,
|
||||
"Started Routine!".to_string(),
|
||||
Arc::new(RwLock::new(params_guard.clone()))
|
||||
).await;
|
||||
drop(botlock);
|
||||
drop(params_guard);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -602,10 +659,11 @@ async fn test3_body(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say_in_reply_to(
|
||||
¶ms_ar.read().await.msg,
|
||||
format!("Routine Result : {:?}",rsltstr),
|
||||
params_clone.read().await.clone()
|
||||
Arc::new(RwLock::new(params_clone.read().await.clone()))
|
||||
).await;
|
||||
|
||||
// [x] Will not be handling JoinHandles here . If immediate abort() handling is required, below is an example that works
|
||||
|
@ -669,10 +727,11 @@ async fn good_girl(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
String::from("GoodGirl xdd "),
|
||||
params.clone()
|
||||
Arc::new(RwLock::new(params.clone()))
|
||||
).await;
|
||||
|
||||
|
||||
|
@ -709,10 +768,11 @@ async fn babygirl(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
String::from("16:13 notohh: cafdk"),
|
||||
params.clone()
|
||||
Arc::new(RwLock::new(params.clone()))
|
||||
).await;
|
||||
|
||||
|
||||
|
@ -721,10 +781,11 @@ async fn babygirl(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
String::from("16:13 notohh: have fun eating princess"),
|
||||
params.clone()
|
||||
Arc::new(RwLock::new(params.clone()))
|
||||
).await;
|
||||
|
||||
|
||||
|
@ -733,10 +794,11 @@ async fn babygirl(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.read().await
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
String::from("16:13 notohh: baby girl"),
|
||||
params.clone()
|
||||
Arc::new(RwLock::new(params.clone()))
|
||||
).await;
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue