mirror of
https://github.com/eRgo35/lyra.git
synced 2026-02-04 20:36:10 +01:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
212abd9bdd
|
|||
|
8d787f2a11
|
12
.gitmodules
vendored
12
.gitmodules
vendored
@@ -1,12 +0,0 @@
|
||||
[submodule "libs/songbird"]
|
||||
path = libs/songbird
|
||||
url = git@github.com:eRgo35/songbird.git
|
||||
[submodule "libs/serenity"]
|
||||
path = libs/serenity
|
||||
url = git@github.com:eRgo35/serenity.git
|
||||
[submodule "libs/poise"]
|
||||
path = libs/poise
|
||||
url = git@github.com:eRgo35/poise.git
|
||||
[submodule "libs/spotify-parser"]
|
||||
path = libs/spotify-parser
|
||||
url = git@github.com:eRgo35/spotify-parser.git
|
||||
30
Cargo.lock
generated
30
Cargo.lock
generated
@@ -1266,18 +1266,6 @@ version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
|
||||
|
||||
[[package]]
|
||||
name = "lib-spotify-parser"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"regex",
|
||||
"reqwest 0.12.5",
|
||||
"scraper",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.155"
|
||||
@@ -1323,11 +1311,10 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lyra"
|
||||
version = "0.10.0"
|
||||
version = "0.10.2"
|
||||
dependencies = [
|
||||
"dotenv",
|
||||
"json",
|
||||
"lib-spotify-parser",
|
||||
"once_cell",
|
||||
"openssl",
|
||||
"owoify",
|
||||
@@ -1339,6 +1326,7 @@ dependencies = [
|
||||
"serde_json",
|
||||
"serenity",
|
||||
"songbird",
|
||||
"spotify-parser",
|
||||
"symphonia",
|
||||
"tokio",
|
||||
"tracing",
|
||||
@@ -2859,6 +2847,20 @@ dependencies = [
|
||||
"lock_api",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "spotify-parser"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e7b9d1d990125af02c6f611f2e8e34fd979310d43ae7ac5bd2cd357b87b13352"
|
||||
dependencies = [
|
||||
"regex",
|
||||
"reqwest 0.12.5",
|
||||
"scraper",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stable-vec"
|
||||
version = "0.4.1"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "lyra"
|
||||
version = "0.10.1"
|
||||
version = "0.10.2"
|
||||
authors = ["Michał Czyż <mike@c2yz.com>"]
|
||||
edition = "2021"
|
||||
description = "A featureful Discord bot written in Rust."
|
||||
@@ -11,7 +11,7 @@ license-file = "LICENSE.md"
|
||||
keywords = ["discord", "bot", "rust", "music", "featureful"]
|
||||
|
||||
[dependencies]
|
||||
lib-spotify-parser = { path = "./libs/spotify-parser" }
|
||||
spotify-parser = "1.0.1"
|
||||
dotenv = "0.15.0"
|
||||
json = "0.12.4"
|
||||
openssl = { version = "0.10.66", features = ["vendored"] }
|
||||
|
||||
Submodule libs/poise deleted from 575025909b
Submodule libs/serenity deleted from 658b6a7261
Submodule libs/songbird deleted from 2d7dc29fd6
Submodule libs/spotify-parser deleted from 4398512b5c
@@ -2,7 +2,6 @@ use crate::commands::music::metadata::Metadata;
|
||||
use crate::commands::music::notifier::TrackErrorNotifier;
|
||||
use crate::{commands::embeds::error_embed, Context, Error};
|
||||
|
||||
use lib_spotify_parser;
|
||||
use poise::serenity_prelude::{
|
||||
Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
|
||||
};
|
||||
@@ -15,6 +14,7 @@ use songbird::input::AuxMetadata;
|
||||
use songbird::input::{Compose, YoutubeDl};
|
||||
use songbird::tracks::TrackQueue;
|
||||
use songbird::Call;
|
||||
use spotify_parser;
|
||||
use std::collections::VecDeque;
|
||||
use std::process::Command;
|
||||
use std::time::Duration;
|
||||
@@ -120,7 +120,7 @@ async fn handle_play<'a>(
|
||||
}
|
||||
|
||||
async fn parse_data(data: String) -> VecDeque<String> {
|
||||
let tracks = lib_spotify_parser::retrieve_async_url(&data)
|
||||
let tracks = spotify_parser::retrieve_async_url(&data)
|
||||
.await
|
||||
.unwrap_or(vec![data])
|
||||
.iter()
|
||||
|
||||
Reference in New Issue
Block a user