mirror of
https://github.com/eRgo35/lyra.git
synced 2026-02-04 20:36:10 +01:00
0.5.1 refractor
This commit is contained in:
@@ -1,23 +1,19 @@
|
||||
use std::time::Duration;
|
||||
|
||||
use crate::{commands::embeds::error_embed, Context, Error};
|
||||
use crate::commands::music::metadata::Metadata;
|
||||
use poise::CreateReply;
|
||||
use serenity::{builder::{CreateEmbedAuthor, CreateEmbedFooter}, model::{Colour, Timestamp}};
|
||||
use crate::{commands::embeds::error_embed, Context, Error};
|
||||
use poise::serenity_prelude::CreateEmbed;
|
||||
use poise::CreateReply;
|
||||
use serenity::{
|
||||
builder::{CreateEmbedAuthor, CreateEmbedFooter},
|
||||
model::{Colour, Timestamp},
|
||||
};
|
||||
use songbird::input::AuxMetadata;
|
||||
|
||||
/// Shows next tracks in queue; \
|
||||
/// aliases: queue, q
|
||||
#[poise::command(
|
||||
prefix_command,
|
||||
slash_command,
|
||||
aliases("q"),
|
||||
category = "Music"
|
||||
)]
|
||||
pub async fn queue(
|
||||
ctx: Context<'_>
|
||||
) -> Result<(), Error> {
|
||||
#[poise::command(prefix_command, slash_command, aliases("q"), category = "Music")]
|
||||
pub async fn queue(ctx: Context<'_>) -> Result<(), Error> {
|
||||
let guild_id = ctx.guild_id().unwrap();
|
||||
|
||||
let manager = songbird::get(&ctx.serenity_context())
|
||||
@@ -33,12 +29,17 @@ pub async fn queue(
|
||||
for (index, song) in queue.current_queue().iter().enumerate() {
|
||||
let meta_typemap = song.typemap().read().await;
|
||||
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_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
|
||||
|
||||
// println!("{:?}", metadata.clone());
|
||||
// println!("{:?}", metadata.clone());
|
||||
|
||||
queue_res.push_str(&format!(
|
||||
"{}. {} - {} [{:02}:{:02}] \n",
|
||||
@@ -50,31 +51,31 @@ pub async fn queue(
|
||||
));
|
||||
}
|
||||
|
||||
ctx.send(
|
||||
CreateReply::default().embed(embed(ctx, queue_res).await.unwrap())
|
||||
).await?;
|
||||
ctx.send(CreateReply::default().embed(embed(ctx, queue_res).await.unwrap()))
|
||||
.await?;
|
||||
} else {
|
||||
let msg = "I am not in a voice channel!";
|
||||
ctx.send(
|
||||
CreateReply::default().embed(error_embed(ctx, msg).await.unwrap())
|
||||
).await?;
|
||||
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||
.await?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn embed(ctx: Context<'_>, queue: String) -> Result<CreateEmbed, Error> {
|
||||
|
||||
let title = "Now playing";
|
||||
let timestamp = Timestamp::now();
|
||||
|
||||
|
||||
let embed = CreateEmbed::default()
|
||||
.author(CreateEmbedAuthor::new("Queue").icon_url(ctx.author().clone().face()))
|
||||
.colour(Colour::from_rgb(255, 58, 97))
|
||||
.title(title)
|
||||
.description(queue)
|
||||
.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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user