DiscordBots/Rustendo
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'Fixing a problem with the return type of interaction_create' (#1) from migueldamota/Rustendo:fix/add-missing-await into master

Browse source 
Reviewed-on: #1
This commit is contained in:
moonleay 2024-02-23 19:30:09 +01:00
commit a1a78d6598
1 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/main.rs
View file

@ -1,12 +1,14 @@
mod commands;
mod util;
mod handler;
mod util;
use std::thread::current;
use chrono::Local;
use serenity::all::{CommandInteraction, OnlineStatus};
use serenity::async_trait;
use serenity::builder::{CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, CreateInteractionResponse, CreateInteractionResponseMessage};
use serenity::builder::{
CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, CreateInteractionResponse,
CreateInteractionResponseMessage,
};
use serenity::gateway::ActivityData;
use serenity::model::application::{Command, Interaction};
use serenity::model::gateway::Ready;
@ -18,18 +20,9 @@ use util::config;
// The voice client can be retrieved in any command using `songbird::get(ctx).await`.
use songbird::SerenityInit;
// Event related imports to detect track creation failures.
use songbird::events::{Event, EventContext, EventHandler as VoiceEventHandler, TrackEvent};
// To turn user URLs into playable audio, we'll use yt-dlp.
use songbird::input::YoutubeDl;
// YtDl requests need an HTTP client to operate -- we'll create and store our own.
use reqwest::Client as HttpClient;
// Import the `Context` to handle commands.
use serenity::client::Context;
struct HttpKey;
impl TypeMapKey for HttpKey {
type Value = HttpClient;
@ -41,12 +34,12 @@ struct Handler;
impl EventHandler for Handler {
async fn interaction_create(&self, ctx: Context, interaction: Interaction) {
if let Interaction::Command(command) = interaction {
let content = match command.data.name.as_str() {
"info" => Some(commands::info::run(&ctx, &command)),
"play" => Some(commands::play::run(&ctx, &command)),
"stop" => Some(commands::stop::run(&ctx, &command)),
_ => Some(respond_with_error(&ctx, &command)),
};
let content = Some(match command.data.name.as_str() {
"info" => commands::info::run(&ctx, &command).await,
"play" => commands::play::run(&ctx, &command).await,
"stop" => commands::stop::run(&ctx, &command).await,
_ => respond_with_error(&ctx, &command).await,
});
if let Some(embed) = content {
let data = CreateInteractionResponseMessage::new().embed(embed);
@ -77,19 +70,23 @@ pub async fn respond_with_error(_ctx: &Context, command: &CommandInteraction) ->
.author(CreateEmbedAuthor::new("Rustendo"))
.title("Command not found")
.description("Cannot find the executed command")
.footer(CreateEmbedFooter::new(format!("> {} | {}", current_time, username)))
.footer(CreateEmbedFooter::new(format!(
"> {} | {}",
current_time, username
)))
}
#[tokio::main]
async fn main() {
println!(r"__________ __ .___
println!(
r"__________ __ .___
\______ \__ __ _______/ |_ ____ ____ __| _/____
| _/ | | ___/\ __\_/ __ \ / \ / __ |/ _ \
| | \ | |___ \ | | \ ___/ | | | /_/ ( <_> )
|____|_ /____/____ > |__| \___ >|___| |____ |\____/
\/ \/ \/ \/ \/
");
"
);
// Load config
let config = config::load().unwrap();
@ -111,9 +108,7 @@ async fn main() {
//
// Shards will automatically attempt to reconnect, and will perform exponential backoff until
// it reconnects.
if let Err(why) = client
.start()
.await {
if let Err(why) = client.start().await {
println!("Client error: {why:?}");
}
}