From 5bd8e2ab57a9f44143e60ddb597e891f62fea60d Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <hi@m7.rs>
Date: Mon, 12 Jun 2023 09:49:39 -0300
Subject: [PATCH] remove dead code

---
 src/discord/common.rs  | 14 ++++++++++----
 src/discord/handler.rs | 14 --------------
 src/discord/mod.rs     |  2 --
 src/handles.rs         | 12 ------------
 src/lib.rs             |  1 -
 5 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 src/discord/handler.rs
 delete mode 100644 src/handles.rs

diff --git a/src/discord/common.rs b/src/discord/common.rs
index 22132b9..f085b15 100644
--- a/src/discord/common.rs
+++ b/src/discord/common.rs
@@ -1,5 +1,8 @@
 use anyhow::{anyhow, Result};
-use serenity::all::{ChannelId, Guild};
+use serenity::{
+    all::{ChannelId, Guild},
+    prelude::TypeMapKey,
+};
 use songbird::{
     input::HttpRequest,
     tracks::{Track, TrackHandle},
@@ -10,7 +13,10 @@ use tokio::sync::Mutex;
 
 use std::sync::Arc;
 
-use crate::handles::SubsonicSongHandle;
+pub struct SongHandle;
+impl TypeMapKey for SongHandle {
+    type Value = Song;
+}
 
 pub struct Data {
     pub subsonic_client: sunk::Client,
@@ -24,7 +30,7 @@ pub async fn queue_song(ctx: Context<'_>, song: &Song, client: &sunk::Client) ->
     let track = load_song(song, client).await?;
     let track_handle = handler.enqueue(track).await;
     let mut type_map = track_handle.typemap().write().await;
-    type_map.insert::<SubsonicSongHandle>(song.clone());
+    type_map.insert::<SongHandle>(song.clone());
 
     Ok(())
 }
@@ -70,7 +76,7 @@ pub async fn get_song(track: &TrackHandle) -> Result<Song> {
         .typemap()
         .read()
         .await
-        .get::<SubsonicSongHandle>()
+        .get::<SongHandle>()
         .map(ToOwned::to_owned)
         .ok_or_else(|| anyhow!("Sound information not found"))?;
     Ok(song)
diff --git a/src/discord/handler.rs b/src/discord/handler.rs
deleted file mode 100644
index c5aac67..0000000
--- a/src/discord/handler.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use serenity::{
-    all::Ready,
-    async_trait,
-    prelude::{Context, EventHandler},
-};
-
-pub struct Handler;
-
-#[async_trait]
-impl EventHandler for Handler {
-    async fn ready(&self, _: Context, ready: Ready) {
-        log::info!("{} is connected!", ready.user.name);
-    }
-}
diff --git a/src/discord/mod.rs b/src/discord/mod.rs
index c3ab224..57fe217 100644
--- a/src/discord/mod.rs
+++ b/src/discord/mod.rs
@@ -1,8 +1,6 @@
 pub mod client;
 pub mod commands;
 pub mod common;
-pub mod handler;
 
 pub use client::create_client;
 pub use common::{Context, Data};
-pub use handler::Handler;
diff --git a/src/handles.rs b/src/handles.rs
deleted file mode 100644
index f7ae464..0000000
--- a/src/handles.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use serenity::prelude::TypeMapKey;
-use sunk::{song::Song as SubsonicSong, Client as SubsonicClient};
-
-pub struct SubsonicClientHandle;
-impl TypeMapKey for SubsonicClientHandle {
-    type Value = SubsonicClient;
-}
-
-pub struct SubsonicSongHandle;
-impl TypeMapKey for SubsonicSongHandle {
-    type Value = SubsonicSong;
-}
diff --git a/src/lib.rs b/src/lib.rs
index 871f51c..ac54d40 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,3 +1,2 @@
 pub mod config;
 pub mod discord;
-pub mod handles;