Fix yt-dlp

Signed-off-by: trivernis <trivernis@protonmail.com>

.github/workflows/build-container.yml

@@ -0,0 +1,56 @@
+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

.github/workflows/build-docker.yml

@@ -1,47 +0,0 @@
-name: Build Docker Container
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ main, actions ]
-
-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: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ hashFiles('Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: ${{github.event.inputs.platforms}}
-          push: true
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-          tags: |
-            trivernis/tobi:latest

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build and Test
+name: Check
 
 on:
   workflow_dispatch:
@@ -31,9 +31,15 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-cargo-
+      
+      
+      - name: Run Rustfmt
+        uses: actions-rust-lang/rustfmt@v1.0.0
 
-      - name: Build
-        run: cargo build --verbose
+      - name: Run Clippy
+        uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}      
 
       - name: Test coreutils
         run: cargo test --verbose --package bot-coreutils

.woodpecker/build.yml

@@ -0,0 +1,39 @@
+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]

.woodpecker/container.yml

@@ -0,0 +1,20 @@
+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
+    

Cargo.toml

@@ -1,6 +1,9 @@
+[workspace]
+members=["bot-coreutils", "bot-database", "bot-database/migration", "."]
+
 [package]
 name = "tobi-rs"
-version = "0.9.7"
+version = "0.11.4"
 authors = ["trivernis <trivernis@protonmail.com>"]
 edition = "2018"
 
@@ -12,41 +15,41 @@ panic = 'abort'
 [dependencies]
 bot-database = {path="./bot-database"}
 bot-coreutils = {path="./bot-coreutils"}
-serenity-rich-interaction = "0.2.5"
-serenity = "0.10.5"
+serenity = "0.11.5"
 dotenv = "0.15.0"
-serde_derive = "1.0.125"
-serde = "1.0.125"
-thiserror = "1.0.24"
-minecraft-data-rs = "0.3.0"
-songbird =  "0.2.0"
-serde_json = "1.0.64"
-rand = "0.8.3"
-regex = "1.4.5"
-aspotify = "0.7.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"
 lazy_static = "1.4.0"
-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"
+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"
 trigram = "0.4.4"
-typemap_rev = "0.1.5"
-youtube-metadata = "0.1.1"
-xkcd-search = "0.1.1"
-animethemes-rs = "0.3.0"
+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.12.0"
+version = "1.21.2"
 features = ["macros", "rt-multi-thread"]
 
-[dependencies.lavalink-rs]
-git = "https://gitlab.com/vicky5124/lavalink-rs/"
-rev = "b90539bd"
-features=["native", "serenity", "songbird", "normal-log"]
-default-features = false
+# [patch.crates-io]
+# serenity-additions = { path = "../serenity-additions" }

Containerfile

@@ -0,0 +1,45 @@
+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"]

Dockerfile

@@ -1,33 +0,0 @@
-# syntax=docker/dockerfile:1.0-experimental
-FROM rust:slim-bullseye  AS builder
-RUN apt-get update
-RUN apt-get install -y build-essential libssl-dev libopus-dev libpq-dev pkg-config
-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
-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:bullseye AS qalculate-builder
-RUN mkdir /tmp/qalculate
-WORKDIR /tmp/qalculate
-RUN install_packages ca-certificates wget xz-utils
-RUN wget https://github.com/Qalculate/qalculate-gtk/releases/download/v3.18.0/qalculate-3.18.0-x86_64.tar.xz -O qalculate.tar.xz
-RUN tar xf qalculate.tar.xz
-RUN cp qalculate-3.18.0/* /tmp/qalculate
-
-FROM bitnami/minideb:bullseye
-RUN apt update
-RUN apt install openssl libopus0 ffmpeg python3 python3-pip libpq5 pkg-config -y
-COPY --from=qalculate-builder /tmp/qalculate/* /usr/bin/
-COPY --from=builder /tmp/tobi/tobi-rs .
-RUN pip3 install youtube-dl
-RUN rm -rf /var/lib/{apt,dpkg,cache,log}/
-ENTRYPOINT ["/tobi-rs"]

README.md

@@ -63,4 +63,4 @@ The required values are:
 
 ## License
 
-It's GPL 3.0
+See LICENSE.md

bot-coreutils/Cargo.lock

@@ -1,314 +0,0 @@
-# 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"

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.4.0", features = ["process", "io-util"]}
-log = "0.4.14"
-url = "2.2.1"
-mime_guess = "2.0.3"
-rand = "0.8.3"
+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"

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::debug!("STDERR of command {}: {}", command, stderr);
+        log::trace!("STDERR of command {}: {}", command, stderr);
     }
     log::trace!("Command output is {}", stdout);
 

bot-database/Cargo.lock

@@ -1,467 +0,0 @@
-# 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"

bot-database/Cargo.toml

@@ -8,10 +8,13 @@ edition = "2018"
 
 [dependencies]
 dotenv = "0.15.0"
-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"}
+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"

bot-database/diesel.toml

@@ -1,5 +0,0 @@
-# For documentation on how to configure this file,
-# see diesel.rs/guides/configuring-diesel-cli
-
-[print_schema]
-file = "src/schema.rs"

bot-database/migration/Cargo.toml

@@ -0,0 +1,13 @@
+[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"] }

bot-database/migration/README.md

@@ -0,0 +1,37 @@
+# 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
+    ```

bot-database/migration/src/lib.rs

@@ -0,0 +1,16 @@
+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),
+        ]
+    }
+}

bot-database/migration/src/m20220029_164527_change_timestamp_format.rs

@@ -0,0 +1,82 @@
+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(())
+    }
+}

bot-database/migration/src/m20220101_000001_create_table.rs

@@ -0,0 +1,287 @@
+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()
+}

bot-database/migration/src/main.rs

@@ -0,0 +1,7 @@
+use migration::Migrator;
+use sea_orm_migration::prelude::*;
+
+#[tokio::main]
+async fn main() {
+    cli::run_cli(Migrator).await;
+}

bot-database/migrations/00000000000000_diesel_initial_setup/down.sql

@@ -1,6 +0,0 @@
--- 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();

bot-database/migrations/00000000000000_diesel_initial_setup/up.sql

@@ -1,36 +0,0 @@
--- 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;

bot-database/migrations/2021-04-09-075309_create_tables/down.sql

@@ -1,2 +0,0 @@
--- This file should undo anything in `up.sql`
-DROP TABLE guild_settings;

bot-database/migrations/2021-04-09-075309_create_tables/up.sql

@@ -1,6 +0,0 @@
-CREATE TABLE guild_settings (
-    guild_id BIGINT NOT NULL,
-    key VARCHAR(255) NOT NULL,
-    value VARCHAR(1024),
-    PRIMARY KEY (guild_id, key)
-);

bot-database/migrations/2021-04-09-095329_create_guild_playlists/down.sql

@@ -1,2 +0,0 @@
--- This file should undo anything in `up.sql`
-DROP TABLE guild_playlists;

bot-database/migrations/2021-04-09-095329_create_guild_playlists/up.sql

@@ -1,7 +0,0 @@
--- 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)
-)

bot-database/migrations/2021-04-12-115141_create_gifs/down.sql

@@ -1,2 +0,0 @@
--- This file should undo anything in `up.sql`
-DROP TABLE gifs;

bot-database/migrations/2021-04-12-115141_create_gifs/up.sql

@@ -1,8 +0,0 @@
--- 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)
-)

bot-database/migrations/2021-04-12-133308_create_statistics/down.sql

@@ -1,2 +0,0 @@
--- This file should undo anything in `up.sql`
-DROP TABLE statistics;

bot-database/migrations/2021-04-12-133308_create_statistics/up.sql

@@ -1,9 +0,0 @@
--- 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
-)

bot-database/migrations/2021-04-13-144951_create_youtube_songs/down.sql

@@ -1,2 +0,0 @@
--- This file should undo anything in `up.sql`
-DROP TABLE youtube_songs;

bot-database/migrations/2021-04-13-144951_create_youtube_songs/up.sql

@@ -1,11 +0,0 @@
--- 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)
-)

bot-database/migrations/2021-04-16-064403_create_ephemeral_messages/down.sql

@@ -1,2 +0,0 @@
--- This file should undo anything in `up.sql`
-DROP TABLE ephemeral_messages;

bot-database/migrations/2021-04-16-064403_create_ephemeral_messages/up.sql

@@ -1,7 +0,0 @@
--- 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)
-)

bot-database/migrations/2021-04-21-095152_rename_gifs_table/down.sql

@@ -1,2 +0,0 @@
--- This file should undo anything in `up.sql`
-ALTER TABLE media RENAME TO gifs;

bot-database/migrations/2021-04-21-095152_rename_gifs_table/up.sql

@@ -1,2 +0,0 @@
--- Your SQL goes here
-ALTER TABLE gifs RENAME TO media;

bot-database/src/database/ephemeral_messages.rs

@@ -1,56 +1,49 @@
+use sea_orm::ActiveValue::Set;
 use std::time::SystemTime;
 
-use diesel::prelude::*;
-use diesel::{delete, insert_into};
-use tokio_diesel::*;
-
+use crate::entity::ephemeral_messages;
 use crate::error::DatabaseResult;
-use crate::models::*;
-use crate::schema::*;
-use crate::Database;
+use sea_orm::prelude::*;
 
-impl Database {
+impl super::BotDatabase {
     /// 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<()> {
-        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?;
+        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?;
 
         Ok(())
     }
 
     /// Returns a vec of all ephemeral messages
-    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?;
+    #[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?;
 
         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<()> {
-        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)
+        ephemeral_messages::Entity::delete_many()
+            .filter(ephemeral_messages::Column::ChannelId.eq(channel_id))
+            .filter(ephemeral_messages::Column::MessageId.eq(message_id))
+            .exec(&self.db)
             .await?;
 
         Ok(())

bot-database/src/database/guild_playlists.rs

@@ -1,65 +1,54 @@
-use diesel::insert_into;
-use diesel::prelude::*;
-use tokio_diesel::*;
-
+use crate::entity::guild_playlists;
 use crate::error::DatabaseResult;
-use crate::models::*;
-use crate::schema::*;
-use crate::Database;
+use sea_orm::prelude::*;
+use sea_orm::ActiveValue::Set;
 
-impl Database {
+impl super::BotDatabase {
     /// Returns a list of all guild playlists
-    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)
+    #[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)
             .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<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)
+    ) -> 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)
             .await?;
 
-        Ok(playlists.into_iter().next())
+        Ok(playlist)
     }
 
     /// 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<()> {
-        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?;
+        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?;
 
         Ok(())
     }

bot-database/src/database/guild_settings.rs

@@ -1,53 +1,46 @@
+use sea_orm::ActiveValue::Set;
 use std::any;
 use std::fmt::Debug;
 use std::str::FromStr;
 
-use diesel::prelude::*;
-use diesel::{delete, insert_into};
-use tokio_diesel::*;
-
+use crate::entity::guild_settings;
 use crate::error::DatabaseResult;
-use crate::models::*;
-use crate::schema::*;
-use crate::Database;
+use sea_orm::prelude::*;
 
-impl Database {
+impl super::BotDatabase {
     /// Returns a guild setting from the database
-    pub async fn get_guild_setting<T: 'static>(
+    #[tracing::instrument(level = "debug", skip(self))]
+    pub async fn get_guild_setting<T: 'static, S: AsRef<str> + Debug>(
         &self,
         guild_id: u64,
-        key: String,
+        key: S,
     ) -> DatabaseResult<Option<T>>
     where
         T: FromStr,
     {
-        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)
+        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)
             .await?;
-        log::trace!("Result is {:?}", entries);
-
-        if let Some(first) = entries.first() {
+        if let Some(setting) = setting {
             if any::TypeId::of::<T>() == any::TypeId::of::<bool>() {
-                Ok(first
+                Ok(setting
                     .value
                     .clone()
                     .unwrap_or("false".to_string())
                     .parse::<T>()
                     .ok())
             } else {
-                Ok(first.value.clone().and_then(|v| v.parse::<T>().ok()))
+                Ok(setting.value.clone().and_then(|v| v.parse::<T>().ok()))
             }
         } else {
-            return Ok(None);
+            Ok(None)
         }
     }
 
     /// Upserting a guild setting
+    #[tracing::instrument(level = "debug", skip(self))]
     pub async fn set_guild_setting<T>(
         &self,
         guild_id: u64,
@@ -55,33 +48,38 @@ impl Database {
         value: T,
     ) -> DatabaseResult<()>
     where
-        T: ToString + Debug,
+        T: 'static + ToString + FromStr + Debug,
     {
-        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?;
+        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?;
+        }
 
         Ok(())
     }
 
     /// Deletes a guild setting
-    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)
+    #[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)
             .await?;
 
         Ok(())

bot-database/src/database/media.rs

@@ -1,56 +1,47 @@
-use diesel::insert_into;
-use diesel::prelude::*;
-use tokio_diesel::*;
-
+use crate::entity::media;
 use crate::error::DatabaseResult;
-use crate::models::*;
-use crate::schema::*;
-use crate::Database;
+use sea_orm::prelude::*;
+use sea_orm::ActiveValue::Set;
+use std::fmt::Debug;
 
-impl Database {
+impl super::BotDatabase {
     /// Returns a list of all gifs in the database
-    pub async fn get_all_media(&self) -> DatabaseResult<Vec<Media>> {
-        use media::dsl;
-        log::debug!("Loading all gifs from 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?;
 
-        let gifs: Vec<Media> = dsl::media.load_async::<Media>(&self.pool).await?;
-        Ok(gifs)
+        Ok(entries)
     }
 
     /// Returns a list of gifs by assigned category
-    pub async fn get_media_by_category(&self, category: &str) -> DatabaseResult<Vec<Media>> {
-        use media::dsl;
-        log::debug!("Searching for gifs in category '{}'", category);
-
-        let gifs: Vec<Media> = dsl::media
-            .filter(dsl::category.eq(category))
-            .load_async::<Media>(&self.pool)
+    #[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(gifs)
+
+        Ok(entries)
     }
 
     /// Adds a gif to the database
+    #[tracing::instrument(level = "debug", skip(self))]
     pub async fn add_media(
         &self,
-        url: &str,
+        url: String,
         category: Option<String>,
         name: Option<String>,
     ) -> DatabaseResult<()> {
-        use media::dsl;
-        log::debug!(
-            "Inserting gif with url '{}' and name {:?} and category {:?}",
-            url,
-            name,
-            category
-        );
-        insert_into(dsl::media)
-            .values(MediaInsert {
-                url: url.to_string(),
-                name,
-                category,
-            })
-            .execute_async(&self.pool)
-            .await?;
+        let model = media::ActiveModel {
+            url: Set(url),
+            category: Set(category),
+            name: Set(name),
+            ..Default::default()
+        };
+        model.insert(&self.db).await?;
 
         Ok(())
     }

bot-database/src/database/mod.rs

@@ -2,11 +2,10 @@ pub use ephemeral_messages::*;
 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 guild_playlists;
 mod guild_settings;
@@ -15,16 +14,12 @@ mod statistics;
 mod youtube_songs;
 
 #[derive(Clone)]
-pub struct Database {
-    pool: PoolConnection,
+pub struct BotDatabase {
+    db: DatabaseConnection,
 }
 
-unsafe impl Send for Database {}
-
-unsafe impl Sync for Database {}
-
-impl Database {
-    pub fn new(pool: PoolConnection) -> Self {
-        Self { pool }
+impl BotDatabase {
+    pub fn new(db: DatabaseConnection) -> Self {
+        Self { db }
     }
 }

bot-database/src/database/statistics.rs

@@ -1,50 +1,49 @@
+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;
 
-use diesel::dsl::count;
-use diesel::insert_into;
-use diesel::prelude::*;
-use tokio_diesel::*;
-
-use crate::error::DatabaseResult;
-use crate::models::*;
-use crate::schema::*;
-use crate::Database;
+#[derive(FromQueryResult)]
+struct CommandCount {
+    count: i64,
+}
 
-impl Database {
+impl super::BotDatabase {
     /// Adds a command statistic to the database
+    #[tracing::instrument(level = "debug", skip(self))]
     pub async fn add_statistic(
         &self,
-        version: &str,
-        command: &str,
+        version: String,
+        command: String,
         executed_at: SystemTime,
         success: bool,
         error_msg: Option<String>,
     ) -> DatabaseResult<()> {
-        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?;
+        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?;
 
         Ok(())
     }
 
     /// Returns the total number of commands executed
+    #[tracing::instrument(level = "debug", skip(self))]
     pub async fn get_total_commands_statistic(&self) -> DatabaseResult<u64> {
-        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)
+        let total_count: Option<CommandCount> = statistics::Entity::find()
+            .select_only()
+            .column_as(statistics::Column::Id.count(), "count")
+            .into_model::<CommandCount>()
+            .one(&self.db)
             .await?;
 
-        Ok(total_count as u64)
+        Ok(total_count.unwrap().count as u64)
     }
 }

bot-database/src/database/youtube_songs.rs

@@ -1,69 +1,56 @@
-use diesel::prelude::*;
-use diesel::{delete, insert_into};
-use tokio_diesel::*;
-
+use crate::entity::youtube_songs;
 use crate::error::DatabaseResult;
-use crate::models::*;
-use crate::schema::*;
-use crate::Database;
+use sea_orm::prelude::*;
+use sea_orm::ActiveValue::Set;
 
-impl Database {
+impl super::BotDatabase {
     /// 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: &str,
-        artist: &str,
-        title: &str,
-        album: &str,
-        url: &str,
+        spotify_id: String,
+        artist: String,
+        title: String,
+        album: String,
+        url: String,
     ) -> DatabaseResult<()> {
-        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?;
+        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?;
+        }
 
         Ok(())
     }
 
     /// Returns the song with the best score for the given query
-    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)
+    #[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)
             .await?;
 
-        Ok(songs.into_iter().next())
+        Ok(song)
     }
 
     /// Deletes a song from the database
+    #[tracing::instrument(level = "debug", skip(self))]
     pub async fn delete_song(&self, id: i64) -> DatabaseResult<()> {
-        use youtube_songs::dsl;
-        delete(dsl::youtube_songs)
-            .filter(dsl::id.eq(id))
-            .execute_async(&self.pool)
+        youtube_songs::Entity::delete_many()
+            .filter(youtube_songs::Column::Id.eq(id))
+            .exec(&self.db)
             .await?;
 
         Ok(())

bot-database/src/entity/ephemeral_messages.rs

@@ -0,0 +1,24 @@
+//! 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 {}

bot-database/src/entity/guild_playlists.rs

@@ -0,0 +1,24 @@
+//! 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 {}

bot-database/src/entity/guild_settings.rs

@@ -0,0 +1,24 @@
+//! 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 {}

bot-database/src/entity/media.rs

@@ -0,0 +1,24 @@
+//! 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 {}

bot-database/src/entity/mod.rs

@@ -0,0 +1,10 @@
+//! 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;

bot-database/src/entity/prelude.rs

@@ -0,0 +1,8 @@
+//! 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;

bot-database/src/entity/statistics.rs

@@ -0,0 +1,27 @@
+//! 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 {}

bot-database/src/entity/youtube_songs.rs

@@ -0,0 +1,27 @@
+//! 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 {}

bot-database/src/error.rs

@@ -7,20 +7,8 @@ pub enum DatabaseError {
     #[error("DotEnv Error: {0}")]
     DotEnv(#[from] dotenv::Error),
 
-    #[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}")]
+    SeaOrm(#[from] sea_orm::error::DbErr),
 
     #[error("{0}")]
     Msg(String),

bot-database/src/lib.rs

@@ -1,47 +1,31 @@
-#[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 crate::error::DatabaseResult;
 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::Database;
-
-type PoolConnection = Pool<ConnectionManager<PgConnection>>;
+pub use database::BotDatabase as Database;
+use migration::MigratorTrait;
+use sea_orm::{ConnectOptions, Database as SeaDatabase, DatabaseConnection};
 
-embed_migrations!("../bot-database/migrations");
-
-fn get_connection() -> DatabaseResult<PoolConnection> {
+#[tracing::instrument]
+async fn get_connection() -> DatabaseResult<DatabaseConnection> {
     let database_url = env::var("DATABASE_URL").expect("No DATABASE_URL in path");
-    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)
+    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)
 }
 
-pub fn get_database() -> DatabaseResult<Database> {
-    let conn = get_connection()?;
+pub async fn get_database() -> DatabaseResult<Database> {
+    let conn = get_connection().await?;
     Ok(Database::new(conn))
 }

bot-database/src/models.rs

@@ -1,94 +1,8 @@
-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 Media {
-    pub id: i64,
-    pub category: Option<String>,
-    pub name: Option<String>,
-    pub url: String,
-}
-
-#[derive(Insertable, Debug)]
-#[table_name = "media"]
-pub struct MediaInsert {
-    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,
-}
+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;

bot-database/src/schema.rs

@@ -1,64 +0,0 @@
-table! {
-    ephemeral_messages (channel_id, message_id) {
-        channel_id -> Int8,
-        message_id -> Int8,
-        timeout -> Timestamp,
-    }
-}
-
-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! {
-    media (id) {
-        id -> Int8,
-        category -> Nullable<Varchar>,
-        name -> Nullable<Varchar>,
-        url -> 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,
-    guild_playlists,
-    guild_settings,
-    media,
-    statistics,
-    youtube_songs,
-);

src/client.rs

@@ -10,13 +10,13 @@ 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_rich_interaction::RegisterRichInteractions;
+use serenity_additions::RegisterAdditions;
 use songbird::SerenityInit;
 
 use crate::commands::*;
 use crate::handler::{get_raw_event_handler, Handler};
-use crate::utils;
 use crate::utils::context_data::{
     get_database_from_context, DatabaseContainer, MusicPlayers, Store, StoreData,
 };
@@ -24,25 +24,16 @@ use crate::utils::error::{BotError, BotResult};
 
 pub async fn get_client() -> BotResult<Client> {
     let token = env::var("BOT_TOKEN").map_err(|_| BotError::MissingToken)?;
-    let database = get_database()?;
-    let client = Client::builder(token)
-        .register_rich_interactions_with(get_raw_event_handler())
+    let database = get_database().await?;
+    let client = Client::builder(token, GatewayIntents::all())
+        .register_serenity_additions_with(get_raw_event_handler())
         .event_handler(Handler)
         .framework(get_framework().await)
         .register_songbird()
-        .type_map_insert::<Store>(StoreData::new())
+        .type_map_insert::<Store>(StoreData::create().await)
         .type_map_insert::<DatabaseContainer>(database)
         .type_map_insert::<MusicPlayers>(HashMap::new())
         .await?;
-    let data = client.data.clone();
-
-    let current_application = client
-        .cache_and_http
-        .http
-        .get_current_application_info()
-        .await?;
-
-    utils::initialize_lavalink(data, current_application).await?;
 
     Ok(client)
 }
@@ -102,13 +93,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;
-        log::warn!("Error in {}: {:?}", cmd_name, why);
+        tracing::warn!("Error in {}: {:?}", cmd_name, why);
     }
     let database = get_database_from_context(ctx).await;
     let _ = database
         .add_statistic(
-            crate::VERSION,
-            cmd_name,
+            crate::VERSION.to_string(),
+            cmd_name.to_string(),
             SystemTime::now(),
             error_msg.is_none(),
             error_msg,
@@ -118,13 +109,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 {
-    log::trace!("Got command message {}", msg.content);
+    tracing::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) {
+async fn dispatch_error(ctx: &Context, msg: &Message, error: DispatchError, command_name: &str) {
     match error {
         DispatchError::Ratelimited(info) => {
             if info.is_first_try {
@@ -140,13 +131,19 @@ async fn dispatch_error(ctx: &Context, msg: &Message, error: DispatchError) {
         DispatchError::OnlyForDM => {
             let _ = msg
                 .channel_id
-                .say(&ctx.http, "This command only works via DM")
+                .say(
+                    &ctx.http,
+                    format!("The command {command_name} only works via DM"),
+                )
                 .await;
         }
         DispatchError::OnlyForGuilds => {
             let _ = msg
                 .channel_id
-                .say(&ctx.http, "This command only works on servers")
+                .say(
+                    &ctx.http,
+                    format!("The command {command_name} only works on servers"),
+                )
                 .await;
         }
         DispatchError::NotEnoughArguments { min, given } => {

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();
-    log::debug!("Searching for enchantment {}", enchantment_name);
+    tracing::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();
-    log::trace!("Enchantment is {:?}", enchantment);
+    tracing::trace!("Enchantment is {:?}", enchantment);
 
     msg.channel_id
         .send_message(ctx, |m| {

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();
-    log::debug!("Searching for item '{}'", item_name);
+    tracing::debug!("Searching for item '{}'", item_name);
     let information = get_item_full_information(&item_name, &store.minecraft_data_api)?;
-    log::trace!("Item full information is {:?}", information);
+    tracing::trace!("Item full information is {:?}", information);
     create_item_message(ctx, msg.channel_id, information).await?;
 
     handle_autodelete(ctx, msg).await?;

src/commands/misc/add_media.rs

@@ -4,8 +4,8 @@ use serenity::client::Context;
 use serenity::framework::standard::macros::command;
 use serenity::framework::standard::{Args, CommandResult};
 use serenity::model::channel::Message;
-use serenity_rich_interaction::core::SHORT_TIMEOUT;
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
+use serenity_additions::core::SHORT_TIMEOUT;
+use serenity_additions::ephemeral_message::EphemeralMessage;
 
 #[command]
 #[description("Adds media to the database")]
@@ -26,7 +26,7 @@ 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_media(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.")

src/commands/misc/clear.rs

@@ -1,11 +1,12 @@
 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_rich_interaction::core::SHORT_TIMEOUT;
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
+use serenity_additions::core::SHORT_TIMEOUT;
+use serenity_additions::ephemeral_message::EphemeralMessage;
 
 #[command]
 #[description("Clears the chat (maximum 100 messages)")]
@@ -17,17 +18,17 @@ use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
 #[required_permissions("MANAGE_MESSAGES")]
 async fn clear(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
     let limit = args.single::<u64>().unwrap_or(20);
-    log::debug!("Deleting messages for channel {}", msg.channel_id);
+    tracing::debug!("Deleting messages for channel {}", msg.channel_id);
     let messages = msg.channel_id.messages(ctx, |b| b.limit(limit)).await?;
-    log::debug!("Deleting {} messages", messages.len());
+    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();
-    log::debug!("Waiting for all messages to be deleted");
+    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();
-    log::debug!("{} Messages deleted", deleted_count);
+    tracing::debug!("{} Messages deleted", deleted_count);
 
     EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |f| {
         f.content(format!("Deleted {} messages", deleted_count))

src/commands/misc/fuck.rs

@@ -2,7 +2,7 @@ use serenity::client::Context;
 use serenity::framework::standard::macros::command;
 use serenity::framework::standard::{Args, CommandResult};
 use serenity::model::channel::Message;
-use serenity::model::id::UserId;
+use std::time::Duration;
 
 #[command]
 #[description("Fuck this person in particular")]
@@ -12,10 +12,15 @@ use serenity::model::id::UserId;
 #[bucket("general")]
 #[aliases("frick", "fock")]
 async fn fuck(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let person = args.single::<UserId>()?;
     let mut amount = args.single::<usize>().unwrap_or(3);
-    if amount > 10 {
-        amount = 10;
+    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 {
@@ -28,9 +33,10 @@ async fn fuck(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
         4 => "fck",
         _ => "fuck",
     };
+
     for _ in 0..amount {
         msg.channel_id
-            .say(&ctx, format!("{} <@{}>", fuck_word, person))
+            .say(&ctx, format!("{} <@{}>", fuck_word, msg.author.id))
             .await?;
     }
 

src/commands/misc/help.rs

@@ -19,6 +19,7 @@ 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(())

src/commands/misc/mod.rs

@@ -10,7 +10,6 @@ use pain::PAIN_COMMAND;
 use party::PARTY_COMMAND;
 use ping::PING_COMMAND;
 use qalc::QALC_COMMAND;
-use reset_lavalink::RESET_LAVALINK_COMMAND;
 use shutdown::SHUTDOWN_COMMAND;
 use stats::STATS_COMMAND;
 use time::TIME_COMMAND;
@@ -28,7 +27,6 @@ mod pain;
 mod party;
 mod ping;
 mod qalc;
-mod reset_lavalink;
 mod shutdown;
 mod stats;
 mod time;
@@ -37,21 +35,7 @@ mod xkcd;
 
 #[group]
 #[commands(
-    ping,
-    stats,
-    shutdown,
-    time,
-    timezones,
-    qalc,
-    about,
-    add_media,
-    media,
-    pain,
-    clear,
-    xkcd,
-    fuck,
-    party,
-    inspirobot,
-    reset_lavalink
+    ping, stats, shutdown, time, timezones, qalc, about, add_media, media, pain, clear, xkcd, fuck,
+    party, inspirobot
 )]
 pub struct Misc;

src/commands/misc/pain.rs

@@ -17,17 +17,17 @@ static NOT_FOUND_PAIN: &str = "404";
 #[max_args(1)]
 #[bucket("general")]
 async fn pain(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
-    log::debug!("Got pain command");
+    tracing::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).as_str())
+        .get_media_by_category(format!("{}{}", CATEGORY_PREFIX, pain_type))
         .await?;
 
     if media.is_empty() {
-        log::debug!("No media found for pain {}. Using 404", pain_type);
+        tracing::debug!("No media found for pain {}. Using 404", pain_type);
         media = database
-            .get_media_by_category(format!("{}{}", CATEGORY_PREFIX, NOT_FOUND_PAIN).as_str())
+            .get_media_by_category(format!("{}{}", CATEGORY_PREFIX, NOT_FOUND_PAIN))
             .await?;
     }
 
@@ -35,7 +35,7 @@ async fn pain(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
         .into_iter()
         .choose(&mut rand::thread_rng())
         .ok_or(BotError::from("No gifs found."))?;
-    log::trace!("Gif for pain is {:?}", entry);
+    tracing::trace!("Gif for pain is {:?}", entry);
     msg.reply(ctx, entry.url).await?;
 
     Ok(())

src/commands/misc/reset_lavalink.rs

@@ -1,40 +0,0 @@
-use serenity::client::Context;
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::CommandResult;
-use serenity::model::channel::Message;
-
-use crate::commands::common::handle_autodelete;
-use crate::providers::music::lavalink::Lavalink;
-use crate::utils::initialize_lavalink;
-use serenity_rich_interaction::core::SHORT_TIMEOUT;
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
-use std::mem;
-use std::sync::Arc;
-
-#[command]
-#[description("Resets the lavalink connection")]
-#[aliases("reconnect_lavalink", "reset-lavalink", "reconnect-lavalink")]
-#[num_args(0)]
-#[owners_only]
-async fn reset_lavalink(ctx: &Context, msg: &Message) -> CommandResult {
-    let app_info = ctx.http.get_current_application_info().await?;
-    destroy_lavalink(ctx).await;
-
-    initialize_lavalink(Arc::clone(&ctx.data), app_info).await?;
-
-    EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
-        m.content("Reconnected to lavalink")
-    })
-    .await?;
-    handle_autodelete(ctx, msg).await?;
-
-    Ok(())
-}
-
-async fn destroy_lavalink(ctx: &Context) {
-    let mut data = ctx.data.write().await;
-    {
-        let lava_client = data.remove::<Lavalink>().unwrap();
-        mem::drop(lava_client);
-    }
-}

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);
-    log::info!("Shutting down with code {}...", code);
+    tracing::info!("Shutting down with code {}...", code);
     msg.channel_id
         .say(
             ctx,

src/commands/misc/stats.rs

@@ -1,12 +1,12 @@
 use std::process;
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
+use std::time::Duration;
 
 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::{ProcessExt, SystemExt};
+use sysinfo::{Pid, PidExt, ProcessExt, SystemExt};
 
 use crate::commands::common::handle_autodelete;
 use crate::utils::context_data::{get_database_from_context, MusicPlayers};
@@ -16,13 +16,13 @@ use crate::utils::context_data::{get_database_from_context, MusicPlayers};
 #[usage("")]
 #[bucket("general")]
 async fn stats(ctx: &Context, msg: &Message) -> CommandResult {
-    log::debug!("Reading system stats");
+    tracing::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.get_kernel_version().unwrap_or("n/a".to_string());
-    let own_process = system.get_process(process::id() as i32).unwrap();
+    let kernel_version = system.kernel_version().unwrap_or("n/a".to_string());
+    let own_process = system.process(Pid::from_u32(process::id())).unwrap();
     let memory_usage = own_process.memory();
     let cpu_usage = own_process.cpu_usage();
     let thread_count = own_process.tasks.len();
@@ -30,16 +30,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 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 uptime = own_process.run_time();
+    let uptime = ChronoDuration::from_std(Duration::from_secs(uptime)).unwrap();
     let total_commands_executed = database.get_total_commands_statistic().await?;
-    let shard_count = ctx.cache.shard_count().await;
+    let shard_count = ctx.cache.shard_count();
 
     let discord_info = format!(
         r#"
     Version: {}
     Compiled with: rustc {}
+    Build at: {}
     Owner: <@{}>
     Guilds: {}
     Shards: {}
@@ -48,6 +48,7 @@ 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,
@@ -55,7 +56,7 @@ async fn stats(ctx: &Context, msg: &Message) -> CommandResult {
         total_commands_executed
     );
 
-    log::trace!("Discord info {}", discord_info);
+    tracing::trace!("Discord info {}", discord_info);
 
     let system_info = format!(
         r#"
@@ -73,7 +74,7 @@ async fn stats(ctx: &Context, msg: &Message) -> CommandResult {
         uptime.num_hours() % 24,
         uptime.num_minutes() % 60
     );
-    log::trace!("System info {}", system_info);
+    tracing::trace!("System info {}", system_info);
 
     msg.channel_id
         .send_message(ctx, |m| {

src/commands/music/clear_queue.rs

@@ -6,8 +6,8 @@ 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_rich_interaction::core::SHORT_TIMEOUT;
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
+use serenity_additions::core::SHORT_TIMEOUT;
+use serenity_additions::ephemeral_message::EphemeralMessage;
 
 #[command]
 #[only_in(guilds)]
@@ -17,8 +17,8 @@ use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
 #[bucket("general")]
 #[checks(DJ)]
 async fn clear_queue(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).await.unwrap();
-    log::debug!("Clearing queue for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).unwrap();
+    tracing::debug!("Clearing queue for guild {}", guild.id);
 
     let player = if let Some(player) = get_music_player_for_guild(ctx, guild.id).await {
         player

src/commands/music/current.rs

@@ -15,9 +15,9 @@ 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).await.unwrap();
+    let guild = msg.guild(&ctx.cache).unwrap();
 
-    log::debug!("Displaying current song for queue in {}", guild.id);
+    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 {

src/commands/music/equalize.rs

@@ -1,62 +0,0 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{Args, CommandError, 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_rich_interaction::core::{MEDIUM_TIMEOUT, SHORT_TIMEOUT};
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
-
-#[command]
-#[only_in(guilds)]
-#[description("Loads an equalizer preset")]
-#[usage("<preset>")]
-#[num_args(1)]
-#[example("bass")]
-#[bucket("general")]
-#[checks(DJ)]
-async fn equalize(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).await.unwrap();
-    log::debug!("Changing equalizer for {}", guild.id);
-    let preset = args.single::<String>().unwrap();
-
-    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 bands = match preset.to_lowercase().as_str() {
-        "metal" => lavalink_rs::EQ_METAL,
-        "boost" => lavalink_rs::EQ_BOOST,
-        "base" => lavalink_rs::EQ_BASE,
-        "piano" => lavalink_rs::EQ_PIANO,
-        _ => {
-            EphemeralMessage::create(&ctx.http, msg.channel_id, MEDIUM_TIMEOUT, |m| {
-                m.content(format!(
-                    "Unknown preset '{}'. Available are 'metal', 'boost', 'base' and 'piano'",
-                    preset
-                ))
-            })
-            .await?;
-            handle_autodelete(ctx, msg).await?;
-            return Ok(());
-        }
-    };
-    {
-        let mut player = player.lock().await;
-        player.equalize_all(bands).await?;
-    }
-    EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
-        m.content(format!("🎛️ Changed equalizer to '{}'", preset))
-    })
-    .await?;
-
-    handle_autodelete(ctx, msg).await?;
-
-    Ok(())
-}

src/commands/music/equalizer.rs

@@ -1,33 +0,0 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{CommandError, 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::equalizer::create_equalizer_message;
-use crate::messages::music::no_voicechannel::create_no_voicechannel_message;
-
-#[command]
-#[only_in(guilds)]
-#[description("Displays the equalizer for the music player")]
-#[usage("")]
-#[bucket("general")]
-#[checks(DJ)]
-async fn equalizer(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).await.unwrap();
-    log::debug!("Displaying equalizer 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);
-    };
-
-    create_equalizer_message(&ctx, msg.channel_id, player).await?;
-    handle_autodelete(ctx, msg).await?;
-
-    Ok(())
-}

src/commands/music/join.rs

@@ -7,8 +7,8 @@ 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 serenity::model::id::ChannelId;
-use serenity_rich_interaction::core::SHORT_TIMEOUT;
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
+use serenity_additions::core::SHORT_TIMEOUT;
+use serenity_additions::ephemeral_message::EphemeralMessage;
 
 #[command]
 #[only_in(guilds)]
@@ -16,7 +16,7 @@ use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
 #[usage("")]
 #[bucket("general")]
 async fn join(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).await.unwrap();
+    let guild = msg.guild(&ctx.cache).unwrap();
     let channel_id = if let Ok(arg) = args.single::<u64>() {
         if is_dj(ctx, guild.id, &msg.author).await? {
             ChannelId(arg)
@@ -41,7 +41,7 @@ async fn join(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
         .await?;
         return Ok(());
     }
-    log::debug!("Joining channel {} for guild {}", channel_id, guild.id);
+    tracing::debug!("Joining channel {} for guild {}", channel_id, guild.id);
     MusicPlayer::join(ctx, guild.id, channel_id, msg.channel_id).await?;
     EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
         m.content("🎤 Joined the Voice Channel")

src/commands/music/leave.rs

@@ -6,8 +6,8 @@ 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_rich_interaction::core::SHORT_TIMEOUT;
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
+use serenity_additions::core::SHORT_TIMEOUT;
+use serenity_additions::ephemeral_message::EphemeralMessage;
 
 #[command]
 #[only_in(guilds)]
@@ -17,13 +17,13 @@ use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
 #[bucket("general")]
 #[checks(DJ)]
 async fn leave(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).await.unwrap();
-    log::debug!("Leave request received for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).unwrap();
+    tracing::debug!("Leave request received for guild {}", guild.id);
 
     let manager = songbird::get(ctx).await.unwrap();
     if let Some(handler) = manager.get(guild.id) {
         let mut handler_lock = handler.lock().await;
-        let _ = handler_lock.leave().await;
+        handler_lock.leave().await?;
     }
 
     let mut data = ctx.data.write().await;

src/commands/music/lyrics.rs

@@ -13,8 +13,8 @@ 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).await.unwrap();
-    log::debug!("Fetching lyrics for song playing in {}", guild.id);
+    let guild = msg.guild(&ctx.cache).unwrap();
+    tracing::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
@@ -46,7 +46,7 @@ async fn lyrics(ctx: &Context, msg: &Message) -> CommandResult {
             })
             .await?;
     } else {
-        log::debug!("No lyrics found");
+        tracing::debug!("No lyrics found");
         msg.channel_id.say(ctx, "No lyrics found").await?;
     }
 

src/commands/music/mod.rs

@@ -18,8 +18,6 @@ use youtube_metadata::get_video_information;
 
 use clear_queue::CLEAR_QUEUE_COMMAND;
 use current::CURRENT_COMMAND;
-use equalize::EQUALIZE_COMMAND;
-use equalizer::EQUALIZER_COMMAND;
 use join::JOIN_COMMAND;
 use leave::LEAVE_COMMAND;
 use lyrics::LYRICS_COMMAND;
@@ -43,8 +41,6 @@ use crate::utils::error::{BotError, BotResult};
 
 mod clear_queue;
 mod current;
-mod equalize;
-mod equalizer;
 mod join;
 mod leave;
 mod lyrics;
@@ -75,9 +71,7 @@ mod skip;
     playlists,
     lyrics,
     move_song,
-    remove_song,
-    equalizer,
-    equalize
+    remove_song
 )]
 pub struct Music;
 
@@ -126,23 +120,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();
 
-    log::debug!("Querying play input {}", query);
+    tracing::debug!("Querying play input {}", query);
     if let Some(captures) = PLAYLIST_NAME_REGEX.captures(&query) {
-        log::debug!("Query is a saved playlist");
+        tracing::debug!("Query is a saved playlist");
         let pl_name: &str = captures.get(1).unwrap().as_str();
-        log::trace!("Playlist name is {}", pl_name);
+        tracing::trace!("Playlist name is {}", pl_name);
         let playlist_opt = database
             .get_guild_playlist(guild_id.0, pl_name.to_string())
             .await?;
-        log::trace!("Playlist is {:?}", playlist_opt);
+        tracing::trace!("Playlist is {:?}", playlist_opt);
 
         if let Some(playlist) = playlist_opt {
-            log::debug!("Assigning url for saved playlist to query");
+            tracing::debug!("Assigning url for saved playlist to query");
             query = playlist.url;
         }
     }
     if YOUTUBE_URL_REGEX.is_match(&query) {
-        log::debug!("Query is youtube video or playlist");
+        tracing::debug!("Query is youtube video or playlist");
         // try fetching the url as a playlist
         songs = youtube_dl::get_videos_for_playlist(&query)
             .await?
@@ -152,18 +146,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 {
-            log::debug!("Query is youtube video");
+            tracing::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 {
-            log::debug!("Query is playlist with {} songs", songs.len());
+            tracing::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
-        log::debug!("Query is spotify playlist");
+        tracing::debug!("Query is spotify playlist");
         let tracks = store.spotify_api.get_songs_in_playlist(&query).await?;
 
         let futures: Vec<BoxFuture<Song>> = tracks
@@ -183,7 +177,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
-        log::debug!("Query is spotify album");
+        tracing::debug!("Query is spotify album");
         let tracks = store.spotify_api.get_songs_in_album(&query).await?;
 
         for track in tracks {
@@ -197,7 +191,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
-        log::debug!("Query is a spotify song");
+        tracing::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?
@@ -205,12 +199,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 {
-        log::debug!("Query is a youtube search");
+        tracing::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();
-        log::trace!("Search result is {:?}", song);
+        tracing::trace!("Search result is {:?}", song);
 
         added_one_msg(&ctx, msg, &mut song).await?;
         songs.push(song);
@@ -257,7 +251,6 @@ 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)
@@ -291,24 +284,24 @@ 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>> {
-    log::debug!("Trying to find track in database.");
+    tracing::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 {
             // check if the video is still available
-            log::trace!("Found entry is {:?}", song);
+            tracing::trace!("Found entry is {:?}", song);
             if let Ok(info) = get_video_information(&song.url).await {
                 return Ok(Some(info.into()));
             } else {
-                log::debug!("Video '{}' is not available. Deleting entry", song.url);
+                tracing::debug!("Video '{}' is not available. Deleting entry", song.url);
                 database.delete_song(song.id).await?;
                 return Ok(None);
             }
         }
         Ok(None)
     } else {
-        log::debug!("Track has no ID");
+        tracing::debug!("Track has no ID");
         Ok(None)
     }
 }

src/commands/music/move_song.rs

@@ -5,8 +5,8 @@ use serenity::client::Context;
 use serenity::framework::standard::macros::command;
 use serenity::framework::standard::{Args, CommandError, CommandResult};
 use serenity::model::channel::Message;
-use serenity_rich_interaction::core::SHORT_TIMEOUT;
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
+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,8 +18,8 @@ use serenity_rich_interaction::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).await.unwrap();
-    log::debug!("Moving song for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).unwrap();
+    tracing::debug!("Moving song for guild {}", guild.id);
 
     let pos1 = args.single::<usize>()?;
     let pos2 = args.single::<usize>()?;

src/commands/music/pause.rs

@@ -6,8 +6,8 @@ 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_rich_interaction::core::SHORT_TIMEOUT;
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
+use serenity_additions::core::SHORT_TIMEOUT;
+use serenity_additions::ephemeral_message::EphemeralMessage;
 
 #[command]
 #[only_in(guilds)]
@@ -16,8 +16,8 @@ use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
 #[bucket("general")]
 #[checks(DJ)]
 async fn pause(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).await.unwrap();
-    log::debug!("Pausing playback for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).unwrap();
+    tracing::debug!("Pausing playback for guild {}", guild.id);
 
     let player = if let Some(player) = get_music_player_for_guild(ctx, guild.id).await {
         player
@@ -33,14 +33,14 @@ async fn pause(ctx: &Context, msg: &Message) -> CommandResult {
         let is_paused = player.is_paused();
 
         if is_paused {
-            log::debug!("Paused");
+            tracing::debug!("Paused");
             EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
                 m.content("⏸️ Paused playback️")
             })
             .await?;
             player.update_now_playing().await?;
         } else {
-            log::debug!("Resumed");
+            tracing::debug!("Resumed");
             EphemeralMessage::create(&ctx.http, msg.channel_id, SHORT_TIMEOUT, |m| {
                 m.content("▶ Resumed playback️")
             })

src/commands/music/play.rs

@@ -22,13 +22,13 @@ use std::sync::Arc;
 async fn play(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
     let query = args.message();
 
-    let guild = msg.guild(&ctx.cache).await.unwrap();
-    log::debug!("Play request received for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).unwrap();
+    tracing::debug!("Play request received for guild {}", guild.id);
 
     let mut player = get_music_player_for_guild(ctx, guild.id).await;
 
     if player.is_none() {
-        log::debug!("Not in a channel. Joining authors channel...");
+        tracing::debug!("Not in a channel. Joining authors channel...");
         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);
@@ -37,7 +37,7 @@ async fn play(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
     let songs = get_songs_for_query(&ctx, msg, query).await?;
 
     let (play_first, create_now_playing) = {
-        log::debug!("Adding song to queue");
+        tracing::debug!("Adding song to queue");
         let mut player_lock = player.lock().await;
         for song in songs {
             player_lock.queue().add(song);
@@ -47,7 +47,7 @@ async fn play(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
             .unwrap_or(false);
 
         if autoshuffle {
-            log::debug!("Autoshuffeling");
+            tracing::debug!("Autoshuffeling");
             player_lock.queue().shuffle();
         }
         (
@@ -57,7 +57,7 @@ async fn play(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
     };
 
     if play_first {
-        log::debug!("Playing first song in queue");
+        tracing::debug!("Playing first song in queue");
         let mut player_lock = player.lock().await;
         player_lock.play_next().await?;
     }

src/commands/music/play_next.rs

@@ -22,13 +22,13 @@ 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).await.unwrap();
-    log::debug!("Playing song as next song for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).unwrap();
+    tracing::debug!("Playing song as next song for guild {}", guild.id);
 
     let mut player = get_music_player_for_guild(ctx, guild.id).await;
 
     if player.is_none() {
-        log::debug!("Not in a channel. Joining authors channel...");
+        tracing::debug!("Not in a channel. Joining authors channel...");
         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);
@@ -40,7 +40,7 @@ async fn play_next(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
     let (play_first, create_now_playing) = {
         let mut player_lock = player.lock().await;
         songs.reverse();
-        log::debug!("Enqueueing songs as next songs in the queue");
+        tracing::debug!("Enqueueing songs as next songs in the queue");
 
         for song in songs {
             player_lock.queue().add_next(song);

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).await.unwrap();
-    log::debug!("Displaying playlists for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).unwrap();
+    tracing::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?;

src/commands/music/queue.rs

@@ -16,8 +16,8 @@ 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).await.unwrap();
-    log::trace!("Displaying queue for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).unwrap();
+    tracing::trace!("Displaying queue for guild {}", guild.id);
 
     let query = args
         .iter::<String>()
@@ -53,7 +53,7 @@ async fn queue(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
         })
         .map(|(i, s)| (i, s.clone()))
         .collect();
-    log::trace!("Songs are {:?}", songs);
+    tracing::trace!("Songs are {:?}", songs);
 
     if songs.len() == 0 {
         msg.channel_id

src/commands/music/remove_song.rs

@@ -5,8 +5,8 @@ use serenity::client::Context;
 use serenity::framework::standard::macros::command;
 use serenity::framework::standard::{Args, CommandError, CommandResult};
 use serenity::model::channel::Message;
-use serenity_rich_interaction::core::SHORT_TIMEOUT;
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
+use serenity_additions::core::SHORT_TIMEOUT;
+use serenity_additions::ephemeral_message::EphemeralMessage;
 
 #[command]
 #[description("Removes a song from the queue")]
@@ -18,8 +18,8 @@ use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
 #[aliases("rms", "removesong", "remove-song")]
 #[checks(DJ)]
 async fn remove_song(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).await.unwrap();
-    log::debug!("Moving song for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).unwrap();
+    tracing::debug!("Moving song for guild {}", guild.id);
 
     let pos = args.single::<usize>()?;
     let player = if let Some(player) = get_music_player_for_guild(ctx, guild.id).await {

src/commands/music/save_playlist.rs

@@ -16,11 +16,11 @@ use crate::utils::context_data::get_database_from_context;
 #[bucket("general")]
 #[checks(DJ)]
 async fn save_playlist(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).await.unwrap();
+    let guild = msg.guild(&ctx.cache).unwrap();
 
     let name: String = args.single().unwrap();
     let url: &str = args.remains().unwrap();
-    log::debug!(
+    tracing::debug!(
         "Adding playlist '{}' with url '{}' to guild {}",
         name,
         url,

src/commands/music/shuffle.rs

@@ -6,8 +6,8 @@ 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_rich_interaction::core::SHORT_TIMEOUT;
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
+use serenity_additions::core::SHORT_TIMEOUT;
+use serenity_additions::ephemeral_message::EphemeralMessage;
 
 #[command]
 #[only_in(guilds)]
@@ -17,9 +17,9 @@ use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
 #[bucket("general")]
 #[checks(DJ)]
 async fn shuffle(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).await.unwrap();
+    let guild = msg.guild(&ctx.cache).unwrap();
 
-    log::debug!("Shuffling queue for guild {}", guild.id);
+    tracing::debug!("Shuffling queue for guild {}", guild.id);
     let player = if let Some(player) = get_music_player_for_guild(ctx, guild.id).await {
         player
     } else {

src/commands/music/skip.rs

@@ -6,8 +6,8 @@ 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_rich_interaction::core::SHORT_TIMEOUT;
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
+use serenity_additions::core::SHORT_TIMEOUT;
+use serenity_additions::ephemeral_message::EphemeralMessage;
 
 #[command]
 #[only_in(guilds)]
@@ -17,8 +17,8 @@ use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
 #[bucket("general")]
 #[checks(DJ)]
 async fn skip(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild = msg.guild(&ctx.cache).await.unwrap();
-    log::debug!("Skipping song for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).unwrap();
+    tracing::debug!("Skipping song for guild {}", guild.id);
 
     let player = if let Some(player) = get_music_player_for_guild(ctx, guild.id).await {
         player

src/commands/settings/get.rs

@@ -17,13 +17,13 @@ use crate::utils::context_data::get_database_from_context;
 #[bucket("general")]
 async fn get(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
     let database = get_database_from_context(ctx).await;
-    let guild = msg.guild(&ctx.cache).await.unwrap();
-    log::debug!("Displaying guild setting for guild {}", guild.id);
+    let guild = msg.guild(&ctx.cache).unwrap();
+    tracing::debug!("Displaying guild setting for guild {}", guild.id);
 
     if let Some(key) = args.single::<String>().ok() {
-        log::debug!("Displaying guild setting of '{}'", key);
+        tracing::debug!("Displaying guild setting of '{}'", key);
         let setting = database
-            .get_guild_setting::<String>(guild.id.0, key.clone())
+            .get_guild_setting::<String, _>(guild.id.0, key.clone())
             .await?;
 
         match setting {
@@ -39,7 +39,7 @@ async fn get(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
             }
         }
     } else {
-        log::debug!("Displaying all guild settings");
+        tracing::debug!("Displaying all guild settings");
         let mut kv_pairs = Vec::new();
 
         for key in ALL_SETTINGS {
@@ -47,7 +47,7 @@ async fn get(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
 
             {
                 match database
-                    .get_guild_setting::<String>(guild.id.0, key.clone())
+                    .get_guild_setting::<String, _>(guild.id.0, key.clone())
                     .await?
                 {
                     Some(value) => kv_pairs.push(format!("`{}` = `{}`", key, value)),

src/commands/settings/set.rs

@@ -28,7 +28,7 @@ async fn set(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
         return Ok(());
     }
     let database = get_database_from_context(ctx).await;
-    let guild = msg.guild(&ctx.cache).await.unwrap();
+    let guild = msg.guild(&ctx.cache).unwrap();
 
     if let Ok(value) = args.single::<String>() {
         database

src/commands/weeb/hololive/pekofy.rs

@@ -43,7 +43,7 @@ async fn pekofy(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
         return Err(CommandError::from("Can't pekofy empty message"));
     }
 
-    log::debug!("Pekofying message '{}'", content);
+    tracing::debug!("Pekofying message '{}'", content);
     let mut alpha_lowercase = content.to_lowercase();
     alpha_lowercase.retain(|c| c.is_alphanumeric());
 
@@ -64,7 +64,7 @@ async fn pekofy(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
         .http
         .get_message(msg.channel_id.0, reference_message.0)
         .await?;
-    log::debug!("Pekofied message is '{}'", pekofied);
+    tracing::debug!("Pekofied message is '{}'", pekofied);
     message.reply(ctx, pekofied).await?;
 
     Ok(())
@@ -73,7 +73,7 @@ async fn pekofy(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
 /// Pekofies a single line
 fn pekofy_line(mut line: &str) -> String {
     lazy_static::lazy_static! { static ref FORMATTING_REGEX: Regex = Regex::new(r"^(.*?)((<:\w+:\d+>|\W)*)$").unwrap(); }
-    log::debug!("Pekofying line '{}'", line);
+    tracing::debug!("Pekofying line '{}'", line);
     let original = line;
 
     let mut md = "";
@@ -84,7 +84,7 @@ fn pekofy_line(mut line: &str) -> String {
 
     for peko in PEKOS {
         if line.to_lowercase().ends_with(peko) {
-            log::debug!("Peko already found in message. Returning original");
+            tracing::debug!("Peko already found in message. Returning original");
             return original.to_string();
         }
     }
@@ -96,7 +96,7 @@ fn pekofy_line(mut line: &str) -> String {
         .filter(|c| c.is_alphabetic())
         .all(char::is_uppercase)
     {
-        log::debug!("Message is all uppercase. Peko will also be uppercase");
+        tracing::debug!("Message is all uppercase. Peko will also be uppercase");
         peko = peko.to_uppercase();
     }
 

src/commands/weeb/mod.rs

@@ -3,6 +3,7 @@ use serenity::client::Context;
 use serenity::framework::standard::macros::group;
 use serenity::framework::standard::CommandResult;
 use serenity::model::channel::Message;
+use std::fmt::Debug;
 
 use hololive::amelia::AMELIA_COMMAND;
 use hololive::fubuki::FUBUKI_COMMAND;
@@ -37,7 +38,11 @@ mod theme;
 pub struct Weeb;
 
 /// Posts a random media entry with the given category
-async fn post_random_media(ctx: &Context, msg: &Message, category: &str) -> CommandResult {
+async fn post_random_media<S: AsRef<str> + 'static + Debug>(
+    ctx: &Context,
+    msg: &Message,
+    category: S,
+) -> CommandResult {
     let database = get_database_from_context(ctx).await;
     let media = database.get_media_by_category(category).await?;
     let gif = media

src/commands/weeb/sauce.rs

@@ -1,4 +1,4 @@
-use sauce_api::Sauce;
+use sauce_api::source::Source;
 use serenity::client::Context;
 use serenity::framework::standard::macros::command;
 use serenity::framework::standard::CommandResult;
@@ -16,17 +16,17 @@ use crate::utils::get_previous_message_or_reply;
 #[aliases("source")]
 #[bucket("sauce_api")]
 async fn sauce(ctx: &Context, msg: &Message) -> CommandResult {
-    log::debug!("Got sauce command");
+    tracing::debug!("Got sauce command");
     let source_msg = get_previous_message_or_reply(ctx, msg).await?;
 
     if source_msg.is_none() {
-        log::debug!("No source message provided");
+        tracing::debug!("No source message provided");
         msg.channel_id.say(ctx, "No source message found.").await?;
         return Ok(());
     }
     let source_msg = source_msg.unwrap();
-    log::trace!("Source message is {:?}", source_msg);
-    log::debug!("Getting attachments...");
+    tracing::trace!("Source message is {:?}", source_msg);
+    tracing::debug!("Getting attachments...");
     let mut attachment_urls: Vec<String> = source_msg
         .attachments
         .into_iter()
@@ -34,7 +34,7 @@ async fn sauce(ctx: &Context, msg: &Message) -> CommandResult {
         .filter(|url| url::is_image(url) || url::is_video(url))
         .collect();
 
-    log::debug!("Getting embedded images...");
+    tracing::debug!("Getting embedded images...");
     let mut embed_images = source_msg
         .embeds
         .into_iter()
@@ -43,29 +43,37 @@ async fn sauce(ctx: &Context, msg: &Message) -> CommandResult {
         .collect::<Vec<String>>();
 
     attachment_urls.append(&mut embed_images);
-    log::trace!("Image urls {:?}", attachment_urls);
+    tracing::trace!("Image urls {:?}", attachment_urls);
 
     if attachment_urls.is_empty() {
-        log::debug!("No images in source image");
+        tracing::debug!("No images in source image");
         msg.channel_id
             .say(ctx, "I could not find any images in the message.")
             .await?;
         return Ok(());
     }
 
-    log::debug!(
+    tracing::debug!(
         "Checking SauceNao for {} attachments",
         attachment_urls.len()
     );
     let data = ctx.data.read().await;
     let store_data = data.get::<Store>().unwrap();
-    let sources = store_data.sauce_nao.check_sauces(attachment_urls).await?;
-    log::trace!("Sources are {:?}", sources);
+    let mut outputs = Vec::new();
 
-    log::debug!("Creating menu...");
+    for attachment in attachment_urls {
+        let output = store_data
+            .sauce_nao
+            .check(&attachment)
+            .await
+            .map_err(|_| "failed to retrieve source")?;
+        tracing::trace!("Output is {:?}", output);
+        outputs.push(output)
+    }
 
-    show_sauce_menu(ctx, msg, sources).await?;
-    log::debug!("Menu created");
+    tracing::debug!("Creating menu...");
+    show_sauce_menu(ctx, msg, outputs).await?;
+    tracing::debug!("Menu created");
 
     Ok(())
 }

src/commands/weeb/theme.rs

@@ -1,12 +1,12 @@
 use crate::messages::theme::create_theme_menu;
 use animethemes_rs::client::AnimeThemesClient;
-use animethemes_rs::includes;
+use animethemes_rs::includes::{AnimeInclude, SearchIncludes};
 use serenity::client::Context;
 use serenity::framework::standard::macros::command;
 use serenity::framework::standard::{Args, CommandResult};
 use serenity::model::channel::Message;
-use serenity_rich_interaction::core::MEDIUM_TIMEOUT;
-use serenity_rich_interaction::ephemeral_message::EphemeralMessage;
+use serenity_additions::core::MEDIUM_TIMEOUT;
+use serenity_additions::ephemeral_message::EphemeralMessage;
 
 #[command]
 #[description("Query for the opening/ending/insert song of an anime")]
@@ -20,12 +20,14 @@ async fn theme(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
     let search_results = client
         .search(
             query,
-            &[includes::ANIME],
-            &[
-                "animethemes",
-                "animethemes.animethemeentries",
-                "animethemes.animethemeentries.videos",
-            ],
+            &["anime"],
+            SearchIncludes {
+                anime: AnimeInclude::default()
+                    .themes()
+                    .themes_entries()
+                    .themes_entries_videos(),
+                ..Default::default()
+            },
         )
         .await?;
     if let Some(anime) = search_results.anime {

src/handler.rs

@@ -4,7 +4,7 @@ use serenity::model::channel::GuildChannel;
 use serenity::model::event::ResumedEvent;
 use serenity::model::gateway::{Activity, Ready};
 use serenity::model::guild::Member;
-use serenity::model::id::{ChannelId, GuildId};
+use serenity::model::id::ChannelId;
 use serenity::model::voice::VoiceState;
 use serenity::prelude::*;
 
@@ -12,8 +12,8 @@ use crate::commands::music::get_music_player_for_guild;
 use crate::utils::context_data::MusicPlayers;
 use crate::utils::delete_messages_from_database;
 use serenity::model::event;
-use serenity_rich_interaction::events::RichEventHandler;
-use serenity_rich_interaction::Result;
+use serenity_additions::events::RichEventHandler;
+use serenity_additions::Result;
 
 /// Returns the raw event handler built from a rich event handler
 pub fn get_raw_event_handler() -> RichEventHandler {
@@ -22,7 +22,7 @@ pub fn get_raw_event_handler() -> RichEventHandler {
         .add_event(|ctx, e: &event::ReadyEvent| Box::pin(ready(ctx, &e.ready)))
         .add_event(|_ctx, _: &event::ResumedEvent| {
             Box::pin(async {
-                log::info!("Reconnected to Gateway");
+                tracing::info!("Reconnected to Gateway");
                 Ok(())
             })
         });
@@ -31,11 +31,12 @@ pub fn get_raw_event_handler() -> RichEventHandler {
 }
 
 async fn ready(ctx: &Context, _: &Ready) -> Result<()> {
-    log::info!("Ready");
+    tracing::info!("Ready");
     delete_messages_from_database(&ctx).await?;
     let prefix = std::env::var("BOT_PREFIX").unwrap_or("~!".to_string());
-    ctx.set_activity(Activity::listening(format!("{}help", prefix).as_str()))
+    ctx.set_activity(Activity::listening(format!("{prefix}help").as_str()))
         .await;
+    tracing::info!("Fully initialized. Listening to {prefix}help");
     Ok(())
 }
 
@@ -44,19 +45,18 @@ pub(crate) struct Handler;
 #[async_trait]
 impl EventHandler for Handler {
     async fn resume(&self, _: Context, _: ResumedEvent) {
-        log::info!("Reconnected to gateway")
+        tracing::info!("Reconnected to gateway")
     }
 
     async fn voice_state_update(
         &self,
         ctx: Context,
-        guild_id: Option<GuildId>,
         old_state: Option<VoiceState>,
         new_state: VoiceState,
     ) {
         let mut member_count = None;
 
-        let guild_id = if let Some(gid) = guild_id {
+        let guild_id = if let Some(gid) = new_state.guild_id {
             gid
         } else {
             return;
@@ -72,16 +72,16 @@ impl EventHandler for Handler {
         }
 
         if let Some(count) = member_count {
-            log::debug!("{} Members in channel", count);
+            tracing::debug!("{} Members in channel", count);
             if let Some(player) = get_music_player_for_guild(&ctx, guild_id).await {
                 let mut player = player.lock().await;
-                log::debug!("Setting leave flag to {}", count == 0);
+                tracing::debug!("Setting leave flag to {}", count == 0);
                 player.set_leave_flag(count == 0);
             }
         }
         // handle disconnects
         if let (Some(state), None) = (old_state, new_state.channel_id) {
-            let current_user = ctx.cache.current_user().await;
+            let current_user = ctx.cache.current_user();
 
             if state.user_id == current_user.id {
                 let mut data = ctx.data.write().await;
@@ -101,7 +101,7 @@ impl EventHandler for Handler {
 async fn get_own_channel_member_count(ctx: &Context, channel_id: ChannelId) -> Option<usize> {
     let guild_channel = get_guild_channel(ctx, channel_id).await?;
 
-    let current_user = ctx.cache.current_user().await;
+    let current_user = ctx.cache.current_user();
 
     let members = guild_channel.members(&ctx).await.ok()?;
     let own_channel = members
@@ -119,7 +119,7 @@ async fn get_own_channel_member_count(ctx: &Context, channel_id: ChannelId) -> O
 
 /// Returns the guild channel for a guild ID
 async fn get_guild_channel(ctx: &Context, channel_id: ChannelId) -> Option<GuildChannel> {
-    if let Some(channel) = ctx.cache.channel(channel_id).await {
+    if let Some(channel) = ctx.cache.channel(channel_id) {
         return channel.guild();
     }
     let channel = ctx.http.get_channel(channel_id.0).await.ok()?;

src/main.rs

@@ -17,11 +17,11 @@ async fn main() {
     init_logger();
     let mut client = get_client()
         .await
-        .map_err(|e| log::error!("Failed to get client: {:?}", e))
+        .map_err(|e| tracing::error!("Failed to get client: {:?}", e))
         .expect("Failed to get client");
 
     // start listening for events by starting a single shard
     if let Err(why) = client.start_autosharded().await {
-        log::error!("An error occurred while running the client: {:?}", why);
+        tracing::error!("An error occurred while running the client: {:?}", why);
     }
 }

src/messages/gifs.rs

@@ -3,7 +3,7 @@ use bot_database::models::Media;
 use serenity::builder::CreateMessage;
 use serenity::client::Context;
 use serenity::model::id::{ChannelId, UserId};
-use serenity_rich_interaction::menu::{MenuBuilder, Page};
+use serenity_additions::menu::{MenuBuilder, Page};
 use std::time::Duration;
 
 /// Creates a new gifs embed

src/messages/inspirobot.rs

@@ -3,10 +3,8 @@ use crate::utils::error::BotResult;
 use serenity::builder::CreateMessage;
 use serenity::client::Context;
 use serenity::model::id::{ChannelId, UserId};
-use serenity_rich_interaction::core::EXTRA_LONG_TIMEOUT;
-use serenity_rich_interaction::menu::{
-    close_menu, display_page, MenuBuilder, Page, CLOSE_MENU_EMOJI,
-};
+use serenity_additions::core::EXTRA_LONG_TIMEOUT;
+use serenity_additions::menu::{close_menu, display_page, MenuBuilder, Page, CLOSE_MENU_EMOJI};
 
 static REFRESH_EMOJI: &str = "🔄";
 
@@ -30,7 +28,7 @@ pub async fn create_inspirobot_menu(
             Box::pin(async {
                 let message = create_inspirobot_page()
                     .await
-                    .map_err(|e| serenity_rich_interaction::Error::Msg(format!("{}", e)))?;
+                    .map_err(|e| serenity_additions::Error::Msg(format!("{}", e)))?;
                 Ok(message)
             })
         }))

src/messages/mod.rs

@@ -1,16 +1,16 @@
 use crate::utils::context_data::get_database_from_context;
 use crate::utils::error::BotResult;
 use serenity::client::Context;
-use serenity_rich_interaction::core::MessageHandle;
+use serenity_additions::core::MessageHandle;
 use std::time::{Duration, SystemTime};
 
 pub mod gifs;
+pub mod inspirobot;
 pub mod minecraft;
 pub mod music;
 pub mod sauce;
 pub mod theme;
 pub mod xkcd;
-pub mod inspirobot;
 
 /// Adds an ephemeral message to the database
 pub async fn add_ephemeral_handle_to_database(