Compare commits

...

7 commits

4 changed files with 624 additions and 317 deletions

918
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
[package] [package]
name = "rustendo" name = "rustendo"
version = "7.0.0" version = "7.0.4"
authors = ["moonleay <contact@moonleay.net>", "migueldamota <miguel@damota.de>"] authors = ["moonleay <contact@moonleay.net>", "migueldamota <miguel@damota.de>"]
edition = "2021" edition = "2021"
@ -9,13 +9,13 @@ edition = "2021"
[dependencies] [dependencies]
serenity = "0.12" serenity = "0.12"
tokio = { version = "1.36", features = ["macros", "rt-multi-thread"] } tokio = { version = "1.39", features = ["macros", "rt-multi-thread"] }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
confy = "0.6.0" confy = "0.6.0"
songbird = "0.4" songbird = "0.4"
chrono = "0.4" chrono = "0.4"
reqwest = "0.11" reqwest = "0.11" # 0.12 creates issues; don't update for now, will fix later
symphonia = "0.5" symphonia = "0.5"
tracing = "0.1.40" tracing = "0.1.40"
tracing-subscriber = "0.3.18" tracing-subscriber = "0.3.18"

View file

@ -1,10 +1,11 @@
FROM rust:1.77 FROM rust:1.81
WORKDIR /usr/src/app WORKDIR /usr/src/app
COPY . . COPY . .
RUN echo 'deb http://deb.debian.org/debian bookworm-backports main' >> /etc/apt/sources.list
RUN apt-get update RUN apt-get update
RUN apt-get install -y cmake yt-dlp RUN apt-get install -y cmake yt-dlp/bookworm-backports
RUN cargo build --release RUN cargo build --release
CMD ["/usr/src/app/target/release/rustendo"] CMD ["/usr/src/app/target/release/rustendo"]

View file

@ -56,7 +56,7 @@ pub async fn attempt_to_queue_song(
return Embed::create_error_respose( return Embed::create_error_respose(
username, username,
"You are not in my VC", "You are not in my VC",
"You have to be in my VC in order to controll the music.", "You have to be in my VC in order to control the music.",
); );
} }
} }
@ -70,6 +70,14 @@ pub async fn attempt_to_queue_song(
.expect("Guaranteed to exist in the typemap.") .expect("Guaranteed to exist in the typemap.")
}; };
if query.contains("youtu") && query.contains("&list=") {
return Embed::create_error_respose(
username,
"Playlists are not supported",
"I do not support playlists of any kind, please only provide links to videos"
);
}
// Create source // Create source
let src = if do_search { let src = if do_search {
YoutubeDl::new_search(http_client, query.to_string()) YoutubeDl::new_search(http_client, query.to_string())