diff --git a/Dockerfile b/Dockerfile index 830863b..6795b40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* RUN pip3 install --break-system-packages --no-cache-dir curl_cffi RUN pip3 install --break-system-packages --no-cache-dir pycryptodome -RUN curl -Lo dpp.deb https://dl.dpp.dev/ +RUN curl -Lo dpp.deb https://dl.dpp.dev/latest +RUN curl -Lo dpp-legacy.deb https://github.com/brainboxdotcc/DPP/releases/download/v10.0.35/libdpp-10.0.35-linux-x64.deb RUN dpkg -i dpp.deb +RUN dpkg -i dpp-legacy.deb RUN rm dpp.deb RUN curl -LO https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp RUN chmod +x ./yt-dlp @@ -16,4 +18,4 @@ COPY ./build/BumbleCee /BumbleCee COPY ./streamOpus.sh /streamOpus.sh RUN chmod +x BumbleCee RUN chmod +x streamOpus.sh -ENTRYPOINT ["/usr/bin/tini", "--", "./BumbleCee"] \ No newline at end of file +ENTRYPOINT ["/usr/bin/tini", "--", "./BumbleCee"] diff --git a/include/Utils/VersionsCheckUtils.hpp b/include/Utils/VersionsCheckUtils.hpp index 2be15fa..16fd366 100644 --- a/include/Utils/VersionsCheckUtils.hpp +++ b/include/Utils/VersionsCheckUtils.hpp @@ -7,7 +7,7 @@ namespace bumbleBee { class VersionsCheckUtils { public: static bool isThereCMD(std::shared_ptr cluster, std::string cmd) { - if (ConsoleUtils::safe_execute_command("which", {cmd}).size() == 0) { + if (ConsoleUtils::safe_execute_command("/usr/bin/which", {cmd}).size() == 0) { cluster->log(dpp::ll_error, cmd + " is unavaliable. unresolable error please install " + cmd); return false; } diff --git a/src/Audio/MusicPlayManager.cpp b/src/Audio/MusicPlayManager.cpp index e7e27f0..60a9de8 100644 --- a/src/Audio/MusicPlayManager.cpp +++ b/src/Audio/MusicPlayManager.cpp @@ -87,7 +87,7 @@ MusicQueueElement MusicPlayManager::getNowPlaying(const dpp::snowflake guildId) } void MusicPlayManager::send_audio_to_voice(std::shared_ptr music, dpp::discord_voice_client* client) { - std::thread t([](std::shared_ptr music, dpp::discord_voice_client* client) { // TODO: thread 벡터 만들고 delete, leave, skip시에 전송 중지하도록 만들기 + std::thread t([](std::shared_ptr music, dpp::discord_voice_client* client) { // TODO: thread 벡터 만들고 delete, leave, skip시에 전송 중지하도록 만들고. 또 노래 캐싱하고 ytdlp를 버퍼링하여 혹시 있을지 모르는 음성의 끊김을 방지할 것것 std::string command = "./streamOpus.sh "; command += SettingsManager::getYTDLP_CMD() + " "; command += SettingsManager::getFFMPEG_CMD() + " "; diff --git a/src/Commands/Play.cpp b/src/Commands/Play.cpp index 19198ce..6ab82e5 100644 --- a/src/Commands/Play.cpp +++ b/src/Commands/Play.cpp @@ -50,7 +50,7 @@ namespace bumbleBee::commands { else msg.content = "큐에 다음 곡을 추가했습니다:"; - if (!ids.empty()) { + if (!ids.empty()) { // TODO : 이거 멀티스레드로 바꿔서 더 빨리 정보를 받아올 수 있도록 개선할 것것 if (ids.front() == "") { ids.pop(); } diff --git a/src/Commands/Shuffle.cpp b/src/Commands/Shuffle.cpp index 0d6078c..2b1977d 100644 --- a/src/Commands/Shuffle.cpp +++ b/src/Commands/Shuffle.cpp @@ -3,6 +3,7 @@ namespace bumbleBee::commands { void Shuffle::execute(const dpp::slashcommand_t &event) { event.edit_original_response(dpp::message("shuffle")); + // TODO : 구현 } void Shuffle::init() { diff --git a/src/main.cpp b/src/main.cpp index b2ffd91..d630530 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,7 +2,8 @@ #include #include -int main() { +int main(int argc, char* argv[]) { bumbleBee::BumbleBee bot; bot.start(); + return 0; } \ No newline at end of file