Compare commits
25 Commits
1ca7d5204d
...
database
| Author | SHA1 | Date | |
|---|---|---|---|
|
7edd14c628
|
|||
|
3242f23f84
|
|||
|
8985945659
|
|||
|
4a69e0f578
|
|||
|
cad6cf22fa
|
|||
|
9f0e934f92
|
|||
|
92be6c26a6
|
|||
|
c5d9c49452
|
|||
|
dbaf1a1374
|
|||
|
c0d9f6cad5
|
|||
|
1aa0efc4a6
|
|||
|
ab7f56fe05
|
|||
| feccbebd4d | |||
| d6a54dfc06 | |||
|
fa17ed75f6
|
|||
| b19f6e552c | |||
|
0bee437e53
|
|||
|
3781785a50
|
|||
| cabae9ea19 | |||
|
54c36688b7
|
|||
|
55fe212424
|
|||
| 2c91c744dc | |||
|
a0ac87959b
|
|||
| b4a1efb22a | |||
|
e831ede37c
|
@@ -12,3 +12,6 @@ README.md
|
||||
# Cargo files
|
||||
**/*.rs.bk
|
||||
/target/
|
||||
|
||||
# Database files
|
||||
data
|
||||
|
||||
@@ -2,7 +2,9 @@ name: tests
|
||||
|
||||
on:
|
||||
push:
|
||||
pull_request:
|
||||
|
||||
paths-ignore:
|
||||
- 'README.md'
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
@@ -36,6 +38,11 @@ jobs:
|
||||
- uses: actions/checkout@v4
|
||||
- run: sudo apt-get update
|
||||
- run: sudo apt-get install -y cmake
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3.12'
|
||||
- name: Install yt-dlp
|
||||
run: pip install yt-dlp
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
- name: Run tests
|
||||
run: cargo test --verbose --all-features
|
||||
|
||||
@@ -5,6 +5,9 @@ on:
|
||||
branches:
|
||||
- main
|
||||
|
||||
paths-ignore:
|
||||
- 'README.md'
|
||||
|
||||
jobs:
|
||||
release-image:
|
||||
runs-on: ubuntu-latest
|
||||
@@ -26,6 +29,5 @@ jobs:
|
||||
with:
|
||||
platforms: |
|
||||
linux/amd64
|
||||
linux/arm64
|
||||
push: true
|
||||
tags: jheuel/ohrwurm:latest
|
||||
|
||||
5
.github/workflows/ci.yml
vendored
5
.github/workflows/ci.yml
vendored
@@ -37,6 +37,11 @@ jobs:
|
||||
- uses: actions/checkout@v4
|
||||
- run: sudo apt-get update
|
||||
- run: sudo apt-get install -y cmake
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3.12'
|
||||
- name: Install yt-dlp
|
||||
run: pip install yt-dlp
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
- name: Run tests
|
||||
run: cargo test --verbose --all-features
|
||||
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,3 +1,6 @@
|
||||
/target
|
||||
.env
|
||||
.vscode
|
||||
|
||||
# Database files
|
||||
data
|
||||
|
||||
1676
Cargo.lock
generated
1676
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -9,6 +9,7 @@ license = "MIT"
|
||||
symphonia = { version = "0.5.2", features=["all"] }
|
||||
songbird = { version = "0.4.0", features = ["driver", "gateway", "twilight", "rustls", "builtin-queue"] }
|
||||
tokio = { features = ["macros", "rt-multi-thread", "signal", "sync"], version = "1" }
|
||||
sqlx = { version = "0.7", features = [ "runtime-tokio", "sqlite", "chrono", "migrate"] }
|
||||
regex = { version = "1", features = ["unicode-case"] }
|
||||
futures = "0.3"
|
||||
reqwest = "0.11"
|
||||
@@ -21,5 +22,11 @@ twilight-standby = "0.15"
|
||||
twilight-cache-inmemory = "0.15"
|
||||
twilight-util = { version = "0.15", features=["builder"] }
|
||||
dotenv = "0.15.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
url = "2.5.0"
|
||||
url = "2.5.1"
|
||||
anyhow = "1.0.86"
|
||||
dashmap = "5.5.3"
|
||||
async-trait = "0.1.80"
|
||||
uuid = "1.8.0"
|
||||
chrono = "0.4.38"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
Ohrwurm is a user-friendly bot designed to play music in Discord voice chats. Once added to your server, you can request a song using the command `/play {query}`, where query can be a URL to a YouTube video or playlist, or a simple search term. The bot will fetch the song and start playing it. You can pause the music with `/pause`, resume playback with `/resume`, and stop and clear the queue with `/stop`. If the bot is alone in a voice chat, it will automatically leave, but you can also manually make it leave with the `/leave` command.
|
||||
|
||||
# Deployment
|
||||
To deploy Ohrwurm with Docker, you can use the [provided Docker](https://hub.docker.com/r/jheuel/ohrwurm) image:
|
||||
To deploy Ohrwurm with Docker, you can use the [provided Docker image](https://hub.docker.com/r/jheuel/ohrwurm):
|
||||
```bash
|
||||
docker run -d \
|
||||
--name ohrwurm \
|
||||
|
||||
3
build.rs
Normal file
3
build.rs
Normal file
@@ -0,0 +1,3 @@
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-changed=migrations");
|
||||
}
|
||||
33
migrations/20240620151940_init.sql
Normal file
33
migrations/20240620151940_init.sql
Normal file
@@ -0,0 +1,33 @@
|
||||
CREATE TABLE IF NOT EXISTS tracks
|
||||
(
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
url TEXT NOT NULL UNIQUE,
|
||||
title TEXT NOT NULL,
|
||||
channel TEXT NOT NULL,
|
||||
duration TEXT NOT NULL,
|
||||
thumbnail TEXT NOT NULL,
|
||||
updated DATETIME NOT NULL
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS queries
|
||||
(
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
user_id TEXT NOT NULL,
|
||||
guild_id TEXT NOT NULL,
|
||||
track_id NUMBER NOT NULL,
|
||||
updated DATETIME NOT NULL
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS users
|
||||
(
|
||||
id TEXT PRIMARY KEY,
|
||||
name TEXT NOT NULL,
|
||||
global_name TEXT,
|
||||
updated DATETIME NOT NULL
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS guilds
|
||||
(
|
||||
id TEXT PRIMARY KEY,
|
||||
updated DATETIME NOT NULL
|
||||
);
|
||||
5
migrations/20240627193022_save_tracks.sql
Normal file
5
migrations/20240627193022_save_tracks.sql
Normal file
@@ -0,0 +1,5 @@
|
||||
CREATE TABLE IF NOT EXISTS blobs
|
||||
(
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
data BLOB
|
||||
);
|
||||
20
src/colors.rs
Normal file
20
src/colors.rs
Normal file
@@ -0,0 +1,20 @@
|
||||
#[allow(dead_code)]
|
||||
pub(crate) const BLURPLE: u32 = 0x58_65_F2;
|
||||
#[allow(dead_code)]
|
||||
pub(crate) const YELLOW: u32 = 0xFE_E7_5C;
|
||||
#[allow(dead_code)]
|
||||
pub(crate) const WHITE: u32 = 0xFF_FF_FF;
|
||||
#[allow(dead_code)]
|
||||
pub(crate) const GREYPLE: u32 = 0x99_AA_B5;
|
||||
#[allow(dead_code)]
|
||||
pub(crate) const BLACK: u32 = 0x23_27_2A;
|
||||
#[allow(dead_code)]
|
||||
pub(crate) const DARK_BUT_NOT_BLACK: u32 = 0x2C_2F_33;
|
||||
#[allow(dead_code)]
|
||||
pub(crate) const NOT_QUITE_BLACK: u32 = 0x23_27_2A;
|
||||
#[allow(dead_code)]
|
||||
pub(crate) const GREEN: u32 = 0x57_F2_87;
|
||||
#[allow(dead_code)]
|
||||
pub(crate) const FUCHSIA: u32 = 0xEB_45_9E;
|
||||
#[allow(dead_code)]
|
||||
pub(crate) const RED: u32 = 0xED_42_45;
|
||||
@@ -9,14 +9,14 @@ pub(crate) async fn delete(
|
||||
state: State,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
let admin = env::var("ADMIN")?.parse::<u64>()?;
|
||||
if msg.author.id != Id::from(NonZeroU64::new(admin).unwrap()) {
|
||||
if msg.author.id != Id::from(NonZeroU64::new(admin).expect("Could not get author id")) {
|
||||
return Ok(());
|
||||
}
|
||||
let n = msg
|
||||
.content
|
||||
.split(' ')
|
||||
.last()
|
||||
.unwrap()
|
||||
.unwrap_or("1")
|
||||
.parse::<u16>()
|
||||
.unwrap_or(1);
|
||||
if n > 100 {
|
||||
|
||||
@@ -2,8 +2,8 @@ use crate::state::State;
|
||||
use std::error::Error;
|
||||
use tracing::debug;
|
||||
use twilight_model::{
|
||||
application::interaction::Interaction,
|
||||
channel::message::MessageFlags,
|
||||
gateway::payload::incoming::InteractionCreate,
|
||||
http::interaction::{InteractionResponse, InteractionResponseType},
|
||||
id::{
|
||||
marker::{GuildMarker, UserMarker},
|
||||
@@ -38,11 +38,14 @@ pub(crate) async fn join_channel(
|
||||
call.deafen(true).await?;
|
||||
}
|
||||
|
||||
// create guild config
|
||||
state.guild_settings.entry(guild_id).or_default();
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) async fn join(
|
||||
interaction: Interaction,
|
||||
interaction: Box<InteractionCreate>,
|
||||
state: State,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
debug!(
|
||||
|
||||
@@ -1,9 +1,59 @@
|
||||
use crate::state::State;
|
||||
use std::error::Error;
|
||||
use twilight_model::application::interaction::Interaction;
|
||||
use crate::state::{State, StateRef};
|
||||
use anyhow::Context;
|
||||
use std::{error::Error, sync::Arc};
|
||||
use twilight_model::{
|
||||
gateway::payload::incoming::InteractionCreate,
|
||||
id::{marker::GuildMarker, Id},
|
||||
};
|
||||
|
||||
pub(crate) async fn leave_if_alone(
|
||||
guild_id: Id<GuildMarker>,
|
||||
state: State,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
let user = state
|
||||
.cache
|
||||
.current_user()
|
||||
.context("Cannot get current user")?;
|
||||
let user_voice_state = state
|
||||
.cache
|
||||
.voice_state(user.id, guild_id)
|
||||
.context("Cannot get voice state")?;
|
||||
let channel = state
|
||||
.cache
|
||||
.channel(user_voice_state.channel_id())
|
||||
.context("Cannot get channel")?;
|
||||
let channel_voice_states = state
|
||||
.cache
|
||||
.voice_channel_states(channel.id)
|
||||
.context("Cannot get voice channel")?;
|
||||
let count = channel_voice_states.count();
|
||||
|
||||
// count is 1 if the bot is the only one in the channel
|
||||
if count == 1 {
|
||||
leave_channel(guild_id, Arc::clone(&state)).await?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) async fn leave_channel(
|
||||
guild_id: Id<GuildMarker>,
|
||||
state: Arc<StateRef>,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
// stop playing
|
||||
if let Some(call_lock) = state.songbird.get(guild_id) {
|
||||
let call = call_lock.lock().await;
|
||||
call.queue().stop();
|
||||
}
|
||||
// leave the voice channel
|
||||
state.songbird.leave(guild_id).await?;
|
||||
|
||||
// reset guild settings
|
||||
state.guild_settings.remove(&guild_id);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) async fn leave(
|
||||
interaction: Interaction,
|
||||
interaction: Box<InteractionCreate>,
|
||||
state: State,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
tracing::debug!(
|
||||
@@ -16,6 +66,8 @@ pub(crate) async fn leave(
|
||||
let Some(guild_id) = interaction.guild_id else {
|
||||
return Ok(());
|
||||
};
|
||||
state.songbird.leave(guild_id).await?;
|
||||
|
||||
leave_channel(guild_id, Arc::clone(&state)).await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
123
src/commands/loop_queue.rs
Normal file
123
src/commands/loop_queue.rs
Normal file
@@ -0,0 +1,123 @@
|
||||
use crate::metadata::MetadataMap;
|
||||
use crate::state::{State, StateRef};
|
||||
use async_trait::async_trait;
|
||||
use songbird::{Event, EventContext, EventHandler, TrackEvent};
|
||||
use std::ops::Sub;
|
||||
use std::time::Duration;
|
||||
use std::{error::Error, sync::Arc};
|
||||
use twilight_model::{
|
||||
gateway::payload::incoming::InteractionCreate,
|
||||
http::interaction::{InteractionResponse, InteractionResponseType},
|
||||
id::{marker::GuildMarker, Id},
|
||||
};
|
||||
use twilight_util::builder::InteractionResponseDataBuilder;
|
||||
|
||||
pub(crate) async fn loop_queue(
|
||||
interaction: Box<InteractionCreate>,
|
||||
state: State,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
tracing::debug!(
|
||||
"loop command in guild {:?} in channel {:?} by {:?}",
|
||||
interaction.guild_id,
|
||||
interaction.channel,
|
||||
interaction.author(),
|
||||
);
|
||||
|
||||
let guild_id: Id<GuildMarker> = if let Some(guild_id) = interaction.guild_id {
|
||||
guild_id
|
||||
} else {
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
state.guild_settings.entry(guild_id).and_modify(|settings| {
|
||||
settings.loop_queue = !settings.loop_queue;
|
||||
});
|
||||
|
||||
let looping = state
|
||||
.guild_settings
|
||||
.get(&guild_id)
|
||||
.expect("Cannot get loop state")
|
||||
.loop_queue;
|
||||
|
||||
if let Some(call_lock) = state.songbird.get(guild_id) {
|
||||
let mut call = call_lock.lock().await;
|
||||
call.add_global_event(
|
||||
Event::Track(TrackEvent::End),
|
||||
TrackEndNotifier {
|
||||
guild_id,
|
||||
state: Arc::clone(&state),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
let message = if looping {
|
||||
"I'm now looping the current queue!".to_string()
|
||||
} else {
|
||||
"I'm not looping anymore!".to_string()
|
||||
};
|
||||
|
||||
let interaction_response_data = InteractionResponseDataBuilder::new()
|
||||
.content(message)
|
||||
.build();
|
||||
|
||||
let response = InteractionResponse {
|
||||
kind: InteractionResponseType::ChannelMessageWithSource,
|
||||
data: Some(interaction_response_data),
|
||||
};
|
||||
|
||||
state
|
||||
.http
|
||||
.interaction(interaction.application_id)
|
||||
.create_response(interaction.id, &interaction.token, &response)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
struct TrackEndNotifier {
|
||||
guild_id: Id<GuildMarker>,
|
||||
state: Arc<StateRef>,
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl EventHandler for TrackEndNotifier {
|
||||
async fn act(&self, ctx: &EventContext<'_>) -> Option<Event> {
|
||||
if !self
|
||||
.state
|
||||
.guild_settings
|
||||
.get(&self.guild_id)
|
||||
.unwrap()
|
||||
.loop_queue
|
||||
{
|
||||
return None;
|
||||
}
|
||||
let EventContext::Track(track_list) = ctx else {
|
||||
return None;
|
||||
};
|
||||
let (_, track_handle) = track_list.first()?;
|
||||
if let Some(call_lock) = self.state.songbird.get(self.guild_id) {
|
||||
let mut call = call_lock.lock().await;
|
||||
|
||||
// get metadata from finished track
|
||||
let old_typemap_lock = track_handle.typemap().read().await;
|
||||
let old_metadata = old_typemap_lock.get::<MetadataMap>().unwrap();
|
||||
|
||||
// enqueue track
|
||||
let handle = call.enqueue_with_preload(
|
||||
old_metadata.src.clone().into(),
|
||||
old_metadata.duration.map(|duration| -> Duration {
|
||||
if duration.as_secs() > 5 {
|
||||
duration.sub(Duration::from_secs(5))
|
||||
} else {
|
||||
duration
|
||||
}
|
||||
}),
|
||||
);
|
||||
|
||||
// insert metadata into new track
|
||||
let mut new_typemap = handle.typemap().write().await;
|
||||
new_typemap.insert::<MetadataMap>(old_metadata.clone());
|
||||
}
|
||||
None
|
||||
}
|
||||
}
|
||||
@@ -3,14 +3,21 @@ pub(crate) use join::join;
|
||||
|
||||
mod leave;
|
||||
pub(crate) use leave::leave;
|
||||
pub(crate) use leave::leave_if_alone;
|
||||
|
||||
mod pause;
|
||||
pub(crate) use pause::pause;
|
||||
|
||||
mod skip;
|
||||
pub(crate) use skip::skip;
|
||||
|
||||
mod loop_queue;
|
||||
pub(crate) use loop_queue::loop_queue;
|
||||
|
||||
mod play;
|
||||
pub(crate) use play::play;
|
||||
|
||||
mod queue;
|
||||
pub(crate) mod queue;
|
||||
pub(crate) use queue::queue;
|
||||
|
||||
mod resume;
|
||||
@@ -29,12 +36,14 @@ pub(crate) fn get_chat_commands() -> Vec<twilight_model::application::command::C
|
||||
vec![
|
||||
CommandBuilder::new("join", "Join the channel", CommandType::ChatInput).build(),
|
||||
CommandBuilder::new("leave", "Leave the channel", CommandType::ChatInput).build(),
|
||||
CommandBuilder::new("loop", "Loop queue", CommandType::ChatInput).build(),
|
||||
CommandBuilder::new("skip", "Skip track", CommandType::ChatInput).build(),
|
||||
CommandBuilder::new("queue", "Print track queue", CommandType::ChatInput).build(),
|
||||
CommandBuilder::new("stop", "Stop playing", CommandType::ChatInput).build(),
|
||||
CommandBuilder::new("pause", "Pause playing", CommandType::ChatInput).build(),
|
||||
CommandBuilder::new("resume", "Resume playing", CommandType::ChatInput).build(),
|
||||
CommandBuilder::new("play", "Add a song to the queue", CommandType::ChatInput)
|
||||
.option(StringBuilder::new("query", "URL of a song").required(true))
|
||||
.build(),
|
||||
CommandBuilder::new("queue", "Print track queue", CommandType::ChatInput).build(),
|
||||
CommandBuilder::new("resume", "Resume playing", CommandType::ChatInput).build(),
|
||||
CommandBuilder::new("stop", "Stop playing", CommandType::ChatInput).build(),
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
use crate::state::State;
|
||||
use std::error::Error;
|
||||
use twilight_model::{
|
||||
application::interaction::Interaction,
|
||||
channel::message::MessageFlags,
|
||||
gateway::payload::incoming::InteractionCreate,
|
||||
http::interaction::{InteractionResponse, InteractionResponseType},
|
||||
};
|
||||
use twilight_util::builder::InteractionResponseDataBuilder;
|
||||
|
||||
pub(crate) async fn pause(
|
||||
interaction: Interaction,
|
||||
interaction: Box<InteractionCreate>,
|
||||
state: State,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
tracing::debug!(
|
||||
|
||||
@@ -1,19 +1,78 @@
|
||||
use crate::commands::join::join_channel;
|
||||
use crate::db::track::{insert_blob, Blob};
|
||||
use crate::metadata::{Metadata, MetadataMap};
|
||||
use crate::state::State;
|
||||
use serde_json::Value;
|
||||
use crate::state::{State, StateRef};
|
||||
use crate::{colors, db};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use songbird::input::cached::Memory;
|
||||
use songbird::input::{Compose, YoutubeDl};
|
||||
use std::io::{BufRead, BufReader};
|
||||
use std::{error::Error, ops::Sub, time::Duration};
|
||||
use songbird::tracks::Track;
|
||||
use songbird::{Event, EventContext, EventHandler, TrackEvent};
|
||||
use std::io::{BufRead, BufReader, Read};
|
||||
use std::ops::Sub;
|
||||
use std::sync::Arc;
|
||||
use std::{error::Error, time::Duration};
|
||||
use tokio::process::Command;
|
||||
use tracing::debug;
|
||||
use twilight_model::application::interaction::Interaction;
|
||||
use twilight_model::channel::message::embed::{
|
||||
EmbedAuthor, EmbedField, EmbedFooter, EmbedThumbnail,
|
||||
};
|
||||
use twilight_model::channel::message::MessageFlags;
|
||||
use twilight_model::gateway::payload::incoming::InteractionCreate;
|
||||
use twilight_model::http::interaction::{InteractionResponse, InteractionResponseType};
|
||||
use twilight_util::builder::embed::EmbedBuilder;
|
||||
use twilight_util::builder::InteractionResponseDataBuilder;
|
||||
use url::Url;
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
struct YouTubeTrack {
|
||||
url: Option<String>,
|
||||
original_url: Option<String>,
|
||||
title: String,
|
||||
channel: String,
|
||||
playlist: Option<String>,
|
||||
playlist_id: Option<String>,
|
||||
duration_string: String,
|
||||
}
|
||||
|
||||
fn build_playlist_url(playlist_id: &str) -> String {
|
||||
format!("https://www.youtube.com/playlist?list={}", playlist_id)
|
||||
}
|
||||
|
||||
async fn get_tracks(
|
||||
url: String,
|
||||
) -> Result<Vec<YouTubeTrack>, Box<dyn Error + Send + Sync + 'static>> {
|
||||
let output = Command::new("yt-dlp")
|
||||
.args(vec![&url, "--flat-playlist", "-j"])
|
||||
.output()
|
||||
.await?;
|
||||
|
||||
let reader = BufReader::new(output.stdout.as_slice());
|
||||
let tracks: Vec<YouTubeTrack> = reader
|
||||
.lines()
|
||||
.map_while(Result::ok)
|
||||
.flat_map(|line| serde_json::from_str(&line))
|
||||
.collect();
|
||||
|
||||
if tracks.is_empty() {
|
||||
if let Ok(stderr) = String::from_utf8(output.stderr) {
|
||||
if stderr.contains("This video is only available to Music Premium members") {
|
||||
return Err("This video is only available to Music Premium members".into());
|
||||
}
|
||||
if stderr.contains("YouTube said: The playlist does not exist.") {
|
||||
return Err("YouTube said: The playlist does not exist.".into());
|
||||
}
|
||||
}
|
||||
return Err("No tracks found".into());
|
||||
}
|
||||
tracing::debug!("tracks: {:?}", tracks);
|
||||
Ok(tracks)
|
||||
}
|
||||
|
||||
pub(crate) async fn play(
|
||||
interaction: Interaction,
|
||||
interaction: Box<InteractionCreate>,
|
||||
state: State,
|
||||
query: String,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
@@ -23,11 +82,17 @@ pub(crate) async fn play(
|
||||
interaction.author(),
|
||||
);
|
||||
|
||||
let content = format!("Adding track(s) to the queue: {}", query);
|
||||
let embeds = vec![EmbedBuilder::new()
|
||||
.description(content)
|
||||
.color(colors::YELLOW)
|
||||
.build()];
|
||||
let interaction_response_data = InteractionResponseDataBuilder::new()
|
||||
.content(format!("Adding track(s) to queue: {}", query))
|
||||
.flags(MessageFlags::LOADING)
|
||||
.embeds(embeds)
|
||||
.build();
|
||||
let response = InteractionResponse {
|
||||
kind: InteractionResponseType::ChannelMessageWithSource,
|
||||
kind: InteractionResponseType::DeferredChannelMessageWithSource,
|
||||
data: Some(interaction_response_data),
|
||||
};
|
||||
state
|
||||
@@ -54,29 +119,129 @@ pub(crate) async fn play(
|
||||
|
||||
debug!("query: {:?}", query);
|
||||
|
||||
// handle playlist links
|
||||
let urls = if query.contains("list=") {
|
||||
get_playlist_urls(query).await?
|
||||
} else {
|
||||
vec![query]
|
||||
let tracks = match get_tracks(query).await {
|
||||
Err(e) => {
|
||||
let content = format!("{}", e);
|
||||
let embeds = vec![EmbedBuilder::new()
|
||||
.description(content)
|
||||
.color(colors::RED)
|
||||
.build()];
|
||||
state
|
||||
.http
|
||||
.interaction(interaction.application_id)
|
||||
.update_response(&interaction.token)
|
||||
.embeds(Some(&embeds))?
|
||||
.await?;
|
||||
return Ok(());
|
||||
}
|
||||
Ok(tracks) => tracks,
|
||||
};
|
||||
|
||||
if tracks.len() > 1 {
|
||||
let first_track = tracks.first().unwrap();
|
||||
let content = format!(
|
||||
"Adding playlist [{}]({})",
|
||||
first_track
|
||||
.playlist
|
||||
.clone()
|
||||
.unwrap_or("Unknown".to_string()),
|
||||
build_playlist_url(
|
||||
&first_track
|
||||
.playlist_id
|
||||
.clone()
|
||||
.unwrap_or("Unknown".to_string())
|
||||
)
|
||||
);
|
||||
let embeds = vec![EmbedBuilder::new()
|
||||
.description(content)
|
||||
.color(colors::BLURPLE)
|
||||
.build()];
|
||||
state
|
||||
.http
|
||||
.interaction(interaction.application_id)
|
||||
.update_response(&interaction.token)
|
||||
.embeds(Some(&embeds))?
|
||||
.await?;
|
||||
}
|
||||
|
||||
if let Some(call_lock) = state.songbird.get(guild_id) {
|
||||
let call = call_lock.lock().await;
|
||||
call.queue().resume()?;
|
||||
}
|
||||
|
||||
struct TrackType {
|
||||
url: String,
|
||||
title: Option<String>,
|
||||
duration_string: String,
|
||||
channel: String,
|
||||
thumbnail: Option<String>,
|
||||
}
|
||||
|
||||
let mut tracks_added = vec![];
|
||||
for url in urls {
|
||||
let mut src = YoutubeDl::new(reqwest::Client::new(), url.to_string());
|
||||
for yttrack in &tracks {
|
||||
tracing::debug!("track: {:?}", yttrack);
|
||||
let url = yttrack
|
||||
.original_url
|
||||
.clone()
|
||||
.or(yttrack.url.clone())
|
||||
.ok_or("Could not find url")?;
|
||||
|
||||
let mut src = YoutubeDl::new(reqwest::Client::new(), url.clone());
|
||||
let memory = Memory::new(src.clone().into()).await.unwrap();
|
||||
let track: Track = memory.new_handle().into();
|
||||
|
||||
if let Ok(metadata) = src.aux_metadata().await {
|
||||
debug!("metadata: {:?}", metadata);
|
||||
tracks_added.push(metadata.title.clone());
|
||||
|
||||
let (author_name, author_global_name) = if let Some(author) = interaction.author() {
|
||||
(author.name.clone(), author.global_name.clone())
|
||||
} else {
|
||||
("".to_string(), None)
|
||||
};
|
||||
|
||||
db::track::insert_guild(&state.pool, db::track::Guild::new(guild_id.to_string()))
|
||||
.await
|
||||
.expect("failed to insert guild: {e}");
|
||||
|
||||
db::track::insert_user(
|
||||
&state.pool,
|
||||
db::track::User::new(user_id.to_string(), author_name, author_global_name),
|
||||
)
|
||||
.await
|
||||
.expect("failed to insert user: {e}");
|
||||
|
||||
let track_id = db::track::insert_track(
|
||||
&state.pool,
|
||||
db::track::Track::new(
|
||||
url.clone(),
|
||||
yttrack.title.clone(),
|
||||
yttrack.channel.clone(),
|
||||
yttrack.duration_string.clone(),
|
||||
metadata.thumbnail.clone().unwrap_or_default(),
|
||||
),
|
||||
)
|
||||
.await
|
||||
.expect("failed to insert track: {e}");
|
||||
|
||||
db::track::insert_query(
|
||||
&state.pool,
|
||||
db::track::Query::new(user_id.to_string(), guild_id.to_string(), track_id),
|
||||
)
|
||||
.await
|
||||
.expect("failed to insert track: {e}");
|
||||
|
||||
tracks_added.push(TrackType {
|
||||
url: url.clone(),
|
||||
title: metadata.title.clone(),
|
||||
duration_string: yttrack.duration_string.clone(),
|
||||
channel: yttrack.channel.clone(),
|
||||
thumbnail: metadata.thumbnail.clone(),
|
||||
});
|
||||
|
||||
if let Some(call_lock) = state.songbird.get(guild_id) {
|
||||
let mut call = call_lock.lock().await;
|
||||
let handle = call.enqueue_with_preload(
|
||||
src.into(),
|
||||
track,
|
||||
metadata.duration.map(|duration| -> Duration {
|
||||
if duration.as_secs() > 5 {
|
||||
duration.sub(Duration::from_secs(5))
|
||||
@@ -89,60 +254,186 @@ pub(crate) async fn play(
|
||||
x.insert::<MetadataMap>(Metadata {
|
||||
title: metadata.title,
|
||||
duration: metadata.duration,
|
||||
url,
|
||||
src,
|
||||
});
|
||||
|
||||
handle
|
||||
.add_event(
|
||||
Event::Track(TrackEvent::Preparing),
|
||||
TrackPreparingNotifier {
|
||||
memory,
|
||||
track_id,
|
||||
state: Arc::clone(&state),
|
||||
},
|
||||
)
|
||||
.expect("could not add event");
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut content = String::new();
|
||||
let num_tracks_added = tracks_added.len();
|
||||
match num_tracks_added {
|
||||
0 => {}
|
||||
let embeds = match num_tracks_added {
|
||||
0 => {
|
||||
vec![]
|
||||
}
|
||||
1 => {
|
||||
content = format!(
|
||||
"Added \"{}\" to queue",
|
||||
tracks_added.first().unwrap().clone().unwrap()
|
||||
);
|
||||
let track = tracks_added.first().unwrap();
|
||||
|
||||
let host = Url::parse(&track.url)?;
|
||||
let host = host
|
||||
.host_str()
|
||||
.unwrap_or_default()
|
||||
.trim_start_matches("www.");
|
||||
let mut embed = EmbedBuilder::new()
|
||||
.author(EmbedAuthor {
|
||||
name: "🔊 Added to queue".to_string(),
|
||||
icon_url: None,
|
||||
proxy_icon_url: None,
|
||||
url: None,
|
||||
})
|
||||
.title(track.title.clone().unwrap_or("Unknown".to_string()))
|
||||
.url(track.url.clone())
|
||||
.color(colors::BLURPLE)
|
||||
.footer(EmbedFooter {
|
||||
text: format!("Streaming from {}", host),
|
||||
icon_url: Some(format!(
|
||||
"https://www.google.com/s2/favicons?domain={}",
|
||||
host
|
||||
)),
|
||||
proxy_icon_url: None,
|
||||
})
|
||||
.field(EmbedField {
|
||||
inline: true,
|
||||
name: "Duration".to_string(),
|
||||
value: track.duration_string.clone(),
|
||||
})
|
||||
.field(EmbedField {
|
||||
inline: true,
|
||||
name: "Channel".to_string(),
|
||||
value: track.channel.clone(),
|
||||
})
|
||||
.build();
|
||||
|
||||
if let Some(thumbnail) = &track.thumbnail {
|
||||
embed.thumbnail = Some(EmbedThumbnail {
|
||||
height: None,
|
||||
proxy_url: None,
|
||||
url: thumbnail.to_string(),
|
||||
width: None,
|
||||
});
|
||||
}
|
||||
|
||||
vec![embed]
|
||||
}
|
||||
_ => {
|
||||
content = format!("Added {} tracks to queue:\n", num_tracks_added);
|
||||
for track in tracks_added.into_iter().take(num_tracks_added.min(3)) {
|
||||
content.push_str(&format!(" \"{}\"\n", track.unwrap()));
|
||||
}
|
||||
}
|
||||
let first_track = tracks.first().unwrap();
|
||||
content.push_str(&format!(
|
||||
"Adding playlist: [{}]({})\n",
|
||||
&first_track
|
||||
.playlist
|
||||
.clone()
|
||||
.unwrap_or("Unknown".to_string()),
|
||||
build_playlist_url(
|
||||
&first_track
|
||||
.playlist_id
|
||||
.clone()
|
||||
.unwrap_or("Unknown".to_string())
|
||||
)
|
||||
));
|
||||
content.push_str(&format!(
|
||||
"Added {} tracks to the queue:\n",
|
||||
num_tracks_added
|
||||
));
|
||||
let embed = EmbedBuilder::new()
|
||||
.description(content)
|
||||
.color(colors::BLURPLE)
|
||||
.build();
|
||||
vec![embed]
|
||||
}
|
||||
};
|
||||
|
||||
state
|
||||
.http
|
||||
.interaction(interaction.application_id)
|
||||
.update_response(&interaction.token)
|
||||
.content(Some(&content))
|
||||
.unwrap()
|
||||
.embeds(Some(&embeds))?
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn get_playlist_urls(
|
||||
url: String,
|
||||
) -> Result<Vec<String>, Box<dyn Error + Send + Sync + 'static>> {
|
||||
let output = Command::new("yt-dlp")
|
||||
.args(vec![&url, "--flat-playlist", "-j"])
|
||||
.output()
|
||||
.await?;
|
||||
struct TrackPreparingNotifier {
|
||||
memory: Memory,
|
||||
track_id: i64,
|
||||
state: Arc<StateRef>,
|
||||
}
|
||||
|
||||
let reader = BufReader::new(output.stdout.as_slice());
|
||||
let urls = reader
|
||||
.lines()
|
||||
.map_while(Result::ok)
|
||||
.map(|line| {
|
||||
let entry: Value = serde_json::from_str(&line).unwrap();
|
||||
entry
|
||||
.get("webpage_url")
|
||||
.unwrap()
|
||||
.as_str()
|
||||
#[async_trait]
|
||||
impl EventHandler for TrackPreparingNotifier {
|
||||
async fn act(&self, _ctx: &EventContext<'_>) -> Option<Event> {
|
||||
tracing::info!("Build buffer");
|
||||
let mut reader = BufReader::new(self.memory.new_handle());
|
||||
let mut bytes = Vec::new();
|
||||
reader
|
||||
.read_to_end(&mut bytes)
|
||||
.expect("could not read track in memory");
|
||||
|
||||
tracing::info!("Saving track");
|
||||
insert_blob(&self.state.pool, Blob::new(self.track_id, bytes))
|
||||
.await
|
||||
.expect("could not insert blob");
|
||||
tracing::info!("Saved");
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_get_tracks() {
|
||||
let urls = [
|
||||
"https://www.youtube.com/playlist?list=PLFxxhcEeloYa1OlnWD6UgxlVQKJH5i_0p",
|
||||
"https://music.youtube.com/watch?v=RO75ZzqUOJw",
|
||||
"https://www.youtube.com/watch?v=qVHyl0P_P-M",
|
||||
"https://www.youtube.com/watch?v=34CZjsEI1yU",
|
||||
];
|
||||
for url in urls.iter() {
|
||||
println!("url: {:?}", url);
|
||||
let tracks = get_tracks(url.to_string()).await.unwrap();
|
||||
assert!(!tracks.is_empty());
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_premium_tracks() {
|
||||
let urls = ["https://www.youtube.com/watch?v=QgMZRmxQ0Dc"];
|
||||
for url in urls.iter() {
|
||||
println!("url: {:?}", url);
|
||||
let tracks = get_tracks(url.to_string()).await;
|
||||
assert!(tracks.is_err());
|
||||
assert!(tracks
|
||||
.err()
|
||||
.unwrap()
|
||||
.to_string()
|
||||
})
|
||||
.collect();
|
||||
.contains("This video is only available to Music Premium members"));
|
||||
}
|
||||
}
|
||||
|
||||
Ok(urls)
|
||||
#[tokio::test]
|
||||
async fn test_playlist_does_not_exist_tracks() {
|
||||
let urls = ["https://www.youtube.com/playlist?list=PLox0oG0uy8Lc1IaIfGyrvtuRItuEyJiyG"];
|
||||
for url in urls.iter() {
|
||||
println!("url: {:?}", url);
|
||||
let tracks = get_tracks(url.to_string()).await;
|
||||
assert!(tracks.is_err());
|
||||
assert!(tracks
|
||||
.err()
|
||||
.unwrap()
|
||||
.to_string()
|
||||
.contains("YouTube said: The playlist does not exist."));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,15 +1,113 @@
|
||||
use songbird::tracks::TrackHandle;
|
||||
use twilight_model::channel::message::component::{ActionRow, Button, ButtonStyle};
|
||||
use twilight_model::channel::message::{Component, Embed, MessageFlags, ReactionType};
|
||||
use twilight_model::gateway::payload::incoming::InteractionCreate;
|
||||
use twilight_model::http::interaction::InteractionResponse;
|
||||
use twilight_model::http::interaction::InteractionResponseType;
|
||||
use twilight_model::{
|
||||
application::interaction::Interaction, channel::message::MessageFlags,
|
||||
http::interaction::InteractionResponse,
|
||||
};
|
||||
use twilight_util::builder::embed::EmbedBuilder;
|
||||
use twilight_util::builder::InteractionResponseDataBuilder;
|
||||
|
||||
use crate::colors;
|
||||
use crate::{metadata::MetadataMap, state::State};
|
||||
use std::error::Error;
|
||||
|
||||
pub(crate) const TRACKS_PER_PAGE: usize = 5;
|
||||
|
||||
fn format_duration(duration: std::time::Duration) -> String {
|
||||
let res = duration.as_secs();
|
||||
let hours = res / (60 * 60);
|
||||
let res = res - hours * 60 * 60;
|
||||
let minutes = res / 60;
|
||||
let res = res - minutes * 60;
|
||||
let seconds = res;
|
||||
let mut s = String::new();
|
||||
if hours > 0 {
|
||||
s.push_str(format!("{:02}:", hours).as_str());
|
||||
}
|
||||
s.push_str(format!("{:02}:{:02}", minutes, seconds).as_str());
|
||||
s
|
||||
}
|
||||
|
||||
pub(crate) async fn build_queue_embeds(queue: &[TrackHandle], page: usize) -> Vec<Embed> {
|
||||
let mut message = String::new();
|
||||
if queue.is_empty() {
|
||||
message.push_str("There are no tracks in the queue.\n");
|
||||
}
|
||||
for track in queue
|
||||
.iter()
|
||||
.skip(TRACKS_PER_PAGE * page)
|
||||
.take(TRACKS_PER_PAGE)
|
||||
{
|
||||
let map = track.typemap().read().await;
|
||||
let metadata = map
|
||||
.get::<MetadataMap>()
|
||||
.expect("Could not get metadata map");
|
||||
message.push_str(
|
||||
format!(
|
||||
"* [{}]({})",
|
||||
metadata.title.clone().unwrap_or("Unknown".to_string()),
|
||||
metadata.url,
|
||||
)
|
||||
.as_str(),
|
||||
);
|
||||
if let Some(duration) = metadata.duration {
|
||||
message.push_str(" (");
|
||||
message.push_str(&format_duration(duration));
|
||||
message.push(')');
|
||||
}
|
||||
message.push('\n');
|
||||
}
|
||||
message.push('\n');
|
||||
|
||||
let n_pages = (queue.len() + TRACKS_PER_PAGE - 1) / TRACKS_PER_PAGE;
|
||||
if n_pages > 1 {
|
||||
message.push_str(&format!("page {}/{}", 1 + page, n_pages));
|
||||
}
|
||||
vec![EmbedBuilder::new()
|
||||
.description(&message)
|
||||
.color(colors::BLURPLE)
|
||||
.build()]
|
||||
}
|
||||
|
||||
pub(crate) fn build_action_row(page: usize, n_pages: usize) -> Vec<Component> {
|
||||
vec![Component::ActionRow(ActionRow {
|
||||
components: vec![
|
||||
Component::Button(Button {
|
||||
custom_id: Some(format!("page:{}", page as i32 - 1)),
|
||||
style: ButtonStyle::Primary,
|
||||
label: Some("Previous page".to_string()),
|
||||
emoji: Some(ReactionType::Unicode {
|
||||
name: "⬅️".to_string(),
|
||||
}),
|
||||
url: None,
|
||||
disabled: page == 0,
|
||||
}),
|
||||
Component::Button(Button {
|
||||
custom_id: Some(format!("page:{}", page)),
|
||||
style: ButtonStyle::Primary,
|
||||
label: Some("Refresh".to_string()),
|
||||
emoji: Some(ReactionType::Unicode {
|
||||
name: "🔄".to_string(),
|
||||
}),
|
||||
url: None,
|
||||
disabled: false,
|
||||
}),
|
||||
Component::Button(Button {
|
||||
custom_id: Some(format!("page:{}", page + 1)),
|
||||
style: ButtonStyle::Primary,
|
||||
label: Some("Next page".to_string()),
|
||||
emoji: Some(ReactionType::Unicode {
|
||||
name: "➡️".to_string(),
|
||||
}),
|
||||
url: None,
|
||||
disabled: page >= n_pages - 1,
|
||||
}),
|
||||
],
|
||||
})]
|
||||
}
|
||||
|
||||
pub(crate) async fn queue(
|
||||
interaction: Interaction,
|
||||
interaction: Box<InteractionCreate>,
|
||||
state: State,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
tracing::debug!(
|
||||
@@ -21,57 +119,43 @@ pub(crate) async fn queue(
|
||||
let Some(guild_id) = interaction.guild_id else {
|
||||
return Ok(());
|
||||
};
|
||||
if let Some(call_lock) = state.songbird.get(guild_id) {
|
||||
let call = call_lock.lock().await;
|
||||
let queue = call.queue().current_queue();
|
||||
let mut message = String::new();
|
||||
if queue.is_empty() {
|
||||
message.push_str("There are no tracks in the queue.\n");
|
||||
} else {
|
||||
message.push_str("Next songs are:\n");
|
||||
}
|
||||
for track in queue.iter().take(5) {
|
||||
let map = track.typemap().read().await;
|
||||
let metadata = map.get::<MetadataMap>().unwrap();
|
||||
message.push_str(
|
||||
format!(
|
||||
"* `{}",
|
||||
metadata.title.clone().unwrap_or("Unknown".to_string()),
|
||||
)
|
||||
.as_str(),
|
||||
);
|
||||
if let Some(duration) = metadata.duration {
|
||||
let res = duration.as_secs();
|
||||
let hours = res / (60 * 60);
|
||||
let res = res - hours * 60 * 60;
|
||||
let minutes = res / 60;
|
||||
let res = res - minutes * 60;
|
||||
let seconds = res;
|
||||
message.push_str(" (");
|
||||
if hours > 0 {
|
||||
message.push_str(format!("{:02}:", hours).as_str());
|
||||
}
|
||||
message.push_str(format!("{:02}:{:02}", minutes, seconds).as_str());
|
||||
message.push(')');
|
||||
}
|
||||
message.push_str("`\n");
|
||||
}
|
||||
|
||||
let content = "Fetching queue".to_string();
|
||||
let embeds = vec![EmbedBuilder::new()
|
||||
.description(content)
|
||||
.color(colors::YELLOW)
|
||||
.build()];
|
||||
let interaction_response_data = InteractionResponseDataBuilder::new()
|
||||
.content(&message)
|
||||
.flags(MessageFlags::EPHEMERAL)
|
||||
.embeds(embeds)
|
||||
.flags(MessageFlags::LOADING)
|
||||
.build();
|
||||
|
||||
let response = InteractionResponse {
|
||||
kind: InteractionResponseType::ChannelMessageWithSource,
|
||||
kind: InteractionResponseType::DeferredChannelMessageWithSource,
|
||||
data: Some(interaction_response_data),
|
||||
};
|
||||
|
||||
state
|
||||
.http
|
||||
.interaction(interaction.application_id)
|
||||
.create_response(interaction.id, &interaction.token, &response)
|
||||
.await?;
|
||||
|
||||
let mut queue = Vec::new();
|
||||
if let Some(call_lock) = state.songbird.get(guild_id) {
|
||||
let call = call_lock.lock().await;
|
||||
queue = call.queue().current_queue();
|
||||
}
|
||||
|
||||
let embeds = build_queue_embeds(&queue, 0).await;
|
||||
let n_pages = (queue.len() + TRACKS_PER_PAGE - 1) / TRACKS_PER_PAGE;
|
||||
let action_row = build_action_row(0, n_pages);
|
||||
|
||||
state
|
||||
.http
|
||||
.interaction(interaction.application_id)
|
||||
.update_response(&interaction.token)
|
||||
.embeds(Some(&embeds))?
|
||||
.components(Some(&action_row))?
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
use crate::state::State;
|
||||
use std::error::Error;
|
||||
use twilight_model::{
|
||||
application::interaction::Interaction,
|
||||
channel::message::MessageFlags,
|
||||
gateway::payload::incoming::InteractionCreate,
|
||||
http::interaction::{InteractionResponse, InteractionResponseType},
|
||||
};
|
||||
use twilight_util::builder::InteractionResponseDataBuilder;
|
||||
|
||||
pub(crate) async fn resume(
|
||||
interaction: Interaction,
|
||||
interaction: Box<InteractionCreate>,
|
||||
state: State,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
tracing::debug!(
|
||||
|
||||
45
src/commands/skip.rs
Normal file
45
src/commands/skip.rs
Normal file
@@ -0,0 +1,45 @@
|
||||
use crate::state::State;
|
||||
use std::error::Error;
|
||||
use twilight_model::{
|
||||
gateway::payload::incoming::InteractionCreate,
|
||||
http::interaction::{InteractionResponse, InteractionResponseType},
|
||||
};
|
||||
use twilight_util::builder::InteractionResponseDataBuilder;
|
||||
|
||||
pub(crate) async fn skip(
|
||||
interaction: Box<InteractionCreate>,
|
||||
state: State,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
tracing::debug!(
|
||||
"skip command in guild {:?} in channel {:?} by {:?}",
|
||||
interaction.guild_id,
|
||||
interaction.channel,
|
||||
interaction.author(),
|
||||
);
|
||||
|
||||
let Some(guild_id) = interaction.guild_id else {
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
if let Some(call_lock) = state.songbird.get(guild_id) {
|
||||
let call = call_lock.lock().await;
|
||||
call.queue().skip()?;
|
||||
}
|
||||
|
||||
let interaction_response_data = InteractionResponseDataBuilder::new()
|
||||
.content("Skipped a track")
|
||||
.build();
|
||||
|
||||
let response = InteractionResponse {
|
||||
kind: InteractionResponseType::ChannelMessageWithSource,
|
||||
data: Some(interaction_response_data),
|
||||
};
|
||||
|
||||
state
|
||||
.http
|
||||
.interaction(interaction.application_id)
|
||||
.create_response(interaction.id, &interaction.token, &response)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
use twilight_model::{
|
||||
application::interaction::Interaction,
|
||||
channel::message::MessageFlags,
|
||||
gateway::payload::incoming::InteractionCreate,
|
||||
http::interaction::{InteractionResponse, InteractionResponseType},
|
||||
};
|
||||
use twilight_util::builder::InteractionResponseDataBuilder;
|
||||
@@ -9,7 +9,7 @@ use crate::state::State;
|
||||
use std::error::Error;
|
||||
|
||||
pub(crate) async fn stop(
|
||||
interaction: Interaction,
|
||||
interaction: Box<InteractionCreate>,
|
||||
state: State,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
tracing::debug!(
|
||||
@@ -23,6 +23,10 @@ pub(crate) async fn stop(
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
state.guild_settings.entry(guild_id).and_modify(|settings| {
|
||||
settings.loop_queue = false;
|
||||
});
|
||||
|
||||
if let Some(call_lock) = state.songbird.get(guild_id) {
|
||||
let call = call_lock.lock().await;
|
||||
call.queue().stop();
|
||||
|
||||
1
src/db/mod.rs
Normal file
1
src/db/mod.rs
Normal file
@@ -0,0 +1 @@
|
||||
pub mod track;
|
||||
168
src/db/track.rs
Normal file
168
src/db/track.rs
Normal file
@@ -0,0 +1,168 @@
|
||||
use chrono::{DateTime, Utc};
|
||||
use sqlx::FromRow;
|
||||
|
||||
#[derive(Debug, FromRow)]
|
||||
pub(crate) struct Track {
|
||||
#[allow(dead_code)]
|
||||
pub(crate) id: i64,
|
||||
pub(crate) url: String,
|
||||
pub(crate) title: String,
|
||||
pub(crate) channel: String,
|
||||
pub(crate) duration: String,
|
||||
pub(crate) thumbnail: String,
|
||||
pub(crate) updated: DateTime<Utc>,
|
||||
}
|
||||
impl Track {
|
||||
pub(crate) fn new(
|
||||
url: String,
|
||||
title: String,
|
||||
channel: String,
|
||||
duration: String,
|
||||
thumbnail: String,
|
||||
) -> Self {
|
||||
Self {
|
||||
id: 0,
|
||||
url,
|
||||
title,
|
||||
channel,
|
||||
duration,
|
||||
thumbnail,
|
||||
updated: chrono::offset::Utc::now(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) async fn insert_track(
|
||||
pool: &sqlx::SqlitePool,
|
||||
track: Track,
|
||||
) -> Result<i64, sqlx::Error> {
|
||||
let query =
|
||||
"INSERT OR REPLACE INTO tracks (url, title, channel, duration, thumbnail, updated) VALUES ($1, $2, $3, $4, $5, $6)";
|
||||
let res = sqlx::query(query)
|
||||
.bind(track.url)
|
||||
.bind(track.title)
|
||||
.bind(track.channel)
|
||||
.bind(track.duration)
|
||||
.bind(track.thumbnail)
|
||||
.bind(track.updated)
|
||||
.execute(pool)
|
||||
.await?;
|
||||
Ok(res.last_insert_rowid())
|
||||
}
|
||||
|
||||
#[derive(Debug, FromRow)]
|
||||
pub(crate) struct User {
|
||||
pub(crate) id: String,
|
||||
pub(crate) name: String,
|
||||
pub(crate) global_name: Option<String>,
|
||||
pub(crate) updated: DateTime<Utc>,
|
||||
}
|
||||
|
||||
impl User {
|
||||
pub(crate) fn new(id: String, name: String, global_name: Option<String>) -> Self {
|
||||
Self {
|
||||
id,
|
||||
name,
|
||||
global_name,
|
||||
updated: chrono::offset::Utc::now(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) async fn insert_user(pool: &sqlx::SqlitePool, user: User) -> Result<(), sqlx::Error> {
|
||||
let query =
|
||||
"INSERT OR REPLACE INTO users (id, name, global_name, updated) VALUES ($1, $2, $3, $4)";
|
||||
sqlx::query(query)
|
||||
.bind(user.id)
|
||||
.bind(user.name)
|
||||
.bind(user.global_name)
|
||||
.bind(user.updated)
|
||||
.execute(pool)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Debug, FromRow)]
|
||||
pub(crate) struct Query {
|
||||
#[allow(dead_code)]
|
||||
pub(crate) id: i64,
|
||||
pub(crate) user_id: String,
|
||||
pub(crate) guild_id: String,
|
||||
pub(crate) track_id: i64,
|
||||
pub(crate) updated: DateTime<Utc>,
|
||||
}
|
||||
|
||||
impl Query {
|
||||
pub(crate) fn new(user_id: String, guild_id: String, track_id: i64) -> Self {
|
||||
Self {
|
||||
id: 0,
|
||||
user_id,
|
||||
guild_id,
|
||||
track_id,
|
||||
updated: chrono::offset::Utc::now(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) async fn insert_query(pool: &sqlx::SqlitePool, q: Query) -> Result<i64, sqlx::Error> {
|
||||
let query =
|
||||
"INSERT OR REPLACE INTO queries (user_id, guild_id, track_id, updated) VALUES ($1, $2, $3, $4)";
|
||||
let res = sqlx::query(query)
|
||||
.bind(q.user_id)
|
||||
.bind(q.guild_id)
|
||||
.bind(q.track_id)
|
||||
.bind(q.updated)
|
||||
.execute(pool)
|
||||
.await?;
|
||||
Ok(res.last_insert_rowid())
|
||||
}
|
||||
|
||||
#[derive(Debug, FromRow)]
|
||||
pub(crate) struct Guild {
|
||||
pub(crate) id: String,
|
||||
pub(crate) updated: DateTime<Utc>,
|
||||
}
|
||||
|
||||
impl Guild {
|
||||
pub(crate) fn new(id: String) -> Self {
|
||||
Self {
|
||||
id,
|
||||
updated: chrono::offset::Utc::now(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) async fn insert_guild(
|
||||
pool: &sqlx::SqlitePool,
|
||||
guild: Guild,
|
||||
) -> Result<i64, sqlx::Error> {
|
||||
let query = "INSERT OR REPLACE INTO guilds (id, updated) VALUES ($1, $2)";
|
||||
let res = sqlx::query(query)
|
||||
.bind(guild.id)
|
||||
.bind(guild.updated)
|
||||
.execute(pool)
|
||||
.await?;
|
||||
Ok(res.last_insert_rowid())
|
||||
}
|
||||
|
||||
#[derive(Debug, FromRow)]
|
||||
pub(crate) struct Blob {
|
||||
pub(crate) id: i64,
|
||||
pub(crate) data: Vec<u8>,
|
||||
}
|
||||
|
||||
impl Blob {
|
||||
pub(crate) fn new(id: i64, data: Vec<u8>) -> Self {
|
||||
Self { id, data }
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) async fn insert_blob(pool: &sqlx::SqlitePool, blob: Blob) -> Result<(), sqlx::Error> {
|
||||
let query = "INSERT OR REPLACE INTO blobs (id, data) VALUES ($1, $2)";
|
||||
sqlx::query(query)
|
||||
.bind(blob.id)
|
||||
.bind(blob.data)
|
||||
.execute(pool)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
236
src/handler.rs
236
src/handler.rs
@@ -1,71 +1,18 @@
|
||||
use crate::commands::{delete, join, leave, pause, play, queue, resume, stop};
|
||||
use crate::commands::queue::{build_action_row, build_queue_embeds, TRACKS_PER_PAGE};
|
||||
use crate::commands::{
|
||||
delete, join, leave, leave_if_alone, loop_queue, pause, play, queue, resume, skip, stop,
|
||||
};
|
||||
use crate::interaction_commands::InteractionCommand;
|
||||
use crate::state::State;
|
||||
use futures::Future;
|
||||
use std::error::Error;
|
||||
use crate::utils::spawn;
|
||||
use anyhow::Context;
|
||||
use std::sync::Arc;
|
||||
use tracing::debug;
|
||||
use twilight_gateway::Event;
|
||||
use twilight_model::application::interaction::application_command::CommandOptionValue;
|
||||
use twilight_model::application::interaction::{Interaction, InteractionData};
|
||||
use twilight_model::gateway::payload::incoming::VoiceStateUpdate;
|
||||
|
||||
#[derive(Debug)]
|
||||
enum InteractionCommand {
|
||||
Play(Interaction, String),
|
||||
Stop(Interaction),
|
||||
Pause(Interaction),
|
||||
Resume(Interaction),
|
||||
Leave(Interaction),
|
||||
Join(Interaction),
|
||||
Queue(Interaction),
|
||||
NotImplemented,
|
||||
}
|
||||
|
||||
fn spawn(
|
||||
fut: impl Future<Output = Result<(), Box<dyn Error + Send + Sync + 'static>>> + Send + 'static,
|
||||
) {
|
||||
tokio::spawn(async move {
|
||||
if let Err(why) = fut.await {
|
||||
tracing::debug!("handler error: {:?}", why);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
pub(crate) async fn leave_if_alone(
|
||||
update: VoiceStateUpdate,
|
||||
state: State,
|
||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
let guild_id = update.guild_id.ok_or("Guild ID not found")?;
|
||||
let user = state
|
||||
.cache
|
||||
.current_user()
|
||||
.ok_or("Cannot get current user")?;
|
||||
let user_voice_state = state
|
||||
.cache
|
||||
.voice_state(user.id, guild_id)
|
||||
.ok_or("Cannot get voice state")?;
|
||||
let channel = state
|
||||
.cache
|
||||
.channel(user_voice_state.channel_id())
|
||||
.ok_or("Cannot get channel")?;
|
||||
let channel_voice_states = state
|
||||
.cache
|
||||
.voice_channel_states(channel.id)
|
||||
.ok_or("Cannot get voice channel")?;
|
||||
let count = channel_voice_states.count();
|
||||
|
||||
// count is 1 if the bot is the only one in the channel
|
||||
if count == 1 {
|
||||
// stop playing
|
||||
if let Some(call_lock) = state.songbird.get(guild_id) {
|
||||
let call = call_lock.lock().await;
|
||||
call.queue().stop();
|
||||
}
|
||||
// leave the voice channel
|
||||
state.songbird.leave(guild_id).await?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
use twilight_model::application::interaction::message_component::MessageComponentInteractionData;
|
||||
use twilight_model::application::interaction::InteractionData;
|
||||
use twilight_model::gateway::payload::incoming::InteractionCreate;
|
||||
use twilight_model::http::interaction::{InteractionResponse, InteractionResponseType};
|
||||
use twilight_util::builder::InteractionResponseDataBuilder;
|
||||
|
||||
pub(crate) struct Handler {
|
||||
state: State,
|
||||
@@ -75,80 +22,117 @@ impl Handler {
|
||||
pub(crate) fn new(state: State) -> Self {
|
||||
Self { state }
|
||||
}
|
||||
pub(crate) async fn act(&self, event: Event) {
|
||||
match &event {
|
||||
pub(crate) async fn act(&self, event: Event) -> anyhow::Result<()> {
|
||||
self.handle_messages(&event).await?;
|
||||
self.handle_voice_state_update(&event).await?;
|
||||
self.handle_interaction(&event).await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn handle_messages(&self, event: &Event) -> anyhow::Result<()> {
|
||||
match event {
|
||||
Event::MessageCreate(message) if message.content.starts_with('!') => {
|
||||
if message.content.contains("!delete") {
|
||||
spawn(delete(message.0.clone(), Arc::clone(&self.state)));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
Event::VoiceStateUpdate(update) => {
|
||||
spawn(leave_if_alone(*update.clone(), Arc::clone(&self.state)))
|
||||
_ => Ok(()),
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
let interaction_command = match event {
|
||||
Event::InteractionCreate(interaction) => {
|
||||
debug!("interaction: {:?}", &interaction);
|
||||
match &interaction.data {
|
||||
async fn handle_voice_state_update(&self, event: &Event) -> anyhow::Result<()> {
|
||||
match event {
|
||||
Event::VoiceStateUpdate(update) => {
|
||||
let guild_id = update.guild_id.context("Guild ID not found")?;
|
||||
spawn(leave_if_alone(guild_id, Arc::clone(&self.state)));
|
||||
Ok(())
|
||||
}
|
||||
_ => Ok(()),
|
||||
}
|
||||
}
|
||||
|
||||
async fn handle_interaction(&self, event: &Event) -> anyhow::Result<()> {
|
||||
match event {
|
||||
Event::InteractionCreate(interaction) => match &interaction.data {
|
||||
Some(InteractionData::ApplicationCommand(command)) => {
|
||||
debug!("command: {:?}", command);
|
||||
match command.name.as_str() {
|
||||
"play" => {
|
||||
if let Some(query_option) =
|
||||
command.options.iter().find(|opt| opt.name == "query")
|
||||
self.handle_application_command(command.clone().into(), interaction.clone())
|
||||
}
|
||||
Some(InteractionData::MessageComponent(data)) => {
|
||||
self.handle_message_component(data, interaction.clone())
|
||||
.await
|
||||
}
|
||||
_ => Ok(()),
|
||||
},
|
||||
_ => Ok(()),
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_application_command(
|
||||
&self,
|
||||
command: InteractionCommand,
|
||||
interaction: Box<InteractionCreate>,
|
||||
) -> anyhow::Result<()> {
|
||||
{
|
||||
if let CommandOptionValue::String(query) = &query_option.value {
|
||||
InteractionCommand::Play(
|
||||
interaction.0.clone(),
|
||||
query.clone(),
|
||||
)
|
||||
} else {
|
||||
InteractionCommand::NotImplemented
|
||||
}
|
||||
} else {
|
||||
InteractionCommand::NotImplemented
|
||||
}
|
||||
}
|
||||
"stop" => InteractionCommand::Stop(interaction.0.clone()),
|
||||
"pause" => InteractionCommand::Pause(interaction.0.clone()),
|
||||
"resume" => InteractionCommand::Resume(interaction.0.clone()),
|
||||
"leave" => InteractionCommand::Leave(interaction.0.clone()),
|
||||
"join" => InteractionCommand::Join(interaction.0.clone()),
|
||||
"queue" => InteractionCommand::Queue(interaction.0.clone()),
|
||||
_ => InteractionCommand::NotImplemented,
|
||||
}
|
||||
}
|
||||
_ => InteractionCommand::NotImplemented,
|
||||
}
|
||||
}
|
||||
_ => InteractionCommand::NotImplemented,
|
||||
};
|
||||
debug!("{:?}", interaction_command);
|
||||
match interaction_command {
|
||||
InteractionCommand::Play(interaction, query) => {
|
||||
match command {
|
||||
InteractionCommand::Play(query) => {
|
||||
spawn(play(interaction, Arc::clone(&self.state), query))
|
||||
}
|
||||
InteractionCommand::Stop(interaction) => {
|
||||
spawn(stop(interaction, Arc::clone(&self.state)))
|
||||
}
|
||||
InteractionCommand::Pause(interaction) => {
|
||||
spawn(pause(interaction, Arc::clone(&self.state)))
|
||||
}
|
||||
InteractionCommand::Resume(interaction) => {
|
||||
spawn(resume(interaction, Arc::clone(&self.state)))
|
||||
}
|
||||
InteractionCommand::Leave(interaction) => {
|
||||
spawn(leave(interaction, Arc::clone(&self.state)))
|
||||
}
|
||||
InteractionCommand::Join(interaction) => {
|
||||
spawn(join(interaction, Arc::clone(&self.state)))
|
||||
}
|
||||
InteractionCommand::Queue(interaction) => {
|
||||
spawn(queue(interaction, Arc::clone(&self.state)))
|
||||
}
|
||||
InteractionCommand::Stop => spawn(stop(interaction, Arc::clone(&self.state))),
|
||||
InteractionCommand::Pause => spawn(pause(interaction, Arc::clone(&self.state))),
|
||||
InteractionCommand::Skip => spawn(skip(interaction, Arc::clone(&self.state))),
|
||||
InteractionCommand::Loop => spawn(loop_queue(interaction, Arc::clone(&self.state))),
|
||||
InteractionCommand::Resume => spawn(resume(interaction, Arc::clone(&self.state))),
|
||||
InteractionCommand::Leave => spawn(leave(interaction, Arc::clone(&self.state))),
|
||||
InteractionCommand::Join => spawn(join(interaction, Arc::clone(&self.state))),
|
||||
InteractionCommand::Queue => spawn(queue(interaction, Arc::clone(&self.state))),
|
||||
_ => {}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
async fn handle_message_component(
|
||||
&self,
|
||||
data: &MessageComponentInteractionData,
|
||||
interaction: Box<InteractionCreate>,
|
||||
) -> anyhow::Result<()> {
|
||||
if !data.custom_id.starts_with("page:") {
|
||||
return Ok(());
|
||||
}
|
||||
let page = data
|
||||
.custom_id
|
||||
.trim_start_matches("page:")
|
||||
.parse::<usize>()
|
||||
.unwrap_or(0);
|
||||
|
||||
if let Some(guild_id) = interaction.guild_id {
|
||||
let mut queue = Vec::new();
|
||||
if let Some(call_lock) = self.state.songbird.get(guild_id) {
|
||||
let call = call_lock.lock().await;
|
||||
queue = call.queue().current_queue();
|
||||
}
|
||||
let n_pages = (queue.len() + TRACKS_PER_PAGE - 1) / TRACKS_PER_PAGE;
|
||||
let page = page.min(n_pages - 1).max(0);
|
||||
let embeds = build_queue_embeds(&queue, page).await;
|
||||
let action_row = build_action_row(page, n_pages);
|
||||
|
||||
let interaction_response_data = InteractionResponseDataBuilder::new()
|
||||
.embeds(embeds)
|
||||
.components(action_row)
|
||||
.build();
|
||||
let response = InteractionResponse {
|
||||
kind: InteractionResponseType::UpdateMessage,
|
||||
data: Some(interaction_response_data),
|
||||
};
|
||||
self.state
|
||||
.http
|
||||
.interaction(interaction.application_id)
|
||||
.create_response(interaction.id, &interaction.token, &response)
|
||||
.await?;
|
||||
Ok(())
|
||||
} else {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
44
src/interaction_commands.rs
Normal file
44
src/interaction_commands.rs
Normal file
@@ -0,0 +1,44 @@
|
||||
use twilight_model::application::interaction::application_command::{
|
||||
CommandData, CommandOptionValue,
|
||||
};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) enum InteractionCommand {
|
||||
Play(String),
|
||||
Stop,
|
||||
Pause,
|
||||
Skip,
|
||||
Loop,
|
||||
Resume,
|
||||
Leave,
|
||||
Join,
|
||||
Queue,
|
||||
NotImplemented,
|
||||
}
|
||||
|
||||
impl From<Box<CommandData>> for InteractionCommand {
|
||||
fn from(command: Box<CommandData>) -> InteractionCommand {
|
||||
match command.name.as_str() {
|
||||
"play" => {
|
||||
if let Some(query_option) = command.options.iter().find(|opt| opt.name == "query") {
|
||||
if let CommandOptionValue::String(query) = &query_option.value {
|
||||
InteractionCommand::Play(query.clone())
|
||||
} else {
|
||||
InteractionCommand::NotImplemented
|
||||
}
|
||||
} else {
|
||||
InteractionCommand::NotImplemented
|
||||
}
|
||||
}
|
||||
"stop" => InteractionCommand::Stop,
|
||||
"pause" => InteractionCommand::Pause,
|
||||
"skip" => InteractionCommand::Skip,
|
||||
"loop" => InteractionCommand::Loop,
|
||||
"resume" => InteractionCommand::Resume,
|
||||
"leave" => InteractionCommand::Leave,
|
||||
"join" => InteractionCommand::Join,
|
||||
"queue" => InteractionCommand::Queue,
|
||||
_ => InteractionCommand::NotImplemented,
|
||||
}
|
||||
}
|
||||
}
|
||||
22
src/main.rs
22
src/main.rs
@@ -1,16 +1,22 @@
|
||||
mod handler;
|
||||
use handler::Handler;
|
||||
use sqlx::sqlite::{SqliteConnectOptions, SqlitePoolOptions};
|
||||
mod colors;
|
||||
mod commands;
|
||||
mod db;
|
||||
mod interaction_commands;
|
||||
mod metadata;
|
||||
mod signal;
|
||||
mod state;
|
||||
mod utils;
|
||||
|
||||
use crate::commands::get_chat_commands;
|
||||
use dotenv::dotenv;
|
||||
use futures::StreamExt;
|
||||
use signal::signal_handler;
|
||||
use songbird::{shards::TwilightMap, Songbird};
|
||||
use state::StateRef;
|
||||
use std::{env, error::Error, sync::Arc};
|
||||
use std::{env, error::Error, str::FromStr, sync::Arc};
|
||||
use tokio::select;
|
||||
use tracing::{debug, info};
|
||||
use twilight_cache_inmemory::InMemoryCache;
|
||||
@@ -34,6 +40,16 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
info!("Starting up...");
|
||||
|
||||
let (mut shards, state) = {
|
||||
let db = env::var("DATABASE_URL").map_err(|_| "DATABASE_URL is not set")?;
|
||||
let options = SqliteConnectOptions::from_str(&db)
|
||||
.expect("could not create options")
|
||||
.create_if_missing(true);
|
||||
let pool = SqlitePoolOptions::new()
|
||||
.max_connections(5)
|
||||
.connect_with(options)
|
||||
.await?;
|
||||
sqlx::migrate!().run(&pool).await?;
|
||||
|
||||
let token = env::var("DISCORD_TOKEN").map_err(|_| "DISCORD_TOKEN is not set")?;
|
||||
let app_id = env::var("DISCORD_APP_ID")
|
||||
.map_err(|_| "DISCORD_APP_ID is not set")?
|
||||
@@ -75,6 +91,8 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
cache,
|
||||
songbird,
|
||||
standby: Standby::new(),
|
||||
guild_settings: Default::default(),
|
||||
pool,
|
||||
}),
|
||||
)
|
||||
};
|
||||
@@ -118,7 +136,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||
state.standby.process(&event);
|
||||
state.songbird.process(&event).await;
|
||||
|
||||
handler.act(event).await;
|
||||
handler.act(event).await?;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
use songbird::typemap::TypeMapKey;
|
||||
use songbird::{input::YoutubeDl, typemap::TypeMapKey};
|
||||
use std::time::Duration;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub(crate) struct Metadata {
|
||||
pub(crate) title: Option<String>,
|
||||
pub(crate) duration: Option<Duration>,
|
||||
pub(crate) url: String,
|
||||
pub(crate) src: YoutubeDl,
|
||||
}
|
||||
|
||||
pub(crate) struct MetadataMap;
|
||||
|
||||
21
src/state.rs
21
src/state.rs
@@ -1,15 +1,36 @@
|
||||
use dashmap::DashMap;
|
||||
use songbird::Songbird;
|
||||
use std::sync::Arc;
|
||||
use twilight_cache_inmemory::InMemoryCache;
|
||||
use twilight_http::Client as HttpClient;
|
||||
use twilight_model::id::{marker::GuildMarker, Id};
|
||||
use twilight_standby::Standby;
|
||||
|
||||
pub(crate) type State = Arc<StateRef>;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct Settings {
|
||||
pub(crate) loop_queue: bool,
|
||||
}
|
||||
|
||||
impl Settings {
|
||||
pub(crate) fn new() -> Self {
|
||||
Self { loop_queue: false }
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Settings {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct StateRef {
|
||||
pub(crate) http: HttpClient,
|
||||
pub(crate) cache: InMemoryCache,
|
||||
pub(crate) songbird: Songbird,
|
||||
pub(crate) standby: Standby,
|
||||
pub(crate) guild_settings: DashMap<Id<GuildMarker>, Settings>,
|
||||
pub(crate) pool: sqlx::SqlitePool,
|
||||
}
|
||||
|
||||
12
src/utils.rs
Normal file
12
src/utils.rs
Normal file
@@ -0,0 +1,12 @@
|
||||
use futures::Future;
|
||||
use std::error::Error;
|
||||
|
||||
pub(crate) fn spawn(
|
||||
fut: impl Future<Output = Result<(), Box<dyn Error + Send + Sync + 'static>>> + Send + 'static,
|
||||
) {
|
||||
tokio::spawn(async move {
|
||||
if let Err(why) = fut.await {
|
||||
tracing::debug!("handler error: {:?}", why);
|
||||
}
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user