Merge pull request #481 from tktcorporation/feature/479/upgrade-songb…

…ird-2

`songbird`, `serenity` のアップグレード. 多数の機能の破壊的変更

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "discord-tts-bot"
-version = "1.5.0"
+version = "2.0.0"
 authors = ["tktcorporation"]
 edition = "2021"
 license = "MIT"
@@ -27,13 +27,21 @@ mockall = "0.12.1"
 mockall_double = "0.3.0"
 serde = "1.0.204"
 
+[dependencies.reqwest]
+version = "0.11"
+features = ["stream"]
+
 [dependencies.songbird]
-version = "0.3.2"
-features = ["builtin-queue", "yt-dlp"]
+version = "0.4.1"
+features = ["builtin-queue"]
+
+[dependencies.symphonia]
+version = "0.5.2"
+features = ["aac", "mp3", "isomp4", "alac"]
 
 [dependencies.serenity]
-version = "0.11.7"
-features = ["cache", "standard_framework", "voice", "rustls_backend"]
+version = "0.12.2"
+features = ["client", "gateway", "cache", "standard_framework", "voice", "rustls_backend", "http"]
 
 [dependencies.tokio]
 version = "1.36.0"

docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.7"
 services:
   app:
     build:

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.74.0-slim-bullseye AS dev-env
+FROM rust:1.81.0-slim-bullseye AS dev-env
 
 RUN apt-get update && \
     apt-get install -y \
@@ -10,13 +10,10 @@ RUN apt-get update && \
     automake \
     libtool \
     m4 \
-    ffmpeg \
     curl \
     python3 \
     git
 
-RUN curl https://raw.githubusercontent.com/nektos/act/master/install.sh | bash
-
 # install yt-dlp
 RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/bin/yt-dlp && \
     chmod a+rx /usr/bin/yt-dlp
@@ -39,7 +36,7 @@ RUN cargo build --release --features "tts"
 
 CMD [ "/bin/sh",  "-c", "cargo run" ]
 
-FROM debian:bullseye-20231030-slim
+FROM debian:bullseye-20240904-slim
 
 RUN apt-get update && \
     apt-get install -y \
@@ -51,7 +48,6 @@ RUN apt-get update && \
     automake \
     libtool \
     m4 \
-    ffmpeg \
     curl \
     python3 \
  && apt-get -y clean \

docker/Dockerfile.music

@@ -1,4 +1,4 @@
-FROM rust:1.74.0-slim-bullseye AS dev-env
+FROM rust:1.81.0-slim-bullseye AS dev-env
 
 RUN apt-get update && \
     apt-get install -y \
@@ -10,13 +10,10 @@ RUN apt-get update && \
     automake \
     libtool \
     m4 \
-    ffmpeg \
     curl \
     python3 \
     git
 
-RUN curl https://raw.githubusercontent.com/nektos/act/master/install.sh | bash
-
 # install yt-dlp
 RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/bin/yt-dlp && \
     chmod a+rx /usr/bin/yt-dlp
@@ -39,7 +36,7 @@ RUN cargo build --release --no-default-features --features "music"
 
 CMD [ "/bin/sh",  "-c", "cargo run" ]
 
-FROM debian:bullseye-20231030-slim
+FROM debian:bullseye-20240904-slim
 
 RUN apt-get update && \
     apt-get install -y \
@@ -51,7 +48,6 @@ RUN apt-get update && \
     automake \
     libtool \
     m4 \
-    ffmpeg \
     curl \
     python3 \
  && apt-get -y clean \

src/commands/mod.rs

@@ -1,4 +1,3 @@
 mod usecase;
-pub use usecase::message_commands;
 
 pub use usecase::slash_commands;