From 8d787f2a118e6ebaeca4afa05b67f1a7bc2b8ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Czy=C5=BC?= <mike@c2yz.com>
Date: Mon, 12 Aug 2024 18:46:21 +0200
Subject: [PATCH] fix: crates bumped

---
 .gitmodules                | 12 ------------
 Cargo.lock                 | 30 ++++++++++++++++--------------
 Cargo.toml                 |  2 +-
 libs/poise                 |  1 -
 libs/serenity              |  1 -
 libs/songbird              |  1 -
 libs/spotify-parser        |  1 -
 src/commands/music/play.rs |  4 ++--
 8 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 libs/poise
 delete mode 160000 libs/serenity
 delete mode 160000 libs/songbird
 delete mode 160000 libs/spotify-parser

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index d617f3a..0000000
--- a/.gitmodules
+++ /dev/null
@@ -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
diff --git a/Cargo.lock b/Cargo.lock
index 853f2f9..d854abb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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.1"
 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"
diff --git a/Cargo.toml b/Cargo.toml
index c5081d8..3e6352a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"] }
diff --git a/libs/poise b/libs/poise
deleted file mode 160000
index 5750259..0000000
--- a/libs/poise
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 575025909b063c3b998659abf9d241c8790404ee
diff --git a/libs/serenity b/libs/serenity
deleted file mode 160000
index 658b6a7..0000000
--- a/libs/serenity
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 658b6a7261fbde7cf59f84613f870ef7a48735c6
diff --git a/libs/songbird b/libs/songbird
deleted file mode 160000
index 2d7dc29..0000000
--- a/libs/songbird
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2d7dc29fd68826fb6998eb748be05387ea2fe91b
diff --git a/libs/spotify-parser b/libs/spotify-parser
deleted file mode 160000
index 4398512..0000000
--- a/libs/spotify-parser
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4398512b5cb88fdd50071fdd360b36a95e9fc6e1
diff --git a/src/commands/music/play.rs b/src/commands/music/play.rs
index b3093e5..82faf4f 100644
--- a/src/commands/music/play.rs
+++ b/src/commands/music/play.rs
@@ -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()