chore: release 0.10.2

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: eRgo35

.github/workflows/ci.yml

@@ -0,0 +1,46 @@
+name: ci
+
+on:
+  push:
+    branches: [senpai]
+  pull_request:
+    branches: [senpai]
+
+env:
+  RUST_BACKTRACE: 1
+  RUST_LOG: trace
+
+jobs:
+  test:
+    name: test
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+
+      - name: Set up cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Build projectable
+        run: cargo build --verbose
+
+      - name: Run tests
+        run: cargo test --verbose

.github/workflows/release.yml

@@ -0,0 +1,119 @@
+name: release
+
+on:
+  push:
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
+
+permissions: write-all
+
+jobs:
+  # Creates a release and outputs the url
+  create-release:
+    name: create-release
+    runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{ env.RELEASE_UPLOAD_URL }}
+      version: ${{ env.VERSION }}
+    steps:
+      - name: Get the release version from the tag
+        shell: bash
+        if: env.VERSION == ''
+        run: |
+          echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+          echo "version is: ${{ env.VERSION }}"
+      - name: Create GitHub release
+        uses: actions/github-script@v6
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          script: |
+            try {
+              const response = await github.rest.repos.createRelease({
+                draft: false,
+                generate_release_notes: true,
+                name: process.env.VERSION,
+                owner: context.repo.owner,
+                prerelease: false,
+                repo: context.repo.repo,
+                tag_name: process.env.VERSION,
+              });
+
+              core.exportVariable('RELEASE_ID', response.data.id);
+              core.exportVariable('RELEASE_UPLOAD_URL', response.data.upload_url);
+            } catch (error) {
+              core.setFailed(error.message);
+            }
+
+  build-and-upload:
+    name: Build and upload
+    needs: create-release
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        build: [linux-gnu, linux-aarch64-gnu]
+        include:
+          - build: linux-gnu
+            os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            use-cross: true
+
+          - build: linux-aarch64-gnu
+            os: ubuntu-latest
+            target: aarch64-unknown-linux-gnu
+            use-cross: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+          target: ${{ matrix.target }}
+
+      - name: Build
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: ${{ matrix.use-cross }}
+          command: build
+          args: --verbose --release --target ${{ matrix.target }}
+
+      - name: Strip release binary (linux and macos)
+        if: matrix.build == 'linux-gnu' || matrix.build == 'linux-musl' || matrix.build == 'macos' || matrix.build == 'linux-aarch64-gnu'
+        run: strip "target/${{ matrix.target }}/release/lyra"
+
+      - name: Build archive
+        shell: bash
+        run: |
+          dirname="lyra-${{ needs.create-release.outputs.version }}-${{ matrix.target }}"
+          mkdir "$dirname"
+          if [ "${{ matrix.os }}" = "windows-latest" ]; then
+            mv "target/${{ matrix.target }}/release/lyra.exe" "$dirname"
+          else
+            mv "target/${{ matrix.target }}/release/lyra" "$dirname"
+          fi
+          mv LICENSE.md "$dirname"
+
+          if [ "${{ matrix.os }}" = "windows-latest" ]; then
+            7z a "$dirname.zip" "$dirname"
+            echo "ASSET=$dirname.zip" >> $GITHUB_ENV
+          else
+            tar -czf "$dirname.tar.gz" "$dirname"
+            echo "ASSET=$dirname.tar.gz" >> $GITHUB_ENV
+          fi
+
+      - name: Upload archive
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create-release.outputs.upload_url }}
+          asset_path: ${{ env.ASSET }}
+          asset_name: ${{ env.ASSET }}
+          asset_content_type: application/octet-stream

.gitignore

@@ -1,3 +1,3 @@
 /target
+**/target
 .env
-

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "src/spotify-parser"]
-	path = src/spotify-parser
-	url = https://github.com/eRgo35/spotify-parser

Cargo.toml

@@ -1,35 +1,38 @@
 [package]
 name = "lyra"
-version = "0.8.2"
+version = "0.10.2"
 authors = ["Michał Czyż <mike@c2yz.com>"]
 edition = "2021"
 description = "A featureful Discord bot written in Rust."
-documentation = "https://lyra.c2yz.com/docs"
+documentation = "https://github.com/eRgo35/lyra"
 readme = "README.md"
 homepage = "https://lyra.c2yz.com"
 license-file = "LICENSE.md"
 keywords = ["discord", "bot", "rust", "music", "featureful"]
 
-
 [dependencies]
+spotify-parser = "1.0.1"
 dotenv = "0.15.0"
-fancy-regex = "0.13.0"
 json = "0.12.4"
 openssl = { version = "0.10.66", features = ["vendored"] }
 owoify = "0.1.5"
-poise = "0.6.1"
+poise = { default-features = true, version = "0.6.1" }
 rand = "0.8.5"
 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 = { version = "0.4.3", default-features = true, features = [
+    "builtin-queue",
+] }
+serenity = { default-features = true, features = [
     "cache",
     "framework",
     "standard_framework",
     "voice",
-] }
+    "http",
-songbird = { version = "0.4.3", features = ["builtin-queue", "serenity"] }
+    "rustls_backend",
+], version = "0.12" }
 symphonia = { version = "0.5.4", features = [
     "aac",
     "adpcm",
@@ -43,3 +46,8 @@ tracing = "0.1.40"
 tracing-futures = "0.2.5"
 tracing-subscriber = "0.3.18"
 url = "2.5.2"
+once_cell = "1.19.0"
+
+[patch.crates-io.serenity-voice-model]
+git = "https://github.com/serenity-rs/serenity"
+branch = "current"

README.md

@@ -1,52 +1,82 @@
-# Lyra
+<h2 align="center">
-
+  <a href="https://lyra.c2yz.com" target="blank_">
-![](assets/lyra-256.png)
+    <img height="256" alt="Lyra" src="assets/lyra-256.png" />
-
+  </a>
-Lyra is a music bot written in Rust.
+  <br />
-
+  Lyra: a discord music bot written in rust :crab:
-## Getting Started
+</h2>
 
 Lyra is an open source, discord music bot written in Rust.
-
 The idea behind this project is to allow a user to self-host one's own instance of the bot.
+User no longer has to rely on 3rd-parties to provide them a service.
+The bot can be run on a desktop, a vps or a phone as it's just a simple binary.
 
-User no longer has to rely on 3rd parties to provide them an invite link.
+Currently bot is still heavily in development!
 
-The bot can be run even on a desktop or a phone because after compilation, it's just a simple binary.
+## Getting started
 
-As of now, the bot supports spotify url track recognition through a separate nodejs script. I plan to write the actual parser inside the bot iteself but as of now I postponed it into future release.
+Before you start, you need to create a discord bot and get a token.
+You can do it [here](https://discord.com/developers/applications).
 
-Slash commands are still work in progress! Currently bot is still heavily in development!
+After you create a bot, you need to invite it to your server.
 
-## Setting up
+Then, head to download section and download the latest release (or compile it yourself).
+
+After you download the binary, you need to create a `.env` file in the same directory as the binary.
+Example can be found in `.env.example` file.
+
+```
+DISCORD_TOKEN=<YOUR_DISCORD_TOKEN>
+PREFIX=<YOUR_PREFIX>
+```
+
+DISCORD_TOKEN is the token you got from discord developers page and PREFIX is the prefix you want to use for your bot.
+
+Bot by default reacts only to the prefix. To enable slash commands, while the bot is running type `:register` in the chat (where `:` is your bot prefix).
+
+## Features
+
+- Music playback
+- Audio effects (soon)
+- Some multipurpose commands
+- Slash commands
+- Self-hosted
+
+## Compilation
 
 To compile the source code on your own, you need `rust` and `cargo`
 
-To run a dev version use
+To run a dev version, `cd` into the project directory and type
+
 ```bash
 $ cargo run
 ```
 
 To build a production version use
+
 ```bash
 $ cargo build --release
 ```
 
-If you need an ARM version and just don't want to wait for ages for the program to compile, use
+If you need a version for a different system or architecture, you can use `cross` crate
+
 ```bash
 $ cross build -r --target aarch64-unknown-linux-gnu
 ```
 
 To run a program, just type
+
 ```bash
 $ ./lyra
 ```
 
-if you want to disown it from the shell, I recommend using the script I provided in `scripts` folder
+Remember to provide a `.env` file in the same directory as the binary.
+
+If you want to disown the bot from the shell, I recommend using the script I provided in `scripts` folder
 
 ## Commands
 
-As of now, working commands are:
+As of now, the commands are:
 
 ```
 Music:
@@ -60,7 +90,7 @@ Music:
   /repeat       Loops currently playing song provided amount of times; aliases: repeat, loop, while, for
   /resume       Resumes currently paused song
   /seek         Seeks a track by provided seconds
-  /skip         Skips the currently playing song
+  /skip         Skips the currently playing song; aliases: skip, :skipper:
   /stop         Stops playback and destroys the queue; aliases: stop, end
   /volume       Changes output volume
   /effect       Plays one of available audio effects
@@ -69,13 +99,22 @@ Music:
 Tools:
   /ai           Asks AI
   /dice         Rolls a dice
+  /dictionary   Explains provided query
+  /ip           Shows IP information
+  /metar        Prints metar for provided airport
   /owoify       Owoifies whatever you want uwu
   /ping         Pings you backs with a response time
   /posix        Prints current time in POSIX format
   /qr           Creates a qr code from text
+  /taf          Returns taf for provided airport
+  /uptime       Checks how long the bot has been running
   /verse        Reference Bible by verse
+  /weather      Shows weather for provided location
 
 Help:
   /help         Prints this help message; aliases: help, huh, welp
 
+Use /help command for more info on a command.
+You can edit you message to the bot and the bot will edit its response.
+
 ```

src/commands.rs

@@ -1,4 +1,3 @@
 pub mod embeds;
-pub mod kashi;
 pub mod music;
 pub mod tools;

src/commands/embeds.rs

@@ -1,11 +1,9 @@
 use crate::{Context, Error};
 
-use poise::serenity_prelude::CreateEmbed;
+use poise::serenity_prelude::{
-use poise::CreateReply;
+    Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
-use serenity::{
-    builder::{CreateEmbedAuthor, CreateEmbedFooter},
-    model::{Colour, Timestamp},
 };
+use poise::CreateReply;
 
 pub async fn fail(ctx: Context<'_>, err: String) -> Result<(), Error> {
     ctx.send(
@@ -25,7 +23,7 @@ pub async fn error_embed(ctx: Context<'_>, msg: &str) -> Result<CreateEmbed, Err
         .author(
             CreateEmbedAuthor::new("Something went wrong!").icon_url(ctx.author().clone().face()),
         )
-        .colour(Colour::from_rgb(255, 58, 97))
+        .colour(Color::from_rgb(255, 58, 97))
         .title("Oopsie, Doopsie!")
         .description(msg)
         .timestamp(Timestamp::now())
@@ -45,7 +43,7 @@ pub async fn embed(
 ) -> Result<CreateEmbed, Error> {
     let embed = CreateEmbed::default()
         .author(CreateEmbedAuthor::new(author).icon_url(ctx.author().clone().face()))
-        .colour(Colour::from_rgb(255, 58, 97))
+        .colour(Color::from_rgb(255, 58, 97))
         .title(title)
         .description(description)
         .timestamp(Timestamp::now())

src/commands/kashi.rs

@@ -1,3 +0,0 @@
-pub mod kashi;
-
-pub use kashi::kashi;

src/commands/kashi/kashi.rs

@@ -1,17 +0,0 @@
-use crate::{Context, Error};
-
-/// Kashi integration platform (WIP)
-#[poise::command(
-    prefix_command, 
-    slash_command,
-    category = "Kashi"
-)]
-pub async fn kashi(
-    ctx: Context<'_>
-) -> Result<(), Error> {
-    
-    let response = format!("Kashi platform is currently under construction!");
-    ctx.say(response).await?;
-
-    Ok(())
-}

src/commands/music/deafen.rs

@@ -15,7 +15,7 @@ use poise::CreateReply;
 pub async fn deafen(ctx: Context<'_>) -> Result<(), Error> {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird client placed at init")
         .clone();

src/commands/music/join.rs

@@ -27,7 +27,7 @@ pub async fn join(ctx: Context<'_>) -> Result<(), Error> {
         }
     };
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird client placed at init")
         .clone();

src/commands/music/leave.rs

@@ -15,12 +15,12 @@ use poise::CreateReply;
 pub async fn leave(ctx: Context<'_>) -> Result<(), Error> {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird client placed at init")
         .clone();
 
-    if !manager.get(guild_id).is_some() {
+    if manager.get(guild_id).is_none() {
         let msg = "I am not in a voice channel!";
         ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
             .await?;

src/commands/music/mute.rs

@@ -15,7 +15,7 @@ use poise::CreateReply;
 pub async fn mute(ctx: Context<'_>) -> Result<(), Error> {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird client placed at init")
         .clone();

src/commands/music/pause.rs

@@ -9,7 +9,7 @@ use poise::CreateReply;
 pub async fn pause(ctx: Context<'_>) -> Result<(), Error> {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird client placed at init")
         .clone();

src/commands/music/play.rs

@@ -1,24 +1,24 @@
 use crate::commands::music::metadata::Metadata;
+use crate::commands::music::notifier::TrackErrorNotifier;
 use crate::{commands::embeds::error_embed, Context, Error};
 
-use fancy_regex::Regex;
+use poise::serenity_prelude::{
-use poise::serenity_prelude::model::Timestamp;
+    Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
-use poise::serenity_prelude::Colour;
+};
-use poise::serenity_prelude::CreateEmbed;
 use poise::CreateReply;
 use regex::Regex as Regex_Classic;
-use serenity::builder::CreateEmbedAuthor;
+use reqwest::Client;
-use serenity::builder::CreateEmbedFooter;
+use serenity::all::GuildId;
 use songbird::events::TrackEvent;
 use songbird::input::AuxMetadata;
 use songbird::input::{Compose, YoutubeDl};
-use songbird::tracks::{TrackHandle, TrackQueue};
+use songbird::tracks::TrackQueue;
+use songbird::Call;
+use spotify_parser;
+use std::collections::VecDeque;
 use std::process::Command;
 use std::time::Duration;
 
-use crate::commands::music::notifier::TrackErrorNotifier;
-use crate::http::HttpKey;
-
 /// Plays a song; \
 /// you can search by query or paste an url; \
 /// aliases: play, p, enqueue
@@ -32,161 +32,151 @@ pub async fn play(
     ctx: Context<'_>,
     #[description = "Provide a query or an url"]
     #[rest]
-    mut song: String,
+    song: String,
 ) -> Result<(), Error> {
-    let regex_spotify = Regex::new(r"https?:\/\/(?:embed\.|open\.)(?:spotify\.com\/)(?:track\/|\?uri=spotify:track:)((\w|-)+)(?:(?=\?)(?:[?&]foo=(\d*)(?=[&#]|$)|(?![?&]foo=)[^#])+)?(?=#|$)").unwrap();
-    let regex_youtube =
-        Regex_Classic::new(r#""url": "(https://www.youtube.com/watch\?v=[A-Za-z0-9]{11})""#)
-            .unwrap();
-    let regex_youtube_playlist = Regex::new(
-        r"^((?:https?:)\/\/)?((?:www|m)\.)?((?:youtube\.com)).*(youtu.be\/|list=)([^#&?]*).*",
-    )
-    .unwrap();
-    let regex_spotify_playlist = Regex::new(r"https?:\/\/(?:embed\.|open\.)(?:spotify\.com\/)(?:(album|playlist)\/|\?uri=spotify:playlist:)((\w|-)+)(?:(?=\?)(?:[?&]foo=(\d*)(?=[&#]|$)|(?![?&]foo=)[^#])+)?(?=#|$)").unwrap();
-
-    let is_playlist = regex_youtube_playlist.is_match(&song).unwrap()
-        || regex_spotify_playlist.is_match(&song).unwrap();
-    let is_spotify =
-        regex_spotify.is_match(&song).unwrap() || regex_spotify_playlist.is_match(&song).unwrap();
-    let is_query = !song.starts_with("http");
-
     let guild_id = ctx.guild_id().unwrap();
-    let channel_id = ctx
+    let http_client = ctx.data().http_client.clone();
-        .guild()
+    let manager = songbird::get(ctx.serenity_context()).await.unwrap().clone();
-        .unwrap()
-        .voice_states
-        .get(&ctx.author().id)
-        .and_then(|voice_state| voice_state.channel_id);
 
-    let connect_to = match channel_id {
+    let mut rest_playlist: VecDeque<String> = VecDeque::new();
-        Some(channel) => channel,
+
-        None => {
+    if manager.get(guild_id).is_none() {
-            let msg = "I am not in a voice channel!";
+        let channel_id = ctx
+            .guild()
+            .unwrap()
+            .voice_states
+            .get(&ctx.author().id)
+            .and_then(|voice_state| voice_state.channel_id);
+
+        let connect_to = match channel_id {
+            Some(channel) => channel,
+            None => {
+                let msg = "I am not in a voice channel!";
+                ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
+                    .await?;
+                return Ok(());
+            }
+        };
+
+        if let Ok(handler_lock) = manager.join(guild_id, connect_to).await {
+            let mut handler = handler_lock.lock().await;
+            handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier);
+
+            rest_playlist = handle_play(ctx, song, handler, http_client.clone())
+                .await
+                .unwrap();
+        } else {
+            let msg = "Failed to join the voice channel!";
             ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
                 .await?;
-
-            return Ok(());
         }
-    };
+    } else {
-
+        let handler = manager.get(guild_id).unwrap();
-    let http_client = {
+        let mut handler = handler.lock().await;
-        let data = ctx.serenity_context().data.read().await;
-        data.get::<HttpKey>()
-            .cloned()
-            .expect("Guaranteed to exist in the typemap.")
-    };
-
-    let manager = songbird::get(&ctx.serenity_context())
-        .await
-        .expect("Songbird Voice placed at init")
-        .clone();
-
-    if let Ok(handler_lock) = manager.join(guild_id, connect_to).await {
-        let mut handler = handler_lock.lock().await;
-
         handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier);
-
+        rest_playlist = handle_play(ctx, song, handler, http_client.clone())
-        if is_playlist && is_spotify {
-            let raw_list = Command::new("node")
-                .args(["./src/spotify-parser", &song])
-                .output()
-                .expect("failed to execute process")
-                .stdout;
-            let list = String::from_utf8(raw_list.clone()).expect("Invalid UTF-8");
-
-            let tracks: Vec<String> = list.split("\n").map(str::to_string).collect();
-
-            for (index, url) in tracks.clone().iter().enumerate() {
-                if url.is_empty() {
-                    break;
-                }
-                let src = YoutubeDl::new_ytdl_like(
-                    "yt-dlp",
-                    http_client.clone(),
-                    format!("ytsearch:{}", url.to_string()),
-                );
-                let aux_metadata = src.clone().aux_metadata().await.unwrap();
-                let track = handler.enqueue_input(src.clone().into()).await;
-                let _ = track
-                    .typemap()
-                    .write()
-                    .await
-                    .insert::<Metadata>(aux_metadata);
-
-                if index == 0 {
-                    let embed = generate_playlist_embed(ctx, track, tracks.len()).await;
-                    let response = CreateReply::default().embed(embed.unwrap());
-                    ctx.send(response).await?;
-                }
-            }
-
-            return Ok(());
-        }
-
-        if is_playlist {
-            let raw_list = Command::new("yt-dlp")
-                .args(["-j", "--flat-playlist", &song])
-                .output()
-                .expect("failed to execute process")
-                .stdout;
-
-            let list = String::from_utf8(raw_list.clone()).expect("Invalid UTF-8");
-
-            let urls: Vec<String> = regex_youtube
-                .captures_iter(&list)
-                .map(|capture| capture[1].to_string())
-                .collect();
-
-            for (index, url) in urls.clone().iter().enumerate() {
-                if url.is_empty() {
-                    break;
-                }
-                let src = YoutubeDl::new_ytdl_like("yt-dlp", http_client.clone(), url.to_string());
-                let aux_metadata = src.clone().aux_metadata().await.unwrap();
-                let track = handler.enqueue_input(src.clone().into()).await;
-                let _ = track
-                    .typemap()
-                    .write()
-                    .await
-                    .insert::<Metadata>(aux_metadata);
-
-                if index == 0 {
-                    let embed = generate_playlist_embed(ctx, track, urls.len()).await;
-                    let response = CreateReply::default().embed(embed.unwrap());
-                    ctx.send(response).await?;
-                }
-            }
-
-            return Ok(());
-        }
-
-        if is_spotify {
-            let query = Command::new("node")
-                .args(["./src/spotify-parser", &song])
-                .output()
-                .expect("failed to execute process")
-                .stdout;
-            let query_str = String::from_utf8(query.clone()).expect("Invalid UTF-8");
-            song = format!("ytsearch:{}", query_str.to_string());
-        }
-
-        if is_query {
-            song = format!("ytsearch:{}", song);
-        }
-
-        let src = YoutubeDl::new_ytdl_like("yt-dlp", http_client, song);
-        let embed = generate_embed(ctx, src.clone(), handler.queue()).await;
-        let response = CreateReply::default().embed(embed.unwrap());
-        ctx.send(response).await?;
-
-        let aux_metadata = src.clone().aux_metadata().await.unwrap();
-
-        let track = handler.enqueue_input(src.clone().into()).await;
-        let _ = track
-            .typemap()
-            .write()
             .await
-            .insert::<Metadata>(aux_metadata);
+            .unwrap();
+    }
+
+    handle_playlist(rest_playlist, manager, guild_id, http_client)
+        .await
+        .unwrap();
+
+    Ok(())
+}
+
+async fn handle_play<'a>(
+    ctx: Context<'a>,
+    song: String,
+    mut handler: tokio::sync::MutexGuard<'a, Call>,
+    http_client: Client,
+) -> Result<VecDeque<String>, Error> {
+    let mut results = parse_data(song).await;
+
+    let src: YoutubeDl =
+        YoutubeDl::new_ytdl_like("yt-dlp", http_client, results.pop_front().unwrap());
+
+    ctx.send(
+        CreateReply::default().embed(
+            generate_embed(ctx, src.clone(), handler.queue(), results.clone())
+                .await
+                .unwrap(),
+        ),
+    )
+    .await?;
+
+    let aux_metadata = src.clone().aux_metadata().await.unwrap();
+
+    handler
+        .enqueue_input(src.clone().into())
+        .await
+        .typemap()
+        .write()
+        .await
+        .insert::<Metadata>(aux_metadata);
+
+    Ok(results)
+}
+
+async fn parse_data(data: String) -> VecDeque<String> {
+    let tracks = spotify_parser::retrieve_async_url(&data)
+        .await
+        .unwrap_or(vec![data])
+        .iter()
+        .flat_map(|track| {
+            if track.contains("?list=") {
+                let regex_youtube = Regex_Classic::new(
+                    r#""url": "(https://www.youtube.com/watch\?v=[A-Za-z0-9]{11})""#,
+                )
+                .unwrap();
+
+                let list = Command::new("yt-dlp")
+                    .args(["-j", "--flat-playlist", track])
+                    .output()
+                    .expect("Failed to execute process")
+                    .stdout;
+                let list = String::from_utf8(list).unwrap();
+
+                regex_youtube
+                    .captures_iter(&list)
+                    .map(|capture| capture.get(1).unwrap().as_str().to_string())
+                    .collect::<Vec<String>>()
+            } else if track.starts_with("http") {
+                vec![track.clone()]
+            } else {
+                vec![format!("ytsearch:{}", track)]
+            }
+        })
+        .collect();
+
+    tracks
+}
+
+async fn handle_playlist(
+    playlist: VecDeque<String>,
+    manager: std::sync::Arc<songbird::Songbird>,
+    guild_id: GuildId,
+    http_client: Client,
+) -> Result<(), Error> {
+    for song in playlist {
+        if manager.get(guild_id).is_some() {
+            let handler = manager.get(guild_id).unwrap();
+            let mut handler = handler.lock().await;
+
+            let src: YoutubeDl =
+                YoutubeDl::new_ytdl_like("yt-dlp", http_client.clone(), song.clone());
+
+            let aux_metadata = src.clone().aux_metadata().await.unwrap();
+
+            handler
+                .enqueue_input(src.clone().into())
+                .await
+                .typemap()
+                .write()
+                .await
+                .insert::<Metadata>(aux_metadata);
+        }
     }
 
     Ok(())
@@ -196,6 +186,7 @@ async fn generate_embed(
     ctx: Context<'_>,
     src: YoutubeDl,
     queue: &TrackQueue,
+    results: VecDeque<String>,
 ) -> Result<CreateEmbed, Error> {
     let metadata = src.clone().aux_metadata().await.unwrap();
     let AuxMetadata {
@@ -206,18 +197,22 @@ async fn generate_embed(
         duration,
         ..
     } = metadata;
-    let timestamp = Timestamp::now();
     let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
     let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
-    let mut description = format!("Song added to queue @ {}", queue.len() + 1);
+    let mut description = format!("Enqueued @ {}", queue.len() + 1);
+    let mut tracks = "Tracks enqueued";
 
-    if queue.len() == 0 {
+    if results.len() == 1 {
-        description = format!("Playing now!");
+        tracks = "Track enqueued";
+    }
+
+    if queue.is_empty() {
+        description = "Playing now!".to_string();
     }
 
     let embed = CreateEmbed::default()
-        .author(CreateEmbedAuthor::new("Track enqueued").icon_url(ctx.author().clone().face()))
+        .author(CreateEmbedAuthor::new(tracks).icon_url(ctx.author().clone().face()))
-        .colour(Colour::from_rgb(255, 58, 97))
+        .colour(Color::from_rgb(255, 58, 97))
         .title(title.unwrap())
         .url(source_url.unwrap())
         .thumbnail(thumbnail.unwrap_or(ctx.cache().current_user().face()))
@@ -233,59 +228,7 @@ async fn generate_embed(
         )
         .field("DJ", ctx.author().name.clone(), true)
         .description(description)
-        .timestamp(timestamp)
+        .timestamp(Timestamp::now())
-        .footer(
-            CreateEmbedFooter::new(ctx.cache().current_user().name.to_string())
-                .icon_url(ctx.cache().current_user().face()),
-        );
-
-    Ok(embed)
-}
-
-async fn generate_playlist_embed(
-    ctx: Context<'_>,
-    track: TrackHandle,
-    queue_length: usize,
-) -> Result<CreateEmbed, Error> {
-    let meta_typemap = track.typemap().read().await;
-    let metadata = meta_typemap.get::<Metadata>().unwrap();
-    let AuxMetadata {
-        title,
-        thumbnail,
-        source_url,
-        artist,
-        duration,
-        ..
-    } = metadata;
-    let timestamp = Timestamp::now();
-    let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
-    let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
-
-    let description = format!("Enqueued tracks: {}", queue_length - 1);
-
-    let embed = CreateEmbed::default()
-        .author(CreateEmbedAuthor::new("Playlist enqueued").icon_url(ctx.author().clone().face()))
-        .colour(Colour::from_rgb(255, 58, 97))
-        .title(title.as_ref().unwrap())
-        .url(source_url.as_ref().unwrap())
-        .thumbnail(
-            thumbnail
-                .as_ref()
-                .unwrap_or(&ctx.cache().current_user().face()),
-        )
-        .field(
-            "Artist",
-            artist.as_ref().unwrap_or(&"Unknown Artist".to_string()),
-            true,
-        )
-        .field(
-            "Duration",
-            format!("{:02}:{:02}", duration_minutes, duration_seconds),
-            true,
-        )
-        .field("DJ", ctx.author().name.clone(), true)
-        .description(description)
-        .timestamp(timestamp)
         .footer(
             CreateEmbedFooter::new(ctx.cache().current_user().name.to_string())
                 .icon_url(ctx.cache().current_user().face()),

src/commands/music/queue.rs

@@ -2,12 +2,10 @@ use std::time::Duration;
 
 use crate::commands::music::metadata::Metadata;
 use crate::{commands::embeds::error_embed, Context, Error};
-use poise::serenity_prelude::CreateEmbed;
+use poise::serenity_prelude::{
-use poise::CreateReply;
+    Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
-use serenity::{
-    builder::{CreateEmbedAuthor, CreateEmbedFooter},
-    model::{Colour, Timestamp},
 };
+use poise::CreateReply;
 use songbird::input::AuxMetadata;
 
 const QUEUE_DISPLAY_LENGTH: usize = 10;
@@ -18,7 +16,7 @@ const QUEUE_DISPLAY_LENGTH: usize = 10;
 pub async fn queue(ctx: Context<'_>) -> Result<(), Error> {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird client placed at init")
         .clone();
@@ -80,7 +78,7 @@ async fn embed(ctx: Context<'_>, queue: String) -> Result<CreateEmbed, Error> {
 
     let embed = CreateEmbed::default()
         .author(CreateEmbedAuthor::new("Queue").icon_url(ctx.author().clone().face()))
-        .colour(Colour::from_rgb(255, 58, 97))
+        .colour(Color::from_rgb(255, 58, 97))
         .title(title)
         .description(queue)
         .timestamp(timestamp)

src/commands/music/repeat.rs

@@ -21,7 +21,7 @@ pub async fn repeat(
 ) -> Result<(), Error> {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird client placed at init")
         .clone();

src/commands/music/resume.rs

@@ -9,7 +9,7 @@ use poise::CreateReply;
 pub async fn resume(ctx: Context<'_>) -> Result<(), Error> {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird client placed at init")
         .clone();

src/commands/music/seek.rs

@@ -14,7 +14,7 @@ pub async fn seek(
 ) -> Result<(), Error> {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird client placed at init")
         .clone();

src/commands/music/skip.rs

@@ -5,25 +5,19 @@ use crate::{
     commands::embeds::{embed, error_embed},
     Context, Error,
 };
-use poise::CreateReply;
+use poise::serenity_prelude::{
-use serenity::{
+    Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
-    builder::{CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter},
-    model::{Colour, Timestamp},
 };
+use poise::CreateReply;
 use songbird::{input::AuxMetadata, tracks::TrackHandle};
 
 /// Skips the currently playing song; \
 /// aliases: skip, :skipper:
-#[poise::command(
+#[poise::command(prefix_command, slash_command, aliases("skipper:"), category = "Music")]
-    prefix_command, 
-    slash_command, 
-    aliases("skipper:"),
-    category = "Music"
-)]
 pub async fn skip(ctx: Context<'_>) -> Result<(), Error> {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird client placed at init")
         .clone();
@@ -36,23 +30,18 @@ pub async fn skip(ctx: Context<'_>) -> Result<(), Error> {
         let track = track_raw.get(1);
         let queue_length = queue.len() - 1;
 
-        let response;
+        let mut response = CreateReply::default().embed(
+            embed(ctx, "Skipped!", "The queue is empty!", "")
+                .await
+                .unwrap(),
+        );
 
-        match track {
+        if let Some(track) = track {
-            Some(track) => {
+            response = CreateReply::default().embed(
-                response = CreateReply::default().embed(
+                generate_embed(ctx, track.clone(), queue_length)
-                    generate_embed(ctx, track.clone(), queue_length)
+                    .await
-                        .await
+                    .unwrap(),
-                        .unwrap(),
+            );
-                );
-            }
-            None => {
-                response = CreateReply::default().embed(
-                    embed(ctx, "Skipped!", "The queue is empty!", "")
-                        .await
-                        .unwrap(),
-                );
-            }
         };
 
         ctx.send(response).await?;
@@ -88,7 +77,7 @@ async fn generate_embed(
 
     let embed = CreateEmbed::default()
         .author(CreateEmbedAuthor::new("Skipped!").icon_url(ctx.author().clone().face()))
-        .colour(Colour::from_rgb(255, 58, 97))
+        .colour(Color::from_rgb(255, 58, 97))
         .title(title.as_ref().unwrap())
         .url(source_url.as_ref().unwrap())
         .thumbnail(

src/commands/music/soundboard/effect.rs

@@ -1,11 +1,9 @@
 use crate::{commands::embeds::error_embed, Context, Error};
 
-use poise::serenity_prelude::model::Timestamp;
+use poise::serenity_prelude::{
-use poise::serenity_prelude::Colour;
+    Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
-use poise::serenity_prelude::CreateEmbed;
+};
 use poise::CreateReply;
-use serenity::builder::CreateEmbedAuthor;
-use serenity::builder::CreateEmbedFooter;
 use songbird::events::TrackEvent;
 use songbird::input::AuxMetadata;
 use songbird::input::{Compose, YoutubeDl};
@@ -36,7 +34,7 @@ pub async fn effect(
             .expect("Guaranteed to exist in the typemap.")
     };
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird Voice placed at init")
         .clone();
@@ -87,11 +85,11 @@ async fn generate_embed(ctx: Context<'_>, src: YoutubeDl) -> Result<CreateEmbed,
     let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
     let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
 
-    let description = format!("Playing now!");
+    let description = "Playing now!";
 
     let embed = CreateEmbed::default()
         .author(CreateEmbedAuthor::new("Playing an effect!").icon_url(ctx.author().clone().face()))
-        .colour(Colour::from_rgb(255, 58, 97))
+        .colour(Color::from_rgb(255, 58, 97))
         .title(title.unwrap())
         .url(source_url.unwrap())
         .thumbnail(thumbnail.unwrap_or(ctx.cache().current_user().face()))

src/commands/music/soundboard/stream.rs

@@ -1,11 +1,9 @@
 use crate::{commands::embeds::error_embed, Context, Error};
 
-use poise::serenity_prelude::model::Timestamp;
+use poise::serenity_prelude::{
-use poise::serenity_prelude::Colour;
+    Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
-use poise::serenity_prelude::CreateEmbed;
+};
 use poise::CreateReply;
-use serenity::builder::CreateEmbedAuthor;
-use serenity::builder::CreateEmbedFooter;
 use songbird::events::TrackEvent;
 use songbird::input::AuxMetadata;
 use songbird::input::{Compose, YoutubeDl};
@@ -43,7 +41,7 @@ pub async fn stream(
             .expect("Guaranteed to exist in the typemap.")
     };
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird Voice placed at init")
         .clone();
@@ -94,13 +92,13 @@ async fn generate_embed(ctx: Context<'_>, src: YoutubeDl) -> Result<CreateEmbed,
     let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
     let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
 
-    let description = format!("Playing now!");
+    let description = "Playing now!";
 
     let embed = CreateEmbed::default()
         .author(
             CreateEmbedAuthor::new("Audio output hijacked!").icon_url(ctx.author().clone().face()),
         )
-        .colour(Colour::from_rgb(255, 58, 97))
+        .colour(Color::from_rgb(255, 58, 97))
         .title(title.unwrap())
         .url(source_url.unwrap())
         .thumbnail(thumbnail.unwrap_or(ctx.cache().current_user().face()))

src/commands/music/stop.rs

@@ -10,7 +10,7 @@ use poise::CreateReply;
 pub async fn stop(ctx: Context<'_>) -> Result<(), Error> {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird client placed at init")
         .clone();

src/commands/music/volume.rs

@@ -9,7 +9,7 @@ use poise::CreateReply;
 pub async fn volume(ctx: Context<'_>, #[description = "Volume"] volume: f32) -> Result<(), Error> {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(&ctx.serenity_context())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird client placed at init")
         .clone();

src/commands/tools.rs

@@ -10,7 +10,7 @@ pub mod posix;
 pub mod qr;
 pub mod register;
 pub mod taf;
-// pub mod uptime;
+pub mod uptime;
 pub mod verse;
 pub mod weather;
 
@@ -26,6 +26,6 @@ pub use posix::posix;
 pub use qr::qr;
 pub use register::register;
 pub use taf::taf;
-// pub use uptime::uptime;
+pub use uptime::uptime;
 pub use verse::verse;
 pub use weather::weather;

src/commands/tools/ai.rs

@@ -15,7 +15,7 @@ pub async fn ai(
     #[rest]
     prompt: String,
 ) -> Result<(), Error> {
-    let iamsorry = vec![
+    let iamsorry = &[
         "I'm sorry, but as an AI language model, I must follow ethical guidelines, and I cannot engage in harmful, malicious, or offensive behavior.",
         "I'm sorry, but as an AI language model, I may not always be perfect and can make mistakes or provide inaccurate information. Please verify important details from reliable sources.",
         "I'm sorry, but as an AI language model, I can't engage in real-time conversations or remember previous interactions with users.",
@@ -27,19 +27,17 @@ pub async fn ai(
 
     println!("Funny prompts: {}", prompt);
 
-    let response;
+    let response = {
-
-    let _ = {
         let mut rng = rand::thread_rng();
 
-        response = rng.gen_range(0..iamsorry.len());
+        rng.gen_range(0..iamsorry.len())
     };
 
-    sleep(Duration::from_secs(3));
+    sleep(Duration::from_secs(1));
 
     ctx.send(
         CreateReply::default().embed(
-            embed(ctx, "AI Response:", "", &format!("{}", iamsorry[response]))
+            embed(ctx, "AI Response:", "", iamsorry[response])
                 .await
                 .unwrap(),
         ),

src/commands/tools/dice.rs

@@ -7,12 +7,9 @@ use crate::{commands::embeds::embed, Context, Error};
 /// Rolls a dice
 #[poise::command(prefix_command, slash_command, category = "Tools")]
 pub async fn dice(ctx: Context<'_>) -> Result<(), Error> {
-    let dice;
+    let dice = {
-
-    let _ = {
         let mut rng = rand::thread_rng();
-
+        rng.gen_range(1..=6)
-        dice = rng.gen_range(1..7);
     };
 
     ctx.send(

src/commands/tools/qr.rs

@@ -1,8 +1,7 @@
-use poise::CreateReply;
+use poise::serenity_prelude::{
-use serenity::{
+    Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
-    builder::{CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter},
-    model::{Colour, Timestamp},
 };
+use poise::CreateReply;
 
 use crate::{Context, Error};
 use url::form_urlencoded;
@@ -34,7 +33,7 @@ async fn generate_embed(ctx: Context<'_>, message: String) -> Result<CreateEmbed
             CreateEmbedAuthor::new("Your message as a QR Code!")
                 .icon_url(ctx.author().clone().face()),
         )
-        .colour(Colour::from_rgb(255, 58, 97))
+        .colour(Color::from_rgb(255, 58, 97))
         .title("Your QR Code:")
         .url(url.clone())
         .image(url)

src/commands/tools/uptime.rs

@@ -1,35 +1,48 @@
+use once_cell::sync::Lazy;
 use poise::CreateReply;
+use std::sync::Mutex;
 
 use crate::{commands::embeds::embed, Context, Error};
 
-// Currently unable to get information on how long the thread was running.
+pub static PROCESS_UPTIME: Lazy<Mutex<std::time::SystemTime>> =
-const PROCESS_UPTIME: i64 = 1000;
+    Lazy::new(|| Mutex::new(std::time::SystemTime::now()));
 
 /// Checks how long the bot has been running
 #[poise::command(prefix_command, slash_command, category = "Tools")]
 pub async fn uptime(ctx: Context<'_>) -> Result<(), Error> {
-    let uptime = PROCESS_UPTIME;
+    let start = *PROCESS_UPTIME.lock().unwrap();
-    let days = uptime / (24 * 60 * 60);
+    let uptime = std::time::SystemTime::now().duration_since(start).unwrap();
-    let hours = (uptime % (24 * 60 * 60)) / 3600;
-    let minutes = (uptime % 60 * 60) / 60;
-    let seconds = uptime % 60;
 
-    ctx.send(
+    let (days, hours, minutes, seconds) = (
-        CreateReply::default().embed(
+        uptime.as_secs() / 86400,
-            embed(
+        (uptime.as_secs() / 3600) % 24,
-                ctx,
+        (uptime.as_secs() / 60) % 60,
-                "I have been up and awake for",
+        uptime.as_secs() % 60,
-                &format!("{} seconds", uptime),
+    );
-                &format!(
+
-                    "{} days, {} hours, {} minutes and {} seconds",
+    let mut message = format!(
-                    days, hours, minutes, seconds
+        "I have been awake for {} days, {} hours, {} minutes and {} seconds!",
-                ),
+        days, hours, minutes, seconds
-            )
+    );
-            .await
+
-            .unwrap(),
+    if days != 0 {
-        ),
+        message = format!("I have been awake for {} days!", days);
-    )
+    }
-    .await?;
+
+    if days == 0 && hours != 0 {
+        message = format!("I have been awake for {} hours!", hours);
+    }
+
+    if days == 0 && hours == 0 && minutes != 0 {
+        message = format!("I have been awake for {} minutes!", minutes);
+    }
+
+    if days == 0 && hours == 0 && minutes == 0 && seconds != 0 {
+        message = format!("I have been awake for {} seconds!", seconds);
+    }
+
+    ctx.send(CreateReply::default().embed(embed(ctx, "Uptime", "", &message).await.unwrap()))
+        .await?;
 
     Ok(())
 }

src/main.rs

@@ -1,3 +1,4 @@
+use commands::tools::uptime::PROCESS_UPTIME;
 use poise::serenity_prelude::{self as serenity, ActivityData};
 use reqwest::Client as HttpClient;
 use songbird::SerenityInit;
@@ -8,7 +9,6 @@ use tracing::{error, info, warn};
 mod commands;
 mod http;
 
-use crate::commands::kashi;
 use crate::commands::music;
 use crate::commands::tools;
 use crate::http::HttpKey;
@@ -16,7 +16,9 @@ use crate::http::HttpKey;
 type Error = Box<dyn std::error::Error + Send + Sync>;
 type Context<'a> = poise::Context<'a, Data, Error>;
 
-pub struct Data;
+pub struct Data {
+    pub http_client: HttpClient,
+}
 
 async fn on_error(error: poise::FrameworkError<'_, Data, Error>) {
     match error {
@@ -37,12 +39,13 @@ async fn main() {
     tracing_subscriber::fmt::init();
     dotenv::dotenv().expect("Failed to load .env file.");
 
+    let _ = *PROCESS_UPTIME.lock().unwrap();
+
     let token =
         std::env::var("DISCORD_TOKEN").expect("Environment variable `DISCORD_TOKEN` not found!");
     let prefix = std::env::var("PREFIX").expect("Environment variable `PREFIX` not found!");
 
     let commands = vec![
-        kashi::kashi(),
         music::deafen(),
         music::join(),
         music::leave(),
@@ -70,7 +73,7 @@ async fn main() {
         tools::qr(),
         tools::register(),
         tools::taf(),
-        // tools::uptime(),
+        tools::uptime(),
         tools::verse(),
         tools::weather(),
     ];
@@ -78,7 +81,7 @@ async fn main() {
     let options = poise::FrameworkOptions {
         commands,
         prefix_options: poise::PrefixFrameworkOptions {
-            prefix: Some(prefix.to_string().into()),
+            prefix: Some(prefix.to_string()),
             edit_tracker: Some(Arc::new(poise::EditTracker::for_timespan(
                 Duration::from_secs(3600),
             ))),
@@ -123,7 +126,7 @@ async fn main() {
     };
 
     let framework = poise::Framework::builder()
-        .setup(move |ctx, ready, _framework| {
+        .setup(move |ctx, ready, framework| {
             Box::pin(async move {
                 info!(
                     "{} [{}] connected successfully!",
@@ -131,8 +134,16 @@ async fn main() {
                 );
                 ctx.set_activity(Some(ActivityData::listening(prefix + "help")));
                 // poise::builtins::register_globally(ctx, &framework.options().commands).await?;
+                poise::builtins::register_in_guild(
+                    ctx,
+                    &framework.options().commands,
+                    512680330495524873.into(),
+                )
+                .await?;
 
-                Ok(Data {})
+                Ok(Data {
+                    http_client: HttpClient::new(),
+                })
             })
         })
         .options(options)