Swap postgresql-client for libpq5 in docker build

Signed-off-by: trivernis <trivernis@protonmail.com>
Remove build-essential package from runtime container
154 changed files with 5757 additions and 5668 deletions
--- a/.containerignore
+++ b/.containerignore
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@ -1,56 +0,0 @@
-name: Build Container
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-      - "v*"
-  schedule:
-    # daily builds to always include patches in the docker image
-    - cron: '0 4 * * *'
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /var/lib/containers/
-          key: ${{ runner.os }}-podman-${{ hashFiles('Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-podman-
-      - name: Build
-        id: build-image
-        uses: redhat-actions/buildah-build@v2
-        with:
-          context: .
-          layers: true
-          containerfiles: ./Containerfile
-          platforms: ${{github.event.inputs.platforms}}
-          image: trivernis/tobi
-      - name: Login to DockerHub
-        uses: redhat-actions/podman-login@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-          registry: docker.io
-      - name: Push
-        uses: redhat-actions/push-to-registry@v2
-        with:
-          image: ${{ steps.build-image.outputs.image }}
-          tags: ${{ steps.build-image.outputs.tags }}
-          registry: docker.io
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,4 +1,4 @@
-name: Check
+name: Build and Test

 on:
  workflow_dispatch:
@ -32,14 +32,8 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-cargo-

-      
-      - name: Run Rustfmt
-        uses: actions-rust-lang/rustfmt@v1.0.0
-
-      - name: Run Clippy
-        uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}      
+      - name: Build
+        run: cargo build --verbose

      - name: Test coreutils
        run: cargo test --verbose --package bot-coreutils
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@ -1,39 +0,0 @@
-version: 1
-when:
-  - event: [pull_request]
-  - event: push
-    branch:
-      - ${CI_REPO_DEFAULT_BRANCH}
-      - release/*
-      - fix/*
-steps:
-  test:
-    image: rust:alpine
-    commands:
-      - apk add --no-cache --force-overwrite \
-        build-base \
-        openssl-dev \
-        libopusenc-dev \
-        libpq-dev \
-        curl \
-        bash
-      - rustup default stable
-      - rustup component add clippy --toolchain stable-x86_64-unknown-linux-musl
-      - cargo clippy
-      - cargo test --verbose --package bot-coreutils
-      - cargo test --verbose --package bot-database
-      - cargo test --verbose
-
-  build:
-    image: rust:alpine
-    commands:
-      - apk add --no-cache --force-overwrite \
-        build-base \
-        openssl-dev \
-        libopusenc-dev \
-        libpq-dev \
-        curl \
-        bash
-      - cargo build
-    when:
-      - event: [pull_request]
--- a/.woodpecker/container.yml
+++ b/.woodpecker/container.yml
@ -1,20 +0,0 @@
-version: 1
-when:
-  - event: [tag]
-    branch:
-      - ${CI_REPO_DEFAULT_BRANCH}
-steps:
-  build:
-    image: woodpeckerci/plugin-docker-buildx
-    secrets: [forgejo_token]
-    settings:
-      dockerfile: Containerfile
-      tag: ${CI_COMMIT_TAG##v}
-      repo: git.trivernis.net/trivernis/2b-rs
-      registry: git.trivernis.net
-      platforms: linux/amd64
-      username: 
-        from_secret: forgejo_id
-      password:
-        from_secret: forgejo_token
-    
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,9 +1,6 @@
-[workspace]
-members=["bot-coreutils", "bot-database", "bot-database/migration", "."]
-
 [package]
 name = "tobi-rs"
-version = "0.11.4"
+version = "0.6.5"
 authors = ["trivernis <trivernis@protonmail.com>"]
 edition = "2018"

@ -15,41 +12,30 @@ panic = 'abort'
 [dependencies]
 bot-database = {path="./bot-database"}
 bot-coreutils = {path="./bot-coreutils"}
-serenity = "0.11.5"
+bot-serenityutils = {path="./bot-serenityutils"}
+serenity = "0.10.5"
 dotenv = "0.15.0"
-serde_derive = "1.0.145"
-serde = "1.0.145"
-thiserror = "1.0.37"
-minecraft-data-rs = "0.5.0"
-serde_json = "1.0.86"
-rand = "0.8.5"
-regex = "1.6.0"
-aspotify = "0.7.1"
+tokio = { version = "1.4.0", features = ["macros", "rt-multi-thread"] }
+serde_derive = "1.0.125"
+serde = "1.0.125"
+thiserror = "1.0.24"
+minecraft-data-rs = "0.3.0"
+songbird =  "0.1.5"
+serde_json = "1.0.64"
+rand = "0.8.3"
+regex = "1.4.5"
+aspotify = "0.7.0"
 lazy_static = "1.4.0"
-futures = "0.3.24"
-chrono = "0.4.22"
-sysinfo = "0.26.4"
-reqwest = "0.11.12"
-chrono-tz = "0.6.3"
-sauce-api = "1.0.0"
-rustc_version_runtime = "0.2.1"
+futures = "0.3.13"
+log = "0.4.14"
+fern = "0.6.0"
+chrono = "0.4.19"
+colored = "2.0.0"
+sysinfo = "0.16.5"
+reqwest = "0.11.2"
+chrono-tz = "0.5.3"
+sauce-api = "0.7.1"
+rustc_version_runtime = "0.2.0"
 trigram = "0.4.4"
-typemap_rev = "0.2.0"
-youtube-metadata = "0.2.0"
-xkcd-search = "0.1.2"
-animethemes-rs = "0.4.5"
-build-time = "0.1.2"
-tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
-tracing = "0.1.37"
-serenity-additions = "0.3.4"
-
-[dependencies.songbird]
-version = "0.3.0"
-features = ["yt-dlp"]
-
-[dependencies.tokio]
-version = "1.21.2"
-features = ["macros", "rt-multi-thread"]
-
-# [patch.crates-io]
-# serenity-additions = { path = "../serenity-additions" }
+typemap_rev = "0.1.5"
+youtube-metadata = "0.1.1"
--- a/45
+++ b/45
@ -1,45 +0,0 @@
-ARG BASE_IMAGE=docker.io/alpine:edge
-
-FROM ${BASE_IMAGE} AS build_base
-RUN apk update
-RUN apk add --no-cache --force-overwrite \
-    build-base \
-    openssl-dev \
-    libopusenc-dev \
-    libpq-dev \
-    curl \
-    bash
-RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
-RUN rm -rf /var/lib/{cache,log}/ /var/cache
-
-FROM build_base AS builder
-ENV RUSTFLAGS="-C target-feature=-crt-static"
-WORKDIR /usr/src
-RUN cargo new tobi
-WORKDIR /usr/src/tobi
-COPY Cargo.toml Cargo.lock ./
-COPY src ./src
-COPY bot-coreutils ./bot-coreutils
-COPY bot-database ./bot-database
-RUN cargo build --release
-RUN mkdir /tmp/tobi
-RUN cp target/release/tobi-rs /tmp/tobi/
-
-FROM ${BASE_IMAGE} AS runtime-base
-RUN apk update
-RUN apk add --no-cache --force-overwrite \
-    openssl \
-    libopusenc \
-    libpq \
-    python3 \
-    py3-pip \
-    qalc \
-    ffmpeg \
-    bash
-RUN pip3 install yt-dlp --break-system-packages
-RUN rm -rf /var/lib/{cache,log}/ /var/cache
-
-FROM runtime-base
-COPY --from=builder /tmp/tobi/tobi-rs .
-ENTRYPOINT ["/tobi-rs"]
--- a/24
+++ b/24
@ -0,0 +1,24 @@
+# syntax=docker/dockerfile:1.0-experimental
+FROM rust:latest  AS builder
+RUN apt-get update
+RUN apt-get install -y build-essential libssl-dev libopus-dev libpq-dev
+WORKDIR /usr/src
+RUN USER=root cargo new tobi
+WORKDIR /usr/src/tobi
+COPY Cargo.toml Cargo.lock ./
+COPY src ./src
+COPY bot-coreutils ./bot-coreutils
+COPY bot-database ./bot-database
+COPY bot-serenityutils ./bot-serenityutils
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=target \
+    cargo build --release
+RUN mkdir /tmp/tobi
+RUN --mount=type=cache,target=target cp target/release/tobi-rs /tmp/tobi/
+
+FROM bitnami/minideb:latest
+RUN install_packages openssl libopus0 ffmpeg python3 python3-pip libpq5
+RUN pip3 install youtube-dl
+RUN rm -rf /var/lib/{apt,dpkg,cache,log}/
+COPY --from=builder /tmp/tobi/tobi-rs .
+ENTRYPOINT ["/tobi-rs"]
--- a/README.md
+++ b/README.md
@ -63,4 +63,4 @@ The required values are:

 ## License

-See LICENSE.md
+It's GPL 3.0
--- a/bot-coreutils/Cargo.lock
+++ b/bot-coreutils/Cargo.lock
@ -0,0 +1,314 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "bot-coreutils"
+version = "0.1.1"
+dependencies = [
+ "log",
+ "mime_guess",
+ "rand",
+ "tokio",
+ "url",
+]
+
+[[package]]
+name = "bytes"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+dependencies = [
+ "matches",
+ "percent-encoding",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "idna"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
+
+[[package]]
+name = "log"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "matches"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+
+[[package]]
+name = "memchr"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
+[[package]]
+name = "mime"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+
+[[package]]
+name = "mime_guess"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
+[[package]]
+name = "mio"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956"
+dependencies = [
+ "libc",
+ "log",
+ "miow",
+ "ntapi",
+ "winapi",
+]
+
+[[package]]
+name = "miow"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "ntapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
+
+[[package]]
+name = "percent-encoding"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+
+[[package]]
+name = "rand"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+
+[[package]]
+name = "tokio"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722"
+dependencies = [
+ "autocfg",
+ "bytes",
+ "libc",
+ "memchr",
+ "mio",
+ "once_cell",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "winapi",
+]
+
+[[package]]
+name = "unicase"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0"
+dependencies = [
+ "matches",
+]
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "url"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "matches",
+ "percent-encoding",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+
+[[package]]
+name = "wasi"
+version = "0.10.2+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
--- a/bot-coreutils/Cargo.toml
+++ b/bot-coreutils/Cargo.toml
@ -7,8 +7,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-tokio = { version = "1.21.2", features = ["process", "io-util"] }
-log = "0.4.17"
-url = "2.3.1"
-mime_guess = "2.0.4"
-rand = "0.8.5"
+tokio = {version = "1.4.0", features = ["process", "io-util"]}
+log = "0.4.14"
+url = "2.2.1"
+mime_guess = "2.0.3"
+rand = "0.8.3"
--- a/bot-coreutils/src/process.rs
+++ b/bot-coreutils/src/process.rs
@ -11,7 +11,7 @@ pub async fn run_command_async(command: &str, args: &[&str]) -> io::Result<Strin
    let stdout = String::from_utf8_lossy(&process_output.stdout[..]);

    if stderr.len() != 0 {
-        log::trace!("STDERR of command {}: {}", command, stderr);
+        log::debug!("STDERR of command {}: {}", command, stderr);
    }
    log::trace!("Command output is {}", stdout);

--- a/bot-database/Cargo.lock
+++ b/bot-database/Cargo.lock
@ -0,0 +1,467 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "async-trait"
+version = "0.1.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "bot-database"
+version = "0.4.0"
+dependencies = [
+ "chrono",
+ "diesel",
+ "diesel_migrations",
+ "dotenv",
+ "log",
+ "r2d2",
+ "thiserror",
+ "tokio-diesel",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+dependencies = [
+ "libc",
+ "num-integer",
+ "num-traits",
+ "time",
+ "winapi",
+]
+
+[[package]]
+name = "diesel"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "047bfc4d5c3bd2ef6ca6f981941046113524b9a9f9a7cbdfdd7ff40f58e6f542"
+dependencies = [
+ "bitflags",
+ "byteorder",
+ "chrono",
+ "diesel_derives",
+ "pq-sys",
+ "r2d2",
+]
+
+[[package]]
+name = "diesel_derives"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "diesel_migrations"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c"
+dependencies = [
+ "migrations_internals",
+ "migrations_macros",
+]
+
+[[package]]
+name = "dotenv"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+
+[[package]]
+name = "futures"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"
+
+[[package]]
+name = "futures-io"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"
+
+[[package]]
+name = "futures-task"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"
+
+[[package]]
+name = "futures-util"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
+
+[[package]]
+name = "lock_api"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "migrations_internals"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860"
+dependencies = [
+ "diesel",
+]
+
+[[package]]
+name = "migrations_macros"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c"
+dependencies = [
+ "migrations_internals",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pq-sys"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ac25eee5a0582f45a67e837e350d784e7003bd29a5f460796772061ca49ffda"
+dependencies = [
+ "vcpkg",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r2d2"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f"
+dependencies = [
+ "log",
+ "parking_lot",
+ "scheduled-thread-pool",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "scheduled-thread-pool"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7"
+dependencies = [
+ "parking_lot",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "smallvec"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+
+[[package]]
+name = "syn"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+dependencies = [
+ "libc",
+ "wasi",
+ "winapi",
+]
+
+[[package]]
+name = "tokio"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722"
+dependencies = [
+ "autocfg",
+ "num_cpus",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "tokio-diesel"
+version = "0.3.0"
+source = "git+https://github.com/Trivernis/tokio-diesel#f4af42558246ab323600622ba8d08803d3c18842"
+dependencies = [
+ "async-trait",
+ "diesel",
+ "futures",
+ "r2d2",
+ "tokio",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
--- a/bot-database/Cargo.toml
+++ b/bot-database/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "bot-database"
-version = "0.6.0"
+version = "0.5.0"
 authors = ["trivernis <trivernis@protonmail.com>"]
 edition = "2018"

@ -8,13 +8,10 @@ edition = "2018"

 [dependencies]
 dotenv = "0.15.0"
-chrono = "0.4.22"
-thiserror = "1.0.37"
-tracing = "0.1.37"
-
-[dependencies.sea-orm]
-version = "0.9.3"
-features = ["runtime-tokio-native-tls", "sqlx-postgres"]
-
-[dependencies.migration]
-path = "./migration"
+chrono = "0.4.19"
+thiserror = "1.0.24"
+diesel = {version="1.4.6", features=["postgres", "r2d2", "chrono"]}
+log = "0.4.14"
+diesel_migrations = "1.4.0"
+r2d2 = "0.8.9"
+tokio-diesel = {git = "https://github.com/Trivernis/tokio-diesel"}
--- a/bot-database/diesel.toml
+++ b/bot-database/diesel.toml
@ -0,0 +1,5 @@
+# For documentation on how to configure this file,
+# see diesel.rs/guides/configuring-diesel-cli
+
+[print_schema]
+file = "src/schema.rs"
--- a/bot-database/migration/Cargo.toml
+++ b/bot-database/migration/Cargo.toml
@ -1,13 +0,0 @@
-[package]
-name = "migration"
-version = "0.1.0"
-edition = "2021"
-publish = false
-
-[lib]
-name = "migration"
-path = "src/lib.rs"
-
-[dependencies]
-sea-orm-migration = "0.9.3"
-tokio = { version = "1.21.2", features = ["rt", "net", "tracing"] }
--- a/bot-database/migration/README.md
+++ b/bot-database/migration/README.md
@ -1,37 +0,0 @@
-# Running Migrator CLI
-
- Apply all pending migrations
-    ```sh
-    cargo run
-    ```
-    ```sh
-    cargo run -- up
-    ```
- Apply first 10 pending migrations
-    ```sh
-    cargo run -- up -n 10
-    ```
- Rollback last applied migrations
-    ```sh
-    cargo run -- down
-    ```
- Rollback last 10 applied migrations
-    ```sh
-    cargo run -- down -n 10
-    ```
- Drop all tables from the database, then reapply all migrations
-    ```sh
-    cargo run -- fresh
-    ```
- Rollback all applied migrations, then reapply all migrations
-    ```sh
-    cargo run -- refresh
-    ```
- Rollback all applied migrations
-    ```sh
-    cargo run -- reset
-    ```
- Check the status of all migrations
-    ```sh
-    cargo run -- status
-    ```
--- a/bot-database/migration/src/lib.rs
+++ b/bot-database/migration/src/lib.rs
@ -1,16 +0,0 @@
-pub use sea_orm_migration::prelude::*;
-
-mod m20220029_164527_change_timestamp_format;
-mod m20220101_000001_create_table;
-
-pub struct Migrator;
-
-#[async_trait::async_trait]
-impl MigratorTrait for Migrator {
-    fn migrations() -> Vec<Box<dyn MigrationTrait>> {
-        vec![
-            Box::new(m20220101_000001_create_table::Migration),
-            Box::new(m20220029_164527_change_timestamp_format::Migration),
-        ]
-    }
-}
--- a/bot-database/migration/src/m20220029_164527_change_timestamp_format.rs
+++ b/bot-database/migration/src/m20220029_164527_change_timestamp_format.rs
@ -1,82 +0,0 @@
-use crate::{DbErr, Table};
-use sea_orm_migration::prelude::*;
-
-#[derive(Iden)]
-pub enum Statistics {
-    Table,
-    ExecutedAt,
-}
-
-#[derive(Iden)]
-pub enum EphemeralMessages {
-    Table,
-    Timeout,
-}
-
-pub struct Migration;
-
-impl MigrationName for Migration {
-    fn name(&self) -> &str {
-        "m20220029_164527_change_timestamp_format"
-    }
-}
-
-#[async_trait::async_trait]
-impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-        manager
-            .alter_table(
-                Table::alter()
-                    .table(Statistics::Table)
-                    .modify_column(
-                        ColumnDef::new(Statistics::ExecutedAt)
-                            .timestamp_with_time_zone()
-                            .not_null(),
-                    )
-                    .to_owned(),
-            )
-            .await?;
-        manager
-            .alter_table(
-                Table::alter()
-                    .table(EphemeralMessages::Table)
-                    .modify_column(
-                        ColumnDef::new(EphemeralMessages::Timeout)
-                            .timestamp_with_time_zone()
-                            .not_null(),
-                    )
-                    .to_owned(),
-            )
-            .await?;
-        Ok(())
-    }
-
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-        manager
-            .alter_table(
-                Table::alter()
-                    .table(Statistics::Table)
-                    .modify_column(
-                        ColumnDef::new(Statistics::ExecutedAt)
-                            .timestamp()
-                            .not_null(),
-                    )
-                    .to_owned(),
-            )
-            .await?;
-        manager
-            .alter_table(
-                Table::alter()
-                    .table(EphemeralMessages::Table)
-                    .modify_column(
-                        ColumnDef::new(EphemeralMessages::Timeout)
-                            .timestamp()
-                            .not_null(),
-                    )
-                    .to_owned(),
-            )
-            .await?;
-
-        Ok(())
-    }
-}
--- a/bot-database/migration/src/m20220101_000001_create_table.rs
+++ b/bot-database/migration/src/m20220101_000001_create_table.rs
@ -1,287 +0,0 @@
-use sea_orm_migration::prelude::*;
-
-pub struct Migration;
-
-#[derive(Iden)]
-pub enum EphemeralMessages {
-    Table,
-    ChannelId,
-    MessageId,
-    Timeout,
-}
-
-#[derive(Iden)]
-pub enum GuildPlaylists {
-    Table,
-    GuildId,
-    Name,
-    Url,
-}
-
-#[derive(Iden)]
-pub enum GuildSettings {
-    Table,
-    GuildId,
-    Key,
-    Value,
-}
-
-#[derive(Iden)]
-pub enum Media {
-    Table,
-    Id,
-    Category,
-    Name,
-    Url,
-}
-
-#[derive(Iden)]
-pub enum Statistics {
-    Table,
-    Id,
-    Version,
-    Command,
-    ExecutedAt,
-    Success,
-    ErrorMsg,
-}
-
-#[derive(Iden)]
-pub enum YoutubeSongs {
-    Table,
-    Id,
-    SpotifyId,
-    Artist,
-    Title,
-    Album,
-    Url,
-    Score,
-}
-
-impl MigrationName for Migration {
-    fn name(&self) -> &str {
-        "m20220101_000001_create_table"
-    }
-}
-
-#[async_trait::async_trait]
-impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-        manager.create_table(ephemeral_messages()).await?;
-        manager.create_table(guild_playlists()).await?;
-        manager.create_table(guild_settings()).await?;
-        manager.create_table(media()).await?;
-        manager.create_table(statistics()).await?;
-        manager.create_table(youtube_songs()).await?;
-
-        Ok(())
-    }
-
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-        manager
-            .drop_table(Table::drop().table(EphemeralMessages::Table).to_owned())
-            .await?;
-        manager
-            .drop_table(Table::drop().table(GuildPlaylists::Table).to_owned())
-            .await?;
-        manager
-            .drop_table(Table::drop().table(GuildSettings::Table).to_owned())
-            .await?;
-        manager
-            .drop_table(Table::drop().table(Media::Table).to_owned())
-            .await?;
-        manager
-            .drop_table(Table::drop().table(Statistics::Table).to_owned())
-            .await?;
-        manager
-            .drop_table(Table::drop().table(YoutubeSongs::Table).to_owned())
-            .await?;
-
-        Ok(())
-    }
-}
-
-fn ephemeral_messages() -> TableCreateStatement {
-    Table::create()
-        .table(EphemeralMessages::Table)
-        .if_not_exists()
-        .col(
-            ColumnDef::new(EphemeralMessages::ChannelId)
-                .big_integer()
-                .not_null(),
-        )
-        .col(
-            ColumnDef::new(EphemeralMessages::MessageId)
-                .big_integer()
-                .not_null(),
-        )
-        .col(
-            ColumnDef::new(EphemeralMessages::Timeout)
-                .timestamp()
-                .not_null(),
-        )
-        .primary_key(
-            Index::create()
-                .col(EphemeralMessages::ChannelId)
-                .col(EphemeralMessages::MessageId),
-        )
-        .to_owned()
-}
-
-fn guild_playlists() -> TableCreateStatement {
-    Table::create()
-        .table(GuildPlaylists::Table)
-        .if_not_exists()
-        .col(
-            ColumnDef::new(GuildPlaylists::GuildId)
-                .big_integer()
-                .not_null(),
-        )
-        .col(
-            ColumnDef::new(GuildPlaylists::Name)
-                .string_len(255)
-                .not_null(),
-        )
-        .col(
-            ColumnDef::new(GuildPlaylists::Url)
-                .string_len(1204)
-                .not_null(),
-        )
-        .primary_key(
-            Index::create()
-                .col(GuildPlaylists::GuildId)
-                .col(GuildPlaylists::Name),
-        )
-        .to_owned()
-}
-
-fn guild_settings() -> TableCreateStatement {
-    Table::create()
-        .table(GuildSettings::Table)
-        .if_not_exists()
-        .col(
-            ColumnDef::new(GuildSettings::GuildId)
-                .big_integer()
-                .not_null(),
-        )
-        .col(
-            ColumnDef::new(GuildSettings::Key)
-                .string_len(255)
-                .not_null(),
-        )
-        .col(
-            ColumnDef::new(GuildSettings::Value)
-                .string_len(1024)
-                .not_null(),
-        )
-        .primary_key(
-            Index::create()
-                .col(GuildSettings::GuildId)
-                .col(GuildSettings::Key),
-        )
-        .to_owned()
-}
-
-fn media() -> TableCreateStatement {
-    Table::create()
-        .table(Media::Table)
-        .if_not_exists()
-        .col(
-            ColumnDef::new(Media::Id)
-                .big_integer()
-                .auto_increment()
-                .not_null()
-                .primary_key(),
-        )
-        .col(ColumnDef::new(Media::Category).string_len(128))
-        .col(ColumnDef::new(Media::Name).string_len(128))
-        .col(ColumnDef::new(Media::Url).string_len(128))
-        .index(
-            Index::create()
-                .unique()
-                .col(Media::Category)
-                .col(Media::Name),
-        )
-        .to_owned()
-}
-
-fn statistics() -> TableCreateStatement {
-    Table::create()
-        .table(Statistics::Table)
-        .if_not_exists()
-        .col(
-            ColumnDef::new(Statistics::Id)
-                .big_integer()
-                .auto_increment()
-                .primary_key(),
-        )
-        .col(
-            ColumnDef::new(Statistics::Version)
-                .string_len(32)
-                .not_null(),
-        )
-        .col(
-            ColumnDef::new(Statistics::Command)
-                .string_len(255)
-                .not_null(),
-        )
-        .col(
-            ColumnDef::new(Statistics::ExecutedAt)
-                .timestamp()
-                .not_null(),
-        )
-        .col(
-            ColumnDef::new(Statistics::Success)
-                .boolean()
-                .not_null()
-                .default(true),
-        )
-        .col(ColumnDef::new(Statistics::ErrorMsg).string())
-        .to_owned()
-}
-
-fn youtube_songs() -> TableCreateStatement {
-    Table::create()
-        .table(YoutubeSongs::Table)
-        .if_not_exists()
-        .col(
-            ColumnDef::new(YoutubeSongs::Id)
-                .big_integer()
-                .primary_key()
-                .auto_increment(),
-        )
-        .col(
-            ColumnDef::new(YoutubeSongs::SpotifyId)
-                .string_len(255)
-                .not_null(),
-        )
-        .col(
-            ColumnDef::new(YoutubeSongs::Artist)
-                .string_len(128)
-                .not_null(),
-        )
-        .col(
-            ColumnDef::new(YoutubeSongs::Title)
-                .string_len(255)
-                .not_null(),
-        )
-        .col(
-            ColumnDef::new(YoutubeSongs::Album)
-                .string_len(255)
-                .not_null(),
-        )
-        .col(ColumnDef::new(YoutubeSongs::Url).string_len(128).not_null())
-        .col(
-            ColumnDef::new(YoutubeSongs::Score)
-                .integer()
-                .default(0)
-                .not_null(),
-        )
-        .index(
-            Index::create()
-                .unique()
-                .col(YoutubeSongs::SpotifyId)
-                .col(YoutubeSongs::Url),
-        )
-        .to_owned()
-}
--- a/bot-database/migration/src/main.rs
+++ b/bot-database/migration/src/main.rs
@ -1,7 +0,0 @@
-use migration::Migrator;
-use sea_orm_migration::prelude::*;
-
-#[tokio::main]
-async fn main() {
-    cli::run_cli(Migrator).await;
-}
--- a/bot-database/migrations/.gitkeep
+++ b/bot-database/migrations/.gitkeep
--- a/bot-database/migrations/00000000000000_diesel_initial_setup/down.sql
+++ b/bot-database/migrations/00000000000000_diesel_initial_setup/down.sql
@ -0,0 +1,6 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+DROP FUNCTION IF EXISTS diesel_manage_updated_at(_tbl regclass);
+DROP FUNCTION IF EXISTS diesel_set_updated_at();
--- a/bot-database/migrations/00000000000000_diesel_initial_setup/up.sql
+++ b/bot-database/migrations/00000000000000_diesel_initial_setup/up.sql
@ -0,0 +1,36 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+
+
+
+-- Sets up a trigger for the given table to automatically set a column called
+-- `updated_at` whenever the row is modified (unless `updated_at` was included
+-- in the modified columns)
+--
+-- # Example
+--
+-- ```sql
+-- CREATE TABLE users (id SERIAL PRIMARY KEY, updated_at TIMESTAMP NOT NULL DEFAULT NOW());
+--
+-- SELECT diesel_manage_updated_at('users');
+-- ```
+CREATE OR REPLACE FUNCTION diesel_manage_updated_at(_tbl regclass) RETURNS VOID AS $$
+BEGIN
+    EXECUTE format('CREATE TRIGGER set_updated_at BEFORE UPDATE ON %s
+                    FOR EACH ROW EXECUTE PROCEDURE diesel_set_updated_at()', _tbl);
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION diesel_set_updated_at() RETURNS trigger AS $$
+BEGIN
+    IF (
+        NEW IS DISTINCT FROM OLD AND
+        NEW.updated_at IS NOT DISTINCT FROM OLD.updated_at
+    ) THEN
+        NEW.updated_at := current_timestamp;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
--- a/bot-database/migrations/2021-04-09-075309_create_tables/down.sql
+++ b/bot-database/migrations/2021-04-09-075309_create_tables/down.sql
@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+DROP TABLE guild_settings;
--- a/bot-database/migrations/2021-04-09-075309_create_tables/up.sql
+++ b/bot-database/migrations/2021-04-09-075309_create_tables/up.sql
@ -0,0 +1,6 @@
+CREATE TABLE guild_settings (
+    guild_id BIGINT NOT NULL,
+    key VARCHAR(255) NOT NULL,
+    value VARCHAR(1024),
+    PRIMARY KEY (guild_id, key)
+);
--- a/bot-database/migrations/2021-04-09-095329_create_guild_playlists/down.sql
+++ b/bot-database/migrations/2021-04-09-095329_create_guild_playlists/down.sql
@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+DROP TABLE guild_playlists;
--- a/bot-database/migrations/2021-04-09-095329_create_guild_playlists/up.sql
+++ b/bot-database/migrations/2021-04-09-095329_create_guild_playlists/up.sql
@ -0,0 +1,7 @@
+-- Your SQL goes here
+CREATE TABLE guild_playlists (
+    guild_id BIGINT NOT NULL,
+    name VARCHAR(255) NOT NULL,
+    url VARCHAR(1024) NOT NULL,
+    PRIMARY KEY (guild_id, name)
+)
--- a/bot-database/migrations/2021-04-12-115141_create_gifs/down.sql
+++ b/bot-database/migrations/2021-04-12-115141_create_gifs/down.sql
@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+DROP TABLE gifs;
--- a/bot-database/migrations/2021-04-12-115141_create_gifs/up.sql
+++ b/bot-database/migrations/2021-04-12-115141_create_gifs/up.sql
@ -0,0 +1,8 @@
+-- Your SQL goes here
+CREATE TABLE gifs (
+    id BIGSERIAL PRIMARY KEY ,
+    category VARCHAR(128),
+    name VARCHAR(128),
+    url VARCHAR(128) NOT NULL,
+    UNIQUE (category, name)
+)
--- a/bot-database/migrations/2021-04-12-133308_create_statistics/down.sql
+++ b/bot-database/migrations/2021-04-12-133308_create_statistics/down.sql
@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+DROP TABLE statistics;
--- a/bot-database/migrations/2021-04-12-133308_create_statistics/up.sql
+++ b/bot-database/migrations/2021-04-12-133308_create_statistics/up.sql
@ -0,0 +1,9 @@
+-- Your SQL goes here
+CREATE TABLE statistics (
+    id BIGSERIAL PRIMARY KEY,
+    version VARCHAR(32) NOT NULL,
+    command VARCHAR(255) NOT NULL,
+    executed_at TIMESTAMP NOT NULL,
+    success BOOLEAN NOT NULL DEFAULT TRUE,
+    error_msg TEXT
+)
--- a/bot-database/migrations/2021-04-13-144951_create_youtube_songs/down.sql
+++ b/bot-database/migrations/2021-04-13-144951_create_youtube_songs/down.sql
@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+DROP TABLE youtube_songs;
--- a/bot-database/migrations/2021-04-13-144951_create_youtube_songs/up.sql
+++ b/bot-database/migrations/2021-04-13-144951_create_youtube_songs/up.sql
@ -0,0 +1,11 @@
+-- Your SQL goes here
+CREATE TABLE youtube_songs (
+    id BIGSERIAL PRIMARY KEY,
+    spotify_id VARCHAR(255) NOT NULL,
+    artist VARCHAR(128) NOT NULL,
+    title VARCHAR(255) NOT NULL,
+    album VARCHAR(255) NOT NULL,
+    url VARCHAR(128) NOT NULL,
+    score INTEGER DEFAULT 0 NOT NULL,
+    UNIQUE (spotify_id, url)
+)
--- a/bot-database/migrations/2021-04-16-064403_create_ephemeral_messages/down.sql
+++ b/bot-database/migrations/2021-04-16-064403_create_ephemeral_messages/down.sql
@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+DROP TABLE ephemeral_messages;
--- a/bot-database/migrations/2021-04-16-064403_create_ephemeral_messages/up.sql
+++ b/bot-database/migrations/2021-04-16-064403_create_ephemeral_messages/up.sql
@ -0,0 +1,7 @@
+-- Your SQL goes here
+CREATE TABLE ephemeral_messages (
+    channel_id BIGINT NOT NULL,
+    message_id BIGINT NOT NULL,
+    timeout TIMESTAMP NOT NULL,
+    PRIMARY KEY (channel_id, message_id)
+)
--- a/bot-database/src/database/ephemeral_messages.rs
+++ b/bot-database/src/database/ephemeral_messages.rs
@ -1,49 +1,56 @@
-use sea_orm::ActiveValue::Set;
 use std::time::SystemTime;

-use crate::entity::ephemeral_messages;
+use diesel::prelude::*;
+use diesel::{delete, insert_into};
+use tokio_diesel::*;
+
 use crate::error::DatabaseResult;
-use sea_orm::prelude::*;
+use crate::models::*;
+use crate::schema::*;
+use crate::Database;

-impl super::BotDatabase {
+impl Database {
    /// Adds a command statistic to the database
-    #[tracing::instrument(level = "debug", skip(self))]
    pub async fn add_ephemeral_message(
        &self,
        channel_id: u64,
        message_id: u64,
        timeout: SystemTime,
    ) -> DatabaseResult<()> {
-        let model = ephemeral_messages::ActiveModel {
-            channel_id: Set(channel_id as i64),
-            message_id: Set(message_id as i64),
-            timeout: Set(DateTimeLocal::from(timeout).into()),
-            ..Default::default()
-        };
-        model.insert(&self.db).await?;
+        use ephemeral_messages::dsl;
+        insert_into(dsl::ephemeral_messages)
+            .values(EphemeralMessageInsert {
+                channel_id: channel_id as i64,
+                message_id: message_id as i64,
+                timeout,
+            })
+            .execute_async(&self.pool)
+            .await?;

        Ok(())
    }

    /// Returns a vec of all ephemeral messages
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub async fn get_ephemeral_messages(&self) -> DatabaseResult<Vec<ephemeral_messages::Model>> {
-        let messages = ephemeral_messages::Entity::find().all(&self.db).await?;
+    pub async fn get_ephemeral_messages(&self) -> DatabaseResult<Vec<EphemeralMessage>> {
+        use ephemeral_messages::dsl;
+        let messages: Vec<EphemeralMessage> = dsl::ephemeral_messages
+            .load_async::<EphemeralMessage>(&self.pool)
+            .await?;

        Ok(messages)
    }

    /// Deletes a single ephemeral message
-    #[tracing::instrument(level = "debug", skip(self))]
    pub async fn delete_ephemeral_message(
        &self,
        channel_id: i64,
        message_id: i64,
    ) -> DatabaseResult<()> {
-        ephemeral_messages::Entity::delete_many()
-            .filter(ephemeral_messages::Column::ChannelId.eq(channel_id))
-            .filter(ephemeral_messages::Column::MessageId.eq(message_id))
-            .exec(&self.db)
+        use ephemeral_messages::dsl;
+        delete(dsl::ephemeral_messages)
+            .filter(dsl::channel_id.eq(channel_id))
+            .filter(dsl::message_id.eq(message_id))
+            .execute_async(&self.pool)
            .await?;

        Ok(())
--- a/bot-database/src/database/gifs.rs
+++ b/bot-database/src/database/gifs.rs
@ -0,0 +1,57 @@
+use diesel::insert_into;
+use diesel::prelude::*;
+use tokio_diesel::*;
+
+use crate::error::DatabaseResult;
+use crate::models::*;
+use crate::schema::*;
+use crate::Database;
+
+impl Database {
+    /// Returns a list of all gifs in the database
+    pub async fn get_all_gifs(&self) -> DatabaseResult<Vec<Gif>> {
+        use gifs::dsl;
+        log::debug!("Loading all gifs from the database");
+
+        let gifs: Vec<Gif> = dsl::gifs.load_async::<Gif>(&self.pool).await?;
+        Ok(gifs)
+    }
+
+    /// Returns a list of gifs by assigned category
+    pub async fn get_gifs_by_category(&self, category: &str) -> DatabaseResult<Vec<Gif>> {
+        use gifs::dsl;
+        log::debug!("Searching for gifs in category '{}'", category);
+
+        let gifs: Vec<Gif> = dsl::gifs
+            .filter(dsl::category.eq(category))
+            .load_async::<Gif>(&self.pool)
+            .await?;
+        Ok(gifs)
+    }
+
+    /// Adds a gif to the database
+    pub async fn add_gif(
+        &self,
+        url: &str,
+        category: Option<String>,
+        name: Option<String>,
+    ) -> DatabaseResult<()> {
+        use gifs::dsl;
+        log::debug!(
+            "Inserting gif with url '{}' and name {:?} and category {:?}",
+            url,
+            name,
+            category
+        );
+        insert_into(dsl::gifs)
+            .values(GifInsert {
+                url: url.to_string(),
+                name,
+                category,
+            })
+            .execute_async(&self.pool)
+            .await?;
+
+        Ok(())
+    }
+}
--- a/bot-database/src/database/guild_playlists.rs
+++ b/bot-database/src/database/guild_playlists.rs
@ -1,54 +1,65 @@
-use crate::entity::guild_playlists;
+use diesel::insert_into;
+use diesel::prelude::*;
+use tokio_diesel::*;
+
 use crate::error::DatabaseResult;
-use sea_orm::prelude::*;
-use sea_orm::ActiveValue::Set;
+use crate::models::*;
+use crate::schema::*;
+use crate::Database;

-impl super::BotDatabase {
+impl Database {
    /// Returns a list of all guild playlists
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub async fn get_guild_playlists(
-        &self,
-        guild_id: u64,
-    ) -> DatabaseResult<Vec<guild_playlists::Model>> {
-        let playlists = guild_playlists::Entity::find()
-            .filter(guild_playlists::Column::GuildId.eq(guild_id))
-            .all(&self.db)
+    pub async fn get_guild_playlists(&self, guild_id: u64) -> DatabaseResult<Vec<GuildPlaylist>> {
+        use guild_playlists::dsl;
+        log::debug!("Retrieving guild playlists for guild {}", guild_id);
+
+        let playlists: Vec<GuildPlaylist> = dsl::guild_playlists
+            .filter(dsl::guild_id.eq(guild_id as i64))
+            .load_async::<GuildPlaylist>(&self.pool)
            .await?;

        Ok(playlists)
    }

    /// Returns a guild playlist by name
-    #[tracing::instrument(level = "debug", skip(self))]
    pub async fn get_guild_playlist(
        &self,
        guild_id: u64,
        name: String,
-    ) -> DatabaseResult<Option<guild_playlists::Model>> {
-        let playlist = guild_playlists::Entity::find()
-            .filter(guild_playlists::Column::GuildId.eq(guild_id))
-            .filter(guild_playlists::Column::Name.eq(name))
-            .one(&self.db)
+    ) -> DatabaseResult<Option<GuildPlaylist>> {
+        use guild_playlists::dsl;
+        log::debug!("Retriving guild playlist '{}' for guild {}", name, guild_id);
+
+        let playlists: Vec<GuildPlaylist> = dsl::guild_playlists
+            .filter(dsl::guild_id.eq(guild_id as i64))
+            .filter(dsl::name.eq(name))
+            .load_async::<GuildPlaylist>(&self.pool)
            .await?;

-        Ok(playlist)
+        Ok(playlists.into_iter().next())
    }

    /// Adds a new playlist to the database overwriting the old one
-    #[tracing::instrument(level = "debug", skip(self))]
    pub async fn add_guild_playlist(
        &self,
        guild_id: u64,
        name: String,
        url: String,
    ) -> DatabaseResult<()> {
-        let model = guild_playlists::ActiveModel {
-            guild_id: Set(guild_id as i64),
-            name: Set(name),
-            url: Set(url),
-            ..Default::default()
-        };
-        model.insert(&self.db).await?;
+        use guild_playlists::dsl;
+        log::debug!("Inserting guild playlist '{}' for guild {}", name, guild_id);
+
+        insert_into(dsl::guild_playlists)
+            .values(GuildPlaylistInsert {
+                guild_id: guild_id as i64,
+                name: name.clone(),
+                url: url.clone(),
+            })
+            .on_conflict((dsl::guild_id, dsl::name))
+            .do_update()
+            .set(dsl::url.eq(url))
+            .execute_async(&self.pool)
+            .await?;

        Ok(())
    }
--- a/bot-database/src/database/guild_settings.rs
+++ b/bot-database/src/database/guild_settings.rs
@ -1,46 +1,53 @@
-use sea_orm::ActiveValue::Set;
 use std::any;
 use std::fmt::Debug;
 use std::str::FromStr;

-use crate::entity::guild_settings;
+use diesel::prelude::*;
+use diesel::{delete, insert_into};
+use tokio_diesel::*;
+
 use crate::error::DatabaseResult;
-use sea_orm::prelude::*;
+use crate::models::*;
+use crate::schema::*;
+use crate::Database;

-impl super::BotDatabase {
+impl Database {
    /// Returns a guild setting from the database
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub async fn get_guild_setting<T: 'static, S: AsRef<str> + Debug>(
+    pub async fn get_guild_setting<T: 'static>(
        &self,
        guild_id: u64,
-        key: S,
+        key: String,
    ) -> DatabaseResult<Option<T>>
    where
        T: FromStr,
    {
-        let setting = guild_settings::Entity::find()
-            .filter(guild_settings::Column::GuildId.eq(guild_id as i64))
-            .filter(guild_settings::Column::Key.eq(key.as_ref()))
-            .one(&self.db)
+        use guild_settings::dsl;
+        log::debug!("Retrieving setting '{}' for guild {}", key, guild_id);
+
+        let entries: Vec<GuildSetting> = dsl::guild_settings
+            .filter(dsl::guild_id.eq(guild_id as i64))
+            .filter(dsl::key.eq(key))
+            .load_async::<GuildSetting>(&self.pool)
            .await?;
-        if let Some(setting) = setting {
+        log::trace!("Result is {:?}", entries);
+
+        if let Some(first) = entries.first() {
            if any::TypeId::of::<T>() == any::TypeId::of::<bool>() {
-                Ok(setting
+                Ok(first
                    .value
                    .clone()
                    .unwrap_or("false".to_string())
                    .parse::<T>()
                    .ok())
            } else {
-                Ok(setting.value.clone().and_then(|v| v.parse::<T>().ok()))
+                Ok(first.value.clone().and_then(|v| v.parse::<T>().ok()))
            }
        } else {
-            Ok(None)
+            return Ok(None);
        }
    }

    /// Upserting a guild setting
-    #[tracing::instrument(level = "debug", skip(self))]
    pub async fn set_guild_setting<T>(
        &self,
        guild_id: u64,
@ -48,38 +55,33 @@ impl super::BotDatabase {
        value: T,
    ) -> DatabaseResult<()>
    where
-        T: 'static + ToString + FromStr + Debug,
+        T: ToString + Debug,
    {
-        let model = guild_settings::ActiveModel {
-            guild_id: Set(guild_id as i64),
-            key: Set(key.clone()),
-            value: Set(Some(value.to_string())),
-            ..Default::default()
-        };
-        if self
-            .get_guild_setting::<T, _>(guild_id, &key)
-            .await?
-            .is_some()
-        {
-            model.update(&self.db).await?;
-        } else {
-            model.insert(&self.db).await?;
-        }
+        use guild_settings::dsl;
+        log::debug!("Setting '{}' to '{:?}' for guild {}", key, value, guild_id);
+
+        insert_into(dsl::guild_settings)
+            .values(GuildSettingInsert {
+                guild_id: guild_id as i64,
+                key: key.to_string(),
+                value: value.to_string(),
+            })
+            .on_conflict((dsl::guild_id, dsl::key))
+            .do_update()
+            .set(dsl::value.eq(value.to_string()))
+            .execute_async(&self.pool)
+            .await?;

        Ok(())
    }

    /// Deletes a guild setting
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub async fn delete_guild_setting<S: AsRef<str> + Debug>(
-        &self,
-        guild_id: u64,
-        key: S,
-    ) -> DatabaseResult<()> {
-        guild_settings::Entity::delete_many()
-            .filter(guild_settings::Column::GuildId.eq(guild_id))
-            .filter(guild_settings::Column::Key.eq(key.as_ref()))
-            .exec(&self.db)
+    pub async fn delete_guild_setting(&self, guild_id: u64, key: String) -> DatabaseResult<()> {
+        use guild_settings::dsl;
+        delete(dsl::guild_settings)
+            .filter(dsl::guild_id.eq(guild_id as i64))
+            .filter(dsl::key.eq(key))
+            .execute_async(&self.pool)
            .await?;

        Ok(())
--- a/bot-database/src/database/media.rs
+++ b/bot-database/src/database/media.rs
@ -1,48 +0,0 @@
-use crate::entity::media;
-use crate::error::DatabaseResult;
-use sea_orm::prelude::*;
-use sea_orm::ActiveValue::Set;
-use std::fmt::Debug;
-
-impl super::BotDatabase {
-    /// Returns a list of all gifs in the database
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub async fn get_all_media(&self) -> DatabaseResult<Vec<media::Model>> {
-        let entries = media::Entity::find().all(&self.db).await?;
-
-        Ok(entries)
-    }
-
-    /// Returns a list of gifs by assigned category
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub async fn get_media_by_category<S: AsRef<str> + 'static + Debug>(
-        &self,
-        category: S,
-    ) -> DatabaseResult<Vec<media::Model>> {
-        let entries = media::Entity::find()
-            .filter(media::Column::Category.eq(category.as_ref()))
-            .all(&self.db)
-            .await?;
-
-        Ok(entries)
-    }
-
-    /// Adds a gif to the database
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub async fn add_media(
-        &self,
-        url: String,
-        category: Option<String>,
-        name: Option<String>,
-    ) -> DatabaseResult<()> {
-        let model = media::ActiveModel {
-            url: Set(url),
-            category: Set(category),
-            name: Set(name),
-            ..Default::default()
-        };
-        model.insert(&self.db).await?;
-
-        Ok(())
-    }
-}
--- a/bot-database/src/database/mod.rs
+++ b/bot-database/src/database/mod.rs
@ -1,25 +1,30 @@
 pub use ephemeral_messages::*;
+pub use gifs::*;
 pub use guild_playlists::*;
 pub use guild_playlists::*;
-pub use media::*;
-use sea_orm::DatabaseConnection;
 pub use statistics::*;
 pub use youtube_songs::*;

+use crate::PoolConnection;
+
 mod ephemeral_messages;
+mod gifs;
 mod guild_playlists;
 mod guild_settings;
-mod media;
 mod statistics;
 mod youtube_songs;

 #[derive(Clone)]
-pub struct BotDatabase {
-    db: DatabaseConnection,
+pub struct Database {
+    pool: PoolConnection,
 }

-impl BotDatabase {
-    pub fn new(db: DatabaseConnection) -> Self {
-        Self { db }
+unsafe impl Send for Database {}
+
+unsafe impl Sync for Database {}
+
+impl Database {
+    pub fn new(pool: PoolConnection) -> Self {
+        Self { pool }
    }
 }
--- a/bot-database/src/database/statistics.rs
+++ b/bot-database/src/database/statistics.rs
@ -1,49 +1,50 @@
-use crate::entity::statistics;
-use crate::error::DatabaseResult;
-use sea_orm::prelude::*;
-use sea_orm::ActiveValue::Set;
-use sea_orm::{FromQueryResult, QuerySelect};
 use std::time::SystemTime;

-#[derive(FromQueryResult)]
-struct CommandCount {
-    count: i64,
-}
+use diesel::dsl::count;
+use diesel::insert_into;
+use diesel::prelude::*;
+use tokio_diesel::*;

-impl super::BotDatabase {
+use crate::error::DatabaseResult;
+use crate::models::*;
+use crate::schema::*;
+use crate::Database;
+
+impl Database {
    /// Adds a command statistic to the database
-    #[tracing::instrument(level = "debug", skip(self))]
    pub async fn add_statistic(
        &self,
-        version: String,
-        command: String,
+        version: &str,
+        command: &str,
        executed_at: SystemTime,
        success: bool,
        error_msg: Option<String>,
    ) -> DatabaseResult<()> {
-        let model = statistics::ActiveModel {
-            version: Set(version),
-            command: Set(command),
-            executed_at: Set(DateTimeLocal::from(executed_at).into()),
-            success: Set(success),
-            error_msg: Set(error_msg),
-            ..Default::default()
-        };
-        model.insert(&self.db).await?;
+        use statistics::dsl;
+        log::trace!("Adding statistic to database");
+        insert_into(dsl::statistics)
+            .values(StatisticInsert {
+                version: version.to_string(),
+                command: command.to_string(),
+                executed_at,
+                success,
+                error_msg,
+            })
+            .execute_async(&self.pool)
+            .await?;

        Ok(())
    }

    /// Returns the total number of commands executed
-    #[tracing::instrument(level = "debug", skip(self))]
    pub async fn get_total_commands_statistic(&self) -> DatabaseResult<u64> {
-        let total_count: Option<CommandCount> = statistics::Entity::find()
-            .select_only()
-            .column_as(statistics::Column::Id.count(), "count")
-            .into_model::<CommandCount>()
-            .one(&self.db)
+        use statistics::dsl;
+        log::trace!("Querying total number of commands");
+        let total_count: i64 = dsl::statistics
+            .select(count(dsl::id))
+            .first_async::<i64>(&self.pool)
            .await?;

-        Ok(total_count.unwrap().count as u64)
+        Ok(total_count as u64)
    }
 }
--- a/bot-database/src/database/youtube_songs.rs
+++ b/bot-database/src/database/youtube_songs.rs
@ -1,56 +1,69 @@
-use crate::entity::youtube_songs;
+use diesel::prelude::*;
+use diesel::{delete, insert_into};
+use tokio_diesel::*;
+
 use crate::error::DatabaseResult;
-use sea_orm::prelude::*;
-use sea_orm::ActiveValue::Set;
+use crate::models::*;
+use crate::schema::*;
+use crate::Database;

-impl super::BotDatabase {
+impl Database {
    /// Adds a song to the database or increments the score when it
    /// already exists
-    #[tracing::instrument(level = "debug", skip(self))]
    pub async fn add_song(
        &self,
-        spotify_id: String,
-        artist: String,
-        title: String,
-        album: String,
-        url: String,
+        spotify_id: &str,
+        artist: &str,
+        title: &str,
+        album: &str,
+        url: &str,
    ) -> DatabaseResult<()> {
-        if let Some(model) = self.get_song(&spotify_id).await? {
-            let mut active_model: youtube_songs::ActiveModel = model.into();
-            active_model.score = Set(active_model.score.unwrap() + 1);
-            active_model.update(&self.db).await?;
-        } else {
-            let model = youtube_songs::ActiveModel {
-                spotify_id: Set(spotify_id),
-                artist: Set(artist),
-                title: Set(title),
-                album: Set(album),
-                url: Set(url),
-                ..Default::default()
-            };
-            model.insert(&self.db).await?;
-        }
+        use youtube_songs::dsl;
+        log::debug!(
+            "Inserting/Updating song in database spotify_id: '{}' artist: '{}', title: '{}', album: '{}', url: '{}'",
+            spotify_id,
+            artist,
+            title,
+            album,
+            url,
+        );
+
+        insert_into(dsl::youtube_songs)
+            .values(YoutubeSongInsert {
+                spotify_id: spotify_id.to_string(),
+                artist: artist.to_string(),
+                title: title.to_string(),
+                album: album.to_string(),
+                url: url.to_string(),
+            })
+            .on_conflict((dsl::spotify_id, dsl::url))
+            .do_update()
+            .set(dsl::score.eq(dsl::score + 1))
+            .execute_async(&self.pool)
+            .await?;

        Ok(())
    }

    /// Returns the song with the best score for the given query
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub async fn get_song(&self, spotify_id: &str) -> DatabaseResult<Option<youtube_songs::Model>> {
-        let song = youtube_songs::Entity::find()
-            .filter(youtube_songs::Column::SpotifyId.eq(spotify_id))
-            .one(&self.db)
+    pub async fn get_song(&self, spotify_id: &str) -> DatabaseResult<Option<YoutubeSong>> {
+        use youtube_songs::dsl;
+        let songs: Vec<YoutubeSong> = dsl::youtube_songs
+            .filter(dsl::spotify_id.eq(spotify_id))
+            .order(dsl::score.desc())
+            .limit(1)
+            .load_async::<YoutubeSong>(&self.pool)
            .await?;

-        Ok(song)
+        Ok(songs.into_iter().next())
    }

    /// Deletes a song from the database
-    #[tracing::instrument(level = "debug", skip(self))]
    pub async fn delete_song(&self, id: i64) -> DatabaseResult<()> {
-        youtube_songs::Entity::delete_many()
-            .filter(youtube_songs::Column::Id.eq(id))
-            .exec(&self.db)
+        use youtube_songs::dsl;
+        delete(dsl::youtube_songs)
+            .filter(dsl::id.eq(id))
+            .execute_async(&self.pool)
            .await?;

        Ok(())
--- a/bot-database/src/entity/ephemeral_messages.rs
+++ b/bot-database/src/entity/ephemeral_messages.rs
@ -1,24 +0,0 @@
-//! SeaORM Entity. Generated by sea-orm-codegen 0.7.0
-
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "ephemeral_messages")]
-pub struct Model {
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub channel_id: i64,
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub message_id: i64,
-    pub timeout: DateTimeWithTimeZone,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter)]
-pub enum Relation {}
-
-impl RelationTrait for Relation {
-    fn def(&self) -> RelationDef {
-        panic!("No RelationDef")
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
--- a/bot-database/src/entity/guild_playlists.rs
+++ b/bot-database/src/entity/guild_playlists.rs
@ -1,24 +0,0 @@
-//! SeaORM Entity. Generated by sea-orm-codegen 0.7.0
-
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "guild_playlists")]
-pub struct Model {
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub guild_id: i64,
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub name: String,
-    pub url: String,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter)]
-pub enum Relation {}
-
-impl RelationTrait for Relation {
-    fn def(&self) -> RelationDef {
-        panic!("No RelationDef")
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
--- a/bot-database/src/entity/guild_settings.rs
+++ b/bot-database/src/entity/guild_settings.rs
@ -1,24 +0,0 @@
-//! SeaORM Entity. Generated by sea-orm-codegen 0.7.0
-
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "guild_settings")]
-pub struct Model {
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub guild_id: i64,
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub key: String,
-    pub value: Option<String>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter)]
-pub enum Relation {}
-
-impl RelationTrait for Relation {
-    fn def(&self) -> RelationDef {
-        panic!("No RelationDef")
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
--- a/bot-database/src/entity/media.rs
+++ b/bot-database/src/entity/media.rs
@ -1,24 +0,0 @@
-//! SeaORM Entity. Generated by sea-orm-codegen 0.7.0
-
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "media")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: i64,
-    pub category: Option<String>,
-    pub name: Option<String>,
-    pub url: String,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter)]
-pub enum Relation {}
-
-impl RelationTrait for Relation {
-    fn def(&self) -> RelationDef {
-        panic!("No RelationDef")
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
--- a/bot-database/src/entity/mod.rs
+++ b/bot-database/src/entity/mod.rs
@ -1,10 +0,0 @@
-//! SeaORM Entity. Generated by sea-orm-codegen 0.7.0
-
-pub mod prelude;
-
-pub mod ephemeral_messages;
-pub mod guild_playlists;
-pub mod guild_settings;
-pub mod media;
-pub mod statistics;
-pub mod youtube_songs;
--- a/bot-database/src/entity/prelude.rs
+++ b/bot-database/src/entity/prelude.rs
@ -1,8 +0,0 @@
-//! SeaORM Entity. Generated by sea-orm-codegen 0.7.0
-
-pub use super::ephemeral_messages::Entity as EphemeralMessages;
-pub use super::guild_playlists::Entity as GuildPlaylists;
-pub use super::guild_settings::Entity as GuildSettings;
-pub use super::media::Entity as Media;
-pub use super::statistics::Entity as Statistics;
-pub use super::youtube_songs::Entity as YoutubeSongs;
--- a/bot-database/src/entity/statistics.rs
+++ b/bot-database/src/entity/statistics.rs
@ -1,27 +0,0 @@
-//! SeaORM Entity. Generated by sea-orm-codegen 0.7.0
-
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "statistics")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: i64,
-    pub version: String,
-    pub command: String,
-    pub executed_at: DateTimeWithTimeZone,
-    pub success: bool,
-    #[sea_orm(column_type = "Text", nullable)]
-    pub error_msg: Option<String>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter)]
-pub enum Relation {}
-
-impl RelationTrait for Relation {
-    fn def(&self) -> RelationDef {
-        panic!("No RelationDef")
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
--- a/bot-database/src/entity/youtube_songs.rs
+++ b/bot-database/src/entity/youtube_songs.rs
@ -1,27 +0,0 @@
-//! SeaORM Entity. Generated by sea-orm-codegen 0.7.0
-
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "youtube_songs")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: i64,
-    pub spotify_id: String,
-    pub artist: String,
-    pub title: String,
-    pub album: String,
-    pub url: String,
-    pub score: i32,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter)]
-pub enum Relation {}
-
-impl RelationTrait for Relation {
-    fn def(&self) -> RelationDef {
-        panic!("No RelationDef")
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
--- a/bot-database/src/error.rs
+++ b/bot-database/src/error.rs
@ -7,8 +7,20 @@ pub enum DatabaseError {
    #[error("DotEnv Error: {0}")]
    DotEnv(#[from] dotenv::Error),

-    #[error("{0}")]
-    SeaOrm(#[from] sea_orm::error::DbErr),
+    #[error("Connection Error: {0}")]
+    ConnectionError(#[from] diesel::prelude::ConnectionError),
+
+    #[error("Pool Connection Error: {0}")]
+    PoolConnectionError(#[from] r2d2::Error),
+
+    #[error("Migration Error: {0}")]
+    MigrationError(#[from] diesel_migrations::RunMigrationsError),
+
+    #[error("Result Error: {0}")]
+    ResultError(#[from] diesel::result::Error),
+
+    #[error("AsyncError: {0}")]
+    AsyncError(#[from] tokio_diesel::AsyncError),

    #[error("{0}")]
    Msg(String),
--- a/bot-database/src/lib.rs
+++ b/bot-database/src/lib.rs
@ -1,31 +1,47 @@
-use crate::error::DatabaseResult;
+#[macro_use]
+extern crate diesel;
+
+#[macro_use]
+extern crate diesel_migrations;
+
+use crate::error::{DatabaseError, DatabaseResult};
+use diesel::prelude::*;
+use diesel::r2d2::{ConnectionManager, ManageConnection, Pool};
 use std::env;

 pub mod database;
-pub mod entity;
 pub mod error;
 pub mod models;
+pub mod schema;

 pub static VERSION: &str = env!("CARGO_PKG_VERSION");
-pub use database::BotDatabase as Database;
-use migration::MigratorTrait;
-use sea_orm::{ConnectOptions, Database as SeaDatabase, DatabaseConnection};
+pub use database::Database;
+
+type PoolConnection = Pool<ConnectionManager<PgConnection>>;

-#[tracing::instrument]
-async fn get_connection() -> DatabaseResult<DatabaseConnection> {
+embed_migrations!("../bot-database/migrations");
+
+fn get_connection() -> DatabaseResult<PoolConnection> {
    let database_url = env::var("DATABASE_URL").expect("No DATABASE_URL in path");
-    tracing::debug!("Establishing database connection...");
-    let opt = ConnectOptions::new(database_url);
-    let db = SeaDatabase::connect(opt).await?;
-    tracing::debug!("Running migrations...");
-    migration::Migrator::up(&db, None).await?;
-    tracing::debug!("Migrations finished");
-    tracing::info!("Database connection initialized");
-
-    Ok(db)
+    log::debug!("Establishing database connection...");
+    let manager = ConnectionManager::<PgConnection>::new(database_url);
+    log::trace!("Connecting...");
+    manager
+        .connect()
+        .map_err(|e| DatabaseError::Msg(format!("{:?}", e)))?;
+    log::trace!("Creating pool...");
+    let pool = Pool::builder().max_size(16).build(manager)?;
+    log::trace!("Getting one connection to run migrations...");
+    let connection = pool.get()?;
+    log::debug!("Running migrations...");
+    embedded_migrations::run(&connection)?;
+    log::debug!("Migrations finished");
+    log::info!("Database connection initialized");
+
+    Ok(pool)
 }

-pub async fn get_database() -> DatabaseResult<Database> {
-    let conn = get_connection().await?;
+pub fn get_database() -> DatabaseResult<Database> {
+    let conn = get_connection()?;
    Ok(Database::new(conn))
 }
--- a/bot-database/src/models.rs
+++ b/bot-database/src/models.rs
@ -1,8 +1,94 @@
-use super::entity;
-
-pub use entity::ephemeral_messages::Model as EphemeralMessage;
-pub use entity::guild_playlists::Model as GuildPlaylist;
-pub use entity::guild_settings::Model as GuildSetting;
-pub use entity::media::Model as Media;
-pub use entity::statistics::Model as Statistic;
-pub use entity::youtube_songs::Model as YoutubeSong;
+use crate::schema::*;
+use std::time::SystemTime;
+
+#[derive(Queryable, Debug)]
+pub struct GuildSetting {
+    pub guild_id: i64,
+    pub key: String,
+    pub value: Option<String>,
+}
+
+#[derive(Insertable, Debug)]
+#[table_name = "guild_settings"]
+pub struct GuildSettingInsert {
+    pub guild_id: i64,
+    pub key: String,
+    pub value: String,
+}
+
+#[derive(Queryable, Debug)]
+pub struct GuildPlaylist {
+    pub guild_id: i64,
+    pub name: String,
+    pub url: String,
+}
+
+#[derive(Insertable, Debug)]
+#[table_name = "guild_playlists"]
+pub struct GuildPlaylistInsert {
+    pub guild_id: i64,
+    pub name: String,
+    pub url: String,
+}
+
+#[derive(Queryable, Debug, Clone)]
+pub struct Gif {
+    pub id: i64,
+    pub category: Option<String>,
+    pub name: Option<String>,
+    pub url: String,
+}
+
+#[derive(Insertable, Debug)]
+#[table_name = "gifs"]
+pub struct GifInsert {
+    pub category: Option<String>,
+    pub name: Option<String>,
+    pub url: String,
+}
+
+#[derive(Insertable, Debug)]
+#[table_name = "statistics"]
+pub struct StatisticInsert {
+    pub version: String,
+    pub command: String,
+    pub executed_at: SystemTime,
+    pub success: bool,
+    pub error_msg: Option<String>,
+}
+
+#[derive(Queryable, Debug, Clone)]
+pub struct YoutubeSong {
+    pub id: i64,
+    pub spotify_id: String,
+    pub artist: String,
+    pub title: String,
+    pub album: String,
+    pub url: String,
+    pub score: i32,
+}
+
+#[derive(Insertable, Debug)]
+#[table_name = "youtube_songs"]
+pub struct YoutubeSongInsert {
+    pub spotify_id: String,
+    pub artist: String,
+    pub title: String,
+    pub album: String,
+    pub url: String,
+}
+
+#[derive(Queryable, Debug, Clone)]
+pub struct EphemeralMessage {
+    pub channel_id: i64,
+    pub message_id: i64,
+    pub timeout: SystemTime,
+}
+
+#[derive(Insertable, Debug)]
+#[table_name = "ephemeral_messages"]
+pub struct EphemeralMessageInsert {
+    pub channel_id: i64,
+    pub message_id: i64,
+    pub timeout: SystemTime,
+}
--- a/bot-database/src/schema.rs
+++ b/bot-database/src/schema.rs
@ -0,0 +1,64 @@
+table! {
+    ephemeral_messages (channel_id, message_id) {
+        channel_id -> Int8,
+        message_id -> Int8,
+        timeout -> Timestamp,
+    }
+}
+
+table! {
+    gifs (id) {
+        id -> Int8,
+        category -> Nullable<Varchar>,
+        name -> Nullable<Varchar>,
+        url -> Varchar,
+    }
+}
+
+table! {
+    guild_playlists (guild_id, name) {
+        guild_id -> Int8,
+        name -> Varchar,
+        url -> Varchar,
+    }
+}
+
+table! {
+    guild_settings (guild_id, key) {
+        guild_id -> Int8,
+        key -> Varchar,
+        value -> Nullable<Varchar>,
+    }
+}
+
+table! {
+    statistics (id) {
+        id -> Int8,
+        version -> Varchar,
+        command -> Varchar,
+        executed_at -> Timestamp,
+        success -> Bool,
+        error_msg -> Nullable<Text>,
+    }
+}
+
+table! {
+    youtube_songs (id) {
+        id -> Int8,
+        spotify_id -> Varchar,
+        artist -> Varchar,
+        title -> Varchar,
+        album -> Varchar,
+        url -> Varchar,
+        score -> Int4,
+    }
+}
+
+allow_tables_to_appear_in_same_query!(
+    ephemeral_messages,
+    gifs,
+    guild_playlists,
+    guild_settings,
+    statistics,
+    youtube_songs,
+);
--- a/bot-serenityutils/.gitignore
+++ b/bot-serenityutils/.gitignore
@ -0,0 +1 @@
+target
--- a/bot-serenityutils/Cargo.lock
+++ b/bot-serenityutils/Cargo.lock
--- a/bot-serenityutils/Cargo.toml
+++ b/bot-serenityutils/Cargo.toml
@ -0,0 +1,15 @@
+[package]
+name = "bot-serenityutils"
+version = "0.2.3"
+authors = ["trivernis <trivernis@protonmail.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+serenity = "0.10.5"
+tokio = "1.4.0"
+thiserror = "1.0.24"
+log = "0.4.14"
+futures = "0.3.14"
+serde_json = "1.0.64"
--- a/bot-serenityutils/src/core.rs
+++ b/bot-serenityutils/src/core.rs
@ -0,0 +1,44 @@
+use crate::error::SerenityUtilsResult;
+use crate::menu::traits::EventDrivenMessage;
+use serenity::http::Http;
+use serenity::model::channel::Message;
+use serenity::model::id::{ChannelId, MessageId};
+use std::sync::Arc;
+use std::time::Duration;
+
+pub static SHORT_TIMEOUT: Duration = Duration::from_secs(5);
+pub static MEDIUM_TIMEOUT: Duration = Duration::from_secs(20);
+pub static LONG_TIMEOUT: Duration = Duration::from_secs(60);
+pub static EXTRA_LONG_TIMEOUT: Duration = Duration::from_secs(600);
+
+pub type BoxedEventDrivenMessage = Box<dyn EventDrivenMessage>;
+
+#[derive(Copy, Clone, Debug, PartialOrd, PartialEq, Eq, Hash)]
+pub struct MessageHandle {
+    pub channel_id: u64,
+    pub message_id: u64,
+}
+
+impl MessageHandle {
+    /// Creates a new message handle
+    pub fn new(channel_id: ChannelId, message_id: MessageId) -> Self {
+        Self {
+            message_id: message_id.0,
+            channel_id: channel_id.0,
+        }
+    }
+
+    /// Creates a new message handle from raw ids
+    pub fn from_raw_ids(channel_id: u64, message_id: u64) -> Self {
+        Self {
+            message_id,
+            channel_id,
+        }
+    }
+
+    /// Returns the message object of the handle
+    pub async fn get_message(&self, http: &Arc<Http>) -> SerenityUtilsResult<Message> {
+        let msg = http.get_message(self.channel_id, self.message_id).await?;
+        Ok(msg)
+    }
+}
--- a/bot-serenityutils/src/ephemeral_message.rs
+++ b/bot-serenityutils/src/ephemeral_message.rs
@ -0,0 +1,56 @@
+use crate::core::MessageHandle;
+use crate::error::SerenityUtilsResult;
+use serenity::builder::CreateMessage;
+use serenity::http::Http;
+use serenity::model::channel::Message;
+use serenity::model::id::ChannelId;
+use std::sync::Arc;
+use std::time::Duration;
+
+pub struct EphemeralMessage;
+
+impl EphemeralMessage {
+    /// Ensures that an already existing message is
+    /// deleted after a certain amount of time
+    pub async fn create_from_message(
+        http: &Arc<Http>,
+        message: &Message,
+        timeout: Duration,
+    ) -> SerenityUtilsResult<()> {
+        log::debug!("Creating ephemeral message from existing message");
+        let handle = MessageHandle::new(message.channel_id, message.id);
+        let http = Arc::clone(&http);
+
+        log::debug!("Starting delete task");
+        tokio::spawn(async move {
+            log::debug!("Waiting for timeout to pass");
+            tokio::time::sleep(timeout).await;
+            log::debug!("Deleting ephemeral message");
+            if let Err(e) = http
+                .delete_message(handle.channel_id, handle.message_id)
+                .await
+            {
+                log::error!("Failed to delete ephemeral message {:?}: {}", handle, e);
+            }
+        });
+
+        Ok(())
+    }
+
+    /// Creates a new message that is deleted after a certain amount of time
+    pub async fn create<'a, F>(
+        http: &Arc<Http>,
+        channel_id: ChannelId,
+        timeout: Duration,
+        f: F,
+    ) -> SerenityUtilsResult<Message>
+    where
+        F: for<'b> FnOnce(&'b mut CreateMessage<'a>) -> &'b mut CreateMessage<'a>,
+    {
+        log::debug!("Creating new ephemeral message");
+        let msg = channel_id.send_message(http, f).await?;
+        Self::create_from_message(http, &msg, timeout).await?;
+
+        Ok(msg)
+    }
+}
--- a/bot-serenityutils/src/error.rs
+++ b/bot-serenityutils/src/error.rs
@ -0,0 +1,18 @@
+use thiserror::Error;
+
+pub type SerenityUtilsResult<T> = Result<T, SerenityUtilsError>;
+
+#[derive(Debug, Error)]
+pub enum SerenityUtilsError {
+    #[error("Serenity Error: {0}")]
+    SerenityError(#[from] serenity::Error),
+
+    #[error("Page {0} not found")]
+    PageNotFound(usize),
+
+    #[error("Serenity Utils not fully initialized")]
+    Uninitialized,
+
+    #[error("{0}")]
+    Msg(String),
+}
--- a/bot-serenityutils/src/lib.rs
+++ b/bot-serenityutils/src/lib.rs
@ -0,0 +1,7 @@
+pub mod core;
+pub mod ephemeral_message;
+pub mod error;
+pub mod macros;
+pub mod menu;
+
+pub static VERSION: &str = env!("CARGO_PKG_VERSION");
--- a/bot-serenityutils/src/macros.rs
+++ b/bot-serenityutils/src/macros.rs
@ -0,0 +1,16 @@
+/// Forwards the error directly to the user
+/// without having to accept it in any handler.
+/// Can only be used in async functions that return a Result.
+#[macro_export]
+macro_rules! forward_error {
+    ($ctx:expr,$channel_id:expr,$result:expr) => {
+        match $result {
+            Err(e) => {
+                use bot_serenityutils::{core::SHORT_TIMEOUT, ephemeral_message::EphemeralMessage};
+                $channel_id.say($ctx, format!("‼️ {}", e)).await?;
+                return Ok(());
+            }
+            Ok(v) => v,
+        }
+    };
+}
--- a/bot-serenityutils/src/menu/container.rs
+++ b/bot-serenityutils/src/menu/container.rs
@ -0,0 +1,181 @@
+use crate::core::{BoxedEventDrivenMessage, MessageHandle};
+use crate::error::{SerenityUtilsError, SerenityUtilsResult};
+use serenity::client::Context;
+use serenity::model::prelude::*;
+use serenity::prelude::TypeMapKey;
+use std::collections::HashMap;
+use std::sync::Arc;
+use std::time::Duration;
+use tokio::sync::Mutex;
+
+/// Container to store event driven messages in the serenity context data
+pub struct EventDrivenMessageContainer;
+pub type MessageRef = Arc<Mutex<BoxedEventDrivenMessage>>;
+pub type EventDrivenMessagesRef = Arc<Mutex<HashMap<MessageHandle, MessageRef>>>;
+
+impl TypeMapKey for EventDrivenMessageContainer {
+    type Value = EventDrivenMessagesRef;
+}
+
+static UPDATE_INTERVAL_SECS: u64 = 5;
+
+/// Starts the loop to handle message updates
+pub async fn start_update_loop(ctx: &Context) {
+    let event_messages = get_listeners_from_context(ctx)
+        .await
+        .expect("Failed to get event message container");
+    let http = Arc::clone(&ctx.http);
+
+    tokio::task::spawn(async move {
+        loop {
+            {
+                log::trace!("Locking listener from update loop.");
+                let messages = {
+                    let msgs_lock = event_messages.lock().await;
+
+                    msgs_lock
+                        .iter()
+                        .map(|(k, v)| (*k, v.clone()))
+                        .collect::<Vec<(MessageHandle, MessageRef)>>()
+                };
+                log::trace!("Listener locked.");
+                let mut frozen_messages = Vec::new();
+
+                for (key, msg) in messages {
+                    let mut msg = msg.lock().await;
+                    if let Err(e) = msg.update(&http).await {
+                        log::error!("Failed to update message: {:?}", e);
+                    }
+                    if msg.is_frozen() {
+                        frozen_messages.push(key);
+                    }
+                }
+                {
+                    let mut msgs_lock = event_messages.lock().await;
+                    for key in frozen_messages {
+                        msgs_lock.remove(&key);
+                    }
+                }
+            }
+            log::trace!("Listener unlocked");
+            tokio::time::sleep(Duration::from_secs(UPDATE_INTERVAL_SECS)).await;
+        }
+    });
+}
+
+/// To be fired from the serenity handler when a message was deleted
+pub async fn handle_message_delete(
+    ctx: &Context,
+    channel_id: ChannelId,
+    message_id: MessageId,
+) -> SerenityUtilsResult<()> {
+    let mut affected_messages = Vec::new();
+    {
+        let listeners = get_listeners_from_context(ctx).await?;
+        log::trace!("Locking listener from handle_message_delete.");
+        let mut listeners_lock = listeners.lock().await;
+        log::trace!("Listener locked.");
+
+        let handle = MessageHandle::new(channel_id, message_id);
+        if let Some(msg) = listeners_lock.get(&handle) {
+            affected_messages.push(Arc::clone(msg));
+            listeners_lock.remove(&handle);
+        }
+    }
+    log::trace!("Listener unlocked");
+    for msg in affected_messages {
+        let mut msg = msg.lock().await;
+        msg.on_deleted(ctx).await?;
+    }
+
+    Ok(())
+}
+
+/// To be fired from the serenity handler when multiple messages were deleted
+pub async fn handle_message_delete_bulk(
+    ctx: &Context,
+    channel_id: ChannelId,
+    message_ids: &Vec<MessageId>,
+) -> SerenityUtilsResult<()> {
+    let mut affected_messages = Vec::new();
+    {
+        let listeners = get_listeners_from_context(ctx).await?;
+        log::trace!("Locking listener from handle_message_delete_bulk.");
+        let mut listeners_lock = listeners.lock().await;
+        log::trace!("Listener locked.");
+
+        for message_id in message_ids {
+            let handle = MessageHandle::new(channel_id, *message_id);
+            if let Some(msg) = listeners_lock.get_mut(&handle) {
+                affected_messages.push(Arc::clone(msg));
+                listeners_lock.remove(&handle);
+            }
+        }
+    }
+    log::trace!("Listener unlocked");
+    for msg in affected_messages {
+        let mut msg = msg.lock().await;
+        msg.on_deleted(ctx).await?;
+    }
+
+    Ok(())
+}
+
+/// Fired when a reaction was added to a message
+pub async fn handle_reaction_add(ctx: &Context, reaction: &Reaction) -> SerenityUtilsResult<()> {
+    let mut affected_messages = Vec::new();
+    {
+        let listeners = get_listeners_from_context(ctx).await?;
+        log::trace!("Locking listener from handle_reaction_add.");
+        let mut listeners_lock = listeners.lock().await;
+        log::trace!("Listener locked.");
+
+        let handle = MessageHandle::new(reaction.channel_id, reaction.message_id);
+
+        if let Some(msg) = listeners_lock.get_mut(&handle) {
+            affected_messages.push(Arc::clone(&msg));
+        }
+    }
+    log::trace!("Listener unlocked");
+    for msg in affected_messages {
+        let mut msg = msg.lock().await;
+        msg.on_reaction_add(ctx, reaction.clone()).await?;
+    }
+
+    Ok(())
+}
+
+/// Fired when a reaction was added to a message
+pub async fn handle_reaction_remove(ctx: &Context, reaction: &Reaction) -> SerenityUtilsResult<()> {
+    let mut affected_messages = Vec::new();
+    {
+        let listeners = get_listeners_from_context(ctx).await?;
+        log::trace!("Locking listener from handle_reaction_remove.");
+        let mut listeners_lock = listeners.lock().await;
+        log::trace!("Listener locked.");
+
+        let handle = MessageHandle::new(reaction.channel_id, reaction.message_id);
+
+        if let Some(msg) = listeners_lock.get_mut(&handle) {
+            affected_messages.push(Arc::clone(&msg));
+        }
+    }
+    log::trace!("Listener unlocked");
+    for msg in affected_messages {
+        let mut msg = msg.lock().await;
+        msg.on_reaction_remove(ctx, reaction.clone()).await?;
+    }
+
+    Ok(())
+}
+
+pub async fn get_listeners_from_context(
+    ctx: &Context,
+) -> SerenityUtilsResult<EventDrivenMessagesRef> {
+    let data = ctx.data.read().await;
+    let listeners = data
+        .get::<EventDrivenMessageContainer>()
+        .ok_or(SerenityUtilsError::Uninitialized)?;
+    log::trace!("Returning listener");
+    Ok(listeners.clone())
+}
--- a/bot-serenityutils/src/menu/controls.rs
+++ b/bot-serenityutils/src/menu/controls.rs
@ -0,0 +1,145 @@
+use crate::error::{SerenityUtilsError, SerenityUtilsResult};
+use crate::menu::container::get_listeners_from_context;
+use crate::menu::menu::Menu;
+use crate::menu::typedata::HelpActiveContainer;
+use crate::menu::ActionContainer;
+use serde_json::json;
+use serde_json::Value;
+use serenity::client::Context;
+use serenity::http::CacheHttp;
+use serenity::model::channel::Reaction;
+use std::sync::atomic::Ordering;
+
+/// Shows the next page in the menu
+pub async fn next_page(ctx: &Context, menu: &mut Menu<'_>, _: Reaction) -> SerenityUtilsResult<()> {
+    log::debug!("Showing next page");
+    menu.current_page = (menu.current_page + 1) % menu.pages.len();
+    display_page(ctx, menu).await?;
+
+    Ok(())
+}
+
+/// Shows the previous page in the menu
+pub async fn previous_page(
+    ctx: &Context,
+    menu: &mut Menu<'_>,
+    _: Reaction,
+) -> SerenityUtilsResult<()> {
+    log::debug!("Showing previous page");
+    if menu.current_page == 0 {
+        menu.current_page = menu.pages.len() - 1;
+    } else {
+        menu.current_page = menu.current_page - 1;
+    }
+    display_page(ctx, menu).await?;
+
+    Ok(())
+}
+
+/// Shows the previous page in the menu
+pub async fn close_menu(
+    ctx: &Context,
+    menu: &mut Menu<'_>,
+    _: Reaction,
+) -> SerenityUtilsResult<()> {
+    log::debug!("Closing menu");
+    menu.close(ctx.http()).await?;
+    let listeners = get_listeners_from_context(&ctx).await?;
+    let mut listeners_lock = listeners.lock().await;
+    let message = menu.message.read().await;
+    listeners_lock.remove(&*message);
+
+    Ok(())
+}
+
+pub async fn toggle_help(
+    ctx: &Context,
+    menu: &mut Menu<'_>,
+    _: Reaction,
+) -> SerenityUtilsResult<()> {
+    log::debug!("Displaying help");
+    let show_help = menu
+        .data
+        .get::<HelpActiveContainer>()
+        .expect("Missing HelpActiveContainer in menu data")
+        .clone();
+
+    if show_help.load(Ordering::Relaxed) {
+        display_page(ctx, menu).await?;
+        show_help.store(false, Ordering::Relaxed);
+        return Ok(());
+    }
+    let page = menu
+        .pages
+        .get(menu.current_page)
+        .ok_or(SerenityUtilsError::PageNotFound(menu.current_page))?
+        .get()
+        .await?;
+    let mut message = menu.get_message(ctx.http()).await?;
+    log::debug!("Building help entries");
+    let mut help_entries = menu
+        .help_entries
+        .iter()
+        .filter_map(|(e, h)| Some((menu.controls.get(e)?, e, h)))
+        .collect::<Vec<(&ActionContainer, &String, &String)>>();
+    help_entries.sort_by_key(|(c, _, _)| c.position());
+    let help_message = help_entries
+        .into_iter()
+        .map(|(_, e, h)| format!(" - {} {}", e, h))
+        .collect::<Vec<String>>()
+        .join("\n");
+    log::trace!("Help message is {}", help_message);
+
+    message
+        .edit(ctx, |m| {
+            m.0.clone_from(&mut page.0.clone());
+
+            if let Some(embed) = m.0.get_mut("embed") {
+                let embed = embed.as_object_mut().unwrap();
+                let fields = embed
+                    .entry("fields")
+                    .or_insert_with(|| Value::Array(vec![]));
+                if let Value::Array(ref mut inner) = *fields {
+                    inner.push(json!({
+                        "inline": false,
+                        "name": "Help".to_string(),
+                        "value": help_message,
+                    }));
+                }
+            } else {
+                m.embed(|e| {
+                    e.field("Help", help_message, false);
+
+                    e
+                });
+            }
+
+            m
+        })
+        .await?;
+    log::debug!("Help message displayed");
+    show_help.store(true, Ordering::Relaxed);
+
+    Ok(())
+}
+
+/// Displays the menu page
+async fn display_page(ctx: &Context, menu: &mut Menu<'_>) -> SerenityUtilsResult<()> {
+    log::debug!("Displaying page {}", menu.current_page);
+    let page = menu
+        .pages
+        .get(menu.current_page)
+        .ok_or(SerenityUtilsError::PageNotFound(menu.current_page))?
+        .get()
+        .await?;
+    let mut msg = menu.get_message(ctx.http()).await?;
+
+    msg.edit(ctx, |e| {
+        e.0.clone_from(&mut page.0.clone());
+        e
+    })
+    .await?;
+    log::debug!("Page displayed");
+
+    Ok(())
+}
--- a/bot-serenityutils/src/menu/menu.rs
+++ b/bot-serenityutils/src/menu/menu.rs
@ -0,0 +1,447 @@
+use crate::core::MessageHandle;
+use crate::error::{SerenityUtilsError, SerenityUtilsResult};
+use crate::menu::container::get_listeners_from_context;
+use crate::menu::controls::{close_menu, next_page, previous_page, toggle_help};
+use crate::menu::traits::EventDrivenMessage;
+use crate::menu::typedata::HelpActiveContainer;
+use crate::menu::{EventDrivenMessagesRef, Page};
+use futures::FutureExt;
+use serenity::async_trait;
+use serenity::client::Context;
+use serenity::http::Http;
+use serenity::model::channel::{Message, Reaction, ReactionType};
+use serenity::model::id::ChannelId;
+use serenity::prelude::{TypeMap, TypeMapKey};
+use std::collections::HashMap;
+use std::future::Future;
+use std::pin::Pin;
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
+use std::time::{Duration, Instant};
+use tokio::sync::{Mutex, RwLock};
+
+pub static NEXT_PAGE_EMOJI: &str = "➡️";
+pub static PREVIOUS_PAGE_EMOJI: &str = "⬅️";
+pub static CLOSE_MENU_EMOJI: &str = "❌";
+pub static HELP_EMOJI: &str = "❔";
+
+pub type ControlActionResult<'b> =
+    Pin<Box<dyn Future<Output = SerenityUtilsResult<()>> + Send + 'b>>;
+
+pub type ControlActionArc = Arc<
+    dyn for<'b> Fn(&'b Context, &'b mut Menu<'_>, Reaction) -> ControlActionResult<'b>
+        + Send
+        + Sync,
+>;
+
+#[derive(Clone)]
+pub struct ActionContainer {
+    inner: ControlActionArc,
+    position: isize,
+}
+
+impl ActionContainer {
+    /// Creates a new control action
+    pub fn new<F: 'static>(position: isize, callback: F) -> Self
+    where
+        F: for<'b> Fn(&'b Context, &'b mut Menu<'_>, Reaction) -> ControlActionResult<'b>
+            + Send
+            + Sync,
+    {
+        Self {
+            inner: Arc::new(callback),
+            position,
+        }
+    }
+
+    /// Runs the action
+    pub async fn run(
+        &self,
+        ctx: &Context,
+        menu: &mut Menu<'_>,
+        reaction: Reaction,
+    ) -> SerenityUtilsResult<()> {
+        self.inner.clone()(ctx, menu, reaction).await?;
+        Ok(())
+    }
+
+    /// Returns the position of the action
+    pub fn position(&self) -> isize {
+        self.position
+    }
+}
+
+/// A menu message
+pub struct Menu<'a> {
+    pub message: Arc<RwLock<MessageHandle>>,
+    pub pages: Vec<Page<'a>>,
+    pub current_page: usize,
+    pub controls: HashMap<String, ActionContainer>,
+    pub timeout: Instant,
+    pub sticky: bool,
+    pub data: TypeMap,
+    pub help_entries: HashMap<String, String>,
+    closed: bool,
+    listeners: EventDrivenMessagesRef,
+}
+
+impl Menu<'_> {
+    /// Removes all reactions from the menu
+    pub(crate) async fn close(&mut self, http: &Http) -> SerenityUtilsResult<()> {
+        log::debug!("Closing menu...");
+        let handle = self.message.read().await;
+        http.delete_message_reactions(handle.channel_id, handle.message_id)
+            .await?;
+        self.closed = true;
+        Ok(())
+    }
+
+    /// Returns the message of the menu
+    pub async fn get_message(&self, http: &Http) -> SerenityUtilsResult<Message> {
+        let handle = self.message.read().await;
+        let msg = http
+            .get_message(handle.channel_id, handle.message_id)
+            .await?;
+
+        Ok(msg)
+    }
+
+    /// Recreates the message completely
+    pub async fn recreate(&self, http: &Http) -> SerenityUtilsResult<()> {
+        log::debug!("Recreating message");
+
+        let old_handle = {
+            let handle = self.message.read().await;
+            (*handle).clone()
+        };
+        log::debug!("Getting current page");
+        let current_page = self
+            .pages
+            .get(self.current_page)
+            .cloned()
+            .ok_or(SerenityUtilsError::PageNotFound(self.current_page))?
+            .get()
+            .await?;
+
+        log::debug!("Creating new message");
+        let message = http
+            .send_message(
+                old_handle.channel_id,
+                &serde_json::to_value(current_page.0).unwrap(),
+            )
+            .await?;
+        let mut controls = self
+            .controls
+            .clone()
+            .into_iter()
+            .collect::<Vec<(String, ActionContainer)>>();
+        controls.sort_by_key(|(_, a)| a.position);
+
+        for emoji in controls.into_iter().map(|(e, _)| e) {
+            http.create_reaction(
+                message.channel_id.0,
+                message.id.0,
+                &ReactionType::Unicode(emoji.clone()),
+            )
+            .await?;
+        }
+        log::trace!("New message is {:?}", message);
+
+        let new_handle = {
+            let mut handle = self.message.write().await;
+            handle.message_id = message.id.0;
+            (*handle).clone()
+        };
+        {
+            log::debug!("Changing key of message");
+            let mut listeners_lock = self.listeners.lock().await;
+            let menu = listeners_lock.remove(&old_handle).unwrap();
+            listeners_lock.insert(new_handle, menu);
+        }
+        log::debug!("Deleting original message");
+        http.delete_message(old_handle.channel_id, old_handle.message_id)
+            .await?;
+        log::debug!("Message recreated");
+
+        Ok(())
+    }
+}
+
+#[async_trait]
+impl<'a> EventDrivenMessage for Menu<'a> {
+    fn is_frozen(&self) -> bool {
+        self.closed
+    }
+
+    async fn update(&mut self, http: &Http) -> SerenityUtilsResult<()> {
+        log::trace!("Checking for menu timeout");
+        if Instant::now() >= self.timeout {
+            log::debug!("Menu timout reached. Closing menu.");
+            self.close(http).await?;
+        } else if self.sticky {
+            log::debug!("Message is sticky. Checking for new messages in channel...");
+            let handle = {
+                let handle = self.message.read().await;
+                (*handle).clone()
+            };
+
+            let channel_id = ChannelId(handle.channel_id);
+            let messages = channel_id
+                .messages(http, |p| p.after(handle.message_id).limit(1))
+                .await?;
+            log::trace!("Messages are {:?}", messages);
+            if messages.len() > 0 {
+                log::debug!("New messages in channel. Recreating...");
+                self.recreate(http).await?;
+            }
+        }
+
+        Ok(())
+    }
+
+    async fn on_reaction_add(
+        &mut self,
+        ctx: &Context,
+        reaction: Reaction,
+    ) -> SerenityUtilsResult<()> {
+        log::debug!("Reaction to menu added");
+        let current_user = ctx.http.get_current_user().await?;
+
+        if reaction.user_id.unwrap().0 == current_user.id.0 {
+            log::debug!("Reaction is from current user.");
+            return Ok(());
+        }
+        let emoji_string = reaction.emoji.as_data();
+
+        log::debug!("Deleting user reaction.");
+        reaction.delete(ctx).await?;
+        if let Some(control) = self.controls.get(&emoji_string).cloned() {
+            log::debug!("Running control");
+            control.run(ctx, self, reaction).await?;
+        }
+
+        Ok(())
+    }
+}
+
+/// A builder for messages
+pub struct MenuBuilder {
+    pages: Vec<Page<'static>>,
+    current_page: usize,
+    controls: HashMap<String, ActionContainer>,
+    timeout: Duration,
+    sticky: bool,
+    data: TypeMap,
+    help_entries: HashMap<String, String>,
+}
+
+impl Default for MenuBuilder {
+    fn default() -> Self {
+        Self {
+            pages: vec![],
+            current_page: 0,
+            controls: HashMap::new(),
+            timeout: Duration::from_secs(60),
+            sticky: false,
+            data: TypeMap::new(),
+            help_entries: HashMap::new(),
+        }
+    }
+}
+
+impl MenuBuilder {
+    /// Creates a new paginaton menu
+    pub fn new_paginator() -> Self {
+        log::debug!("Creating new paginator");
+        let mut controls = HashMap::new();
+        let mut help_entries = HashMap::new();
+        controls.insert(
+            PREVIOUS_PAGE_EMOJI.to_string(),
+            ActionContainer::new(0, |c, m, r| previous_page(c, m, r).boxed()),
+        );
+        help_entries.insert(
+            PREVIOUS_PAGE_EMOJI.to_string(),
+            "Displays the previous page".to_string(),
+        );
+        controls.insert(
+            CLOSE_MENU_EMOJI.to_string(),
+            ActionContainer::new(1, |c, m, r| close_menu(c, m, r).boxed()),
+        );
+        help_entries.insert(
+            CLOSE_MENU_EMOJI.to_string(),
+            "Closes the menu buttons".to_string(),
+        );
+        controls.insert(
+            NEXT_PAGE_EMOJI.to_string(),
+            ActionContainer::new(2, |c, m, r| next_page(c, m, r).boxed()),
+        );
+        help_entries.insert(
+            NEXT_PAGE_EMOJI.to_string(),
+            "Displays the next page".to_string(),
+        );
+
+        Self {
+            controls,
+            help_entries,
+            ..Default::default()
+        }
+    }
+
+    /// Adds a page to the message builder
+    pub fn add_page(mut self, page: Page<'static>) -> Self {
+        self.pages.push(page);
+
+        self
+    }
+
+    /// Adds multiple pages to the message
+    pub fn add_pages<I>(mut self, pages: I) -> Self
+    where
+        I: IntoIterator<Item = Page<'static>>,
+    {
+        let mut pages = pages.into_iter().collect();
+        self.pages.append(&mut pages);
+
+        self
+    }
+
+    /// Adds a single control to the message
+    pub fn add_control<S, F: 'static>(mut self, position: isize, emoji: S, action: F) -> Self
+    where
+        S: ToString,
+        F: for<'b> Fn(&'b Context, &'b mut Menu<'_>, Reaction) -> ControlActionResult<'b>
+            + Send
+            + Sync,
+    {
+        self.controls
+            .insert(emoji.to_string(), ActionContainer::new(position, action));
+
+        self
+    }
+
+    /// Adds a single control to the message
+    pub fn add_controls<S, I>(mut self, controls: I) -> Self
+    where
+        S: ToString,
+        I: IntoIterator<Item = (isize, S, ControlActionArc)>,
+    {
+        for (position, emoji, action) in controls {
+            self.controls.insert(
+                emoji.to_string(),
+                ActionContainer {
+                    position,
+                    inner: action,
+                },
+            );
+        }
+
+        self
+    }
+
+    /// Sets the timeout for the message
+    pub fn timeout(mut self, timeout: Duration) -> Self {
+        self.timeout = timeout;
+
+        self
+    }
+
+    /// Sets the start page of the message
+    pub fn start_page(mut self, page: usize) -> Self {
+        self.current_page = page;
+
+        self
+    }
+
+    /// If the message should be sticky and always be
+    /// the last one in the channel
+    pub fn sticky(mut self, value: bool) -> Self {
+        self.sticky = value;
+
+        self
+    }
+
+    /// Adds data to the menu typemap
+    pub fn add_data<T>(mut self, value: T::Value) -> Self
+    where
+        T: TypeMapKey,
+    {
+        self.data.insert::<T>(value);
+
+        self
+    }
+
+    /// Adds a help entry
+    pub fn add_help<S: ToString>(mut self, button: S, help: S) -> Self {
+        self.help_entries
+            .insert(button.to_string(), help.to_string());
+
+        self
+    }
+
+    /// Turns showing help for buttons on
+    pub fn show_help(self) -> Self {
+        self.add_control(100, HELP_EMOJI, |c, m, r| Box::pin(toggle_help(c, m, r)))
+            .add_data::<HelpActiveContainer>(Arc::new(AtomicBool::new(false)))
+    }
+
+    /// builds the menu
+    pub async fn build(
+        self,
+        ctx: &Context,
+        channel_id: ChannelId,
+    ) -> SerenityUtilsResult<Arc<RwLock<MessageHandle>>> {
+        log::debug!("Building menu...");
+        let mut current_page = self
+            .pages
+            .get(self.current_page)
+            .ok_or(SerenityUtilsError::PageNotFound(self.current_page))?
+            .clone()
+            .get()
+            .await?;
+
+        let message = channel_id.send_message(ctx, |_| &mut current_page).await?;
+        log::trace!("Message is {:?}", message);
+        let listeners = get_listeners_from_context(ctx).await?;
+        log::debug!("Sorting controls...");
+        let mut controls = self
+            .controls
+            .clone()
+            .into_iter()
+            .collect::<Vec<(String, ActionContainer)>>();
+        controls.sort_by_key(|(_, a)| a.position);
+
+        log::debug!("Creating menu...");
+        let message_handle = MessageHandle::new(message.channel_id, message.id);
+        let handle_lock = Arc::new(RwLock::new(message_handle));
+
+        let menu = Menu {
+            message: Arc::clone(&handle_lock),
+            pages: self.pages,
+            current_page: self.current_page,
+            controls: self.controls,
+            timeout: Instant::now() + self.timeout,
+            closed: false,
+            listeners: Arc::clone(&listeners),
+            sticky: self.sticky,
+            data: self.data,
+            help_entries: self.help_entries,
+        };
+
+        log::debug!("Storing menu to listeners...");
+        {
+            let mut listeners_lock = listeners.lock().await;
+            log::trace!("Listeners locked.");
+            listeners_lock.insert(message_handle, Arc::new(Mutex::new(Box::new(menu))));
+        }
+
+        log::debug!("Adding controls...");
+        for (emoji, _) in controls {
+            message
+                .react(ctx, ReactionType::Unicode(emoji.clone()))
+                .await?;
+        }
+        log::debug!("Menu successfully created.");
+
+        Ok(handle_lock)
+    }
+}
--- a/bot-serenityutils/src/menu/mod.rs
+++ b/bot-serenityutils/src/menu/mod.rs
@ -0,0 +1,16 @@
+pub(crate) mod container;
+pub(crate) mod controls;
+pub(crate) mod menu;
+pub(crate) mod page;
+pub(crate) mod traits;
+pub(crate) mod typedata;
+
+pub use container::*;
+pub use controls::*;
+pub use menu::{
+    ActionContainer, ControlActionArc, Menu, MenuBuilder, CLOSE_MENU_EMOJI, NEXT_PAGE_EMOJI,
+    PREVIOUS_PAGE_EMOJI,
+};
+pub use page::*;
+
+pub use traits::EventDrivenMessage;
--- a/bot-serenityutils/src/menu/page.rs
+++ b/bot-serenityutils/src/menu/page.rs
@ -0,0 +1,40 @@
+use crate::error::SerenityUtilsResult;
+use serenity::builder::CreateMessage;
+use std::future::Future;
+use std::pin::Pin;
+use std::sync::Arc;
+
+pub type MessageBuildOutput<'b> =
+    Pin<Box<dyn Future<Output = SerenityUtilsResult<CreateMessage<'b>>> + Send + 'b>>;
+pub type MessageBuilderFn<'b> = Arc<dyn Fn() -> MessageBuildOutput<'b> + Send + Sync>;
+
+#[derive(Clone)]
+/// A page that stores a builder function for message pages
+/// or static pages
+pub enum Page<'b> {
+    Builder(MessageBuilderFn<'b>),
+    Static(CreateMessage<'b>),
+}
+
+impl<'b> Page<'b> {
+    /// Creates a new page with the given builder function
+    pub fn new_builder<F: 'static>(builder_fn: F) -> Self
+    where
+        F: Fn() -> MessageBuildOutput<'b> + Send + Sync,
+    {
+        Self::Builder(Arc::new(builder_fn))
+    }
+
+    /// Creates a new page with a static message
+    pub fn new_static(page: CreateMessage<'b>) -> Self {
+        Self::Static(page)
+    }
+
+    /// Returns the CreateMessage of the page
+    pub async fn get(&self) -> SerenityUtilsResult<CreateMessage<'b>> {
+        match self {
+            Page::Builder(b) => b().await,
+            Page::Static(inner) => Ok(inner.clone()),
+        }
+    }
+}
--- a/bot-serenityutils/src/menu/traits.rs
+++ b/bot-serenityutils/src/menu/traits.rs
@ -0,0 +1,40 @@
+use crate::error::SerenityUtilsResult;
+use serenity::client::Context;
+use serenity::http::Http;
+use serenity::{async_trait, model::prelude::*};
+
+#[async_trait]
+pub trait EventDrivenMessage: Send + Sync {
+    /// Returns if a message has been frozen and won't handle any further events
+    fn is_frozen(&self) -> bool {
+        false
+    }
+
+    /// Fired periodically
+    async fn update(&mut self, _http: &Http) -> SerenityUtilsResult<()> {
+        Ok(())
+    }
+
+    /// Fired when the message was deleted
+    async fn on_deleted(&mut self, _ctx: &Context) -> SerenityUtilsResult<()> {
+        Ok(())
+    }
+
+    /// Fired when a reaction was added to the message
+    async fn on_reaction_add(
+        &mut self,
+        _ctx: &Context,
+        _reaction: Reaction,
+    ) -> SerenityUtilsResult<()> {
+        Ok(())
+    }
+
+    /// Fired when a reaction was removed from the message
+    async fn on_reaction_remove(
+        &mut self,
+        _ctx: &Context,
+        _reaction: Reaction,
+    ) -> SerenityUtilsResult<()> {
+        Ok(())
+    }
+}
--- a/bot-serenityutils/src/menu/typedata.rs
+++ b/bot-serenityutils/src/menu/typedata.rs
@ -0,0 +1,9 @@
+use serenity::prelude::TypeMapKey;
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
+
+pub struct HelpActiveContainer;
+
+impl TypeMapKey for HelpActiveContainer {
+    type Value = Arc<AtomicBool>;
+}
--- a/src/client.rs
+++ b/src/client.rs
@ -1,39 +1,40 @@
 use std::collections::{HashMap, HashSet};
-use std::env;
-use std::time::SystemTime;

 use bot_database::get_database;
 use serenity::client::Context;
-use serenity::framework::standard::buckets::LimitedFor;
 use serenity::framework::standard::macros::hook;
 use serenity::framework::standard::{CommandResult, DispatchError};
 use serenity::framework::StandardFramework;
 use serenity::model::channel::Message;
 use serenity::model::id::UserId;
-use serenity::prelude::GatewayIntents;
 use serenity::Client;
-use serenity_additions::RegisterAdditions;
 use songbird::SerenityInit;

 use crate::commands::*;
-use crate::handler::{get_raw_event_handler, Handler};
-use crate::utils::context_data::{
-    get_database_from_context, DatabaseContainer, MusicPlayers, Store, StoreData,
-};
+use crate::handler::Handler;
+use crate::utils::context_data::{get_database_from_context, DatabaseContainer, Store, StoreData};
 use crate::utils::error::{BotError, BotResult};
+use bot_serenityutils::menu::EventDrivenMessageContainer;
+use serenity::framework::standard::buckets::LimitedFor;
+use std::sync::Arc;
+use std::time::SystemTime;
+use tokio::sync::Mutex;

 pub async fn get_client() -> BotResult<Client> {
-    let token = env::var("BOT_TOKEN").map_err(|_| BotError::MissingToken)?;
-    let database = get_database().await?;
-    let client = Client::builder(token, GatewayIntents::all())
-        .register_serenity_additions_with(get_raw_event_handler())
+    let token = dotenv::var("BOT_TOKEN").map_err(|_| BotError::MissingToken)?;
+    let database = get_database()?;
+
+    let client = Client::builder(token)
        .event_handler(Handler)
        .framework(get_framework().await)
        .register_songbird()
-        .type_map_insert::<Store>(StoreData::create().await)
-        .type_map_insert::<DatabaseContainer>(database)
-        .type_map_insert::<MusicPlayers>(HashMap::new())
        .await?;
+    {
+        let mut data = client.data.write().await;
+        data.insert::<Store>(StoreData::new());
+        data.insert::<DatabaseContainer>(database);
+        data.insert::<EventDrivenMessageContainer>(Arc::new(Mutex::new(HashMap::new())));
+    }

    Ok(client)
 }
@ -93,13 +94,13 @@ async fn after_hook(ctx: &Context, msg: &Message, cmd_name: &str, error: Command
                m.embed(|e| e.title("Error occurred").description(format!("{}", why)))
            })
            .await;
-        tracing::warn!("Error in {}: {:?}", cmd_name, why);
+        log::warn!("Error in {}: {:?}", cmd_name, why);
    }
    let database = get_database_from_context(ctx).await;
    let _ = database
        .add_statistic(
-            crate::VERSION.to_string(),
-            cmd_name.to_string(),
+            crate::VERSION,
+            cmd_name,
            SystemTime::now(),
            error_msg.is_none(),
            error_msg,
@ -109,13 +110,13 @@ async fn after_hook(ctx: &Context, msg: &Message, cmd_name: &str, error: Command

 #[hook]
 async fn before_hook(ctx: &Context, msg: &Message, _: &str) -> bool {
-    tracing::trace!("Got command message {}", msg.content);
+    log::trace!("Got command message {}", msg.content);
    let _ = msg.channel_id.broadcast_typing(ctx).await;
    true
 }

 #[hook]
-async fn dispatch_error(ctx: &Context, msg: &Message, error: DispatchError, command_name: &str) {
+async fn dispatch_error(ctx: &Context, msg: &Message, error: DispatchError) {
    match error {
        DispatchError::Ratelimited(info) => {
            if info.is_first_try {
@ -131,19 +132,13 @@ async fn dispatch_error(ctx: &Context, msg: &Message, error: DispatchError, comm
        DispatchError::OnlyForDM => {
            let _ = msg
                .channel_id
-                .say(
-                    &ctx.http,
-                    format!("The command {command_name} only works via DM"),
-                )
+                .say(&ctx.http, "This command only works via DM")
                .await;
        }
        DispatchError::OnlyForGuilds => {
            let _ = msg
                .channel_id
-                .say(
-                    &ctx.http,
-                    format!("The command {command_name} only works on servers"),
-                )
+                .say(&ctx.http, "This command only works on servers")
                .await;
        }
        DispatchError::NotEnoughArguments { min, given } => {
--- a/src/commands/minecraft/enchantment.rs
+++ b/src/commands/minecraft/enchantment.rs
@ -16,7 +16,7 @@ pub(crate) async fn enchantment(ctx: &Context, msg: &Message, args: Args) -> Com
    let data = ctx.data.read().await;
    let store = data.get::<Store>().expect("Failed to get store");
    let enchantment_name = args.message().to_lowercase();
-    tracing::debug!("Searching for enchantment {}", enchantment_name);
+    log::debug!("Searching for enchantment {}", enchantment_name);

    let enchantments_by_name = store
        .minecraft_data_api
@ -29,7 +29,7 @@ pub(crate) async fn enchantment(ctx: &Context, msg: &Message, args: Args) -> Com
            enchantment_name
        )))?
        .clone();
-    tracing::trace!("Enchantment is {:?}", enchantment);
+    log::trace!("Enchantment is {:?}", enchantment);

    msg.channel_id
        .send_message(ctx, |m| {
--- a/src/commands/minecraft/item.rs
+++ b/src/commands/minecraft/item.rs
@ -19,9 +19,9 @@ pub(crate) async fn item(ctx: &Context, msg: &Message, args: Args) -> CommandRes
    let store = data.get::<Store>().expect("Failed to get store");

    let item_name = args.message().to_lowercase();
-    tracing::debug!("Searching for item '{}'", item_name);
+    log::debug!("Searching for item '{}'", item_name);
    let information = get_item_full_information(&item_name, &store.minecraft_data_api)?;
-    tracing::trace!("Item full information is {:?}", information);
+    log::trace!("Item full information is {:?}", information);
    create_item_message(ctx, msg.channel_id, information).await?;

    handle_autodelete(ctx, msg).await?;
--- a/src/commands/misc/add_media.rs
+++ b/src/commands/misc/add_media.rs
@ -1,21 +1,21 @@
 use crate::utils::context_data::get_database_from_context;
 use bot_coreutils::url;
+use bot_serenityutils::core::SHORT_TIMEOUT;
+use bot_serenityutils::ephemeral_message::EphemeralMessage;
 use serenity::client::Context;
 use serenity::framework::standard::macros::command;
 use serenity::framework::standard::{Args, CommandResult};
 use serenity::model::channel::Message;
-use serenity_additions::core::SHORT_TIMEOUT;
-use serenity_additions::ephemeral_message::EphemeralMessage;

 #[command]
-#[description("Adds media to the database")]
+#[description("Simple ping test command")]
 #[usage("<url> [<category>] [<name>]")]
 #[bucket("general")]
-#[aliases("add_gif", "add-gif", "addgif", "add-media", "addmedia")]
+#[aliases("add-gif", "addgif")]
 #[min_args(1)]
 #[max_args(3)]
 #[owners_only]
-async fn add_media(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
+async fn add_gif(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
    let url = args.single::<String>()?;

    if !url::is_valid(&url) {
@ -26,10 +26,10 @@ async fn add_media(ctx: &Context, msg: &Message, mut args: Args) -> CommandResul
    let name = args.single_quoted::<String>().ok();
    let database = get_database_from_context(&ctx).await;

-    database.add_media(url, category, name).await?;
+    database.add_gif(&url, category, name).await?;
    EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |c| {
        c.reference_message(msg)
-            .content("Media entry added to the database.")
+            .content("Gif added to the database.")
    })
    .await?;

--- a/src/commands/misc/clear.rs
+++ b/src/commands/misc/clear.rs
@ -1,39 +0,0 @@
-use futures::future::BoxFuture;
-use futures::FutureExt;
-use serenity::client::Context;
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{Args, CommandResult};
-use serenity::model::channel::Message;
-use serenity::Result as SerenityResult;
-use serenity_additions::core::SHORT_TIMEOUT;
-use serenity_additions::ephemeral_message::EphemeralMessage;
-
-#[command]
-#[description("Clears the chat (maximum 100 messages)")]
-#[usage("[<number>]")]
-#[example("20")]
-#[min_args(0)]
-#[max_args(1)]
-#[bucket("general")]
-#[required_permissions("MANAGE_MESSAGES")]
-async fn clear(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let limit = args.single::<u64>().unwrap_or(20);
-    tracing::debug!("Deleting messages for channel {}", msg.channel_id);
-    let messages = msg.channel_id.messages(ctx, |b| b.limit(limit)).await?;
-    tracing::debug!("Deleting {} messages", messages.len());
-    let futures: Vec<BoxFuture<SerenityResult<()>>> = messages
-        .into_iter()
-        .map(|m| async move { ctx.http.delete_message(m.channel_id.0, m.id.0).await }.boxed())
-        .collect();
-    tracing::debug!("Waiting for all messages to be deleted");
-    let deleted = futures::future::join_all(futures).await;
-    let deleted_count = deleted.into_iter().filter(|d| d.is_ok()).count();
-    tracing::debug!("{} Messages deleted", deleted_count);
-
-    EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |f| {
-        f.content(format!("Deleted {} messages", deleted_count))
-    })
-    .await?;
-
-    Ok(())
-}
--- a/src/commands/misc/fuck.rs
+++ b/src/commands/misc/fuck.rs
@ -1,44 +0,0 @@
-use serenity::client::Context;
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{Args, CommandResult};
-use serenity::model::channel::Message;
-use std::time::Duration;
-
-#[command]
-#[description("Fuck this person in particular")]
-#[usage("<person> [<amount>] [<verbosity>]")]
-#[min_args(1)]
-#[max_args(3)]
-#[bucket("general")]
-#[aliases("frick", "fock")]
-async fn fuck(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let mut amount = args.single::<usize>().unwrap_or(3);
-    if amount > 3 {
-        msg.reply(&ctx.http, "Don't you think that's a bit much?")
-            .await?;
-        tokio::time::sleep(Duration::from_secs(2)).await;
-        amount = 3;
-    } else {
-        msg.reply(&ctx.http, "no").await?;
-        tokio::time::sleep(Duration::from_secs(1)).await;
-    }
-    let mut verbosity = args.single::<usize>().unwrap_or(1);
-    if verbosity == 0 {
-        verbosity = 1
-    }
-    let fuck_word = match verbosity {
-        1 => "frick",
-        2 => "flock",
-        3 => "fock",
-        4 => "fck",
-        _ => "fuck",
-    };
-
-    for _ in 0..amount {
-        msg.channel_id
-            .say(&ctx, format!("{} <@{}>", fuck_word, msg.author.id))
-            .await?;
-    }
-
-    Ok(())
-}
--- a/src/commands/misc/media.rs
+++ b/src/commands/misc/media.rs
@ -1,4 +1,4 @@
-use crate::messages::gifs::create_media_menu;
+use crate::messages::gifs::create_gifs_menu;
 use crate::utils::context_data::get_database_from_context;
 use serenity::client::Context;
 use serenity::framework::standard::macros::command;
@ -9,10 +9,10 @@ use serenity::model::channel::Message;
 #[description("Displays a list of all gifs used by the bot")]
 #[bucket("general")]
 #[only_in(guilds)]
-async fn media(ctx: &Context, msg: &Message) -> CommandResult {
+async fn gifs(ctx: &Context, msg: &Message) -> CommandResult {
    let database = get_database_from_context(ctx).await;
-    let gifs = database.get_all_media().await?;
-    create_media_menu(ctx, msg.channel_id, gifs, msg.author.id).await?;
+    let gifs = database.get_all_gifs().await?;
+    create_gifs_menu(ctx, msg.channel_id, gifs).await?;

    Ok(())
 }
--- a/src/commands/misc/help.rs
+++ b/src/commands/misc/help.rs
@ -19,7 +19,6 @@ pub async fn help(
    groups: &[&'static CommandGroup],
    owners: HashSet<UserId>,
 ) -> CommandResult {
-    tracing::debug!("Help");
    let _ = help_commands::with_embeds(ctx, msg, args, help_options, groups, owners).await;
    handle_autodelete(ctx, msg).await?;
    Ok(())
--- a/src/commands/misc/inspirobot.rs
+++ b/src/commands/misc/inspirobot.rs
@ -1,16 +0,0 @@
-use crate::messages::inspirobot::create_inspirobot_menu;
-use serenity::client::Context;
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::CommandResult;
-use serenity::model::channel::Message;
-
-#[command]
-#[description("Get an inspiring quote")]
-#[usage("")]
-#[aliases("inspireme", "inspire-me", "inspiro")]
-#[bucket("general")]
-async fn inspirobot(ctx: &Context, msg: &Message) -> CommandResult {
-    create_inspirobot_menu(ctx, msg.channel_id, msg.author.id).await?;
-
-    Ok(())
-}
--- a/src/commands/misc/mod.rs
+++ b/src/commands/misc/mod.rs
@ -1,41 +1,30 @@
 use serenity::framework::standard::macros::group;

 use about::ABOUT_COMMAND;
-use add_media::ADD_MEDIA_COMMAND;
-use clear::CLEAR_COMMAND;
-use fuck::FUCK_COMMAND;
-use inspirobot::INSPIROBOT_COMMAND;
-use media::MEDIA_COMMAND;
+use add_gif::ADD_GIF_COMMAND;
+use gifs::GIFS_COMMAND;
 use pain::PAIN_COMMAND;
-use party::PARTY_COMMAND;
 use ping::PING_COMMAND;
 use qalc::QALC_COMMAND;
 use shutdown::SHUTDOWN_COMMAND;
 use stats::STATS_COMMAND;
 use time::TIME_COMMAND;
 use timezones::TIMEZONES_COMMAND;
-use xkcd::XKCD_COMMAND;

 mod about;
-mod add_media;
-mod clear;
-mod fuck;
+mod add_gif;
+mod gifs;
 pub(crate) mod help;
-mod inspirobot;
-mod media;
 mod pain;
-mod party;
 mod ping;
 mod qalc;
 mod shutdown;
 mod stats;
 mod time;
 mod timezones;
-mod xkcd;

 #[group]
 #[commands(
-    ping, stats, shutdown, time, timezones, qalc, about, add_media, media, pain, clear, xkcd, fuck,
-    party, inspirobot
+    ping, stats, shutdown, time, timezones, qalc, about, add_gif, gifs, pain
 )]
 pub struct Misc;
--- a/src/commands/misc/pain.rs
+++ b/src/commands/misc/pain.rs
@ -17,26 +17,26 @@ static NOT_FOUND_PAIN: &str = "404";
 #[max_args(1)]
 #[bucket("general")]
 async fn pain(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
-    tracing::debug!("Got pain command");
+    log::debug!("Got pain command");
    let pain_type = args.message().to_lowercase();
    let database = get_database_from_context(ctx).await;
-    let mut media = database
-        .get_media_by_category(format!("{}{}", CATEGORY_PREFIX, pain_type))
+    let mut gifs = database
+        .get_gifs_by_category(format!("{}{}", CATEGORY_PREFIX, pain_type).as_str())
        .await?;

-    if media.is_empty() {
-        tracing::debug!("No media found for pain {}. Using 404", pain_type);
-        media = database
-            .get_media_by_category(format!("{}{}", CATEGORY_PREFIX, NOT_FOUND_PAIN))
+    if gifs.is_empty() {
+        log::debug!("No gif found for pain {}. Using 404", pain_type);
+        gifs = database
+            .get_gifs_by_category(format!("{}{}", CATEGORY_PREFIX, NOT_FOUND_PAIN).as_str())
            .await?;
    }

-    let entry = media
+    let gif = gifs
        .into_iter()
        .choose(&mut rand::thread_rng())
        .ok_or(BotError::from("No gifs found."))?;
-    tracing::trace!("Gif for pain is {:?}", entry);
-    msg.reply(ctx, entry.url).await?;
+    log::trace!("Gif for pain is {:?}", gif);
+    msg.reply(ctx, gif.url).await?;

    Ok(())
 }
--- a/src/commands/misc/party.rs
+++ b/src/commands/misc/party.rs
@ -1,43 +0,0 @@
-use crate::utils::context_data::get_database_from_context;
-use crate::utils::error::BotError;
-use bot_database::models::Media;
-use rand::prelude::SliceRandom;
-use serenity::client::Context;
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{Args, CommandResult};
-use serenity::model::channel::Message;
-
-#[command]
-#[description("Party command")]
-#[max_args(1)]
-#[usage("(<amount>)")]
-#[bucket("general")]
-async fn party(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let mut amount = args.single::<u32>().unwrap_or(1);
-    if amount > 5 {
-        amount = 5;
-    }
-    if amount == 0 {
-        return Ok(());
-    }
-    let database = get_database_from_context(ctx).await;
-    let mut media = database.get_media_by_category("party").await?;
-    media.shuffle(&mut rand::thread_rng());
-    let mut chosen_gifs = Vec::new();
-
-    for _ in 0..amount {
-        chosen_gifs.push(media.pop());
-    }
-    let chosen_gifs: Vec<Media> = chosen_gifs.into_iter().filter_map(|g| g).collect();
-    if chosen_gifs.is_empty() {
-        return Err(BotError::from("No media found.").into());
-    }
-
-    for gif in chosen_gifs {
-        msg.channel_id
-            .send_message(&ctx.http, |m| m.content(gif.url))
-            .await?;
-    }
-
-    Ok(())
-}
--- a/src/commands/misc/shutdown.rs
+++ b/src/commands/misc/shutdown.rs
@ -15,7 +15,7 @@ use crate::commands::common::handle_autodelete;
 #[owners_only]
 async fn shutdown(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
    let code = args.single::<i32>().unwrap_or(0);
-    tracing::info!("Shutting down with code {}...", code);
+    log::info!("Shutting down with code {}...", code);
    msg.channel_id
        .say(
            ctx,
--- a/src/commands/misc/stats.rs
+++ b/src/commands/misc/stats.rs
@ -1,28 +1,30 @@
 use std::process;
-use std::time::Duration;
+use std::time::{Duration, SystemTime, UNIX_EPOCH};

 use chrono::Duration as ChronoDuration;
 use serenity::framework::standard::macros::command;
 use serenity::framework::standard::CommandResult;
 use serenity::model::channel::Message;
 use serenity::prelude::*;
-use sysinfo::{Pid, PidExt, ProcessExt, SystemExt};
+use sysinfo::{ProcessExt, SystemExt};

 use crate::commands::common::handle_autodelete;
-use crate::utils::context_data::{get_database_from_context, MusicPlayers};
+use crate::providers::music::queue::MusicQueue;
+use crate::utils::context_data::{get_database_from_context, Store};
+use std::sync::Arc;

 #[command]
 #[description("Shows some statistics about the bot")]
 #[usage("")]
 #[bucket("general")]
 async fn stats(ctx: &Context, msg: &Message) -> CommandResult {
-    tracing::debug!("Reading system stats");
+    log::debug!("Reading system stats");
    let database = get_database_from_context(ctx).await;
    let mut system = sysinfo::System::new_all();
    system.refresh_all();

-    let kernel_version = system.kernel_version().unwrap_or("n/a".to_string());
-    let own_process = system.process(Pid::from_u32(process::id())).unwrap();
+    let kernel_version = system.get_kernel_version().unwrap_or("n/a".to_string());
+    let own_process = system.get_process(process::id() as i32).unwrap();
    let memory_usage = own_process.memory();
    let cpu_usage = own_process.cpu_usage();
    let thread_count = own_process.tasks.len();
@ -30,16 +32,16 @@ async fn stats(ctx: &Context, msg: &Message) -> CommandResult {
    let guild_count: usize = current_user.guilds(ctx).await?.len();
    let bot_info = ctx.http.get_current_application_info().await?;

-    let uptime = own_process.run_time();
-    let uptime = ChronoDuration::from_std(Duration::from_secs(uptime)).unwrap();
+    let current_time_seconds = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
+    let uptime = current_time_seconds - Duration::from_secs(own_process.start_time());
+    let uptime = ChronoDuration::from_std(uptime).unwrap();
    let total_commands_executed = database.get_total_commands_statistic().await?;
-    let shard_count = ctx.cache.shard_count();
+    let shard_count = ctx.cache.shard_count().await;

    let discord_info = format!(
        r#"
    Version: {}
    Compiled with: rustc {}
-    Build at: {}
    Owner: <@{}>
    Guilds: {}
    Shards: {}
@ -48,7 +50,6 @@ async fn stats(ctx: &Context, msg: &Message) -> CommandResult {
    "#,
        crate::VERSION,
        rustc_version_runtime::version(),
-        build_time::build_time_utc!("%Y-%m-%dT%H:%M:%S"),
        bot_info.owner.id,
        guild_count,
        shard_count,
@ -56,7 +57,7 @@ async fn stats(ctx: &Context, msg: &Message) -> CommandResult {
        total_commands_executed
    );

-    tracing::trace!("Discord info {}", discord_info);
+    log::trace!("Discord info {}", discord_info);

    let system_info = format!(
        r#"
@ -74,7 +75,7 @@ async fn stats(ctx: &Context, msg: &Message) -> CommandResult {
        uptime.num_hours() % 24,
        uptime.num_minutes() % 60
    );
-    tracing::trace!("System info {}", system_info);
+    log::trace!("System info {}", system_info);

    msg.channel_id
        .send_message(ctx, |m| {
@ -93,7 +94,23 @@ async fn stats(ctx: &Context, msg: &Message) -> CommandResult {
 /// Returns the total number of queues that are not
 /// flagged to leave
 async fn get_queue_count(ctx: &Context) -> usize {
-    let data = ctx.data.read().await;
-    let players = data.get::<MusicPlayers>().unwrap();
-    players.len()
+    let queues: Vec<Arc<Mutex<MusicQueue>>> = {
+        let data = ctx.data.read().await;
+        let store = data.get::<Store>().unwrap();
+
+        store
+            .music_queues
+            .iter()
+            .map(|(_, q)| Arc::clone(q))
+            .collect()
+    };
+    let mut count = 0;
+    for queue in queues {
+        let queue = queue.lock().await;
+        if !queue.leave_flag {
+            count += 1;
+        }
+    }
+
+    count
 }
--- a/src/commands/misc/time.rs
+++ b/src/commands/misc/time.rs
@ -17,13 +17,13 @@ async fn time(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
    let second_timezone = args.single::<String>().ok();

    let from_timezone: Tz = if let Some(first) = &first_timezone {
-        crate::forward_error!(ctx, msg.channel_id, first.parse::<Tz>())
+        forward_error!(ctx, msg.channel_id, first.parse::<Tz>())
    } else {
        Tz::UTC
    };

    let to_timezone = if let Some(second) = &second_timezone {
-        crate::forward_error!(ctx, msg.channel_id, second.parse::<Tz>())
+        forward_error!(ctx, msg.channel_id, second.parse::<Tz>())
    } else {
        Tz::UTC
    };
@ -33,7 +33,7 @@ async fn time(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
    } else {
        let now = Utc::now();
        if second_timezone.is_some() {
-            crate::forward_error!(
+            forward_error!(
                ctx,
                msg.channel_id,
                from_timezone.datetime_from_str(
@ -43,7 +43,7 @@ async fn time(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
            )
        } else {
            let timezone: Tz = "UTC".parse().unwrap();
-            crate::forward_error!(
+            forward_error!(
                ctx,
                msg.channel_id,
                timezone.datetime_from_str(
--- a/src/commands/misc/xkcd.rs
+++ b/src/commands/misc/xkcd.rs
@ -1,35 +0,0 @@
-use crate::messages::xkcd::create_xkcd_menu;
-use serenity::client::Context;
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{Args, CommandResult};
-use serenity::model::channel::Message;
-use xkcd_search::get_comic;
-
-#[command]
-#[description("Retrieves xkcd comics")]
-#[usage("[(<id>|<query..>)]")]
-#[bucket("general")]
-async fn xkcd(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let comics = if let Ok(id) = args.single::<u32>() {
-        if let Ok(comic) = xkcd_search::get_comic(id).await {
-            vec![comic]
-        } else {
-            vec![]
-        }
-    } else if !args.is_empty() {
-        let query = args.message();
-        let results = xkcd_search::search(query).await?;
-        let comics =
-            futures::future::join_all(results.into_iter().map(|(_, id)| get_comic(id))).await;
-        comics
-            .into_iter()
-            .filter_map(|result| result.ok())
-            .collect()
-    } else {
-        vec![xkcd_search::get_latest_comic().await?]
-    };
-
-    create_xkcd_menu(ctx, msg.channel_id, comics, msg.author.id).await?;
-
-    Ok(())
-}
--- a/src/commands/music/clear_queue.rs
+++ b/src/commands/music/clear_queue.rs
@ -1,13 +1,12 @@
 use serenity::client::Context;
 use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{CommandError, CommandResult};
+use serenity::framework::standard::CommandResult;
 use serenity::model::channel::Message;

 use crate::commands::common::handle_autodelete;
-use crate::commands::music::{get_music_player_for_guild, DJ_CHECK};
-use crate::messages::music::no_voicechannel::create_no_voicechannel_message;
-use serenity_additions::core::SHORT_TIMEOUT;
-use serenity_additions::ephemeral_message::EphemeralMessage;
+use crate::commands::music::{get_queue_for_guild, DJ_CHECK};
+use bot_serenityutils::core::SHORT_TIMEOUT;
+use bot_serenityutils::ephemeral_message::EphemeralMessage;

 #[command]
 #[only_in(guilds)]
@ -17,19 +16,17 @@ use serenity_additions::ephemeral_message::EphemeralMessage;
 #[bucket("general")]
 #[checks(DJ)]
 async fn clear_queue(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).unwrap();
-    tracing::debug!("Clearing queue for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).await.unwrap();
+    log::debug!("Clearing queue for guild {}", guild.id);

-    let player = if let Some(player) = get_music_player_for_guild(ctx, guild.id).await {
-        player
-    } else {
-        return create_no_voicechannel_message(&ctx.http, msg.channel_id)
-            .await
-            .map_err(CommandError::from);
-    };
+    let queue = forward_error!(
+        ctx,
+        msg.channel_id,
+        get_queue_for_guild(ctx, &guild.id).await
+    );
    {
-        let mut player = player.lock().await;
-        player.queue().clear();
+        let mut queue_lock = queue.lock().await;
+        queue_lock.clear();
    }

    EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
--- a/src/commands/music/current.rs
+++ b/src/commands/music/current.rs
@ -1,11 +1,12 @@
+use std::mem;
+
 use serenity::client::Context;
 use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{CommandError, CommandResult};
+use serenity::framework::standard::CommandResult;
 use serenity::model::channel::Message;

 use crate::commands::common::handle_autodelete;
-use crate::commands::music::get_music_player_for_guild;
-use crate::messages::music::no_voicechannel::create_no_voicechannel_message;
+use crate::commands::music::get_queue_for_guild;
 use crate::messages::music::now_playing::create_now_playing_msg;

 #[command]
@ -15,25 +16,32 @@ use crate::messages::music::now_playing::create_now_playing_msg;
 #[aliases("nowplaying", "np")]
 #[bucket("general")]
 async fn current(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).unwrap();
-
-    tracing::debug!("Displaying current song for queue in {}", guild.id);
-    let player = if let Some(player) = get_music_player_for_guild(ctx, guild.id).await {
-        player
-    } else {
-        return create_no_voicechannel_message(&ctx.http, msg.channel_id)
-            .await
-            .map_err(CommandError::from);
-    };
+    let guild = msg.guild(&ctx.cache).await.unwrap();
+
+    log::debug!("Displaying current song for queue in {}", guild.id);
+    let queue = forward_error!(
+        ctx,
+        msg.channel_id,
+        get_queue_for_guild(ctx, &guild.id).await
+    );
+
    let current = {
-        let mut player = player.lock().await;
-        player.queue().current().clone()
+        let queue_lock = queue.lock().await;
+        queue_lock.current().clone()
    };

-    if let Some(_) = current {
-        let np_msg = create_now_playing_msg(ctx, player.clone(), msg.channel_id).await?;
-        let mut player = player.lock().await;
-        player.set_now_playing(np_msg).await;
+    if let Some((current, _)) = current {
+        let metadata = current.metadata().clone();
+        log::trace!("Metadata is {:?}", metadata);
+        let np_msg = create_now_playing_msg(ctx, queue.clone(), msg.channel_id).await?;
+
+        let mut queue_lock = queue.lock().await;
+        if let Some(old_np) = mem::replace(&mut queue_lock.now_playing_msg, Some(np_msg)) {
+            let old_np = old_np.read().await;
+            if let Ok(message) = old_np.get_message(&ctx.http).await {
+                let _ = message.delete(ctx).await;
+            }
+        }
    }
    handle_autodelete(ctx, msg).await?;

--- a/src/commands/music/join.rs
+++ b/src/commands/music/join.rs
@ -4,11 +4,10 @@ use serenity::framework::standard::{Args, CommandResult};
 use serenity::model::channel::Message;

 use crate::commands::common::handle_autodelete;
-use crate::commands::music::{get_channel_for_author, get_music_player_for_guild, is_dj};
-use crate::providers::music::player::MusicPlayer;
+use crate::commands::music::{get_channel_for_author, is_dj, join_channel};
+use bot_serenityutils::core::SHORT_TIMEOUT;
+use bot_serenityutils::ephemeral_message::EphemeralMessage;
 use serenity::model::id::ChannelId;
-use serenity_additions::core::SHORT_TIMEOUT;
-use serenity_additions::ephemeral_message::EphemeralMessage;

 #[command]
 #[only_in(guilds)]
@ -16,33 +15,26 @@ use serenity_additions::ephemeral_message::EphemeralMessage;
 #[usage("")]
 #[bucket("general")]
 async fn join(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).unwrap();
+    let guild = msg.guild(&ctx.cache).await.unwrap();
    let channel_id = if let Ok(arg) = args.single::<u64>() {
        if is_dj(ctx, guild.id, &msg.author).await? {
            ChannelId(arg)
        } else {
-            crate::forward_error!(
+            forward_error!(
                ctx,
                msg.channel_id,
                get_channel_for_author(&msg.author.id, &guild)
            )
        }
    } else {
-        crate::forward_error!(
+        forward_error!(
            ctx,
            msg.channel_id,
            get_channel_for_author(&msg.author.id, &guild)
        )
    };
-    if get_music_player_for_guild(ctx, guild.id).await.is_some() {
-        EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
-            m.content("‼️ I'm already in a Voice Channel")
-        })
-        .await?;
-        return Ok(());
-    }
-    tracing::debug!("Joining channel {} for guild {}", channel_id, guild.id);
-    MusicPlayer::join(ctx, guild.id, channel_id, msg.channel_id).await?;
+    log::debug!("Joining channel {} for guild {}", channel_id, guild.id);
+    join_channel(ctx, channel_id, guild.id).await;
    EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
        m.content("🎤 Joined the Voice Channel")
    })
--- a/src/commands/music/leave.rs
+++ b/src/commands/music/leave.rs
@ -4,10 +4,10 @@ use serenity::framework::standard::CommandResult;
 use serenity::model::channel::Message;

 use crate::commands::common::handle_autodelete;
-use crate::commands::music::DJ_CHECK;
-use crate::utils::context_data::MusicPlayers;
-use serenity_additions::core::SHORT_TIMEOUT;
-use serenity_additions::ephemeral_message::EphemeralMessage;
+use crate::commands::music::{get_voice_manager, DJ_CHECK};
+use crate::utils::context_data::Store;
+use bot_serenityutils::core::SHORT_TIMEOUT;
+use bot_serenityutils::ephemeral_message::EphemeralMessage;

 #[command]
 #[only_in(guilds)]
@ -17,33 +17,43 @@ use serenity_additions::ephemeral_message::EphemeralMessage;
 #[bucket("general")]
 #[checks(DJ)]
 async fn leave(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).unwrap();
-    tracing::debug!("Leave request received for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).await.unwrap();
+    log::debug!("Leave request received for guild {}", guild.id);

-    let manager = songbird::get(ctx).await.unwrap();
-    if let Some(handler) = manager.get(guild.id) {
+    let manager = get_voice_manager(ctx).await;
+    let queue = {
+        let mut data = ctx.data.write().await;
+        let store = data.get_mut::<Store>().unwrap();
+        store
+            .music_queues
+            .remove(&guild.id)
+            .expect("No queue for guild.")
+    };
+    let queue_lock = queue.lock().await;
+    let handler = manager.get(guild.id);
+
+    if let Some(handler) = handler {
        let mut handler_lock = handler.lock().await;
-        handler_lock.leave().await?;
+        handler_lock.remove_all_global_events();
    }

-    let mut data = ctx.data.write().await;
-    let players = data.get_mut::<MusicPlayers>().unwrap();
-
-    match players.remove(&guild.id.0) {
-        None => {
-            EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
-                m.content("‼️ I'm not in a Voice Channel")
-            })
-            .await?;
-        }
-        Some(player) => {
-            let mut player = player.lock().await;
-            player.stop().await?;
-            player.delete_now_playing().await?;
+    if manager.get(guild.id).is_some() {
+        if let Some((current, _)) = queue_lock.current() {
+            current.stop()?;
        }
+        manager.remove(guild.id).await?;
+        EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
+            m.content("👋 Left the Voice Channel")
+        })
+        .await?;
+        log::debug!("Left the voice channel");
+    } else {
+        EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
+            m.content("‼️ I'm not in a Voice Channel")
+        })
+        .await?;
+        log::debug!("Not in a voice channel");
    }
-    manager.remove(guild.id).await?;
-
    handle_autodelete(ctx, msg).await?;

    Ok(())
--- a/src/commands/music/lyrics.rs
+++ b/src/commands/music/lyrics.rs
@ -1,11 +1,11 @@
 use serenity::client::Context;
 use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{CommandError, CommandResult};
+use serenity::framework::standard::CommandResult;
 use serenity::model::channel::Message;

 use crate::commands::common::handle_autodelete;
-use crate::commands::music::get_music_player_for_guild;
-use crate::messages::music::no_voicechannel::create_no_voicechannel_message;
+use crate::commands::music::get_queue_for_guild;
+use crate::providers::music::lyrics::get_lyrics;

 #[command]
 #[only_in(guilds)]
@ -13,43 +13,43 @@ use crate::messages::music::no_voicechannel::create_no_voicechannel_message;
 #[usage("")]
 #[bucket("general")]
 async fn lyrics(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).unwrap();
-    tracing::debug!("Fetching lyrics for song playing in {}", guild.id);
+    let guild = msg.guild(&ctx.cache).await.unwrap();
+    log::debug!("Fetching lyrics for song playing in {}", guild.id);

-    let player = if let Some(player) = get_music_player_for_guild(ctx, guild.id).await {
-        player
-    } else {
-        return create_no_voicechannel_message(&ctx.http, msg.channel_id)
-            .await
-            .map_err(CommandError::from);
-    };
+    let queue = forward_error!(
+        ctx,
+        msg.channel_id,
+        get_queue_for_guild(ctx, &guild.id).await
+    );
+    let queue_lock = queue.lock().await;

-    let (lyrics, current) = {
-        let mut player = player.lock().await;
-        let current = player.queue().current().clone();
-        (player.lyrics().await?, current)
-    };
+    if let Some((current, _)) = queue_lock.current() {
+        log::debug!("Playing music. Fetching lyrics for currently playing song...");
+        let metadata = current.metadata();
+        let title = metadata.title.clone().unwrap();
+        let author = metadata.artist.clone().unwrap();

-    if let Some(lyrics) = lyrics {
-        let current = current.unwrap();
-        msg.channel_id
-            .send_message(ctx, |m| {
-                m.embed(|e| {
-                    e.title(format!(
-                        "Lyrics for {} by {}",
-                        current.title(),
-                        current.author()
-                    ))
-                    .description(lyrics)
-                    .footer(|f| f.text("Powered by lyricsovh"))
+        if let Some(lyrics) = get_lyrics(&*author, &*title).await? {
+            log::trace!("Lyrics for '{}' are {}", title, lyrics);
+
+            msg.channel_id
+                .send_message(ctx, |m| {
+                    m.embed(|e| {
+                        e.title(format!("Lyrics for {} by {}", title, author))
+                            .description(lyrics)
+                            .footer(|f| f.text("Powered by lyricsovh"))
+                    })
                })
-            })
-            .await?;
+                .await?;
+        } else {
+            log::debug!("No lyrics found");
+            msg.channel_id.say(ctx, "No lyrics found").await?;
+        }
    } else {
-        tracing::debug!("No lyrics found");
-        msg.channel_id.say(ctx, "No lyrics found").await?;
+        msg.channel_id
+            .say(ctx, "I'm not playing music right now")
+            .await?;
    }
-
    handle_autodelete(ctx, msg).await?;

    Ok(())
--- a/src/commands/music/mod.rs
+++ b/src/commands/music/mod.rs
@ -1,20 +1,22 @@
+use std::mem;
+use std::sync::atomic::{AtomicIsize, AtomicUsize, Ordering};
 use std::sync::Arc;
+use std::time::Duration;

 use aspotify::Track;
-use bot_database::Database;
-use futures::future::BoxFuture;
-use futures::FutureExt;
 use regex::Regex;
+use serenity::async_trait;
 use serenity::client::Context;
 use serenity::framework::standard::macros::{check, group};
-use serenity::framework::standard::{Args, CommandOptions, Reason};
+use serenity::http::Http;
 use serenity::model::channel::Message;
 use serenity::model::guild::Guild;
 use serenity::model::id::{ChannelId, GuildId, UserId};
 use serenity::model::user::User;
-use songbird::Songbird;
+use songbird::{
+    Call, Event, EventContext, EventHandler as VoiceEventHandler, Songbird, TrackEvent,
+};
 use tokio::sync::Mutex;
-use youtube_metadata::get_video_information;

 use clear_queue::CLEAR_QUEUE_COMMAND;
 use current::CURRENT_COMMAND;
@ -32,12 +34,17 @@ use save_playlist::SAVE_PLAYLIST_COMMAND;
 use shuffle::SHUFFLE_COMMAND;
 use skip::SKIP_COMMAND;

-use crate::providers::music::player::MusicPlayer;
-use crate::providers::music::queue::Song;
+use crate::messages::music::now_playing::update_now_playing_msg;
+use crate::providers::music::queue::{MusicQueue, Song};
 use crate::providers::music::{add_youtube_song_to_database, youtube_dl};
 use crate::providers::settings::{get_setting, Setting};
-use crate::utils::context_data::{DatabaseContainer, MusicPlayers, Store};
+use crate::utils::context_data::{DatabaseContainer, Store};
 use crate::utils::error::{BotError, BotResult};
+use bot_database::Database;
+use futures::future::BoxFuture;
+use futures::FutureExt;
+use serenity::framework::standard::{Args, CommandOptions, Reason};
+use youtube_metadata::get_video_information;

 mod clear_queue;
 mod current;
@ -75,12 +82,116 @@ mod skip;
 )]
 pub struct Music;

-/// Returns the voice manager from the context
-pub async fn get_voice_manager(ctx: &Context) -> Arc<Songbird> {
-    songbird::get(ctx)
+struct SongEndNotifier {
+    channel_id: ChannelId,
+    http: Arc<Http>,
+    queue: Arc<Mutex<MusicQueue>>,
+    handler: Arc<Mutex<Call>>,
+}
+
+#[async_trait]
+impl VoiceEventHandler for SongEndNotifier {
+    async fn act(&self, _ctx: &EventContext<'_>) -> Option<Event> {
+        log::debug!("Song ended in {}. Playing next one", self.channel_id);
+        while !play_next_in_queue(&self.http, &self.channel_id, &self.queue, &self.handler).await {
+            tokio::time::sleep(Duration::from_millis(100)).await;
+        }
+
+        None
+    }
+}
+
+struct ChannelDurationNotifier {
+    channel_id: ChannelId,
+    guild_id: GuildId,
+    count: Arc<AtomicUsize>,
+    queue: Arc<Mutex<MusicQueue>>,
+    leave_in: Arc<AtomicIsize>,
+    handler: Arc<Mutex<Call>>,
+    manager: Arc<Songbird>,
+}
+
+#[async_trait]
+impl VoiceEventHandler for ChannelDurationNotifier {
+    async fn act(&self, _ctx: &EventContext<'_>) -> Option<Event> {
+        let count_before = self.count.fetch_add(1, Ordering::Relaxed);
+        log::debug!(
+            "Playing in channel {} for {} minutes",
+            self.channel_id,
+            count_before
+        );
+        let queue_lock = self.queue.lock().await;
+        if queue_lock.leave_flag {
+            log::debug!("Waiting to leave");
+            if self.leave_in.fetch_sub(1, Ordering::Relaxed) <= 0 {
+                log::debug!("Leaving voice channel");
+                {
+                    let mut handler_lock = self.handler.lock().await;
+                    handler_lock.remove_all_global_events();
+                }
+                if let Some((current, _)) = queue_lock.current() {
+                    let _ = current.stop();
+                }
+                let _ = self.manager.remove(self.guild_id).await;
+                log::debug!("Left the voice channel");
+            }
+        } else {
+            log::debug!("Resetting leave value");
+            self.leave_in.store(5, Ordering::Relaxed)
+        }
+
+        None
+    }
+}
+
+/// Joins a voice channel
+async fn join_channel(ctx: &Context, channel_id: ChannelId, guild_id: GuildId) -> Arc<Mutex<Call>> {
+    log::debug!(
+        "Attempting to join channel {} in guild {}",
+        channel_id,
+        guild_id
+    );
+    let manager = songbird::get(ctx)
        .await
        .expect("Songbird Voice client placed in at initialisation.")
-        .clone()
+        .clone();
+
+    let (handler, _) = manager.join(guild_id, channel_id).await;
+    let mut data = ctx.data.write().await;
+    let store = data.get_mut::<Store>().unwrap();
+    log::debug!("Creating new queue");
+    let queue = Arc::new(Mutex::new(MusicQueue::new()));
+
+    store.music_queues.insert(guild_id, queue.clone());
+    {
+        let mut handler_lock = handler.lock().await;
+
+        log::debug!("Registering track end handler");
+        handler_lock.add_global_event(
+            Event::Track(TrackEvent::End),
+            SongEndNotifier {
+                channel_id: channel_id.clone(),
+                http: ctx.http.clone(),
+                queue: Arc::clone(&queue),
+                handler: handler.clone(),
+            },
+        );
+
+        handler_lock.add_global_event(
+            Event::Periodic(Duration::from_secs(60), None),
+            ChannelDurationNotifier {
+                channel_id,
+                guild_id,
+                count: Default::default(),
+                queue: Arc::clone(&queue),
+                handler: handler.clone(),
+                leave_in: Arc::new(AtomicIsize::new(5)),
+                manager: manager.clone(),
+            },
+        );
+    }
+
+    handler
 }

 /// Returns the voice channel the author is in
@ -92,15 +203,88 @@ fn get_channel_for_author(author_id: &UserId, guild: &Guild) -> BotResult<Channe
        .ok_or(BotError::from("You're not in a Voice Channel"))
 }

-/// Returns the music player for a given guild
-pub async fn get_music_player_for_guild(
+/// Returns the voice manager from the context
+pub async fn get_voice_manager(ctx: &Context) -> Arc<Songbird> {
+    songbird::get(ctx)
+        .await
+        .expect("Songbird Voice client placed in at initialisation.")
+        .clone()
+}
+
+/// Returns a reference to a guilds music queue
+pub(crate) async fn get_queue_for_guild(
    ctx: &Context,
-    guild_id: GuildId,
-) -> Option<Arc<Mutex<MusicPlayer>>> {
+    guild_id: &GuildId,
+) -> BotResult<Arc<Mutex<MusicQueue>>> {
    let data = ctx.data.read().await;
-    let players = data.get::<MusicPlayers>().unwrap();
+    let store = data.get::<Store>().unwrap();

-    players.get(&guild_id.0).cloned()
+    let queue = store
+        .music_queues
+        .get(guild_id)
+        .ok_or(BotError::from("I'm not in a Voice Channel"))?
+        .clone();
+    Ok(queue)
+}
+
+/// Plays the next song in the queue
+async fn play_next_in_queue(
+    http: &Arc<Http>,
+    channel_id: &ChannelId,
+    queue: &Arc<Mutex<MusicQueue>>,
+    handler: &Arc<Mutex<Call>>,
+) -> bool {
+    let mut queue_lock = queue.lock().await;
+
+    if let Some(mut next) = queue_lock.next() {
+        let url = match next.url().await {
+            Some(url) => url,
+            None => {
+                let _ = channel_id
+                    .say(&http, format!("'{}' not found", next.title()))
+                    .await;
+                return false;
+            }
+        };
+        log::debug!("Getting source for song '{}'", url);
+        let source = match songbird::ytdl(&url).await {
+            Ok(s) => s,
+            Err(e) => {
+                let _ = channel_id
+                    .say(
+                        &http,
+                        format!("Failed to enqueue {}: {:?}", next.title(), e),
+                    )
+                    .await;
+                return false;
+            }
+        };
+        let mut handler_lock = handler.lock().await;
+        let track = handler_lock.play_only_source(source);
+        log::trace!("Track is {:?}", track);
+
+        if queue_lock.paused() {
+            let _ = track.pause();
+        }
+
+        if let Some(np) = &queue_lock.now_playing_msg {
+            if let Err(e) =
+                update_now_playing_msg(http, np, track.metadata(), queue_lock.paused()).await
+            {
+                log::error!("Failed to update now playing message: {:?}", e);
+            }
+        }
+        queue_lock.set_current(track, next);
+    } else {
+        if let Some(np) = mem::take(&mut queue_lock.now_playing_msg) {
+            let np = np.read().await;
+            if let Ok(message) = np.get_message(http).await {
+                let _ = message.delete(http).await;
+            }
+        }
+        queue_lock.clear_current();
+    }
+    true
 }

 /// Returns the list of songs for a given url
@ -120,23 +304,23 @@ async fn get_songs_for_query(ctx: &Context, msg: &Message, query: &str) -> BotRe
    let store = data.get::<Store>().unwrap();
    let database = data.get::<DatabaseContainer>().unwrap();

-    tracing::debug!("Querying play input {}", query);
+    log::debug!("Querying play input {}", query);
    if let Some(captures) = PLAYLIST_NAME_REGEX.captures(&query) {
-        tracing::debug!("Query is a saved playlist");
+        log::debug!("Query is a saved playlist");
        let pl_name: &str = captures.get(1).unwrap().as_str();
-        tracing::trace!("Playlist name is {}", pl_name);
+        log::trace!("Playlist name is {}", pl_name);
        let playlist_opt = database
            .get_guild_playlist(guild_id.0, pl_name.to_string())
            .await?;
-        tracing::trace!("Playlist is {:?}", playlist_opt);
+        log::trace!("Playlist is {:?}", playlist_opt);

        if let Some(playlist) = playlist_opt {
-            tracing::debug!("Assigning url for saved playlist to query");
+            log::debug!("Assigning url for saved playlist to query");
            query = playlist.url;
        }
    }
    if YOUTUBE_URL_REGEX.is_match(&query) {
-        tracing::debug!("Query is youtube video or playlist");
+        log::debug!("Query is youtube video or playlist");
        // try fetching the url as a playlist
        songs = youtube_dl::get_videos_for_playlist(&query)
            .await?
@ -146,18 +330,18 @@ async fn get_songs_for_query(ctx: &Context, msg: &Message, query: &str) -> BotRe

        // if no songs were found fetch the song as a video
        if songs.len() == 0 {
-            tracing::debug!("Query is youtube video");
+            log::debug!("Query is youtube video");
            let mut song: Song = get_video_information(&query).await?.into();
            added_one_msg(&ctx, msg, &mut song).await?;
            add_youtube_song_to_database(&store, &database, &mut song).await?;
            songs.push(song);
        } else {
-            tracing::debug!("Query is playlist with {} songs", songs.len());
+            log::debug!("Query is playlist with {} songs", songs.len());
            added_multiple_msg(&ctx, msg, &mut songs).await?;
        }
    } else if SPOTIFY_PLAYLIST_REGEX.is_match(&query) {
        // search for all songs in the playlist and search for them on youtube
-        tracing::debug!("Query is spotify playlist");
+        log::debug!("Query is spotify playlist");
        let tracks = store.spotify_api.get_songs_in_playlist(&query).await?;

        let futures: Vec<BoxFuture<Song>> = tracks
@ -177,7 +361,7 @@ async fn get_songs_for_query(ctx: &Context, msg: &Message, query: &str) -> BotRe
        added_multiple_msg(&ctx, msg, &mut songs).await?;
    } else if SPOTIFY_ALBUM_REGEX.is_match(&query) {
        // fetch all songs in the album and search for them on youtube
-        tracing::debug!("Query is spotify album");
+        log::debug!("Query is spotify album");
        let tracks = store.spotify_api.get_songs_in_album(&query).await?;

        for track in tracks {
@ -191,7 +375,7 @@ async fn get_songs_for_query(ctx: &Context, msg: &Message, query: &str) -> BotRe
        added_multiple_msg(&ctx, msg, &mut songs).await?;
    } else if SPOTIFY_SONG_REGEX.is_match(&query) {
        // fetch the song name and search it on youtube
-        tracing::debug!("Query is a spotify song");
+        log::debug!("Query is a spotify song");
        let track = store.spotify_api.get_track_for_url(&query).await?;
        let mut song = get_youtube_song_for_track(&database, track.clone())
            .await?
@ -199,12 +383,12 @@ async fn get_songs_for_query(ctx: &Context, msg: &Message, query: &str) -> BotRe
        added_one_msg(ctx, msg, &mut song).await?;
        songs.push(song);
    } else {
-        tracing::debug!("Query is a youtube search");
+        log::debug!("Query is a youtube search");
        let mut song: Song = youtube_dl::search_video_information(query.clone())
            .await?
            .ok_or(BotError::Msg(format!("Noting found for {}", query)))?
            .into();
-        tracing::trace!("Search result is {:?}", song);
+        log::trace!("Search result is {:?}", song);

        added_one_msg(&ctx, msg, &mut song).await?;
        songs.push(song);
@ -251,6 +435,7 @@ pub async fn check_dj(
 ) -> Result<(), Reason> {
    let guild = msg
        .guild(&ctx.cache)
+        .await
        .ok_or(Reason::Log("Not in a guild".to_string()))?;

    if is_dj(ctx, guild.id, &msg.author)
@ -284,24 +469,22 @@ pub async fn is_dj(ctx: &Context, guild: GuildId, user: &User) -> BotResult<bool

 /// Searches for a matching youtube song for the given track in the local database
 async fn get_youtube_song_for_track(database: &Database, track: Track) -> BotResult<Option<Song>> {
-    tracing::debug!("Trying to find track in database.");
+    log::debug!("Trying to find track in database.");
    if let Some(id) = track.id {
        let entry = database.get_song(&id).await?;

-        if let Some(song) = entry {
+        if let Some(song) = &entry {
            // check if the video is still available
-            tracing::trace!("Found entry is {:?}", song);
-            if let Ok(info) = get_video_information(&song.url).await {
-                return Ok(Some(info.into()));
-            } else {
-                tracing::debug!("Video '{}' is not available. Deleting entry", song.url);
+            if get_video_information(&song.url).await.is_err() {
+                log::debug!("Video '{}' is not available. Deleting entry", song.url);
                database.delete_song(song.id).await?;
                return Ok(None);
            }
        }
-        Ok(None)
+        log::trace!("Found entry is {:?}", entry);
+        Ok(entry.map(Song::from))
    } else {
-        tracing::debug!("Track has no ID");
+        log::debug!("Track has no ID");
        Ok(None)
    }
 }
--- a/src/commands/music/move_song.rs
+++ b/src/commands/music/move_song.rs
@ -1,12 +1,11 @@
 use crate::commands::common::handle_autodelete;
-use crate::commands::music::{get_music_player_for_guild, DJ_CHECK};
-use crate::messages::music::no_voicechannel::create_no_voicechannel_message;
+use crate::commands::music::{get_queue_for_guild, DJ_CHECK};
+use bot_serenityutils::core::SHORT_TIMEOUT;
+use bot_serenityutils::ephemeral_message::EphemeralMessage;
 use serenity::client::Context;
 use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{Args, CommandError, CommandResult};
+use serenity::framework::standard::{Args, CommandResult};
 use serenity::model::channel::Message;
-use serenity_additions::core::SHORT_TIMEOUT;
-use serenity_additions::ephemeral_message::EphemeralMessage;

 #[command]
 #[description("Moves a song in the queue from one position to a new one")]
@ -18,22 +17,20 @@ use serenity_additions::ephemeral_message::EphemeralMessage;
 #[aliases("mvs", "movesong", "move-song")]
 #[checks(DJ)]
 async fn move_song(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).unwrap();
-    tracing::debug!("Moving song for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).await.unwrap();
+    log::debug!("Moving song for guild {}", guild.id);

    let pos1 = args.single::<usize>()?;
    let pos2 = args.single::<usize>()?;
-    let player = if let Some(player) = get_music_player_for_guild(ctx, guild.id).await {
-        player
-    } else {
-        return create_no_voicechannel_message(&ctx.http, msg.channel_id)
-            .await
-            .map_err(CommandError::from);
-    };

    {
-        let mut player = player.lock().await;
-        player.queue().move_position(pos1, pos2);
+        let queue = forward_error!(
+            ctx,
+            msg.channel_id,
+            get_queue_for_guild(ctx, &guild.id).await
+        );
+        let mut queue_lock = queue.lock().await;
+        queue_lock.move_position(pos1, pos2);
    }
    EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
        m.content(format!(
--- a/src/commands/music/pause.rs
+++ b/src/commands/music/pause.rs
@ -1,13 +1,13 @@
 use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{CommandError, CommandResult};
+use serenity::framework::standard::CommandResult;
 use serenity::model::channel::Message;
 use serenity::prelude::*;

 use crate::commands::common::handle_autodelete;
-use crate::commands::music::{get_music_player_for_guild, DJ_CHECK};
-use crate::messages::music::no_voicechannel::create_no_voicechannel_message;
-use serenity_additions::core::SHORT_TIMEOUT;
-use serenity_additions::ephemeral_message::EphemeralMessage;
+use crate::commands::music::{get_queue_for_guild, DJ_CHECK};
+use crate::messages::music::now_playing::update_now_playing_msg;
+use bot_serenityutils::core::SHORT_TIMEOUT;
+use bot_serenityutils::ephemeral_message::EphemeralMessage;

 #[command]
 #[only_in(guilds)]
@ -16,36 +16,40 @@ use serenity_additions::ephemeral_message::EphemeralMessage;
 #[bucket("general")]
 #[checks(DJ)]
 async fn pause(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).unwrap();
-    tracing::debug!("Pausing playback for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).await.unwrap();
+    log::debug!("Pausing playback for guild {}", guild.id);

-    let player = if let Some(player) = get_music_player_for_guild(ctx, guild.id).await {
-        player
-    } else {
-        return create_no_voicechannel_message(&ctx.http, msg.channel_id)
-            .await
-            .map_err(CommandError::from);
-    };
-    let mut player = player.lock().await;
-
-    if let Some(_) = player.queue().current() {
-        player.toggle_paused().await?;
-        let is_paused = player.is_paused();
+    let queue = forward_error!(
+        ctx,
+        msg.channel_id,
+        get_queue_for_guild(ctx, &guild.id).await
+    );
+    let mut queue_lock = queue.lock().await;

-        if is_paused {
-            tracing::debug!("Paused");
+    if let Some(_) = queue_lock.current() {
+        queue_lock.pause();
+        if queue_lock.paused() {
+            log::debug!("Paused");
            EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
                m.content("⏸️ Paused playback️")
            })
            .await?;
-            player.update_now_playing().await?;
+            if let (Some(menu), Some((current, _))) =
+                (&queue_lock.now_playing_msg, queue_lock.current())
+            {
+                update_now_playing_msg(&ctx.http, menu, current.metadata(), true).await?;
+            }
        } else {
-            tracing::debug!("Resumed");
+            log::debug!("Resumed");
            EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
                m.content("▶ Resumed playback️")
            })
            .await?;
-            player.update_now_playing().await?;
+            if let (Some(menu), Some((current, _))) =
+                (&queue_lock.now_playing_msg, queue_lock.current())
+            {
+                update_now_playing_msg(&ctx.http, menu, current.metadata(), true).await?;
+            }
        }
    } else {
        msg.channel_id.say(ctx, "Nothing to pause").await?;
--- a/src/commands/music/play.rs
+++ b/src/commands/music/play.rs
@ -1,16 +1,15 @@
 use serenity::client::Context;
 use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{Args, CommandResult};
+use serenity::framework::standard::{Args, CommandError, CommandResult};
 use serenity::model::channel::Message;

 use crate::commands::common::handle_autodelete;
 use crate::commands::music::{
-    get_channel_for_author, get_music_player_for_guild, get_songs_for_query,
+    get_channel_for_author, get_queue_for_guild, get_songs_for_query, get_voice_manager,
+    join_channel, play_next_in_queue,
 };
 use crate::messages::music::now_playing::create_now_playing_msg;
-use crate::providers::music::player::MusicPlayer;
 use crate::providers::settings::{get_setting, Setting};
-use std::sync::Arc;

 #[command]
 #[only_in(guilds)]
@ -22,49 +21,57 @@ use std::sync::Arc;
 async fn play(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
    let query = args.message();

-    let guild = msg.guild(&ctx.cache).unwrap();
-    tracing::debug!("Play request received for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).await.unwrap();
+    log::debug!("Play request received for guild {}", guild.id);

-    let mut player = get_music_player_for_guild(ctx, guild.id).await;
+    let manager = get_voice_manager(ctx).await;
+    let mut handler = manager.get(guild.id);

-    if player.is_none() {
-        tracing::debug!("Not in a channel. Joining authors channel...");
+    if handler.is_none() {
+        log::debug!("Not in a channel. Joining authors channel...");
+        msg.guild(&ctx.cache).await.unwrap();
        let channel_id = get_channel_for_author(&msg.author.id, &guild)?;
-        let music_player = MusicPlayer::join(ctx, guild.id, channel_id, msg.channel_id).await?;
-        player = Some(music_player);
+        handler = Some(join_channel(ctx, channel_id, guild.id).await);
    }
-    let player = player.unwrap();
+
+    let handler_lock = forward_error!(
+        ctx,
+        msg.channel_id,
+        handler.ok_or(CommandError::from("I'm not in a voice channel"))
+    );
+
    let songs = get_songs_for_query(&ctx, msg, query).await?;

+    let queue = get_queue_for_guild(ctx, &guild.id).await?;
+
    let (play_first, create_now_playing) = {
-        tracing::debug!("Adding song to queue");
-        let mut player_lock = player.lock().await;
+        log::debug!("Adding song to queue");
+        let mut queue_lock = queue.lock().await;
        for song in songs {
-            player_lock.queue().add(song);
+            queue_lock.add(song);
        }
        let autoshuffle = get_setting(ctx, guild.id, Setting::MusicAutoShuffle)
            .await?
            .unwrap_or(false);

        if autoshuffle {
-            tracing::debug!("Autoshuffeling");
-            player_lock.queue().shuffle();
+            log::debug!("Autoshuffeling");
+            queue_lock.shuffle();
        }
        (
-            player_lock.queue().current().is_none(),
-            player_lock.now_playing_message().is_none(),
+            queue_lock.current().is_none(),
+            queue_lock.now_playing_msg.is_none(),
        )
    };

    if play_first {
-        tracing::debug!("Playing first song in queue");
-        let mut player_lock = player.lock().await;
-        player_lock.play_next().await?;
+        log::debug!("Playing first song in queue");
+        while !play_next_in_queue(&ctx.http, &msg.channel_id, &queue, &handler_lock).await {}
    }
    if create_now_playing {
-        let handle = create_now_playing_msg(ctx, Arc::clone(&player), msg.channel_id).await?;
-        let mut player_lock = player.lock().await;
-        player_lock.set_now_playing(handle).await;
+        let handle = create_now_playing_msg(ctx, queue.clone(), msg.channel_id).await?;
+        let mut queue_lock = queue.lock().await;
+        queue_lock.now_playing_msg = Some(handle);
    }
    handle_autodelete(ctx, msg).await?;

--- a/src/commands/music/play_next.rs
+++ b/src/commands/music/play_next.rs
@ -1,15 +1,14 @@
 use serenity::client::Context;
 use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{Args, CommandResult};
+use serenity::framework::standard::{Args, CommandError, CommandResult};
 use serenity::model::channel::Message;

 use crate::commands::common::handle_autodelete;
 use crate::commands::music::{
-    get_channel_for_author, get_music_player_for_guild, get_songs_for_query, DJ_CHECK,
+    get_channel_for_author, get_queue_for_guild, get_songs_for_query, get_voice_manager,
+    join_channel, play_next_in_queue, DJ_CHECK,
 };
 use crate::messages::music::now_playing::create_now_playing_msg;
-use crate::providers::music::player::MusicPlayer;
-use std::sync::Arc;

 #[command]
 #[only_in(guilds)]
@ -22,43 +21,48 @@ use std::sync::Arc;
 async fn play_next(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
    let query = args.message();

-    let guild = msg.guild(&ctx.cache).unwrap();
-    tracing::debug!("Playing song as next song for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).await.unwrap();
+    log::debug!("Playing song as next song for guild {}", guild.id);
+    let manager = get_voice_manager(ctx).await;
+    let mut handler = manager.get(guild.id);

-    let mut player = get_music_player_for_guild(ctx, guild.id).await;
-
-    if player.is_none() {
-        tracing::debug!("Not in a channel. Joining authors channel...");
+    if handler.is_none() {
+        log::debug!("Not in a voice channel. Joining authors channel");
+        msg.guild(&ctx.cache).await.unwrap();
        let channel_id = get_channel_for_author(&msg.author.id, &guild)?;
-        let music_player = MusicPlayer::join(ctx, guild.id, channel_id, msg.channel_id).await?;
-        player = Some(music_player);
+        handler = Some(join_channel(ctx, channel_id, guild.id).await);
    }

-    let player = player.unwrap();
+    let handler = forward_error!(
+        ctx,
+        msg.channel_id,
+        handler.ok_or(CommandError::from("I'm not in a voice channel"))
+    );
+
    let mut songs = get_songs_for_query(&ctx, msg, query).await?;

+    let queue = get_queue_for_guild(ctx, &guild.id).await?;
    let (play_first, create_now_playing) = {
-        let mut player_lock = player.lock().await;
+        let mut queue_lock = queue.lock().await;
        songs.reverse();
-        tracing::debug!("Enqueueing songs as next songs in the queue");
+        log::debug!("Enqueueing songs as next songs in the queue");

        for song in songs {
-            player_lock.queue().add_next(song);
+            queue_lock.add_next(song);
        }
        (
-            player_lock.queue().current().is_none(),
-            player_lock.now_playing_message().is_none(),
+            queue_lock.current().is_none(),
+            queue_lock.now_playing_msg.is_none(),
        )
    };

    if play_first {
-        let mut player_lock = player.lock().await;
-        player_lock.play_next().await?;
+        while !play_next_in_queue(&ctx.http, &msg.channel_id, &queue, &handler).await {}
    }
    if create_now_playing {
-        let handle = create_now_playing_msg(ctx, Arc::clone(&player), msg.channel_id).await?;
-        let mut player_lock = player.lock().await;
-        player_lock.set_now_playing(handle).await;
+        let handle = create_now_playing_msg(ctx, queue.clone(), msg.channel_id).await?;
+        let mut queue_lock = queue.lock().await;
+        queue_lock.now_playing_msg = Some(handle);
    }
    handle_autodelete(ctx, msg).await?;

--- a/src/commands/music/playlists.rs
+++ b/src/commands/music/playlists.rs
@ -12,8 +12,8 @@ use crate::utils::context_data::get_database_from_context;
 #[usage("")]
 #[bucket("general")]
 async fn playlists(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).unwrap();
-    tracing::debug!("Displaying playlists for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).await.unwrap();
+    log::debug!("Displaying playlists for guild {}", guild.id);
    let database = get_database_from_context(ctx).await;

    let playlists = database.get_guild_playlists(guild.id.0).await?;
--- a/src/commands/music/queue.rs
+++ b/src/commands/music/queue.rs
@ -1,11 +1,10 @@
 use serenity::client::Context;
 use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{Args, CommandError, CommandResult};
+use serenity::framework::standard::{Args, CommandResult};
 use serenity::model::channel::Message;

 use crate::commands::common::handle_autodelete;
-use crate::commands::music::get_music_player_for_guild;
-use crate::messages::music::no_voicechannel::create_no_voicechannel_message;
+use crate::commands::music::get_queue_for_guild;
 use crate::messages::music::queue::create_queue_menu;
 use crate::providers::music::queue::Song;

@ -16,24 +15,21 @@ use crate::providers::music::queue::Song;
 #[aliases("q")]
 #[bucket("general")]
 async fn queue(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).unwrap();
-    tracing::trace!("Displaying queue for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).await.unwrap();
+    log::trace!("Displaying queue for guild {}", guild.id);

    let query = args
        .iter::<String>()
        .map(|s| s.unwrap().to_lowercase())
        .collect::<Vec<String>>();

-    let player = if let Some(player) = get_music_player_for_guild(ctx, guild.id).await {
-        player
-    } else {
-        return create_no_voicechannel_message(&ctx.http, msg.channel_id)
-            .await
-            .map_err(CommandError::from);
-    };
-    let mut player = player.lock().await;
-    let songs: Vec<(usize, Song)> = player
-        .queue()
+    let queue = forward_error!(
+        ctx,
+        msg.channel_id,
+        get_queue_for_guild(ctx, &guild.id).await
+    );
+    let queue_lock = queue.lock().await;
+    let songs: Vec<(usize, Song)> = queue_lock
        .entries()
        .into_iter()
        .enumerate()
@ -53,7 +49,7 @@ async fn queue(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
        })
        .map(|(i, s)| (i, s.clone()))
        .collect();
-    tracing::trace!("Songs are {:?}", songs);
+    log::trace!("Songs are {:?}", songs);

    if songs.len() == 0 {
        msg.channel_id
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
trivernis	2c02320d83	Swap postgresql-client for libpq5 in docker build Signed-off-by: trivernis <trivernis@protonmail.com>	4 years ago
trivernis	314e305bba	Remove build-essential package from runtime container Signed-off-by: trivernis <trivernis@protonmail.com>	4 years ago
trivernis	6a56c02712	Fix docker build Signed-off-by: trivernis <trivernis@protonmail.com>	4 years ago
trivernis	1550cebdf7	Add Dockerfile Signed-off-by: trivernis <trivernis@protonmail.com>	4 years ago