Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3d7af18dc4 | |||
| 4924b7e505 | |||
| d9a7bb7fed |
@@ -1 +1,2 @@
|
|||||||
/target
|
/target
|
||||||
|
cliff.toml
|
||||||
Generated
+878
-7
File diff suppressed because it is too large
Load Diff
+5
-1
@@ -1,9 +1,11 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "RhythmWorks"
|
name = "RhythmWorks"
|
||||||
version = "0.5.1"
|
version = "0.6.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
color-eyre = "0.6.5"
|
||||||
|
crossterm = "0.29.0"
|
||||||
dialoguer = "0.12.0"
|
dialoguer = "0.12.0"
|
||||||
keyring = { version = "3.6.3", features = ["linux-native", "windows-native"] }
|
keyring = { version = "3.6.3", features = ["linux-native", "windows-native"] }
|
||||||
opentelemetry = { version = "0.27.0", features = ["logs", "metrics", "trace"] }
|
opentelemetry = { version = "0.27.0", features = ["logs", "metrics", "trace"] }
|
||||||
@@ -11,6 +13,7 @@ opentelemetry-otlp = { version = "0.27.0", features = ["trace", "metrics", "grpc
|
|||||||
opentelemetry-proto = "0.27.0"
|
opentelemetry-proto = "0.27.0"
|
||||||
opentelemetry-semantic-conventions = "0.27.0"
|
opentelemetry-semantic-conventions = "0.27.0"
|
||||||
opentelemetry_sdk = { version = "0.27.0", features = ["rt-tokio", "trace"] }
|
opentelemetry_sdk = { version = "0.27.0", features = ["rt-tokio", "trace"] }
|
||||||
|
ratatui = { version = "0.30.0", features = ["all-widgets"] }
|
||||||
reqwest = { version = "0.12.28", features = ["blocking", "json"] }
|
reqwest = { version = "0.12.28", features = ["blocking", "json"] }
|
||||||
semver = "1.0.27"
|
semver = "1.0.27"
|
||||||
serde = "1.0.228"
|
serde = "1.0.228"
|
||||||
@@ -19,6 +22,7 @@ serenity = { version = "0.12.5", features = ["client", "gateway", "voice"] }
|
|||||||
songbird = { version = "0.5.0", features = ["builtin-queue", "driver", "serenity"] }
|
songbird = { version = "0.5.0", features = ["builtin-queue", "driver", "serenity"] }
|
||||||
symphonia = { version = "0.5.5", features = ["aac", "alac", "isomp4", "mp3"] }
|
symphonia = { version = "0.5.5", features = ["aac", "alac", "isomp4", "mp3"] }
|
||||||
tokio = "1.48.0"
|
tokio = "1.48.0"
|
||||||
|
tokio-util = "0.7.18"
|
||||||
tonic = { version = "0.12.3", features = ["tls-roots"] }
|
tonic = { version = "0.12.3", features = ["tls-roots"] }
|
||||||
tracing = "0.1.41"
|
tracing = "0.1.41"
|
||||||
tracing-opentelemetry = "0.32.0"
|
tracing-opentelemetry = "0.32.0"
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
## [0.5.2] - 2026-01-21
|
||||||
+72
-15
@@ -21,8 +21,14 @@ use songbird::input::Input;
|
|||||||
use std::env;
|
use std::env;
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
use std::process::Stdio;
|
use std::process::Stdio;
|
||||||
pub mod modules;
|
use tokio::task::JoinHandle;
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
|
||||||
|
pub mod modules;
|
||||||
|
enum BotState {
|
||||||
|
Stopped,
|
||||||
|
Running,
|
||||||
|
}
|
||||||
struct TrackTraceHandler {
|
struct TrackTraceHandler {
|
||||||
otel_ctx: opentelemetry::Context,
|
otel_ctx: opentelemetry::Context,
|
||||||
guild_id: String,
|
guild_id: String,
|
||||||
@@ -349,6 +355,30 @@ impl EventHandler for Handler {
|
|||||||
println!("{} is connected!", ready.user.name);
|
println!("{} is connected!", ready.user.name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
async fn run_bot(token: String, shutdown: CancellationToken) {
|
||||||
|
let intents = GatewayIntents::GUILD_MESSAGES
|
||||||
|
| GatewayIntents::GUILDS
|
||||||
|
| GatewayIntents::DIRECT_MESSAGES
|
||||||
|
| GatewayIntents::MESSAGE_CONTENT
|
||||||
|
| GatewayIntents::GUILD_VOICE_STATES;
|
||||||
|
|
||||||
|
let mut client = Client::builder(&token, intents)
|
||||||
|
.event_handler(Handler)
|
||||||
|
.register_songbird()
|
||||||
|
.await
|
||||||
|
.expect("Err creating client");
|
||||||
|
|
||||||
|
tokio::select! {
|
||||||
|
result = client.start() => {
|
||||||
|
if let Err(why) = result {
|
||||||
|
println!("Client error: {why:?}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ = shutdown.cancelled() => {
|
||||||
|
println!("Shutting down bot...");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() {
|
async fn main() {
|
||||||
@@ -365,9 +395,18 @@ This is free software, and you are welcome to redistribute it under certain cond
|
|||||||
.await;
|
.await;
|
||||||
let service_name = "RhythmWorks";
|
let service_name = "RhythmWorks";
|
||||||
let username = env::var("USER").or_else(|_| env::var("USERNAME")).unwrap();
|
let username = env::var("USER").or_else(|_| env::var("USERNAME")).unwrap();
|
||||||
|
let mut bot_task: Option<JoinHandle<()>> = None;
|
||||||
|
let mut shutdown_token: Option<CancellationToken> = None;
|
||||||
|
let mut bot_state = BotState::Stopped;
|
||||||
loop {
|
loop {
|
||||||
let token = credentialmanager::get_token(service_name, &username);
|
let token = credentialmanager::get_token(service_name, &username);
|
||||||
let options: Vec<&'static str> = vec!["- Start Bot", "- Change Token", "- Delete Token"];
|
let options: Vec<&'static str> = vec![
|
||||||
|
"- Start Bot",
|
||||||
|
"- Stop Bot",
|
||||||
|
"- Change Token",
|
||||||
|
"- Delete Token",
|
||||||
|
"- Exit",
|
||||||
|
];
|
||||||
let selection = Select::with_theme(&ColorfulTheme::default())
|
let selection = Select::with_theme(&ColorfulTheme::default())
|
||||||
.with_prompt("Choose an Option")
|
.with_prompt("Choose an Option")
|
||||||
.default(0)
|
.default(0)
|
||||||
@@ -376,26 +415,44 @@ This is free software, and you are welcome to redistribute it under certain cond
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
match selection {
|
match selection {
|
||||||
0 => {
|
0 => {
|
||||||
let intents = GatewayIntents::GUILD_MESSAGES
|
if matches!(bot_state, BotState::Running) {
|
||||||
| GatewayIntents::GUILDS
|
println!("[x] Bot is already running.");
|
||||||
| GatewayIntents::DIRECT_MESSAGES
|
continue;
|
||||||
| GatewayIntents::MESSAGE_CONTENT
|
|
||||||
| GatewayIntents::GUILD_VOICE_STATES;
|
|
||||||
let mut client = Client::builder(&token, intents)
|
|
||||||
.event_handler(Handler)
|
|
||||||
.register_songbird()
|
|
||||||
.await
|
|
||||||
.expect("Err creating client");
|
|
||||||
if let Err(why) = client.start().await {
|
|
||||||
println!("Client error: {why:?}");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let token = credentialmanager::get_token(service_name, &username);
|
||||||
|
let shutdown = CancellationToken::new();
|
||||||
|
let shutdown_clone = shutdown.clone();
|
||||||
|
|
||||||
|
let task = tokio::spawn(run_bot(token, shutdown_clone));
|
||||||
|
|
||||||
|
bot_task = Some(task);
|
||||||
|
shutdown_token = Some(shutdown);
|
||||||
|
bot_state = BotState::Running;
|
||||||
|
|
||||||
|
println!("✅ Bot started.");
|
||||||
}
|
}
|
||||||
1 => {
|
1 => {
|
||||||
credentialmanager::change_token(service_name, &username);
|
if let Some(token) = shutdown_token.take() {
|
||||||
|
token.cancel();
|
||||||
|
}
|
||||||
|
if let Some(task) = bot_task.take() {
|
||||||
|
let _ = task.await;
|
||||||
|
}
|
||||||
|
println!("Bot stopped.");
|
||||||
}
|
}
|
||||||
2 => {
|
2 => {
|
||||||
|
credentialmanager::change_token(service_name, &username);
|
||||||
|
}
|
||||||
|
3 => {
|
||||||
credentialmanager::remove_token(service_name, &username);
|
credentialmanager::remove_token(service_name, &username);
|
||||||
}
|
}
|
||||||
|
4 => {
|
||||||
|
if let Some(token) = shutdown_token {
|
||||||
|
token.cancel();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
_ => println!("Invalid Option"),
|
_ => println!("Invalid Option"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user