Finish documentation, clean up commands

2022-11-08 14:13:13 +01:00
parent b57b4127c6
commit 66e4579e5a
6 changed files with 68 additions and 29 deletions
@@ -19,8 +19,14 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
      EmbedBuilder::new()
        .title("Spoticord Help")
        .icon_url("https://spoticord.com/img/logo-standard.webp")
-        .description(format!("Click **[here](https://spoticord.com/commands)** for a list of commands.\n{}",
-        "If you need help setting Spoticord up you can check out the **[Documentation](https://spoticord.com/documentation)** page on the Spoticord website.\n\n"))
+        .description(format!("**Welcome to Spoticord**
+         It seems you have requested some help. Not to worry, we can help you out.\n
+         **Not sure how the bot works?**
+         **[Click here](https://spoticord.com/#how-to)** for a quick overview about how to set up Spoticord and how to use it.\n
+         **Which commands are there?**
+         You can find all **[the commands](https://spoticord.com/#commands)** on the website. You may also just type `/` in Discord and see which commands are available there.\n
+         **Need more help?**
+         If you still need some help, whether you are having issues with the bot or you just want to give us some feedback, you can join our **[Discord server](https://discord.gg/wRCyhVqBZ5)**."))
        .status(Status::Info)
        .build(),
      false,
@@ -44,7 +44,7 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
        EmbedBuilder::new()
          .title("Link your Spotify account")
          .title_url(&link)
-          .icon_url("https://spoticord.com/img/spotify-logo.png")
+          .icon_url("https://spoticord.com/spotify-logo.png")
          .description(format!(
            "Go to [this link]({}) to connect your Spotify account.",
            link
@@ -111,7 +111,7 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
          EmbedBuilder::new()
            .title("Link your Spotify account")
            .title_url(&link)
-            .icon_url("https://spoticord.com/img/spotify-logo.png")
+            .icon_url("https://spoticord.com/spotify-logo.png")
            .description(format!(
              "Go to [this link]({}) to connect your Spotify account.",
              link
@@ -30,7 +30,6 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
          &command,
          EmbedBuilder::new()
            .title("Cannot join voice channel")
-            .icon_url("https://spoticord.com/static/image/prohibited.png")
            .description("You need to connect to a voice channel")
            .status(Status::Error)
            .build(),
@@ -61,7 +60,6 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
          &command,
          EmbedBuilder::new()
            .title("Cannot join voice channel")
-            .icon_url("https://spoticord.com/static/image/prohibited.png")
            .description(msg)
            .status(Status::Error)
            .build(),
@@ -80,7 +78,6 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
          &command,
          EmbedBuilder::new()
          .title("Cannot join voice channel")
-          .icon_url("https://spoticord.com/static/image/prohibited.png")
          .description(
          format!(
            "You are already playing music in another server ({}).\nStop playing in that server first before joining this one.",
@@ -115,7 +112,6 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
            &command,
            EmbedBuilder::new()
              .title("Cannot join voice channel")
-              .icon_url("https://spoticord.com/static/image/prohibited.png")
              .description("You need to link your Spotify account. Use </link:1036714850367320136> or go to [the accounts website](https://account.spoticord.com/) to get started.")
              .status(Status::Error)
              .build(),
@@ -131,7 +127,6 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
          &command,
          EmbedBuilder::new()
            .title("Cannot join voice channel")
-            .icon_url("https://spoticord.com/static/image/prohibited.png")
            .description("An error occured while joining the channel. Please try again later.")
            .status(Status::Error)
            .build(),
@@ -159,7 +154,6 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
            &command,
            EmbedBuilder::new()
              .title("Cannot join voice channel")
-              .icon_url("https://spoticord.com/static/image/prohibited.png")
              .description("You need to link your Spotify account. Use </link:1036714850367320136> or go to [the accounts website](https://account.spoticord.com/) to get started.")
              .status(Status::Error)
              .build(),
@@ -175,7 +169,6 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
          &command,
          EmbedBuilder::new()
            .title("Cannot join voice channel")
-            .icon_url("https://spoticord.com/static/image/prohibited.png")
            .description("An error occured while joining the channel. Please try again later.")
            .status(Status::Error)
            .build(),
@@ -191,7 +184,7 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
      &command,
      EmbedBuilder::new()
        .title("Connected to voice channel")
-        .icon_url("https://spoticord.com/static/image/speaker.png")
+        .icon_url("https://spoticord.com/speaker.png")
        .description(format!("Come listen along in <#{}>", channel_id))
        .footer("Spotify will automatically start playing on Spoticord")
        .status(Status::Info)
@@ -25,7 +25,6 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
          &command,
          EmbedBuilder::new()
            .title("Cannot disconnect bot")
-            .icon_url("https://tabler-icons.io/static/tabler-icons/icons/ban.svg")
            .description("I'm currently not connected to any voice channel")
            .status(Status::Error)
            .build(),
@@ -149,22 +149,24 @@ pub fn run(ctx: Context, command: ApplicationCommandInteraction) -> CommandOutpu
        response
          .kind(InteractionResponseType::ChannelMessageWithSource)
          .interaction_response_data(|message| {
-            message
-              .embed(|embed| embed
-                  .author(|author| author
-                      .name("Currently Playing")
-                      .icon_url("https://www.freepnglogos.com/uploads/spotify-logo-png/file-spotify-logo-png-4.png")
-                    )
-                  .title(title)
-                  .url(format!("https://open.spotify.com/{}/{}", audio_type, spotify_id.to_base62().unwrap()))
-                  .description(description)
-                  .footer(|footer| footer
-                      .text(&owner.name)
-                      .icon_url(owner.face())
-                  )
-                  .thumbnail(&thumbnail)
-                  .color(Status::Info as u64)
-              )
+            message.embed(|embed| {
+              embed
+                .author(|author| {
+                  author
+                    .name("Currently Playing")
+                    .icon_url("https://spoticord.com/spotify-logo.png")
+                })
+                .title(title)
+                .url(format!(
+                  "https://open.spotify.com/{}/{}",
+                  audio_type,
+                  spotify_id.to_base62().unwrap()
+                ))
+                .description(description)
+                .footer(|footer| footer.text(&owner.name).icon_url(owner.face()))
+                .thumbnail(&thumbnail)
+                .color(Status::Info as u64)
+            })
          })
      })
      .await