From 16c6b0eebb3670fd398c4f8eb0d085faa2eb6b69 Mon Sep 17 00:00:00 2001
From: ModulatingForce <116608425+modulatingforce@users.noreply.github.com>
Date: Tue, 9 Apr 2024 12:32:02 -0400
Subject: [PATCH] self-invoking identity methods

---
 src/core/identity.rs | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/core/identity.rs b/src/core/identity.rs
index a6e623d..59f6eed 100644
--- a/src/core/identity.rs
+++ b/src/core/identity.rs
@@ -255,16 +255,16 @@ async fn cmd_promote(params : ExecBodyParams) {
             params.clone(),
             ).await;
 
-            sleep(Duration::from_secs_f64(1.0)).await;
+            sleep(Duration::from_secs_f64(2.0)).await;
 
             
             botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
-                "... ".to_string()
+                "... chatter getting cucked ...".to_string()
                 ),
             params.clone(),
             ).await;
 
-            sleep(Duration::from_secs_f64(2.0)).await;
+            sleep(Duration::from_secs_f64(1.0)).await;
 
         }
     }
@@ -608,6 +608,8 @@ async fn getroles(params : ExecBodyParams) {
 
      */
 
+    let sendername = params.msg.clone().sender.name;
+
 
     let mut argv = params.msg.message_text.split(' ');
 
@@ -615,11 +617,17 @@ async fn getroles(params : ExecBodyParams) {
 
     let arg1 = argv.next();
 
-    let targetuser = match arg1 {
-        None => return, // exit if no arguments
+    let mut targetuser = match arg1 {
+        // None => return, // exit if no arguments
+        None => sendername.as_str(), // self-invoke in this case
         Some(arg) => arg,
     };
 
+    targetuser = match twitch_irc::validate::validate_login(targetuser.to_lowercase().as_str()) {
+        Ok(_) => targetuser,
+        Err(_) => sendername.as_str(), // self-invoke in this case
+    };
+
     let arg2 = argv.next();
 
     let targetchnl = arg2;
@@ -703,7 +711,9 @@ async fn getroles(params : ExecBodyParams) {
             params.msg.channel_login.to_lowercase(),
         ))) || sproles.contains(&UserRole::BotAdmin)
         {
-            outmsg += format!("Target chatter's user roles are : {:?}", sproles).as_str();
+            // targetuser
+            // outmsg += format!("Target chatter's user roles are : {:?}", sproles).as_str();
+            outmsg += format!("{}'s user roles are : {:?}", targetuser, sproles).as_str();
         }
         outmsg
     } else if sproles.contains(&UserRole::Mod(Channel(
@@ -712,9 +722,10 @@ async fn getroles(params : ExecBodyParams) {
         params.msg.channel_login.to_lowercase(),
     ))) || sproles.contains(&UserRole::BotAdmin)
     {
-        format!("Target chatter's user roles are : {:?}", sproles)
+        // format!("Target chatter's user roles are : {:?}", sproles)
+        format!("{}'s user roles are : {:?}", targetuser, sproles)
     } else {
-        "Target chatter has no special roles LULE ".to_string()
+        format!("{} has no special roles LULE ",targetuser)
     };
 
     botlog::debug(