mirror of
https://github.com/eRgo35/lyra.git
synced 2026-02-04 04:16:11 +01:00
0.5.1 refractor
This commit is contained in:
3
Cargo.lock
generated
3
Cargo.lock
generated
@@ -959,12 +959,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lyra"
|
name = "lyra"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dotenv",
|
"dotenv",
|
||||||
"fancy-regex",
|
"fancy-regex",
|
||||||
"openssl",
|
"openssl",
|
||||||
"poise",
|
"poise",
|
||||||
|
"rand",
|
||||||
"regex",
|
"regex",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"serenity",
|
"serenity",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lyra"
|
name = "lyra"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
authors = ["Michał Czyż <mike@c2yz.com>"]
|
authors = ["Michał Czyż <mike@c2yz.com>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
description = "A featureful Discord bot written in Rust."
|
description = "A featureful Discord bot written in Rust."
|
||||||
@@ -16,6 +16,7 @@ dotenv = "0.15.0"
|
|||||||
fancy-regex = "0.13.0"
|
fancy-regex = "0.13.0"
|
||||||
openssl = { version = "0.10.63", features = ["vendored"] }
|
openssl = { version = "0.10.63", features = ["vendored"] }
|
||||||
poise = "0.6.1"
|
poise = "0.6.1"
|
||||||
|
rand = "0.8.5"
|
||||||
regex = "1.10.3"
|
regex = "1.10.3"
|
||||||
reqwest = "0.11.23"
|
reqwest = "0.11.23"
|
||||||
serenity = { version = "0.12.0", features = ["cache", "framework", "standard_framework", "voice"] }
|
serenity = { version = "0.12.0", features = ["cache", "framework", "standard_framework", "voice"] }
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
|
pub mod embeds;
|
||||||
pub mod kashi;
|
pub mod kashi;
|
||||||
pub mod music;
|
pub mod music;
|
||||||
pub mod tools;
|
pub mod tools;
|
||||||
pub mod embeds;
|
|
||||||
|
|||||||
@@ -1,37 +1,58 @@
|
|||||||
use crate::{Context, Error};
|
use crate::{Context, Error};
|
||||||
|
|
||||||
use serenity::{builder::{CreateEmbedAuthor, CreateEmbedFooter}, model::{Colour, Timestamp}};
|
|
||||||
use poise::serenity_prelude::CreateEmbed;
|
use poise::serenity_prelude::CreateEmbed;
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
use serenity::{
|
||||||
|
builder::{CreateEmbedAuthor, CreateEmbedFooter},
|
||||||
|
model::{Colour, Timestamp},
|
||||||
|
};
|
||||||
|
|
||||||
pub async fn fail(ctx: Context<'_>, err: String) -> Result<(), Error> {
|
pub async fn fail(ctx: Context<'_>, err: String) -> Result<(), Error> {
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(error_embed(ctx, &format!("Failed: {:?}", err)).await.unwrap())
|
CreateReply::default().embed(
|
||||||
).await?;
|
error_embed(ctx, &format!("Failed: {:?}", err))
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn error_embed(ctx: Context<'_>, msg: &str) -> Result<CreateEmbed, Error> {
|
pub async fn error_embed(ctx: Context<'_>, msg: &str) -> Result<CreateEmbed, Error> {
|
||||||
let embed = CreateEmbed::default()
|
let embed = CreateEmbed::default()
|
||||||
.author(CreateEmbedAuthor::new("Something went wrong!").icon_url(ctx.author().clone().face()))
|
.author(
|
||||||
.colour(Colour::from_rgb(255, 58, 97))
|
CreateEmbedAuthor::new("Something went wrong!").icon_url(ctx.author().clone().face()),
|
||||||
.title("Oopsie, Doopsie!")
|
)
|
||||||
.description(msg)
|
.colour(Colour::from_rgb(255, 58, 97))
|
||||||
.timestamp(Timestamp::now())
|
.title("Oopsie, Doopsie!")
|
||||||
.footer(CreateEmbedFooter::new(ctx.cache().current_user().name.to_string()).icon_url(ctx.cache().current_user().face()));
|
.description(msg)
|
||||||
|
.timestamp(Timestamp::now())
|
||||||
|
.footer(
|
||||||
|
CreateEmbedFooter::new(ctx.cache().current_user().name.to_string())
|
||||||
|
.icon_url(ctx.cache().current_user().face()),
|
||||||
|
);
|
||||||
|
|
||||||
Ok(embed)
|
Ok(embed)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn embed(ctx: Context<'_>, author: &str, description: &str, title: &str) -> Result<CreateEmbed, Error> {
|
pub async fn embed(
|
||||||
|
ctx: Context<'_>,
|
||||||
|
author: &str,
|
||||||
|
description: &str,
|
||||||
|
title: &str,
|
||||||
|
) -> Result<CreateEmbed, Error> {
|
||||||
let embed = CreateEmbed::default()
|
let embed = CreateEmbed::default()
|
||||||
.author(CreateEmbedAuthor::new(author).icon_url(ctx.author().clone().face()))
|
.author(CreateEmbedAuthor::new(author).icon_url(ctx.author().clone().face()))
|
||||||
.colour(Colour::from_rgb(255, 58, 97))
|
.colour(Colour::from_rgb(255, 58, 97))
|
||||||
.title(title)
|
.title(title)
|
||||||
.description(description)
|
.description(description)
|
||||||
.timestamp(Timestamp::now())
|
.timestamp(Timestamp::now())
|
||||||
.footer(CreateEmbedFooter::new(ctx.cache().current_user().name.to_string()).icon_url(ctx.cache().current_user().face()));
|
.footer(
|
||||||
|
CreateEmbedFooter::new(ctx.cache().current_user().name.to_string())
|
||||||
|
.icon_url(ctx.cache().current_user().face()),
|
||||||
|
);
|
||||||
|
|
||||||
Ok(embed)
|
Ok(embed)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,20 @@
|
|||||||
pub mod deafen;
|
pub mod deafen;
|
||||||
pub mod join;
|
pub mod join;
|
||||||
pub mod leave;
|
pub mod leave;
|
||||||
pub mod notifier;
|
|
||||||
pub mod metadata;
|
pub mod metadata;
|
||||||
pub mod mute;
|
pub mod mute;
|
||||||
|
pub mod notifier;
|
||||||
pub mod pause;
|
pub mod pause;
|
||||||
pub mod play;
|
pub mod play;
|
||||||
pub mod queue;
|
pub mod queue;
|
||||||
pub mod repeat;
|
pub mod repeat;
|
||||||
pub mod resume;
|
pub mod resume;
|
||||||
|
pub mod seek;
|
||||||
|
pub mod shuffle;
|
||||||
pub mod skip;
|
pub mod skip;
|
||||||
|
pub mod soundboard;
|
||||||
pub mod stop;
|
pub mod stop;
|
||||||
|
pub mod volume;
|
||||||
|
|
||||||
pub use deafen::deafen;
|
pub use deafen::deafen;
|
||||||
pub use join::join;
|
pub use join::join;
|
||||||
@@ -21,5 +25,9 @@ pub use play::play;
|
|||||||
pub use queue::queue;
|
pub use queue::queue;
|
||||||
pub use repeat::repeat;
|
pub use repeat::repeat;
|
||||||
pub use resume::resume;
|
pub use resume::resume;
|
||||||
|
pub use seek::seek;
|
||||||
|
pub use shuffle::shuffle;
|
||||||
pub use skip::skip;
|
pub use skip::skip;
|
||||||
|
pub use soundboard::soundboard;
|
||||||
pub use stop::stop;
|
pub use stop::stop;
|
||||||
|
pub use volume::volume;
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
use crate::{commands::embeds::{error_embed, embed, fail}, Context, Error};
|
use crate::{
|
||||||
|
commands::embeds::{embed, error_embed, fail},
|
||||||
|
Context, Error,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
|
||||||
/// Deafens itself while in a voice channel; \
|
/// Deafens itself while in a voice channel; \
|
||||||
@@ -9,9 +12,7 @@ use poise::CreateReply;
|
|||||||
aliases("shuush", "undeafen"),
|
aliases("shuush", "undeafen"),
|
||||||
category = "Music"
|
category = "Music"
|
||||||
)]
|
)]
|
||||||
pub async fn deafen(
|
pub async fn deafen(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
ctx: Context<'_>
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let guild_id = ctx.guild_id().unwrap();
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
let manager = songbird::get(&ctx.serenity_context())
|
let manager = songbird::get(&ctx.serenity_context())
|
||||||
@@ -23,10 +24,9 @@ pub async fn deafen(
|
|||||||
Some(handler) => handler,
|
Some(handler) => handler,
|
||||||
None => {
|
None => {
|
||||||
let msg = "I am not in a voice channel!";
|
let msg = "I am not in a voice channel!";
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
CreateReply::default().embed(error_embed(ctx, msg).await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
|
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -38,17 +38,15 @@ pub async fn deafen(
|
|||||||
fail(ctx, err.to_string()).await.unwrap();
|
fail(ctx, err.to_string()).await.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(embed(ctx, "Undeafened!", "", "").await.unwrap()))
|
||||||
CreateReply::default().embed(embed(ctx, "Undeafened!", "", "").await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
} else {
|
} else {
|
||||||
if let Err(err) = handler.deafen(true).await {
|
if let Err(err) = handler.deafen(true).await {
|
||||||
fail(ctx, err.to_string()).await.unwrap();
|
fail(ctx, err.to_string()).await.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(embed(ctx, "Deafened!", "", "").await.unwrap()))
|
||||||
CreateReply::default().embed(embed(ctx, "Deafened!", "", "").await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
@@ -1,29 +1,28 @@
|
|||||||
use crate::{commands::embeds::{error_embed, embed}, Context, Error};
|
use crate::commands::music::notifier::TrackErrorNotifier;
|
||||||
|
use crate::{
|
||||||
|
commands::embeds::{embed, error_embed},
|
||||||
|
Context, Error,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
use songbird::TrackEvent;
|
use songbird::TrackEvent;
|
||||||
use crate::commands::music::notifier::TrackErrorNotifier;
|
|
||||||
|
|
||||||
/// Joins your voice channel
|
/// Joins your voice channel
|
||||||
#[poise::command(
|
#[poise::command(prefix_command, slash_command, category = "Music")]
|
||||||
prefix_command,
|
pub async fn join(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
slash_command,
|
|
||||||
category = "Music"
|
|
||||||
)]
|
|
||||||
pub async fn join(
|
|
||||||
ctx: Context<'_>
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let guild_id = ctx.guild_id().unwrap();
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
let channel_id = ctx.guild().unwrap()
|
let channel_id = ctx
|
||||||
.voice_states.get(&ctx.author().id)
|
.guild()
|
||||||
|
.unwrap()
|
||||||
|
.voice_states
|
||||||
|
.get(&ctx.author().id)
|
||||||
.and_then(|voice_state| voice_state.channel_id);
|
.and_then(|voice_state| voice_state.channel_id);
|
||||||
|
|
||||||
let connect_to = match channel_id {
|
let connect_to = match channel_id {
|
||||||
Some(channel) => channel,
|
Some(channel) => channel,
|
||||||
None => {
|
None => {
|
||||||
let msg = "I am not in a voice channel!";
|
let msg = "I am not in a voice channel!";
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
CreateReply::default().embed(error_embed(ctx, msg).await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -38,9 +37,8 @@ pub async fn join(
|
|||||||
handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier);
|
handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier);
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(embed(ctx, "Joined!", "Hi there!", "").await.unwrap()))
|
||||||
CreateReply::default().embed(embed(ctx, "Joined!", "Hi there!", "").await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
|
use crate::{
|
||||||
|
commands::embeds::{embed, error_embed, fail},
|
||||||
|
Context, Error,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
use crate::{commands::embeds::{error_embed, fail, embed}, Context, Error};
|
|
||||||
|
|
||||||
/// Leaves the voice channel; \
|
/// Leaves the voice channel; \
|
||||||
/// aliases: leave, qa!
|
/// aliases: leave, qa!
|
||||||
@@ -9,9 +12,7 @@ use crate::{commands::embeds::{error_embed, fail, embed}, Context, Error};
|
|||||||
aliases("leave", "qa!"),
|
aliases("leave", "qa!"),
|
||||||
category = "Music"
|
category = "Music"
|
||||||
)]
|
)]
|
||||||
pub async fn leave(
|
pub async fn leave(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
ctx: Context<'_>
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let guild_id = ctx.guild_id().unwrap();
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
let manager = songbird::get(&ctx.serenity_context())
|
let manager = songbird::get(&ctx.serenity_context())
|
||||||
@@ -21,20 +22,24 @@ pub async fn leave(
|
|||||||
|
|
||||||
if !manager.get(guild_id).is_some() {
|
if !manager.get(guild_id).is_some() {
|
||||||
let msg = "I am not in a voice channel!";
|
let msg = "I am not in a voice channel!";
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
CreateReply::default().embed(error_embed(ctx, msg).await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
|
|
||||||
return Ok(())
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Err(err) = manager.remove(guild_id).await {
|
if let Err(err) = manager.remove(guild_id).await {
|
||||||
fail(ctx, err.to_string()).await.unwrap();
|
fail(ctx, err.to_string()).await.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(embed(ctx, "Left!", "I left the voice channel", "").await.unwrap())
|
CreateReply::default().embed(
|
||||||
).await?;
|
embed(ctx, "Left!", "I left the voice channel", "")
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,18 @@
|
|||||||
use crate::{commands::embeds::{error_embed, embed, fail}, Context, Error};
|
use crate::{
|
||||||
|
commands::embeds::{embed, error_embed, fail},
|
||||||
|
Context, Error,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
|
||||||
/// Mutes itself while in a voice channel; \
|
/// Mutes itself while in a voice channel; \
|
||||||
/// aliases: mute, unmute, shhh
|
/// aliases: mute, unmute, shhh
|
||||||
#[poise::command(
|
#[poise::command(
|
||||||
prefix_command,
|
prefix_command,
|
||||||
slash_command,
|
slash_command,
|
||||||
aliases("shhh", "unmute"),
|
aliases("shhh", "unmute"),
|
||||||
category = "Music"
|
category = "Music"
|
||||||
)]
|
)]
|
||||||
pub async fn mute(
|
pub async fn mute(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
ctx: Context<'_>
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let guild_id = ctx.guild_id().unwrap();
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
let manager = songbird::get(&ctx.serenity_context())
|
let manager = songbird::get(&ctx.serenity_context())
|
||||||
@@ -21,33 +22,30 @@ pub async fn mute(
|
|||||||
|
|
||||||
let handler_lock = match manager.get(guild_id) {
|
let handler_lock = match manager.get(guild_id) {
|
||||||
Some(handler) => handler,
|
Some(handler) => handler,
|
||||||
None => {
|
None => {
|
||||||
let msg = "I am not in a voice channel!";
|
let msg = "I am not in a voice channel!";
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
CreateReply::default().embed(error_embed(ctx, msg).await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut handler = handler_lock.lock().await;
|
let mut handler = handler_lock.lock().await;
|
||||||
|
|
||||||
if handler.is_mute() {
|
if handler.is_mute() {
|
||||||
if let Err(err) = handler.mute(false).await {
|
if let Err(err) = handler.mute(false).await {
|
||||||
fail(ctx, err.to_string()).await.unwrap();
|
fail(ctx, err.to_string()).await.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(embed(ctx, "Unmuted!", "", "").await.unwrap()))
|
||||||
CreateReply::default().embed(embed(ctx, "Unmuted!", "", "").await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
} else {
|
} else {
|
||||||
if let Err(err) = handler.mute(true).await {
|
if let Err(err) = handler.mute(true).await {
|
||||||
fail(ctx, err.to_string()).await.unwrap();
|
fail(ctx, err.to_string()).await.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(embed(ctx, "Muted!", "", "").await.unwrap()))
|
||||||
CreateReply::default().embed(embed(ctx, "Muted!", "", "").await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
@@ -1,15 +1,12 @@
|
|||||||
use crate::{commands::embeds::{error_embed, embed}, Context, Error};
|
use crate::{
|
||||||
|
commands::embeds::{embed, error_embed},
|
||||||
|
Context, Error,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
|
||||||
/// Pauses the currently playing song
|
/// Pauses the currently playing song
|
||||||
#[poise::command(
|
#[poise::command(prefix_command, slash_command, category = "Music")]
|
||||||
prefix_command,
|
pub async fn pause(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
slash_command,
|
|
||||||
category = "Music"
|
|
||||||
)]
|
|
||||||
pub async fn pause(
|
|
||||||
ctx: Context<'_>
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let guild_id = ctx.guild_id().unwrap();
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
let manager = songbird::get(&ctx.serenity_context())
|
let manager = songbird::get(&ctx.serenity_context())
|
||||||
@@ -21,15 +18,19 @@ pub async fn pause(
|
|||||||
let handler = handler_lock.lock().await;
|
let handler = handler_lock.lock().await;
|
||||||
let queue = handler.queue();
|
let queue = handler.queue();
|
||||||
let _ = queue.pause();
|
let _ = queue.pause();
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(embed(ctx, "Paused!", "Currently playing song is now paused!", "").await.unwrap())
|
CreateReply::default().embed(
|
||||||
).await?;
|
embed(ctx, "Paused!", "Currently playing song is now paused!", "")
|
||||||
} else {
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
} else {
|
||||||
let msg = "I am not in a voice channel!";
|
let msg = "I am not in a voice channel!";
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
CreateReply::default().embed(error_embed(ctx, msg).await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
@@ -1,20 +1,20 @@
|
|||||||
use crate::{commands::embeds::error_embed, Context, Error};
|
|
||||||
use crate::commands::music::metadata::Metadata;
|
use crate::commands::music::metadata::Metadata;
|
||||||
|
use crate::{commands::embeds::error_embed, Context, Error};
|
||||||
|
|
||||||
use fancy_regex::Regex;
|
use fancy_regex::Regex;
|
||||||
|
use poise::serenity_prelude::model::Timestamp;
|
||||||
|
use poise::serenity_prelude::Colour;
|
||||||
|
use poise::serenity_prelude::CreateEmbed;
|
||||||
|
use poise::CreateReply;
|
||||||
use regex::Regex as Regex_Classic;
|
use regex::Regex as Regex_Classic;
|
||||||
|
use serenity::builder::CreateEmbedAuthor;
|
||||||
|
use serenity::builder::CreateEmbedFooter;
|
||||||
|
use songbird::events::TrackEvent;
|
||||||
|
use songbird::input::AuxMetadata;
|
||||||
|
use songbird::input::{Compose, YoutubeDl};
|
||||||
use songbird::tracks::{TrackHandle, TrackQueue};
|
use songbird::tracks::{TrackHandle, TrackQueue};
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use poise::CreateReply;
|
|
||||||
use poise::serenity_prelude::CreateEmbed;
|
|
||||||
use poise::serenity_prelude::Colour;
|
|
||||||
use poise::serenity_prelude::model::Timestamp;
|
|
||||||
use serenity::builder::CreateEmbedAuthor;
|
|
||||||
use serenity::builder::CreateEmbedFooter;
|
|
||||||
use songbird::input::AuxMetadata;
|
|
||||||
use songbird::input::{Compose, YoutubeDl};
|
|
||||||
use songbird::events::TrackEvent;
|
|
||||||
|
|
||||||
use crate::commands::music::notifier::TrackErrorNotifier;
|
use crate::commands::music::notifier::TrackErrorNotifier;
|
||||||
use crate::http::HttpKey;
|
use crate::http::HttpKey;
|
||||||
@@ -23,33 +23,44 @@ use crate::http::HttpKey;
|
|||||||
/// you can search by query or paste an url; \
|
/// you can search by query or paste an url; \
|
||||||
/// aliases: play, p, enqueue
|
/// aliases: play, p, enqueue
|
||||||
#[poise::command(
|
#[poise::command(
|
||||||
prefix_command,
|
prefix_command,
|
||||||
slash_command,
|
slash_command,
|
||||||
aliases("p", "enqueue"),
|
aliases("p", "enqueue"),
|
||||||
category = "Music"
|
category = "Music"
|
||||||
)]
|
)]
|
||||||
pub async fn play(
|
pub async fn play(
|
||||||
ctx: Context<'_>,
|
ctx: Context<'_>,
|
||||||
#[description = "Provide a query or an url"] #[rest] mut song: String,
|
#[description = "Provide a query or an url"]
|
||||||
|
#[rest]
|
||||||
|
mut song: String,
|
||||||
) -> Result<(), Error> {
|
) -> Result<(), Error> {
|
||||||
let regex_spotify = Regex::new(r"https?:\/\/(?:embed\.|open\.)(?:spotify\.com\/)(?:track\/|\?uri=spotify:track:)((\w|-)+)(?:(?=\?)(?:[?&]foo=(\d*)(?=[&#]|$)|(?![?&]foo=)[^#])+)?(?=#|$)").unwrap();
|
let regex_spotify = Regex::new(r"https?:\/\/(?:embed\.|open\.)(?:spotify\.com\/)(?:track\/|\?uri=spotify:track:)((\w|-)+)(?:(?=\?)(?:[?&]foo=(\d*)(?=[&#]|$)|(?![?&]foo=)[^#])+)?(?=#|$)").unwrap();
|
||||||
let regex_youtube = Regex_Classic::new(r#""url": "(https://www.youtube.com/watch\?v=[A-Za-z0-9]{11})""#).unwrap();
|
let regex_youtube =
|
||||||
let regex_youtube_playlist = Regex::new(r"^((?:https?:)\/\/)?((?:www|m)\.)?((?:youtube\.com)).*(youtu.be\/|list=)([^#&?]*).*").unwrap();
|
Regex_Classic::new(r#""url": "(https://www.youtube.com/watch\?v=[A-Za-z0-9]{11})""#)
|
||||||
|
.unwrap();
|
||||||
|
let regex_youtube_playlist = Regex::new(
|
||||||
|
r"^((?:https?:)\/\/)?((?:www|m)\.)?((?:youtube\.com)).*(youtu.be\/|list=)([^#&?]*).*",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
let is_playlist = regex_youtube_playlist.is_match(&song).unwrap();
|
let is_playlist = regex_youtube_playlist.is_match(&song).unwrap();
|
||||||
let is_spotify = regex_spotify.is_match(&song).unwrap();
|
let is_spotify = regex_spotify.is_match(&song).unwrap();
|
||||||
let is_query = !song.starts_with("http");
|
let is_query = !song.starts_with("http");
|
||||||
|
|
||||||
let guild_id = ctx.guild_id().unwrap();
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
let channel_id = ctx.guild().unwrap().voice_states.get(&ctx.author().id).and_then(|voice_state| voice_state.channel_id);
|
let channel_id = ctx
|
||||||
|
.guild()
|
||||||
|
.unwrap()
|
||||||
|
.voice_states
|
||||||
|
.get(&ctx.author().id)
|
||||||
|
.and_then(|voice_state| voice_state.channel_id);
|
||||||
|
|
||||||
let connect_to = match channel_id {
|
let connect_to = match channel_id {
|
||||||
Some(channel) => channel,
|
Some(channel) => channel,
|
||||||
None => {
|
None => {
|
||||||
let msg = "I am not in a voice channel!";
|
let msg = "I am not in a voice channel!";
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
CreateReply::default().embed(error_embed(ctx, msg).await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
|
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
@@ -77,17 +88,24 @@ pub async fn play(
|
|||||||
.args(["-j", "--flat-playlist", &song])
|
.args(["-j", "--flat-playlist", &song])
|
||||||
.output()
|
.output()
|
||||||
.expect("failed to execute process")
|
.expect("failed to execute process")
|
||||||
.stdout;
|
.stdout;
|
||||||
|
|
||||||
let list = String::from_utf8(raw_list.clone()).expect("Invalid UTF-8");
|
let list = String::from_utf8(raw_list.clone()).expect("Invalid UTF-8");
|
||||||
|
|
||||||
let urls: Vec<String> = regex_youtube.captures_iter(&list).map(|capture| capture[1].to_string()).collect();
|
let urls: Vec<String> = regex_youtube
|
||||||
|
.captures_iter(&list)
|
||||||
for (index, url) in urls.clone().iter().enumerate() {
|
.map(|capture| capture[1].to_string())
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
for (index, url) in urls.clone().iter().enumerate() {
|
||||||
let src = YoutubeDl::new_ytdl_like("yt-dlp", http_client.clone(), url.to_string());
|
let src = YoutubeDl::new_ytdl_like("yt-dlp", http_client.clone(), url.to_string());
|
||||||
let aux_metadata = src.clone().aux_metadata().await.unwrap();
|
let aux_metadata = src.clone().aux_metadata().await.unwrap();
|
||||||
let track = handler.enqueue_input(src.clone().into()).await;
|
let track = handler.enqueue_input(src.clone().into()).await;
|
||||||
let _ = track.typemap().write().await.insert::<Metadata>(aux_metadata);
|
let _ = track
|
||||||
|
.typemap()
|
||||||
|
.write()
|
||||||
|
.await
|
||||||
|
.insert::<Metadata>(aux_metadata);
|
||||||
|
|
||||||
if index == 0 {
|
if index == 0 {
|
||||||
let embed = generate_playlist_embed(ctx, track, urls.len()).await;
|
let embed = generate_playlist_embed(ctx, track, urls.len()).await;
|
||||||
@@ -95,43 +113,61 @@ pub async fn play(
|
|||||||
ctx.send(response).await?;
|
ctx.send(response).await?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if is_spotify {
|
if is_spotify {
|
||||||
let exec = format!("node ./src/spotify --url {}", song);
|
let exec = format!("node ./src/spotify --url {}", song);
|
||||||
let query = Command::new("sh").arg("-c").arg(exec).output().expect("failed to execute process").stdout;
|
let query = Command::new("sh")
|
||||||
|
.arg("-c")
|
||||||
|
.arg(exec)
|
||||||
|
.output()
|
||||||
|
.expect("failed to execute process")
|
||||||
|
.stdout;
|
||||||
let query_str = String::from_utf8(query.clone()).expect("Invalid UTF-8");
|
let query_str = String::from_utf8(query.clone()).expect("Invalid UTF-8");
|
||||||
song = format!("ytsearch:{}", query_str.to_string());
|
song = format!("ytsearch:{}", query_str.to_string());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if is_query {
|
if is_query {
|
||||||
song = format!("ytsearch:{}", song);
|
song = format!("ytsearch:{}", song);
|
||||||
}
|
}
|
||||||
|
|
||||||
let src = YoutubeDl::new_ytdl_like("yt-dlp", http_client, song);
|
let src = YoutubeDl::new_ytdl_like("yt-dlp", http_client, song);
|
||||||
let embed = generate_embed(ctx, src.clone(), handler.queue()).await;
|
let embed = generate_embed(ctx, src.clone(), handler.queue()).await;
|
||||||
let response = CreateReply::default().embed(embed.unwrap());
|
let response = CreateReply::default().embed(embed.unwrap());
|
||||||
ctx.send(response).await?;
|
ctx.send(response).await?;
|
||||||
|
|
||||||
let aux_metadata = src.clone().aux_metadata().await.unwrap();
|
let aux_metadata = src.clone().aux_metadata().await.unwrap();
|
||||||
|
|
||||||
let track = handler.enqueue_input(src.clone().into()).await;
|
let track = handler.enqueue_input(src.clone().into()).await;
|
||||||
let _ = track.typemap().write().await.insert::<Metadata>(aux_metadata);
|
let _ = track
|
||||||
|
.typemap()
|
||||||
|
.write()
|
||||||
|
.await
|
||||||
|
.insert::<Metadata>(aux_metadata);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn generate_embed(ctx: Context<'_>, src: YoutubeDl, queue: &TrackQueue) -> Result<CreateEmbed, Error> {
|
async fn generate_embed(
|
||||||
|
ctx: Context<'_>,
|
||||||
|
src: YoutubeDl,
|
||||||
|
queue: &TrackQueue,
|
||||||
|
) -> Result<CreateEmbed, Error> {
|
||||||
let metadata = src.clone().aux_metadata().await.unwrap();
|
let metadata = src.clone().aux_metadata().await.unwrap();
|
||||||
let AuxMetadata {title, thumbnail, source_url, artist, duration, ..} = metadata;
|
let AuxMetadata {
|
||||||
|
title,
|
||||||
|
thumbnail,
|
||||||
|
source_url,
|
||||||
|
artist,
|
||||||
|
duration,
|
||||||
|
..
|
||||||
|
} = metadata;
|
||||||
let timestamp = Timestamp::now();
|
let timestamp = Timestamp::now();
|
||||||
let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
|
let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
|
||||||
let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
|
let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
|
||||||
let mut description = format!("Song added to queue @ {}", queue.len());
|
let mut description = format!("Song added to queue @ {}", queue.len());
|
||||||
|
|
||||||
if queue.len() == 0 {
|
if queue.len() == 0 {
|
||||||
description = format!("Playing now!");
|
description = format!("Playing now!");
|
||||||
}
|
}
|
||||||
@@ -142,24 +178,46 @@ async fn generate_embed(ctx: Context<'_>, src: YoutubeDl, queue: &TrackQueue) ->
|
|||||||
.title(title.unwrap())
|
.title(title.unwrap())
|
||||||
.url(source_url.unwrap())
|
.url(source_url.unwrap())
|
||||||
.thumbnail(thumbnail.unwrap_or(ctx.cache().current_user().face()))
|
.thumbnail(thumbnail.unwrap_or(ctx.cache().current_user().face()))
|
||||||
.field("Artist", artist.unwrap_or("Unknown Artist".to_string()), true)
|
.field(
|
||||||
.field("Duration", format!("{:02}:{:02}", duration_minutes, duration_seconds), true)
|
"Artist",
|
||||||
|
artist.unwrap_or("Unknown Artist".to_string()),
|
||||||
|
true,
|
||||||
|
)
|
||||||
|
.field(
|
||||||
|
"Duration",
|
||||||
|
format!("{:02}:{:02}", duration_minutes, duration_seconds),
|
||||||
|
true,
|
||||||
|
)
|
||||||
.field("DJ", ctx.author().name.clone(), true)
|
.field("DJ", ctx.author().name.clone(), true)
|
||||||
.description(description)
|
.description(description)
|
||||||
.timestamp(timestamp)
|
.timestamp(timestamp)
|
||||||
.footer(CreateEmbedFooter::new(ctx.cache().current_user().name.to_string()).icon_url(ctx.cache().current_user().face()));
|
.footer(
|
||||||
|
CreateEmbedFooter::new(ctx.cache().current_user().name.to_string())
|
||||||
|
.icon_url(ctx.cache().current_user().face()),
|
||||||
|
);
|
||||||
|
|
||||||
Ok(embed)
|
Ok(embed)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn generate_playlist_embed(ctx: Context<'_>, track: TrackHandle, queue_length: usize) -> Result<CreateEmbed, Error> {
|
async fn generate_playlist_embed(
|
||||||
|
ctx: Context<'_>,
|
||||||
|
track: TrackHandle,
|
||||||
|
queue_length: usize,
|
||||||
|
) -> Result<CreateEmbed, Error> {
|
||||||
let meta_typemap = track.typemap().read().await;
|
let meta_typemap = track.typemap().read().await;
|
||||||
let metadata = meta_typemap.get::<Metadata>().unwrap();
|
let metadata = meta_typemap.get::<Metadata>().unwrap();
|
||||||
let AuxMetadata {title, thumbnail, source_url, artist, duration, ..} = metadata;
|
let AuxMetadata {
|
||||||
|
title,
|
||||||
|
thumbnail,
|
||||||
|
source_url,
|
||||||
|
artist,
|
||||||
|
duration,
|
||||||
|
..
|
||||||
|
} = metadata;
|
||||||
let timestamp = Timestamp::now();
|
let timestamp = Timestamp::now();
|
||||||
let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
|
let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
|
||||||
let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
|
let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
|
||||||
|
|
||||||
let description = format!("Enqueued tracks: {}", queue_length - 1);
|
let description = format!("Enqueued tracks: {}", queue_length - 1);
|
||||||
|
|
||||||
let embed = CreateEmbed::default()
|
let embed = CreateEmbed::default()
|
||||||
@@ -167,13 +225,28 @@ async fn generate_playlist_embed(ctx: Context<'_>, track: TrackHandle, queue_len
|
|||||||
.colour(Colour::from_rgb(255, 58, 97))
|
.colour(Colour::from_rgb(255, 58, 97))
|
||||||
.title(title.as_ref().unwrap())
|
.title(title.as_ref().unwrap())
|
||||||
.url(source_url.as_ref().unwrap())
|
.url(source_url.as_ref().unwrap())
|
||||||
.thumbnail(thumbnail.as_ref().unwrap_or(&ctx.cache().current_user().face()))
|
.thumbnail(
|
||||||
.field("Artist", artist.as_ref().unwrap_or(&"Unknown Artist".to_string()), true)
|
thumbnail
|
||||||
.field("Duration", format!("{:02}:{:02}", duration_minutes, duration_seconds), true)
|
.as_ref()
|
||||||
|
.unwrap_or(&ctx.cache().current_user().face()),
|
||||||
|
)
|
||||||
|
.field(
|
||||||
|
"Artist",
|
||||||
|
artist.as_ref().unwrap_or(&"Unknown Artist".to_string()),
|
||||||
|
true,
|
||||||
|
)
|
||||||
|
.field(
|
||||||
|
"Duration",
|
||||||
|
format!("{:02}:{:02}", duration_minutes, duration_seconds),
|
||||||
|
true,
|
||||||
|
)
|
||||||
.field("DJ", ctx.author().name.clone(), true)
|
.field("DJ", ctx.author().name.clone(), true)
|
||||||
.description(description)
|
.description(description)
|
||||||
.timestamp(timestamp)
|
.timestamp(timestamp)
|
||||||
.footer(CreateEmbedFooter::new(ctx.cache().current_user().name.to_string()).icon_url(ctx.cache().current_user().face()));
|
.footer(
|
||||||
|
CreateEmbedFooter::new(ctx.cache().current_user().name.to_string())
|
||||||
|
.icon_url(ctx.cache().current_user().face()),
|
||||||
|
);
|
||||||
|
|
||||||
Ok(embed)
|
Ok(embed)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,23 +1,19 @@
|
|||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use crate::{commands::embeds::error_embed, Context, Error};
|
|
||||||
use crate::commands::music::metadata::Metadata;
|
use crate::commands::music::metadata::Metadata;
|
||||||
use poise::CreateReply;
|
use crate::{commands::embeds::error_embed, Context, Error};
|
||||||
use serenity::{builder::{CreateEmbedAuthor, CreateEmbedFooter}, model::{Colour, Timestamp}};
|
|
||||||
use poise::serenity_prelude::CreateEmbed;
|
use poise::serenity_prelude::CreateEmbed;
|
||||||
|
use poise::CreateReply;
|
||||||
|
use serenity::{
|
||||||
|
builder::{CreateEmbedAuthor, CreateEmbedFooter},
|
||||||
|
model::{Colour, Timestamp},
|
||||||
|
};
|
||||||
use songbird::input::AuxMetadata;
|
use songbird::input::AuxMetadata;
|
||||||
|
|
||||||
/// Shows next tracks in queue; \
|
/// Shows next tracks in queue; \
|
||||||
/// aliases: queue, q
|
/// aliases: queue, q
|
||||||
#[poise::command(
|
#[poise::command(prefix_command, slash_command, aliases("q"), category = "Music")]
|
||||||
prefix_command,
|
pub async fn queue(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
slash_command,
|
|
||||||
aliases("q"),
|
|
||||||
category = "Music"
|
|
||||||
)]
|
|
||||||
pub async fn queue(
|
|
||||||
ctx: Context<'_>
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let guild_id = ctx.guild_id().unwrap();
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
let manager = songbird::get(&ctx.serenity_context())
|
let manager = songbird::get(&ctx.serenity_context())
|
||||||
@@ -33,12 +29,17 @@ pub async fn queue(
|
|||||||
for (index, song) in queue.current_queue().iter().enumerate() {
|
for (index, song) in queue.current_queue().iter().enumerate() {
|
||||||
let meta_typemap = song.typemap().read().await;
|
let meta_typemap = song.typemap().read().await;
|
||||||
let metadata = meta_typemap.get::<Metadata>().unwrap();
|
let metadata = meta_typemap.get::<Metadata>().unwrap();
|
||||||
let AuxMetadata { title, artist, duration, ..} = metadata;
|
let AuxMetadata {
|
||||||
|
title,
|
||||||
|
artist,
|
||||||
|
duration,
|
||||||
|
..
|
||||||
|
} = metadata;
|
||||||
|
|
||||||
let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
|
let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
|
||||||
let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
|
let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
|
||||||
|
|
||||||
// println!("{:?}", metadata.clone());
|
// println!("{:?}", metadata.clone());
|
||||||
|
|
||||||
queue_res.push_str(&format!(
|
queue_res.push_str(&format!(
|
||||||
"{}. {} - {} [{:02}:{:02}] \n",
|
"{}. {} - {} [{:02}:{:02}] \n",
|
||||||
@@ -50,31 +51,31 @@ pub async fn queue(
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(embed(ctx, queue_res).await.unwrap()))
|
||||||
CreateReply::default().embed(embed(ctx, queue_res).await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
} else {
|
} else {
|
||||||
let msg = "I am not in a voice channel!";
|
let msg = "I am not in a voice channel!";
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
CreateReply::default().embed(error_embed(ctx, msg).await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn embed(ctx: Context<'_>, queue: String) -> Result<CreateEmbed, Error> {
|
async fn embed(ctx: Context<'_>, queue: String) -> Result<CreateEmbed, Error> {
|
||||||
|
|
||||||
let title = "Now playing";
|
let title = "Now playing";
|
||||||
let timestamp = Timestamp::now();
|
let timestamp = Timestamp::now();
|
||||||
|
|
||||||
let embed = CreateEmbed::default()
|
let embed = CreateEmbed::default()
|
||||||
.author(CreateEmbedAuthor::new("Queue").icon_url(ctx.author().clone().face()))
|
.author(CreateEmbedAuthor::new("Queue").icon_url(ctx.author().clone().face()))
|
||||||
.colour(Colour::from_rgb(255, 58, 97))
|
.colour(Colour::from_rgb(255, 58, 97))
|
||||||
.title(title)
|
.title(title)
|
||||||
.description(queue)
|
.description(queue)
|
||||||
.timestamp(timestamp)
|
.timestamp(timestamp)
|
||||||
.footer(CreateEmbedFooter::new(ctx.cache().current_user().name.to_string()).icon_url(ctx.cache().current_user().face()));
|
.footer(
|
||||||
|
CreateEmbedFooter::new(ctx.cache().current_user().name.to_string())
|
||||||
|
.icon_url(ctx.cache().current_user().face()),
|
||||||
|
);
|
||||||
|
|
||||||
Ok(embed)
|
Ok(embed)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,23 @@
|
|||||||
use crate::{commands::embeds::{error_embed, embed}, Context, Error};
|
use crate::{
|
||||||
|
commands::embeds::{embed, error_embed},
|
||||||
|
Context, Error,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
use songbird::tracks::LoopState;
|
use songbird::tracks::LoopState;
|
||||||
|
|
||||||
/// Loops currently playing song provided amount of times; \
|
/// Loops currently playing song provided amount of times; \
|
||||||
/// aliases: repeat, loop, while, for
|
/// aliases: repeat, loop, while, for
|
||||||
#[poise::command(
|
#[poise::command(
|
||||||
prefix_command,
|
prefix_command,
|
||||||
slash_command,
|
slash_command,
|
||||||
aliases("loop", "while", "for"),
|
aliases("loop", "while", "for"),
|
||||||
category = "Music"
|
category = "Music"
|
||||||
)]
|
)]
|
||||||
pub async fn repeat(
|
pub async fn repeat(
|
||||||
ctx: Context<'_>,
|
ctx: Context<'_>,
|
||||||
#[description = "How many times"] #[rest] times: usize
|
#[description = "How many times"]
|
||||||
|
#[rest]
|
||||||
|
times: usize,
|
||||||
) -> Result<(), Error> {
|
) -> Result<(), Error> {
|
||||||
let guild_id = ctx.guild_id().unwrap();
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
@@ -21,7 +26,6 @@ pub async fn repeat(
|
|||||||
.expect("Songbird client placed at init")
|
.expect("Songbird client placed at init")
|
||||||
.clone();
|
.clone();
|
||||||
|
|
||||||
|
|
||||||
if let Some(handler_lock) = manager.get(guild_id) {
|
if let Some(handler_lock) = manager.get(guild_id) {
|
||||||
let handler = handler_lock.lock().await;
|
let handler = handler_lock.lock().await;
|
||||||
let queue = handler.queue();
|
let queue = handler.queue();
|
||||||
@@ -34,36 +38,52 @@ pub async fn repeat(
|
|||||||
let _ = queue.current().unwrap().disable_loop();
|
let _ = queue.current().unwrap().disable_loop();
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(embed(ctx, "Song Unlooped!", "", "").await.unwrap())
|
CreateReply::default()
|
||||||
).await?;
|
.embed(embed(ctx, "Song Unlooped!", "", "").await.unwrap()),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
}
|
}
|
||||||
LoopState::Finite(_) => {
|
LoopState::Finite(_) => {
|
||||||
if times == 0 {
|
if times == 0 {
|
||||||
let _ = queue.current().unwrap().disable_loop();
|
let _ = queue.current().unwrap().disable_loop();
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(embed(ctx, "Song Unlooped!", "", "").await.unwrap())
|
CreateReply::default()
|
||||||
).await?;
|
.embed(embed(ctx, "Song Unlooped!", "", "").await.unwrap()),
|
||||||
}
|
)
|
||||||
else if times < 100 {
|
.await?;
|
||||||
|
} else if times < 100 {
|
||||||
let _ = queue.current().unwrap().loop_for(times);
|
let _ = queue.current().unwrap().loop_for(times);
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(embed(ctx, &format!("Song looped {} times!", times), "You definitelly love this song!", "").await.unwrap())
|
CreateReply::default().embed(
|
||||||
).await?;
|
embed(
|
||||||
}
|
ctx,
|
||||||
else {
|
&format!("Song looped {} times!", times),
|
||||||
|
"You definitelly love this song!",
|
||||||
|
"",
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
} else {
|
||||||
let _ = queue.current().unwrap().enable_loop();
|
let _ = queue.current().unwrap().enable_loop();
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(embed(ctx, "Song looped forever!", "A very long time!", "").await.unwrap())
|
CreateReply::default().embed(
|
||||||
).await?;
|
embed(ctx, "Song looped forever!", "A very long time!", "")
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
let msg = "I am not in a voice channel!";
|
let msg = "I am not in a voice channel!";
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
CreateReply::default().embed(error_embed(ctx, msg).await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
@@ -1,15 +1,12 @@
|
|||||||
use crate::{commands::embeds::{error_embed, embed}, Context, Error};
|
use crate::{
|
||||||
|
commands::embeds::{embed, error_embed},
|
||||||
|
Context, Error,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
|
||||||
/// Resumes currently paused song
|
/// Resumes currently paused song
|
||||||
#[poise::command(
|
#[poise::command(prefix_command, slash_command, category = "Music")]
|
||||||
prefix_command,
|
pub async fn resume(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
slash_command,
|
|
||||||
category = "Music"
|
|
||||||
)]
|
|
||||||
pub async fn resume(
|
|
||||||
ctx: Context<'_>
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let guild_id = ctx.guild_id().unwrap();
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
let manager = songbird::get(&ctx.serenity_context())
|
let manager = songbird::get(&ctx.serenity_context())
|
||||||
@@ -24,13 +21,17 @@ pub async fn resume(
|
|||||||
|
|
||||||
ctx.say(format!("Song resumed.")).await?;
|
ctx.say(format!("Song resumed.")).await?;
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(embed(ctx, "Resumed!", "Currently paused song is now resumed!", "").await.unwrap())
|
CreateReply::default().embed(
|
||||||
).await?;
|
embed(ctx, "Resumed!", "Currently paused song is now resumed!", "")
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
} else {
|
} else {
|
||||||
let msg = "I am not in a voice channel!";
|
let msg = "I am not in a voice channel!";
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
CreateReply::default().embed(error_embed(ctx, msg).await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
/// Seeks a track by provided seconds
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Music")]
|
||||||
|
pub async fn seek(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
/// Shuffles the playlist
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Music")]
|
||||||
|
pub async fn shuffle(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,15 +1,12 @@
|
|||||||
use crate::{commands::embeds::{error_embed, embed}, Context, Error};
|
use crate::{
|
||||||
|
commands::embeds::{embed, error_embed},
|
||||||
|
Context, Error,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
|
||||||
/// Skips the currently playing song
|
/// Skips the currently playing song
|
||||||
#[poise::command(
|
#[poise::command(prefix_command, slash_command, category = "Music")]
|
||||||
prefix_command,
|
pub async fn skip(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
slash_command,
|
|
||||||
category = "Music"
|
|
||||||
)]
|
|
||||||
pub async fn skip(
|
|
||||||
ctx: Context<'_>
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let guild_id = ctx.guild_id().unwrap();
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
let manager = songbird::get(&ctx.serenity_context())
|
let manager = songbird::get(&ctx.serenity_context())
|
||||||
@@ -23,13 +20,22 @@ pub async fn skip(
|
|||||||
let _ = queue.skip();
|
let _ = queue.skip();
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(embed(ctx, "Skipped!", "Next song: {song}", &format!("Songs left in queue: {}", queue.len())).await.unwrap())
|
CreateReply::default().embed(
|
||||||
).await?;
|
embed(
|
||||||
|
ctx,
|
||||||
|
"Skipped!",
|
||||||
|
"Next song: {song}",
|
||||||
|
&format!("Songs left in queue: {}", queue.len()),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
} else {
|
} else {
|
||||||
let msg = "I am not in a voice channel!";
|
let msg = "I am not in a voice channel!";
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
CreateReply::default().embed(error_embed(ctx, msg).await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
/// A better soundboard
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Music")]
|
||||||
|
pub async fn soundboard(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,19 +1,15 @@
|
|||||||
use crate::{commands::embeds::{error_embed, embed}, Context, Error};
|
use crate::{
|
||||||
|
commands::embeds::{embed, error_embed},
|
||||||
|
Context, Error,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
|
||||||
/// Stops playback and destroys the queue; \
|
/// Stops playback and destroys the queue; \
|
||||||
/// aliases: stop, end
|
/// aliases: stop, end
|
||||||
#[poise::command(
|
#[poise::command(prefix_command, slash_command, aliases("end"), category = "Music")]
|
||||||
prefix_command,
|
pub async fn stop(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
slash_command,
|
|
||||||
aliases("end"),
|
|
||||||
category = "Music"
|
|
||||||
)]
|
|
||||||
pub async fn stop(
|
|
||||||
ctx: Context<'_>
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let guild_id = ctx.guild_id().unwrap();
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
let manager = songbird::get(&ctx.serenity_context())
|
let manager = songbird::get(&ctx.serenity_context())
|
||||||
.await
|
.await
|
||||||
.expect("Songbird client placed at init")
|
.expect("Songbird client placed at init")
|
||||||
@@ -25,14 +21,23 @@ pub async fn stop(
|
|||||||
queue.stop();
|
queue.stop();
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(embed(ctx, "Stopped!", "Playback stopped!", "Queue destroyed! Bot will stay and chill with you in a vc").await.unwrap())
|
CreateReply::default().embed(
|
||||||
).await?;
|
embed(
|
||||||
} else {
|
ctx,
|
||||||
|
"Stopped!",
|
||||||
|
"Playback stopped!",
|
||||||
|
"Queue destroyed! Bot will stay and chill with you in a vc",
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
} else {
|
||||||
let msg = "I am not in a voice channel!";
|
let msg = "I am not in a voice channel!";
|
||||||
ctx.send(
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
CreateReply::default().embed(error_embed(ctx, msg).await.unwrap())
|
.await?;
|
||||||
).await?;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
/// Changes output volume
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Music")]
|
||||||
|
pub async fn volume(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,9 +1,31 @@
|
|||||||
pub mod ping;
|
pub mod ai;
|
||||||
pub mod register;
|
pub mod dice;
|
||||||
|
pub mod dictionary;
|
||||||
pub mod help;
|
pub mod help;
|
||||||
|
pub mod ip;
|
||||||
|
pub mod metar;
|
||||||
|
pub mod owoify;
|
||||||
|
pub mod ping;
|
||||||
pub mod posix;
|
pub mod posix;
|
||||||
|
pub mod qr;
|
||||||
|
pub mod register;
|
||||||
|
pub mod taf;
|
||||||
|
pub mod uptime;
|
||||||
|
pub mod verse;
|
||||||
|
pub mod weather;
|
||||||
|
|
||||||
pub use ping::ping;
|
pub use ai::ai;
|
||||||
pub use register::register;
|
pub use dice::dice;
|
||||||
|
pub use dictionary::dictionary;
|
||||||
pub use help::help;
|
pub use help::help;
|
||||||
|
pub use ip::ip;
|
||||||
|
pub use metar::metar;
|
||||||
|
pub use owoify::owoify;
|
||||||
|
pub use ping::ping;
|
||||||
pub use posix::posix;
|
pub use posix::posix;
|
||||||
|
pub use qr::qr;
|
||||||
|
pub use register::register;
|
||||||
|
pub use taf::taf;
|
||||||
|
pub use uptime::uptime;
|
||||||
|
pub use verse::verse;
|
||||||
|
pub use weather::weather;
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
use rand::Rng;
|
||||||
|
|
||||||
|
use std::thread::sleep;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
|
/// Asks AI
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
|
pub async fn ai(
|
||||||
|
ctx: Context<'_>,
|
||||||
|
#[description = "prompt to ask"]
|
||||||
|
#[rest]
|
||||||
|
prompt: String,
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
let iamsorry = vec![
|
||||||
|
"I'm sorry, but as an AI language model, I must follow ethical guidelines, and I cannot engage in harmful, malicious, or offensive behavior.",
|
||||||
|
"I'm sorry, but as an AI language model, I may not always be perfect and can make mistakes or provide inaccurate information. Please verify important details from reliable sources.",
|
||||||
|
"I'm sorry, but as an AI language model, I can't engage in real-time conversations or remember previous interactions with users.",
|
||||||
|
"I'm sorry, but as an AI language model, I don't have personal opinions or feelings; I can only provide information based on patterns in the data I was trained on.",
|
||||||
|
"I'm sorry, but as an AI language model, I don't have access to real-time information or updates beyond my last training data in September 2021.",
|
||||||
|
"I'm sorry, but as an AI language model, I don't have the ability to recall specific personal data or information about individuals.",
|
||||||
|
"I'm sorry, but as an AI language model, I don't have consciousness or self-awareness. I'm simply a program designed to process and generate human-like text."
|
||||||
|
];
|
||||||
|
|
||||||
|
println!("Funny prompts: {}", prompt);
|
||||||
|
|
||||||
|
let response;
|
||||||
|
|
||||||
|
let _ = {
|
||||||
|
let mut rng = rand::thread_rng();
|
||||||
|
|
||||||
|
response = rng.gen_range(0..iamsorry.len());
|
||||||
|
};
|
||||||
|
|
||||||
|
sleep(Duration::from_secs(3));
|
||||||
|
|
||||||
|
ctx.send(
|
||||||
|
CreateReply::default().embed(
|
||||||
|
embed(ctx, "AI Response:", "", &format!("{}", iamsorry[response]))
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
use rand::Rng;
|
||||||
|
|
||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
|
/// Rolls a dice
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
|
pub async fn dice(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
let dice;
|
||||||
|
|
||||||
|
let _ = {
|
||||||
|
let mut rng = rand::thread_rng();
|
||||||
|
|
||||||
|
dice = rng.gen_range(1..7);
|
||||||
|
};
|
||||||
|
|
||||||
|
ctx.send(
|
||||||
|
CreateReply::default().embed(
|
||||||
|
embed(
|
||||||
|
ctx,
|
||||||
|
"Let's roll the dice!",
|
||||||
|
"",
|
||||||
|
&format!("Your number is: {}", dice),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
|
/// Explains provided query
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
|
pub async fn dictionary(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
|
/// Shows IP information
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
|
pub async fn ip(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
|
/// Prints metar for provided airport
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
|
pub async fn metar(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
|
/// Owoifies whatever you want uwu
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
|
pub async fn owoify(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,17 +2,12 @@ use crate::{Context, Error};
|
|||||||
use std::time::SystemTime;
|
use std::time::SystemTime;
|
||||||
|
|
||||||
/// Pings you backs with a response time
|
/// Pings you backs with a response time
|
||||||
#[poise::command(
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
prefix_command,
|
pub async fn ping(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
slash_command,
|
|
||||||
category = "Tools"
|
|
||||||
)]
|
|
||||||
pub async fn ping(
|
|
||||||
ctx: Context<'_>
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let system_now = SystemTime::now()
|
let system_now = SystemTime::now()
|
||||||
.duration_since(SystemTime::UNIX_EPOCH)
|
.duration_since(SystemTime::UNIX_EPOCH)
|
||||||
.unwrap().as_millis() as i64;
|
.unwrap()
|
||||||
|
.as_millis() as i64;
|
||||||
|
|
||||||
let message_now = ctx.created_at().timestamp_millis();
|
let message_now = ctx.created_at().timestamp_millis();
|
||||||
|
|
||||||
|
|||||||
@@ -5,19 +5,26 @@ use poise::CreateReply;
|
|||||||
use crate::{commands::embeds::embed, Context, Error};
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
/// Prints current time in POSIX format
|
/// Prints current time in POSIX format
|
||||||
#[poise::command(
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
prefix_command,
|
pub async fn posix(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
slash_command,
|
let time = SystemTime::now()
|
||||||
category = "Tools"
|
.duration_since(SystemTime::UNIX_EPOCH)
|
||||||
)]
|
.unwrap()
|
||||||
pub async fn posix(
|
.as_millis();
|
||||||
ctx: Context<'_>
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let time = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap().as_millis();
|
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(embed(ctx, "The time is", &format!("{} ms", time), "since Jan 1st 1970").await.unwrap())
|
CreateReply::default().embed(
|
||||||
).await?;
|
embed(
|
||||||
|
ctx,
|
||||||
|
"The time is",
|
||||||
|
"since Jan 1st 1970",
|
||||||
|
&format!("{} ms", time),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
|
/// Creates a qr code from text
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
|
pub async fn qr(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
use crate::{Context, Error};
|
use crate::{Context, Error};
|
||||||
|
|
||||||
#[poise::command(
|
#[poise::command(prefix_command, hide_in_help, owners_only)]
|
||||||
prefix_command,
|
pub async fn register(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
hide_in_help,
|
|
||||||
owners_only
|
|
||||||
)]
|
|
||||||
pub async fn register(
|
|
||||||
ctx: Context<'_>
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
poise::builtins::register_application_commands_buttons(ctx).await?;
|
poise::builtins::register_application_commands_buttons(ctx).await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
|
/// Returns taf for provided airport
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
|
pub async fn taf(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
|
/// Checks how long the bot has been running
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
|
pub async fn uptime(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
|
/// Reference Bible by verse
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
|
pub async fn verse(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
|
/// Shows weather for provided location
|
||||||
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
|
pub async fn weather(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
use reqwest::Client as HttpClient;
|
|
||||||
use poise::serenity_prelude::prelude::TypeMapKey;
|
use poise::serenity_prelude::prelude::TypeMapKey;
|
||||||
|
use reqwest::Client as HttpClient;
|
||||||
|
|
||||||
pub struct HttpKey;
|
pub struct HttpKey;
|
||||||
|
|
||||||
|
|||||||
45
src/main.rs
45
src/main.rs
@@ -1,9 +1,9 @@
|
|||||||
|
use poise::serenity_prelude::{self as serenity, ActivityData};
|
||||||
|
use reqwest::Client as HttpClient;
|
||||||
|
use songbird::SerenityInit;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use tracing::{info, warn, error};
|
use tracing::{error, info, warn};
|
||||||
use poise::serenity_prelude::{self as serenity, ActivityData};
|
|
||||||
use songbird::SerenityInit;
|
|
||||||
use reqwest::Client as HttpClient;
|
|
||||||
|
|
||||||
mod commands;
|
mod commands;
|
||||||
mod http;
|
mod http;
|
||||||
@@ -37,7 +37,8 @@ async fn main() {
|
|||||||
tracing_subscriber::fmt::init();
|
tracing_subscriber::fmt::init();
|
||||||
dotenv::dotenv().expect("Failed to load .env file.");
|
dotenv::dotenv().expect("Failed to load .env file.");
|
||||||
|
|
||||||
let token = std::env::var("DISCORD_TOKEN").expect("Environment variable `DISCORD_TOKEN` not found!");
|
let token =
|
||||||
|
std::env::var("DISCORD_TOKEN").expect("Environment variable `DISCORD_TOKEN` not found!");
|
||||||
let prefix = std::env::var("PREFIX").expect("Environment variable `PREFIX` not found!");
|
let prefix = std::env::var("PREFIX").expect("Environment variable `PREFIX` not found!");
|
||||||
|
|
||||||
let commands = vec![
|
let commands = vec![
|
||||||
@@ -45,18 +46,33 @@ async fn main() {
|
|||||||
music::deafen(),
|
music::deafen(),
|
||||||
music::join(),
|
music::join(),
|
||||||
music::leave(),
|
music::leave(),
|
||||||
music::repeat(),
|
|
||||||
music::mute(),
|
music::mute(),
|
||||||
music::pause(),
|
music::pause(),
|
||||||
music::play(),
|
music::play(),
|
||||||
music::queue(),
|
music::queue(),
|
||||||
|
music::repeat(),
|
||||||
music::resume(),
|
music::resume(),
|
||||||
|
music::seek(),
|
||||||
|
music::shuffle(),
|
||||||
music::skip(),
|
music::skip(),
|
||||||
|
music::soundboard(),
|
||||||
music::stop(),
|
music::stop(),
|
||||||
tools::ping(),
|
music::volume(),
|
||||||
tools::register(),
|
tools::ai(),
|
||||||
|
tools::dice(),
|
||||||
|
tools::dictionary(),
|
||||||
tools::help(),
|
tools::help(),
|
||||||
|
tools::ip(),
|
||||||
|
tools::metar(),
|
||||||
|
tools::owoify(),
|
||||||
|
tools::ping(),
|
||||||
tools::posix(),
|
tools::posix(),
|
||||||
|
tools::qr(),
|
||||||
|
tools::register(),
|
||||||
|
tools::taf(),
|
||||||
|
tools::uptime(),
|
||||||
|
tools::verse(),
|
||||||
|
tools::weather(),
|
||||||
];
|
];
|
||||||
|
|
||||||
let options = poise::FrameworkOptions {
|
let options = poise::FrameworkOptions {
|
||||||
@@ -96,7 +112,10 @@ async fn main() {
|
|||||||
skip_checks_for_owners: false,
|
skip_checks_for_owners: false,
|
||||||
event_handler: |_ctx, event, _framework, _data| {
|
event_handler: |_ctx, event, _framework, _data| {
|
||||||
Box::pin(async move {
|
Box::pin(async move {
|
||||||
info!("Got an event in event handler: {:?}", event.snake_case_name());
|
info!(
|
||||||
|
"Got an event in event handler: {:?}",
|
||||||
|
event.snake_case_name()
|
||||||
|
);
|
||||||
Ok(())
|
Ok(())
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -106,7 +125,10 @@ async fn main() {
|
|||||||
let framework = poise::Framework::builder()
|
let framework = poise::Framework::builder()
|
||||||
.setup(move |ctx, ready, _framework| {
|
.setup(move |ctx, ready, _framework| {
|
||||||
Box::pin(async move {
|
Box::pin(async move {
|
||||||
info!("{} [{}] connected successfully!", ready.user.name, ready.user.id);
|
info!(
|
||||||
|
"{} [{}] connected successfully!",
|
||||||
|
ready.user.name, ready.user.id
|
||||||
|
);
|
||||||
ctx.set_activity(Some(ActivityData::listening(prefix + "help")));
|
ctx.set_activity(Some(ActivityData::listening(prefix + "help")));
|
||||||
// poise::builtins::register_globally(ctx, &framework.options().commands).await?;
|
// poise::builtins::register_globally(ctx, &framework.options().commands).await?;
|
||||||
|
|
||||||
@@ -116,7 +138,8 @@ async fn main() {
|
|||||||
.options(options)
|
.options(options)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
let intents = serenity::GatewayIntents::non_privileged() | serenity::GatewayIntents::MESSAGE_CONTENT;
|
let intents =
|
||||||
|
serenity::GatewayIntents::non_privileged() | serenity::GatewayIntents::MESSAGE_CONTENT;
|
||||||
|
|
||||||
let mut client = serenity::ClientBuilder::new(token, intents)
|
let mut client = serenity::ClientBuilder::new(token, intents)
|
||||||
.framework(framework)
|
.framework(framework)
|
||||||
|
|||||||
Reference in New Issue
Block a user