Custom this BotCommand #48
15 changed files with 573 additions and 173 deletions
8
.gitignore
vendored
8
.gitignore
vendored
|
|
@ -22,4 +22,10 @@ target/
|
|||
*.log
|
||||
|
||||
# debug
|
||||
.vscode/
|
||||
.vscode/
|
||||
|
||||
# nix
|
||||
result/
|
||||
|
||||
# pre-commit
|
||||
/.pre-commit-config.yaml
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
when:
|
||||
branch: main
|
||||
branch: master
|
||||
event: [push, pull_request]
|
||||
path:
|
||||
include:
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ steps:
|
|||
owner: ${CI_REPO_OWNER}
|
||||
repo: ${CI_REPO_NAME}
|
||||
branch: flake-lock-update
|
||||
base_branch: main
|
||||
base_branch: master
|
||||
pr_title: "flake.lock: update"
|
||||
pr_body: PR automatically created by Woodpecker CI
|
||||
close_pr_if_empty: true
|
||||
|
|
|
|||
|
|
@ -9,9 +9,10 @@ test ModulatingForceBot
|
|||
|
||||
```
|
||||
login_name = <botname>
|
||||
access_token = <oath token>
|
||||
access_token = <oauth token>
|
||||
bot_channels = <chnl1>,<chnl2>
|
||||
prefix = <prefix>
|
||||
bot_admins = <admins>
|
||||
```
|
||||
|
||||
|
||||
|
|
|
|||
173
flake.lock
173
flake.lock
|
|
@ -6,11 +6,11 @@
|
|||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706768574,
|
||||
"narHash": "sha256-4o6TMpzBHO659EiJTzd/EGQGUDdbgwKwhqf3u6b23U8=",
|
||||
"lastModified": 1711952616,
|
||||
"narHash": "sha256-WJvDdOph001fA1Ap3AyaQtz/afJAe7meSG5uJAdSE+A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "668102037129923cd0fc239d864fce71eabdc6a3",
|
||||
"rev": "209048d7c545905c470f6f8c05c5061f391031a8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -20,13 +20,68 @@
|
|||
"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": 1706550542,
|
||||
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
|
||||
"lastModified": 1711703276,
|
||||
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
|
||||
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -36,36 +91,92 @@
|
|||
"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": 1708296515,
|
||||
"narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=",
|
||||
"owner": "nixos",
|
||||
"lastModified": 1712573573,
|
||||
"narHash": "sha256-xxon7WwNm4/EadMKg1eF40/5s0O78nXUy2ILZt6vT7E=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa",
|
||||
"rev": "0d28066770464d19d637f6e8e42e8688420b6ac6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-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": 1706735270,
|
||||
"narHash": "sha256-IJk+UitcJsxzMQWm9pa1ZbJBriQ4ginXOlPyVq+Cu40=",
|
||||
"lastModified": 1711885694,
|
||||
"narHash": "sha256-dyezzeSbWMpflma+E9USmvSxuLgGcNGcGw3cOnX36ko=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "42cb1a2bd79af321b0cc503d2960b73f34e2f92b",
|
||||
"rev": "e4a405f877efd820bef9c0e77a02494e47c17512",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -74,6 +185,36 @@
|
|||
"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",
|
||||
|
|
|
|||
97
flake.nix
97
flake.nix
|
|
@ -1,39 +1,80 @@
|
|||
{
|
||||
description = "forcebot_rs flake";
|
||||
description = "A basic flake";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
systems.url = "github:nix-systems/default-linux";
|
||||
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,
|
||||
...
|
||||
} @ inputs: let
|
||||
system = "x86_64-linux";
|
||||
overlays = [fenix.overlays.default];
|
||||
pkgs = import nixpkgs {
|
||||
inherit system overlays;
|
||||
};
|
||||
pre-commit-hooks,
|
||||
}: let
|
||||
eachSystem = nixpkgs.lib.genAttrs (import systems);
|
||||
pkgsFor = eachSystem (system:
|
||||
import nixpkgs {
|
||||
localSystem.system = system;
|
||||
overlays = [fenix.overlays.default];
|
||||
});
|
||||
in {
|
||||
devShells.${system}.default = pkgs.mkShell {
|
||||
name = "forcebot_rs-devenv";
|
||||
nativeBuildInputs = [pkgs.pkg-config];
|
||||
buildInputs = with pkgs; [openssl libiconv];
|
||||
packages = with pkgs; [
|
||||
nil
|
||||
alejandra
|
||||
rust-analyzer-nightly
|
||||
(fenix.packages.${system}.complete.withComponents [
|
||||
"cargo"
|
||||
"clippy"
|
||||
"rust-src"
|
||||
"rustc"
|
||||
"rustfmt"
|
||||
])
|
||||
];
|
||||
RUST_BACKTRACE = 1;
|
||||
RUST_SRC_PATH = "${fenix.packages.${system}.complete.rust-src}/lib/rustlib/src/rust/library";
|
||||
};
|
||||
packages = eachSystem (system: let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
inherit ((builtins.fromTOML (builtins.readFile ./Cargo.toml)).package) version;
|
||||
in {
|
||||
default = pkgsFor.${system}.rustPlatform.buildRustPackage {
|
||||
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
|
||||
(fenix.packages.${system}.complete.withComponents [
|
||||
"cargo"
|
||||
"clippy"
|
||||
"rust-src"
|
||||
"rustc"
|
||||
"rustfmt"
|
||||
])
|
||||
];
|
||||
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;};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
30
nix/module.nix
Normal file
30
nix/module.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{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";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
|
||||
use twitch_irc::message::PrivmsgMessage;
|
||||
use twitch_irc::message::{PrivmsgMessage, TwitchUserBasics};
|
||||
use std::sync::Arc;
|
||||
use tokio::sync::RwLock;
|
||||
|
||||
|
|
@ -57,9 +56,68 @@ impl ExecBodyParams {
|
|||
requestor_badge_mut
|
||||
}
|
||||
|
||||
/// Returns some information about the message that was replied to by the `PrivmsgMessage` contained
|
||||
/// in the `msg` field of this struct.
|
||||
///
|
||||
/// If that message replied to message return that information in form of `Some<ReplyParent>`.
|
||||
/// Otherwise, return `None`.
|
||||
pub fn get_parent_reply(&self) -> Option<ReplyParent> {
|
||||
let map = &self.msg.source.tags.0;
|
||||
let tags = [
|
||||
"reply-parent-user-id",
|
||||
"reply-parent-user-login",
|
||||
"reply-parent-display-name",
|
||||
"reply-parent-msg-id",
|
||||
"reply-parent-msg-body"
|
||||
];
|
||||
|
||||
// filter out all tags that do not have content.
|
||||
let tag_contents: Vec<String> = tags.iter().filter_map(|tag| {
|
||||
// if let Some(&Some(ref t)) = map.get(*tag) {
|
||||
if let Some(Some(t)) = map.get(*tag) {
|
||||
Some(t.clone())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}).collect();
|
||||
|
||||
// if no tags got filtered out return the struct.
|
||||
// else return `None`.
|
||||
if tag_contents.len() == 5 {
|
||||
Some(ReplyParent {
|
||||
sender: TwitchUserBasics {
|
||||
id: tag_contents[0].clone(),
|
||||
login: tag_contents[1].clone(),
|
||||
name: tag_contents[2].clone(),
|
||||
},
|
||||
message_id: tag_contents[3].clone(),
|
||||
message_text: tag_contents[4].clone(),
|
||||
channel_login: self.msg.channel_login.clone(),
|
||||
channel_id: self.msg.channel_id.clone(),
|
||||
})
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Represents the message a `PrivmsgMessage` replies to.
|
||||
/// Similar to a less detailed `PrivmsgMessage`.
|
||||
///
|
||||
/// This should not be constructed manually but only from calling `get_parent_reply()` on
|
||||
/// `ExecBodyParams`.
|
||||
///
|
||||
/// Fields that will be the same as the `PrivmsgMessage` this was generated from:
|
||||
/// - `channel_login`
|
||||
/// - `channel_id`
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub struct ReplyParent {
|
||||
pub sender: TwitchUserBasics,
|
||||
pub message_id: String,
|
||||
pub message_text: String,
|
||||
pub channel_login: String,
|
||||
pub channel_id: String,
|
||||
}
|
||||
|
||||
|
||||
pub mod actions_util {
|
||||
|
|
|
|||
|
|
@ -24,11 +24,10 @@ debug = "Checking bot actions",
|
|||
pub fn trace(in_msg: &str, in_module: Option<String>, in_prvmsg: Option<&PrivmsgMessage>) {
|
||||
let (chnl, chatter) = match in_prvmsg {
|
||||
Some(prvmsg) => {
|
||||
//Log::trace(&format!("(#{}) {}: {}", prvmsg.channel_login, prvmsg.sender.name, prvmsg.message_text));
|
||||
(
|
||||
Some(prvmsg.channel_login.clone()),
|
||||
Some(prvmsg.sender.name.clone()),
|
||||
) // <-- Clone fine atm while we're just working with Strings
|
||||
)
|
||||
}
|
||||
None => (None, None),
|
||||
};
|
||||
|
|
@ -45,11 +44,10 @@ pub fn trace(in_msg: &str, in_module: Option<String>, in_prvmsg: Option<&Privmsg
|
|||
pub fn debug(in_msg: &str, in_module: Option<String>, in_prvmsg: Option<&PrivmsgMessage>) {
|
||||
let (chnl, chatter) = match in_prvmsg {
|
||||
Some(prvmsg) => {
|
||||
//Log::trace(&format!("(#{}) {}: {}", prvmsg.channel_login, prvmsg.sender.name, prvmsg.message_text));
|
||||
(
|
||||
Some(prvmsg.channel_login.clone()),
|
||||
Some(prvmsg.sender.name.clone()),
|
||||
) // <-- Clone fine atm while we're just working with Strings
|
||||
)
|
||||
}
|
||||
None => (None, None),
|
||||
};
|
||||
|
|
@ -66,11 +64,10 @@ pub fn debug(in_msg: &str, in_module: Option<String>, in_prvmsg: Option<&Privmsg
|
|||
pub fn info(in_msg: &str, in_module: Option<String>, in_prvmsg: Option<&PrivmsgMessage>) {
|
||||
let (chnl, chatter) = match in_prvmsg {
|
||||
Some(prvmsg) => {
|
||||
//Log::trace(&format!("(#{}) {}: {}", prvmsg.channel_login, prvmsg.sender.name, prvmsg.message_text));
|
||||
(
|
||||
Some(prvmsg.channel_login.clone()),
|
||||
Some(prvmsg.sender.name.clone()),
|
||||
) // <-- Clone fine atm while we're just working with Strings
|
||||
)
|
||||
}
|
||||
None => (None, None),
|
||||
};
|
||||
|
|
@ -87,11 +84,10 @@ pub fn info(in_msg: &str, in_module: Option<String>, in_prvmsg: Option<&PrivmsgM
|
|||
pub fn notice(in_msg: &str, in_module: Option<String>, in_prvmsg: Option<&PrivmsgMessage>) {
|
||||
let (chnl, chatter) = match in_prvmsg {
|
||||
Some(prvmsg) => {
|
||||
//Log::trace(&format!("(#{}) {}: {}", prvmsg.channel_login, prvmsg.sender.name, prvmsg.message_text));
|
||||
(
|
||||
Some(prvmsg.channel_login.clone()),
|
||||
Some(prvmsg.sender.name.clone()),
|
||||
) // <-- Clone fine atm while we're just working with Strings
|
||||
)
|
||||
}
|
||||
None => (None, None),
|
||||
};
|
||||
|
|
@ -108,11 +104,10 @@ pub fn notice(in_msg: &str, in_module: Option<String>, in_prvmsg: Option<&Privms
|
|||
pub fn warn(in_msg: &str, in_module: Option<String>, in_prvmsg: Option<&PrivmsgMessage>) {
|
||||
let (chnl, chatter) = match in_prvmsg {
|
||||
Some(prvmsg) => {
|
||||
//Log::trace(&format!("(#{}) {}: {}", prvmsg.channel_login, prvmsg.sender.name, prvmsg.message_text));
|
||||
(
|
||||
Some(prvmsg.channel_login.clone()),
|
||||
Some(prvmsg.sender.name.clone()),
|
||||
) // <-- Clone fine atm while we're just working with Strings
|
||||
)
|
||||
}
|
||||
None => (None, None),
|
||||
};
|
||||
|
|
@ -129,11 +124,10 @@ pub fn warn(in_msg: &str, in_module: Option<String>, in_prvmsg: Option<&PrivmsgM
|
|||
pub fn error(in_msg: &str, in_module: Option<String>, in_prvmsg: Option<&PrivmsgMessage>) {
|
||||
let (chnl, chatter) = match in_prvmsg {
|
||||
Some(prvmsg) => {
|
||||
//Log::trace(&format!("(#{}) {}: {}", prvmsg.channel_login, prvmsg.sender.name, prvmsg.message_text));
|
||||
(
|
||||
Some(prvmsg.channel_login.clone()),
|
||||
Some(prvmsg.sender.name.clone()),
|
||||
) // <-- Clone fine atm while we're just working with Strings
|
||||
)
|
||||
}
|
||||
None => (None, None),
|
||||
};
|
||||
|
|
@ -154,11 +148,10 @@ pub fn fatal<'a>(
|
|||
) -> &'a str {
|
||||
let (chnl, chatter) = match in_prvmsg {
|
||||
Some(prvmsg) => {
|
||||
//Log::trace(&format!("(#{}) {}: {}", prvmsg.channel_login, prvmsg.sender.name, prvmsg.message_text));
|
||||
(
|
||||
Some(prvmsg.channel_login.clone()),
|
||||
Some(prvmsg.sender.name.clone()),
|
||||
) // <-- Clone fine atm while we're just working with Strings
|
||||
)
|
||||
}
|
||||
None => (None, None),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -253,7 +253,6 @@ pub async fn init(mgr: Arc<ModulesManager>) {
|
|||
// 2. Add the BotAction to ModulesManager
|
||||
botc1.add_core_to_modmgr(Arc::clone(&mgr)).await;
|
||||
|
||||
// async fn cmd_disable(bot: BotAR, msg: PrivmsgMessage) {
|
||||
async fn cmd_disable(params : ExecBodyParams) {
|
||||
/*
|
||||
There should be additional validation checks
|
||||
|
|
|
|||
134
src/core/chat.rs
134
src/core/chat.rs
|
|
@ -4,7 +4,7 @@ use std::sync::Arc;
|
|||
use tokio::sync::Mutex;
|
||||
|
||||
use twitch_irc::login::StaticLoginCredentials;
|
||||
use twitch_irc::message::PrivmsgMessage;
|
||||
use twitch_irc::message::ReplyToMessage;
|
||||
use twitch_irc::transport::tcp::{TCPTransport, TLS};
|
||||
use twitch_irc::TwitchIRCClient;
|
||||
|
||||
|
|
@ -34,9 +34,9 @@ pub struct Chat {
|
|||
}
|
||||
|
||||
|
||||
#[derive(Clone,Debug)]
|
||||
pub enum BotMsgType<'a> {
|
||||
SayInReplyTo(&'a PrivmsgMessage,String),
|
||||
#[derive(Clone,Debug)]
|
||||
pub enum BotMsgType {
|
||||
SayInReplyTo(Channel,String,String), // ( Destination Channel , Message ID to reply to , OutMessage ) // https://docs.rs/twitch-irc/latest/twitch_irc/client/struct.TwitchIRCClient.html#method.say_in_reply_to
|
||||
Say(String,String),
|
||||
Notif(String), // For Bot Sent Notifications
|
||||
}
|
||||
|
|
@ -59,7 +59,7 @@ impl Chat {
|
|||
}
|
||||
|
||||
#[async_recursion]
|
||||
pub async fn send_botmsg(&self, msginput: BotMsgType<'async_recursion>, params : ExecBodyParams) {
|
||||
pub async fn send_botmsg(&self, msginput: BotMsgType, params : ExecBodyParams) {
|
||||
|
||||
|
||||
|
||||
|
|
@ -72,17 +72,18 @@ impl Chat {
|
|||
|
||||
*/
|
||||
|
||||
|
||||
botlog::trace(
|
||||
botlog::trace(
|
||||
format!("send_bot_msg params : {:?}",msginput).as_str(),
|
||||
Some("chat.rs > send_botmsg ".to_string()),
|
||||
Some(¶ms.msg),
|
||||
);
|
||||
Log::flush();
|
||||
|
||||
|
||||
let (channel_login,mut outmsg) = match msginput.clone() {
|
||||
BotMsgType::SayInReplyTo(msg, outmsg) => {
|
||||
(msg.channel_login.clone(),outmsg)
|
||||
BotMsgType::SayInReplyTo(chnl, _, outmsg) => {
|
||||
(chnl.0.to_lowercase(), // Desintation Channel
|
||||
outmsg)
|
||||
},
|
||||
BotMsgType::Say(a,b ) => {
|
||||
(a.clone(),b.clone())
|
||||
|
|
@ -113,13 +114,15 @@ impl Chat {
|
|||
).await;
|
||||
|
||||
if !params.bot.read().await.bot_channels.contains(&Channel(channel_login.clone())) {
|
||||
|
||||
dbg!("ISSUE : NONJOINED CHANNEL",¶ms.bot.read().await.bot_channels,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()),
|
||||
None,
|
||||
);
|
||||
|
||||
if let BotMsgType::SayInReplyTo(_prvmsg,_outmsg) = msginput {
|
||||
if let BotMsgType::SayInReplyTo(_chnl,_msgid, _outmsg) = msginput {
|
||||
|
||||
self.send_botmsg(BotMsgType::Notif(
|
||||
"uuh Bot can't send to a channel it isn't joined".to_string(),
|
||||
|
|
@ -167,7 +170,7 @@ impl Chat {
|
|||
|
||||
match msginput {
|
||||
BotMsgType::Notif(_) => (), // Do nothing with Notif > We'll validate the user later to handle
|
||||
BotMsgType::SayInReplyTo(_, _) | BotMsgType::Say(_,_) => {
|
||||
BotMsgType::SayInReplyTo(_, _, _) | BotMsgType::Say(_,_) => {
|
||||
|
||||
botlog::trace(
|
||||
"BEFORE potential Async recursion",
|
||||
|
|
@ -232,7 +235,7 @@ impl Chat {
|
|||
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 idlock = id.read().await;
|
||||
let user_roles = idlock.getspecialuserroles(
|
||||
params.get_sender(),
|
||||
Some(Channel(channel_login.clone()))
|
||||
|
|
@ -266,7 +269,7 @@ impl Chat {
|
|||
return;
|
||||
}
|
||||
},
|
||||
BotMsgType::SayInReplyTo(_,_ ) | BotMsgType::Say(_,_) => {
|
||||
BotMsgType::SayInReplyTo(_,_,_ ) | BotMsgType::Say(_,_) => {
|
||||
// If the BotMsg a Say/SayInReplyTo (from Developer or Chatter) , and the Sender does not have Specific Roles in the Source Channel Sent
|
||||
|
||||
self.send_botmsg(BotMsgType::Notif(
|
||||
|
|
@ -320,7 +323,6 @@ impl Chat {
|
|||
);
|
||||
|
||||
let contextratelimiter = rllock
|
||||
// .get_mut()
|
||||
.get_mut(&Channel(channel_login.to_lowercase().clone()))
|
||||
.expect("ERROR: Issue with Rate limiters");
|
||||
|
||||
|
|
@ -339,13 +341,21 @@ impl Chat {
|
|||
}
|
||||
|
||||
match msginput.clone() {
|
||||
BotMsgType::SayInReplyTo(msg, _) => {
|
||||
self.client.say_in_reply_to(msg, outmsg).await.unwrap();
|
||||
BotMsgType::SayInReplyTo(chnl,msgid, _) => {
|
||||
|
||||
dbg!(chnl.clone(),msgid.clone(),outmsg.clone());
|
||||
|
||||
self.client.say_in_reply_to(&(
|
||||
chnl.0,
|
||||
msgid),
|
||||
outmsg).await.unwrap();
|
||||
},
|
||||
BotMsgType::Say(a, _) => {
|
||||
self.client.say(a, outmsg).await.unwrap();
|
||||
}
|
||||
BotMsgType::Notif(outmsg) => {
|
||||
|
||||
dbg!(params.msg.channel_login(),params.msg.message_id());
|
||||
self.client.say_in_reply_to(¶ms.msg, outmsg).await.unwrap();
|
||||
}
|
||||
}
|
||||
|
|
@ -357,11 +367,11 @@ impl Chat {
|
|||
channel_login.clone(), "rate limit counter increase", contextratelimiter
|
||||
);
|
||||
|
||||
if let BotMsgType::SayInReplyTo(msg,_ ) = msginput {
|
||||
if let BotMsgType::SayInReplyTo(_,_,_ ) = msginput {
|
||||
botlog::trace(
|
||||
logstr.as_str(),
|
||||
Some("Chat > send_botmsg".to_string()),
|
||||
Some(msg),
|
||||
None,
|
||||
);
|
||||
} else {
|
||||
botlog::trace(
|
||||
|
|
@ -387,73 +397,49 @@ impl Chat {
|
|||
}
|
||||
|
||||
|
||||
pub async fn say_in_reply(
|
||||
&self,
|
||||
destination_channel : Channel ,
|
||||
outmsg: String ,
|
||||
params : 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(BotMsgType::SayInReplyTo(
|
||||
destination_channel,
|
||||
params.msg.message_id().to_string(),
|
||||
outmsg) , params).await;
|
||||
|
||||
// let params_clone = params.clone();
|
||||
|
||||
// let botclone = Arc::clone(¶ms_clone.bot);
|
||||
// let botlock = botclone.read().await;
|
||||
// let id = botlock.get_identity();
|
||||
// let id = Arc::clone(&id);
|
||||
|
||||
// // botlog::trace(
|
||||
// // "ACQUIRING WRITE LOCK : ID",
|
||||
// // Some("Chat > send_botmsg".to_string()),
|
||||
// // Some(¶ms.msg),
|
||||
// // );
|
||||
// // Log::flush();
|
||||
|
||||
// botlog::trace(
|
||||
// "ACQUIRING READ LOCK : ID",
|
||||
// Some("Chat > send_botmsg".to_string()),
|
||||
// Some(¶ms.msg),
|
||||
// );
|
||||
// Log::flush();
|
||||
|
||||
|
||||
// // let idlock = id.write().await; // <-- [ ] 03.24 - This is definitely locking it
|
||||
// let idlock = id.read().await; // <-- [ ] 03.24 - seems to work
|
||||
// let a = idlock.getspecialuserroles(params.get_sender(), Some(Channel(msg.channel_login.clone()))).await;
|
||||
// botlog::trace(
|
||||
// format!("GETSPECIALUSERROLES RESULT : {:?}",a).as_str(),
|
||||
// Some("Chat > send_botmsg".to_string()),
|
||||
// Some(¶ms.msg),
|
||||
// );
|
||||
// Log::flush();
|
||||
|
||||
|
||||
|
||||
// // botlog::trace(
|
||||
// // "ACQUIRED WRITE LOCK : ID",
|
||||
// // Some("Chat > send_botmsg".to_string()),
|
||||
// // Some(¶ms.msg),
|
||||
// // );
|
||||
// // Log::flush();
|
||||
|
||||
|
||||
|
||||
// botlog::trace(
|
||||
// "ACQUIRED READ LOCK : ID",
|
||||
// Some("Chat > send_botmsg".to_string()),
|
||||
// Some(¶ms.msg),
|
||||
// );
|
||||
// Log::flush();
|
||||
|
||||
|
||||
self.send_botmsg(BotMsgType::SayInReplyTo(msg, outmsg) , params).await;
|
||||
|
||||
}
|
||||
|
||||
// pub async fn say(&self, channel_login: String, message: String) {
|
||||
pub async fn say_in_reply_to(
|
||||
&self,
|
||||
destination_channel : Channel ,
|
||||
reply_message_id : String ,
|
||||
outmsg: String ,
|
||||
params : ExecBodyParams)
|
||||
{
|
||||
|
||||
self.send_botmsg(BotMsgType::SayInReplyTo(
|
||||
destination_channel,
|
||||
reply_message_id,
|
||||
outmsg) , params).await;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
pub async fn say(&self, channel_login: String, message: String , params : 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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
async fn _me(&self, _: String, _: String) {
|
||||
// more info https://docs.rs/twitch-irc/latest/twitch_irc/client/struct.TwitchIRCClient.html#method.say
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ use std::sync::Arc;
|
|||
|
||||
use tokio::sync::RwLock;
|
||||
|
||||
use tokio::time::{sleep,Duration};
|
||||
use twitch_irc::message::PrivmsgMessage;
|
||||
|
||||
use casual_logger::Log;
|
||||
|
|
@ -17,19 +18,24 @@ 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> {
|
||||
vec![String::from("ModulatingForce")]
|
||||
//vec![]
|
||||
dotenv().ok();
|
||||
let mut admins = Vec::new();
|
||||
|
||||
if let Ok(value) = env::var("bot_admins") {
|
||||
for admin in value.split(',') {
|
||||
admins.push(String::from(admin))
|
||||
}
|
||||
}
|
||||
|
||||
admins
|
||||
}
|
||||
|
||||
|
||||
pub fn otherbots_vector() -> Vec<String> {
|
||||
// vec![String::from("ModulatingForce")]
|
||||
// //vec![]
|
||||
|
||||
dotenv().ok();
|
||||
let mut other_bots = Vec::new();
|
||||
|
|
@ -62,7 +68,10 @@ pub async fn init(mgr: Arc<ModulesManager>) {
|
|||
let tempb = BotCommand {
|
||||
module: BotModule(String::from("identity")),
|
||||
command: String::from("promote"), // command call name
|
||||
alias: vec![], // String of alternative names
|
||||
alias: vec![
|
||||
"cucked".to_string(),
|
||||
"cuck".to_string(),
|
||||
], // String of alternative names
|
||||
exec_body: actions_util::asyncbox(cmd_promote),
|
||||
help: String::from("promote"),
|
||||
required_roles: vec![
|
||||
|
|
@ -167,7 +176,7 @@ async fn cmd_promote(params : ExecBodyParams) {
|
|||
|
||||
let mut argv = params.msg.message_text.split(' ');
|
||||
|
||||
argv.next(); // Skip the command name
|
||||
let cmdname = argv.next(); // Skip the command name
|
||||
|
||||
let arg1 = argv.next();
|
||||
|
||||
|
|
@ -205,7 +214,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 targetusr = if
|
||||
let mut targetusr = if
|
||||
arg1 == Some("-admin")
|
||||
|| arg1 == Some("-v")
|
||||
|| arg1 == Some("-vip")
|
||||
|
|
@ -225,6 +234,50 @@ 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
|
||||
|
|
@ -275,14 +328,23 @@ async fn cmd_promote(params : ExecBodyParams) {
|
|||
// [x] 3. Output resulting change
|
||||
|
||||
let outmsg = match rslt {
|
||||
ChangeResult::Success(a) => {
|
||||
format!("o7 Successfully promoted : {a}")
|
||||
ChangeResult::Success(rsltstr) => {
|
||||
format!("o7 Successfully promoted {} : {}",
|
||||
targetusr.unwrap(),
|
||||
rsltstr
|
||||
)
|
||||
}
|
||||
ChangeResult::Failed(a) => {
|
||||
format!("PoroSad failed to promote : {a}")
|
||||
ChangeResult::Failed(rsltstr) => {
|
||||
format!("PoroSad failed to promote {} : {}",
|
||||
targetusr.unwrap(),
|
||||
rsltstr
|
||||
)
|
||||
}
|
||||
ChangeResult::NoChange(a) => {
|
||||
format!("uuh No Promotion Change : {a}")
|
||||
ChangeResult::NoChange(rsltstr) => {
|
||||
format!("uuh No Promotion Change {} : {}",
|
||||
targetusr.unwrap(),
|
||||
rsltstr
|
||||
)
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -502,14 +564,23 @@ async fn cmd_demote(params : ExecBodyParams) {
|
|||
*/
|
||||
|
||||
let outmsg = match rslt {
|
||||
ChangeResult::Success(a) => {
|
||||
format!("o7 Successfully demoted : {a}")
|
||||
ChangeResult::Success(rsltstr) => {
|
||||
format!("o7 Successfully demoted {} : {}",
|
||||
targetusr.unwrap(),
|
||||
rsltstr
|
||||
)
|
||||
}
|
||||
ChangeResult::Failed(a) => {
|
||||
format!("PoroSad failed to demote : {a}")
|
||||
ChangeResult::Failed(rsltstr) => {
|
||||
format!("PoroSad failed to demote {} : {}",
|
||||
targetusr.unwrap(),
|
||||
rsltstr
|
||||
)
|
||||
}
|
||||
ChangeResult::NoChange(a) => {
|
||||
format!("uuh No Demotion Change : {a}")
|
||||
ChangeResult::NoChange(rsltstr) => {
|
||||
format!("uuh No Demotion Change {} : {}",
|
||||
targetusr.unwrap(),
|
||||
rsltstr
|
||||
)
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -545,6 +616,8 @@ async fn getroles(params : ExecBodyParams) {
|
|||
|
||||
*/
|
||||
|
||||
let sendername = params.msg.clone().sender.name;
|
||||
|
||||
|
||||
let mut argv = params.msg.message_text.split(' ');
|
||||
|
||||
|
|
@ -552,11 +625,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;
|
||||
|
|
@ -640,7 +719,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(
|
||||
|
|
@ -649,9 +730,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(
|
||||
|
|
@ -1467,7 +1549,6 @@ impl IdentityManager {
|
|||
return ChangeResult::NoChange("Already does not have VIP role".to_string());
|
||||
}
|
||||
else {
|
||||
// self.affirm_chatter_in_db(trgchatter.clone()).await;
|
||||
|
||||
self.remove_role(trgchatter.clone(), UserRole::VIP(channel.clone())).await;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ const OF_CMD_CHANNEL:Channel = Channel(String::new());
|
|||
|
||||
|
||||
use rand::Rng;
|
||||
use twitch_irc::message::ReplyToMessage;
|
||||
use std::sync::Arc;
|
||||
|
||||
use crate::core::bot_actions::ExecBodyParams;
|
||||
|
|
@ -95,8 +96,65 @@ pub async fn init(mgr: Arc<ModulesManager>) {
|
|||
// 2. Add the BotAction to ModulesManager
|
||||
botc1.add_to_modmgr(Arc::clone(&mgr)).await;
|
||||
|
||||
let bc1 = BotCommand {
|
||||
module: BotModule(String::from("experiments001")),
|
||||
command: String::from("rp1"), // command call name
|
||||
alias: vec![
|
||||
String::from("rp2"),
|
||||
String::from("rp3")], // String of alternative names
|
||||
exec_body: actions_util::asyncbox(rp),
|
||||
help: String::from("Test Command tester"),
|
||||
required_roles: vec![
|
||||
BotAdmin,
|
||||
Mod(OF_CMD_CHANNEL),
|
||||
],
|
||||
};
|
||||
bc1.add_core_to_modmgr(Arc::clone(&mgr)).await;
|
||||
}
|
||||
|
||||
async fn rp(params : ExecBodyParams)
|
||||
{
|
||||
//triggers if the message is a reply
|
||||
if params.get_parent_reply().is_some(){
|
||||
|
||||
//getting the channel id where the message was sent
|
||||
let channel_id = params.get_parent_reply().unwrap().channel_login;
|
||||
|
||||
//getting the first message id that was sent
|
||||
let message_id = params.get_parent_reply().unwrap().message_id;
|
||||
|
||||
//just for testing purposes
|
||||
//print!("{} , {}",channel_id, message_id);
|
||||
|
||||
//creating a tuple with the channel id and message id
|
||||
let answear =
|
||||
(
|
||||
channel_id.clone(),
|
||||
message_id.clone()
|
||||
);
|
||||
|
||||
let bot = Arc::clone(¶ms.bot);
|
||||
let botlock = bot.read().await;
|
||||
// uses chat.say_in_reply_to() for the bot controls for messages
|
||||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.say_in_reply_to(
|
||||
//using the tuple as param to the message being replied
|
||||
Channel(answear.0),
|
||||
answear.1,
|
||||
String::from("hey there"),
|
||||
params.clone()
|
||||
).await;
|
||||
}
|
||||
else
|
||||
{
|
||||
println!("no reply")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
async fn good_girl(params : ExecBodyParams) {
|
||||
|
||||
// [ ] Uses gen_ratio() to output bool based on a ratio probability .
|
||||
|
|
@ -130,7 +188,8 @@ async fn good_girl(params : ExecBodyParams) {
|
|||
.botmgrs
|
||||
.chat
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
Channel(params.clone().msg.channel_login().to_string()),
|
||||
params.clone().msg.message_id().to_string(),
|
||||
String::from("GoodGirl xdd "),
|
||||
params.clone()
|
||||
).await;
|
||||
|
|
@ -167,8 +226,8 @@ async fn babygirl(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
.say_in_reply(
|
||||
Channel(params.clone().msg.channel_login().to_string()),
|
||||
String::from("16:13 notohh: cafdk"),
|
||||
params.clone()
|
||||
).await;
|
||||
|
|
@ -179,8 +238,8 @@ async fn babygirl(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
.say_in_reply(
|
||||
Channel(params.clone().msg.channel_login().to_string()),
|
||||
String::from("16:13 notohh: have fun eating princess"),
|
||||
params.clone()
|
||||
).await;
|
||||
|
|
@ -191,8 +250,8 @@ async fn babygirl(params : ExecBodyParams) {
|
|||
botlock
|
||||
.botmgrs
|
||||
.chat
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
.say_in_reply(
|
||||
Channel(params.clone().msg.channel_login().to_string()),
|
||||
String::from("16:13 notohh: baby girl"),
|
||||
params.clone()
|
||||
).await;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ const OF_CMD_CHANNEL:Channel = Channel(String::new());
|
|||
use std::sync::Arc;
|
||||
|
||||
use chrono::{TimeZone,Local};
|
||||
use twitch_irc::message::ReplyToMessage;
|
||||
|
||||
|
||||
use crate::core::bot_actions::ExecBodyParams;
|
||||
|
|
@ -180,7 +181,8 @@ async fn sayout(params : ExecBodyParams) {
|
|||
.botmgrs
|
||||
.chat
|
||||
.say_in_reply_to(
|
||||
¶ms.msg,
|
||||
Channel(params.clone().msg.channel_login().to_string()),
|
||||
params.clone().msg.message_id().to_string(),
|
||||
String::from("Invalid arguments"),
|
||||
params.clone()
|
||||
).await;
|
||||
|
|
|
|||
3
statix.toml
Normal file
3
statix.toml
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
disabled = []
|
||||
nix_version = '2.4'
|
||||
ignore = ['.direnv']
|
||||
Loading…
Reference in a new issue