From 8a0d08de4ed280b4d24aa70c156ad5b7047fbe2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Czy=C5=BC?= Date: Mon, 5 Aug 2024 11:32:23 +0200 Subject: [PATCH] added songbird as a submodule --- .gitmodules | 3 +++ Cargo.lock | 2 -- Cargo.toml | 12 ++++++++---- libs/songbird | 1 + 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 .gitmodules create mode 160000 libs/songbird diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..133a6ec --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libs/songbird"] + path = libs/songbird + url = git@github.com:eRgo35/songbird.git diff --git a/Cargo.lock b/Cargo.lock index 505d58a..73cda35 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2829,8 +2829,6 @@ dependencies = [ [[package]] name = "songbird" version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338dd182f9f084f583c4c0db38588e28a34778ecec288208cf0b61c378ac90d1" dependencies = [ "async-trait", "audiopus", diff --git a/Cargo.toml b/Cargo.toml index e32a750..2ca9bee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,6 @@ homepage = "https://lyra.c2yz.com" license-file = "LICENSE.md" keywords = ["discord", "bot", "rust", "music", "featureful"] - [dependencies] lib-spotify-parser = { path = "libs/spotify-parser" } dotenv = "0.15.0" @@ -24,13 +23,18 @@ regex = "1.10.6" reqwest = { version = "0.11.27", features = ["json"] } serde = { version = "1.0.204", features = ["derive"] } serde_json = "1.0.122" -serenity = { version = "0.12.2", features = [ +songbird = { path = "./libs/songbird", version = "0.4", default-features = true, features = [ + "builtin-queue", +] } +serenity = { features = [ "cache", "framework", "standard_framework", "voice", -] } -songbird = { version = "0.4.3", features = ["builtin-queue", "serenity"] } + "http", + "rustls_backend", +], version = "0.12" } + symphonia = { version = "0.5.4", features = [ "aac", "adpcm", diff --git a/libs/songbird b/libs/songbird new file mode 160000 index 0000000..52ccf8b --- /dev/null +++ b/libs/songbird @@ -0,0 +1 @@ +Subproject commit 52ccf8b328a91f262fdd07bfae7c6067f9df442c