.gitignore

@@ -23,9 +23,3 @@ target/
 
 # debug
 .vscode/
-
-# nix
-result/
-
-# pre-commit
-/.pre-commit-config.yaml

.woodpecker/cargo-checks.yml

@@ -1,5 +1,5 @@
 when:
-  branch: master
+  branch: main
   event: [push, pull_request]
   path:
     include:

.woodpecker/flake-update.yml

@@ -37,7 +37,7 @@ steps:
       owner: ${CI_REPO_OWNER}
       repo: ${CI_REPO_NAME}
       branch: flake-lock-update
-      base_branch: master
+      base_branch: main
       pr_title: "flake.lock: update"
       pr_body: PR automatically created by Woodpecker CI
       close_pr_if_empty: true

README.md

@@ -9,10 +9,9 @@ test ModulatingForceBot
 
 ```
 login_name = <botname>
-access_token = <oauth token>
+access_token = <oath token>
 bot_channels = <chnl1>,<chnl2>
 prefix = <prefix>
-bot_admins = <admins>
 ```
 
 

flake.lock

@@ -6,11 +6,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1711952616,
+        "lastModified": 1706768574,
-        "narHash": "sha256-WJvDdOph001fA1Ap3AyaQtz/afJAe7meSG5uJAdSE+A=",
+        "narHash": "sha256-4o6TMpzBHO659EiJTzd/EGQGUDdbgwKwhqf3u6b23U8=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "209048d7c545905c470f6f8c05c5061f391031a8",
+        "rev": "668102037129923cd0fc239d864fce71eabdc6a3",
         "type": "github"
       },
       "original": {
@@ -20,68 +20,13 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711703276,
+        "lastModified": 1706550542,
-        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
+        "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
+        "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
         "type": "github"
       },
       "original": {
@@ -91,92 +36,36 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1710695816,
-        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1712573573,
+        "lastModified": 1708296515,
-        "narHash": "sha256-xxon7WwNm4/EadMKg1eF40/5s0O78nXUy2ILZt6vT7E=",
+        "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0d28066770464d19d637f6e8e42e8688420b6ac6",
+        "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1710765496,
-        "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "gitignore": "gitignore",
-        "nixpkgs": "nixpkgs_3",
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
-      "locked": {
-        "lastModified": 1712579741,
-        "narHash": "sha256-igpsH+pa6yFwYOdah3cFciCk8gw+ytniG9quf5f/q84=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "70f504012f0a132ac33e56988e1028d88a48855c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "fenix": "fenix",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_2"
-        "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems_2"
       }
     },
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1711885694,
+        "lastModified": 1706735270,
-        "narHash": "sha256-dyezzeSbWMpflma+E9USmvSxuLgGcNGcGw3cOnX36ko=",
+        "narHash": "sha256-IJk+UitcJsxzMQWm9pa1ZbJBriQ4ginXOlPyVq+Cu40=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "e4a405f877efd820bef9c0e77a02494e47c17512",
+        "rev": "42cb1a2bd79af321b0cc503d2960b73f34e2f92b",
         "type": "github"
       },
       "original": {
@@ -185,36 +74,6 @@
         "repo": "rust-analyzer",
         "type": "github"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -1,65 +1,26 @@
 {
-  description = "A basic flake";
+  description = "forcebot_rs flake";
 
   inputs = {
-    systems.url = "github:nix-systems/default-linux";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     fenix.url = "github:nix-community/fenix/monthly";
-    pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
   };
-
   outputs = {
-    self,
-    systems,
     nixpkgs,
     fenix,
-    pre-commit-hooks,
+    ...
-  }: let
+  } @ inputs: let
-    eachSystem = nixpkgs.lib.genAttrs (import systems);
+    system = "x86_64-linux";
-    pkgsFor = eachSystem (system:
-      import nixpkgs {
-        localSystem.system = system;
     overlays = [fenix.overlays.default];
-      });
+    pkgs = import nixpkgs {
+      inherit system overlays;
+    };
   in {
-    packages = eachSystem (system: let
+    devShells.${system}.default = pkgs.mkShell {
-      pkgs = nixpkgs.legacyPackages.${system};
+      name = "forcebot_rs-devenv";
-      inherit ((builtins.fromTOML (builtins.readFile ./Cargo.toml)).package) version;
+      nativeBuildInputs = [pkgs.pkg-config];
-    in {
+      buildInputs = with pkgs; [openssl libiconv];
-      default = pkgsFor.${system}.rustPlatform.buildRustPackage {
+      packages = with pkgs; [
-        pname = "forcebot_rs";
-        version = "${version}";
-
-        src = self;
-
-        cargoLock = {
-          lockFile = ./Cargo.lock;
-        };
-
-        nativeBuildInputs = with pkgs; [pkg-config];
-        buildInputs = with pkgs; [openssl];
-
-        doCheck = false;
-      };
-    });
-    checks = eachSystem (system: {
-      pre-commit-check = pre-commit-hooks.lib.${system}.run {
-        src = ./.;
-        hooks = {
-          # rust
-          rustfmt.enable = true;
-          clippy.enable = true;
-          # nix
-          statix.enable = true;
-          alejandra.enable = true;
-          deadnix.enable = true;
-        };
-      };
-    });
-    devShells = eachSystem (system: {
-      default = pkgsFor.${system}.mkShell {
-        inherit (self.checks.${system}.pre-commit-check) shellHook;
-        packages = with pkgsFor.${system}; [
         nil
         alejandra
         rust-analyzer-nightly
@@ -74,7 +35,5 @@
       RUST_BACKTRACE = 1;
       RUST_SRC_PATH = "${fenix.packages.${system}.complete.rust-src}/lib/rustlib/src/rust/library";
     };
-    });
-    nixosModules.default = import ./nix/module.nix {inherit self;};
   };
 }

nix/module.nix

@@ -1,30 +0,0 @@
-{self}: {
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib) types;
-  inherit (lib.modules) mkIf;
-  inherit (lib.options) mkOption mkEnableOption;
-  inherit (pkgs.stdenv.hostPlatform) system;
-  cfg = config.services.forcebot_rs;
-in {
-  options.services.forcebot_rs = {
-    enable = mkEnableOption ''
-      Enable forcebot
-    '';
-
-    package = mkOption {
-      type = types.package;
-      inherit (self.packages.${system}) default;
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.forcebot_rs = {
-      wantedBy = ["multi-user.target"];
-      serviceConfig.ExecStart = "${cfg.package}/bin/forcebot_rs";
-    };
-  };
-}

src/core/identity.rs

@@ -8,7 +8,6 @@ use std::sync::Arc;
 
 use tokio::sync::RwLock;
 
-use tokio::time::{sleep,Duration};
 use twitch_irc::message::PrivmsgMessage;
 
 use casual_logger::Log;
@@ -18,20 +17,12 @@ use crate::core::bot_actions::ExecBodyParams;
 use crate::core::botinstance::{Channel,ChangeResult};
 use crate::core::botlog;
 use crate::core::botmodules::{BotActionTrait, BotCommand, BotModule, ModulesManager};
+
 use dotenv::dotenv;
 use std::env;
 
 fn adminvector() -> Vec<String> {
-    dotenv().ok();
+    vec![String::from("ModulatingForce")]
-    let mut admins = Vec::new();
-
-    if let Ok(value) = env::var("bot_admins") {
-        for admin in value.split(',') {
-            admins.push(String::from(admin))        
-        }
-    }
-
-    admins
 }
 
 
@@ -68,10 +59,7 @@ pub async fn init(mgr: Arc<ModulesManager>) {
     let tempb = BotCommand {
         module: BotModule(String::from("identity")),
         command: String::from("promote"), // command call name
-        alias: vec![
+        alias: vec![],                    // String of alternative names
-            "cucked".to_string(),
-            "cuck".to_string(),
-        ],                    // String of alternative names
         exec_body: actions_util::asyncbox(cmd_promote),
         help: String::from("promote"),
         required_roles: vec![
@@ -176,7 +164,7 @@ async fn cmd_promote(params : ExecBodyParams) {
 
     let mut argv = params.msg.message_text.split(' ');
 
-    let cmdname = argv.next(); // Skip the command name
+    argv.next(); // Skip the command name
 
     let arg1 = argv.next();
 
@@ -214,7 +202,7 @@ async fn cmd_promote(params : ExecBodyParams) {
     // [x] 1. Get trgusr (regardless of -admin flag)
 
     // let targetusr = if arg1 == Some("-admin") { arg2 } else { arg1 };
-    let mut targetusr = if 
+    let targetusr = if 
             arg1 == Some("-admin") 
             || arg1 == Some("-v") 
             || arg1 == Some("-vip") 
@@ -234,50 +222,6 @@ async fn cmd_promote(params : ExecBodyParams) {
             }
             else { arg1 };
 
-
-    // [x] Check if target is an existing user
-    targetusr = if let Some(chkusr) = targetusr {
-        match twitch_irc::validate::validate_login(chkusr.to_lowercase().as_str()) {
-            Ok(_) => Some(chkusr),
-            Err(_) => None,
-        }
-    } else { None } ;
-
-
-    // [x] Check if cmd passed is cucked, then go through special cucked handling
-    if let Some(cmd_to_check) = cmdname {
-        if cmd_to_check.to_lowercase() == String::from(botlock.get_prefix()) + "cucked" 
-        || cmd_to_check.to_lowercase() == String::from(botlock.get_prefix()) + "cuck"
-        {
-
-            let idlock = botlock.botmgrs.identity.read().await;
-            let senderroles = idlock.getspecialuserroles(sendername.clone(), Some(Channel(targetchnl.to_lowercase()))).await;
-
-            if senderroles.contains(&UserRole::BotAdmin) && targetusr.is_none() {
-                targetusr = Some(sendername.as_str())
-            }
-
-            botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
-                "uuh ".to_string()
-                ),
-            params.clone(),
-            ).await;
-
-            sleep(Duration::from_secs_f64(2.0)).await;
-
-            
-            botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
-                "... chatter getting cucked ...".to_string()
-                ),
-            params.clone(),
-            ).await;
-
-            sleep(Duration::from_secs_f64(1.0)).await;
-
-        }
-    }
-
-
     // [x] 2. promote trguser
 
     // [x] Get a required lock first
@@ -328,23 +272,14 @@ async fn cmd_promote(params : ExecBodyParams) {
     // [x] 3. Output resulting change
 
     let outmsg = match rslt {
-        ChangeResult::Success(rsltstr) => {
+        ChangeResult::Success(a) => {
-            format!("o7 Successfully promoted {} : {}",
+            format!("o7 Successfully promoted : {a}")
-            targetusr.unwrap(),
-            rsltstr
-            )
         }
-        ChangeResult::Failed(rsltstr) => {
+        ChangeResult::Failed(a) => {
-            format!("PoroSad failed to promote {} : {}",
+            format!("PoroSad failed to promote : {a}")
-            targetusr.unwrap(),
-            rsltstr
-            )
         }
-        ChangeResult::NoChange(rsltstr) => {
+        ChangeResult::NoChange(a) => {
-            format!("uuh No Promotion Change {} : {}",
+            format!("uuh No Promotion Change : {a}")
-            targetusr.unwrap(),
-            rsltstr
-            )
         }
     };
 
@@ -564,23 +499,14 @@ async fn cmd_demote(params : ExecBodyParams) {
      */
 
     let outmsg = match rslt {
-        ChangeResult::Success(rsltstr) => {
+        ChangeResult::Success(a) => {
-            format!("o7 Successfully demoted {} : {}",
+            format!("o7 Successfully demoted : {a}")
-            targetusr.unwrap(),
-            rsltstr
-            )
         }
-        ChangeResult::Failed(rsltstr) => {
+        ChangeResult::Failed(a) => {
-            format!("PoroSad failed to demote {} : {}",
+            format!("PoroSad failed to demote : {a}")
-            targetusr.unwrap(),
-            rsltstr
-            )
         }
-        ChangeResult::NoChange(rsltstr) => {
+        ChangeResult::NoChange(a) => {
-            format!("uuh No Demotion Change {} : {}",
+            format!("uuh No Demotion Change : {a}")
-            targetusr.unwrap(),
-            rsltstr
-            )
         }
     };
 
@@ -616,8 +542,6 @@ async fn getroles(params : ExecBodyParams) {
 
      */
 
-    let sendername = params.msg.clone().sender.name;
-
 
     let mut argv = params.msg.message_text.split(' ');
 
@@ -625,17 +549,11 @@ async fn getroles(params : ExecBodyParams) {
 
     let arg1 = argv.next();
 
-    let mut targetuser = match arg1 {
+    let targetuser = match arg1 {
-        // None => return, // exit if no arguments
+        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;
@@ -719,9 +637,7 @@ async fn getroles(params : ExecBodyParams) {
             params.msg.channel_login.to_lowercase(),
         ))) || sproles.contains(&UserRole::BotAdmin)
         {
-            // targetuser
+            outmsg += format!("Target chatter's user roles are : {:?}", sproles).as_str();
-            // 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(
@@ -730,10 +646,9 @@ 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 {
-        format!("{} has no special roles LULE ",targetuser)
+        "Target chatter has no special roles LULE ".to_string()
     };
 
     botlog::debug(

src/custom.rs

@@ -13,7 +13,6 @@ pub use crate::core::botmodules::ModulesManager;
 
 // mod experiments;
 mod experimental;
-mod thisguy;
 
 // [ ] init() function that accepts bot instance - this is passed to init() on submodules
 
@@ -22,6 +21,5 @@ pub async fn init(mgr: Arc<ModulesManager>) {
     // this is achieved by calling submodules that also have fn init() defined
 
     // experiments::init(mgr).await
-    experimental::init(mgr.clone()).await;
+    experimental::init(mgr).await;
-    thisguy::init(&mgr).await;
 }

src/custom/experimental/experiment001.rs

@@ -163,7 +163,6 @@ async fn good_girl(params : ExecBodyParams) {
 
     if params.msg.sender.name.to_lowercase() == "ModulatingForce".to_lowercase()
         || params.msg.sender.name.to_lowercase() == "mzNToRi".to_lowercase()
-        || params.msg.sender.name.to_lowercase() == "haruyuumei".to_lowercase()
     {
         botlog::debug(
             "Good Girl Detected > Pausechamp",
@@ -181,6 +180,8 @@ async fn good_girl(params : ExecBodyParams) {
             );
 
             let bot = Arc::clone(&params.bot);
+
+
             let botlock = bot.read().await;
 
             // uses chat.say_in_reply_to() for the bot controls for messages
@@ -193,6 +194,8 @@ async fn good_girl(params : ExecBodyParams) {
                 String::from("GoodGirl xdd "),
                 params.clone()
             ).await;
+
+
         }
     }
 }

src/custom/thisguy.rs

@@ -1,62 +0,0 @@
-use crate::core::bot_actions::*;
-use crate::core::botinstance::Channel;
-use crate::core::botlog;
-use crate::core::botmodules::{BotActionTrait, BotCommand, BotModule, ModulesManager};
-use crate::core::identity::UserRole::*;
-use rand::Rng;
-use twitch_irc::message::ReplyToMessage;
-use std::sync::Arc;
-use tokio::time::{sleep, Duration};
-const OF_CMD_CHANNEL:Channel = Channel(String::new());
-
-async fn tsg(params: ExecBodyParams) {
-
-    let phrases: [String; 6] = [
-        "Clueless ".to_string(),
-        "ICANT This guy....".to_string(),
-        "He is right tho".to_string(),
-        "KEKW true!".to_string(),
-        "OMEGALUL wth man...".to_string(),
-        "PepeLaugh El no sabe".to_string(),
-    ];
-
-    let r = rand::thread_rng().gen_range(0..=4);
-    let a = phrases[r].clone();
-
-    botlog::debug(
-        "This guy works!",
-        Some("modules > thisguy()".to_string()),
-        Some(&params.msg),
-    );
-    let bot = Arc::clone(&params.bot);
-    let botlock = bot.read().await;
-
-    // uses chat.say_in_reply_to() for the bot controls for messages
-    botlock
-        .botmgrs
-        .chat
-        .say_in_reply(
-            Channel(params.clone().msg.channel_login().to_string()),
-             a,
-              params.clone()
-            )
-        .await;
-    sleep(Duration::from_secs_f64(0.5)).await;
-}
-
-pub async fn init(mgr: &Arc<ModulesManager>) {
-    BotCommand {
-        module: BotModule(String::from("thisguy")),
-        command: String::from("thisguy"),
-        alias: vec![String::from("Thisguy")],
-        exec_body: actions_util::asyncbox(tsg),
-        help: String::from("test"),
-        required_roles: vec![
-            BotAdmin,
-            Mod(OF_CMD_CHANNEL),
-            Broadcaster
-            ],
-    }
-    .add_to_modmgr(Arc::clone(mgr))
-    .await;
-}

statix.toml

@@ -1,3 +0,0 @@
-disabled = []
-nix_version = '2.4'
-ignore = ['.direnv']