완?성

CMakeLists.txt

@@ -35,8 +35,6 @@ target_include_directories(${BOT_NAME} PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${OPENSSL_INCLUDE_DIR}
     /usr/include/opus
-    /usr/include
-    /usr/local/include
 )
 
 target_link_libraries(${BOT_NAME}

include/Commands/CommandType.hpp

@@ -15,4 +15,15 @@ public:
 protected:
     std::shared_ptr<dpp::cluster> botCluster;
 };
+}
+
+namespace commands {
+class VCCommand : public ICommand {
+public:
+    VCCommand(std::shared_ptr<dpp::cluster> botCluster) : ICommand(botCluster) {}
+
+    std::shared_ptr<MusicQueue> getQueue(const dpp::slashcommand_t& event);
+protected:
+    std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap;
+};
 }

include/Commands/Delete.hpp

@@ -4,12 +4,10 @@
 #include <memory>
 
 namespace commands {
-class Delete : public ICommand {
+class Delete : public VCCommand {
 public:
     Delete(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap);
 
     void operator()(const dpp::slashcommand_t& event);
-private:
-    std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap;
 };
 }

include/Commands/Leave.hpp

@@ -4,12 +4,10 @@
 #include <memory>
 
 namespace commands {
-class Leave : public ICommand {
+class Leave : public VCCommand {
 public:
     Leave(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap);
 
     void operator()(const dpp::slashcommand_t& event);
-private:
-    std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap;
 };
 }

include/Commands/Play.hpp

@@ -4,12 +4,10 @@
 #include <memory>
 
 namespace commands {
-class Play : public ICommand {
+class Play : public VCCommand {
 public:
     Play(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap);
 
     void operator()(const dpp::slashcommand_t& event);
-private:
-    std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap;
 };
 }

include/Commands/Queue.hpp

@@ -4,12 +4,10 @@
 #include <memory>
 
 namespace commands {
-class Queue : public ICommand {
+class Queue : public VCCommand {
 public:
     Queue(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap);
 
     void operator()(const dpp::slashcommand_t& event);
-private:
-    std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap;
 };
 }

include/Commands/Repeat.hpp

@@ -4,12 +4,10 @@
 #include <memory>
 
 namespace commands {
-class Repeat : public ICommand {
+class Repeat : public VCCommand {
 public:
     Repeat(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap);
 
     void operator()(const dpp::slashcommand_t& event);
-private:
-    std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap;
 };
 }

include/Commands/Skip.hpp

@@ -4,12 +4,10 @@
 #include <memory>
 
 namespace commands {
-class Skip : public ICommand {
+class Skip : public VCCommand {
 public:
     Skip(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap);
 
     void operator()(const dpp::slashcommand_t& event);
-private:
-    std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap;
 };
 }

include/MusicQueue.hpp

@@ -9,7 +9,7 @@ struct FMusicQueueID {
 
 class MusicQueue {
 public:
-    MusicQueue(FMusicQueueID id);
+    MusicQueue(FMusicQueueID id, std::shared_ptr<dpp::cluster> botCluster);
     void operator+=(FQueueElement operand);
     FQueueElement pop(int index);
     FQueueElement peek(int index);
@@ -19,9 +19,9 @@ public:
     std::list<struct FQueueElement>::iterator end();
     std::size_t size();
     FMusicQueueID getId();
-    void play(std::shared_ptr<dpp::cluster> botCluster);
+    void play();
 
-    void markerCallback(std::shared_ptr<dpp::cluster> botCluster);
+    void markerCallback();
 
     bool repeat;
 private:
@@ -29,5 +29,5 @@ private:
     std::mutex mutex;
     std::mutex playMutex;
     FMusicQueueID id;
-    bool queuePlaying;
+    std::shared_ptr<dpp::cluster> botCluster;
 };

src/Commands/CommandType.cpp

@@ -4,3 +4,16 @@ commands::ICommand::ICommand(std::shared_ptr<dpp::cluster> botCluster)
 {
     this->botCluster = botCluster;
 }
+
+std::shared_ptr<MusicQueue> commands::VCCommand::getQueue(const dpp::slashcommand_t& event) {
+    auto findResult = queueMap->find(event.command.guild_id);
+    if (findResult == queueMap->end())
+    {
+        FMusicQueueID queueID;
+        queueID.guild_id = event.command.guild_id;
+        queueID.shard_id = event.from->shard_id;
+
+        (*queueMap)[queueID.guild_id] = std::make_shared<MusicQueue>(queueID, botCluster);
+    }
+    return queueMap->find(event.command.guild_id)->second;
+}

src/Commands/Delete.cpp

@@ -2,7 +2,7 @@
 #include <iostream>
 
 commands::Delete::Delete(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap)
-    : ICommand(botCluster)
+    : VCCommand(botCluster)
 {
     this->queueMap = queueMap;
     dpp::slashcommand Command = dpp::slashcommand("d", "큐의 해당하는 번호의 노래를 지웁니다", botCluster->me.id);
@@ -23,25 +23,29 @@ void commands::Delete::operator()(const dpp::slashcommand_t& event)
     std::string Pos = std::get<std::string>(event.get_parameter("pos"));
     event.thinking();
 
-    auto findResult = queueMap->find(event.command.guild_id);
-    if (findResult == queueMap->end())
-    {
-        FMusicQueueID queueID;
-        queueID.guild_id = event.command.guild_id;
-        queueID.shard_id = event.from->shard_id;
+    std::shared_ptr<MusicQueue> queue = getQueue(event);
 
-        (*queueMap)[queueID.guild_id] = std::make_shared<MusicQueue>(queueID);
+    auto index = atoi(Pos.c_str());
+
+    int queueSize = queue->size();
+
+    std::cout << "queue size : " << queueSize << "\n";
+
+    if (index < 0 || (queueSize - 1) < index) {
+        std::cout << "invalid index : " << index << ", " + Pos + "\n";
+
+        event.edit_original_response(dpp::message(event.command.channel_id, "이상한 인덱스 위치. Pos : " + Pos));
+        return;
     }
-    std::shared_ptr<MusicQueue> queue = queueMap->find(event.command.guild_id)->second;
 
-    auto PopedElement = queue->pop(atoi(Pos.c_str()));
+    auto PopedElement = queue->pop(index);
 
     dpp::embed embed = PopedElement.embed
         .set_timestamp(time(0));
 
     dpp::message msg(event.command.channel_id, "다음 항목을 큐에서 삭제했습니다!:");
 
-    if (!atoi(Pos.c_str())) {
+    if (atoi(Pos.c_str()) == 0) {
         dpp::voiceconn* v = event.from->get_voice(event.command.guild_id);
 
         if (!v || !v->voiceclient || !v->voiceclient->is_ready()) {
@@ -49,6 +53,7 @@ void commands::Delete::operator()(const dpp::slashcommand_t& event)
         }
 
         v->voiceclient->stop_audio();
+        v->voiceclient->insert_marker("end of music");
     }
     
     msg.add_embed(embed);

src/Commands/Leave.cpp

@@ -2,7 +2,7 @@
 #include <iostream>
 
 commands::Leave::Leave(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap)
-    : ICommand(botCluster)
+    : VCCommand(botCluster)
 {
     this->queueMap = queueMap;
     dpp::slashcommand command = dpp::slashcommand("l", "음챗을 떠납니다", botCluster->me.id);
@@ -19,16 +19,7 @@ void commands::Leave::operator()(const dpp::slashcommand_t& event)
     }
     v->voiceclient->stop_audio();
 
-    auto findResult = queueMap->find(event.command.guild_id);
-    if (findResult == queueMap->end())
-    {
-        FMusicQueueID queueID;
-        queueID.guild_id = event.command.guild_id;
-        queueID.shard_id = event.from->shard_id;
-
-        (*queueMap)[queueID.guild_id] = std::make_shared<MusicQueue>(queueID);
-    }
-    std::shared_ptr<MusicQueue> queue = queueMap->find(event.command.guild_id)->second;
+    std::shared_ptr<MusicQueue> queue = getQueue(event);
 
     queue->clear();
     event.from->disconnect_voice(event.command.guild_id);

src/Commands/Play.cpp

@@ -8,7 +8,7 @@
 using json = nlohmann::json;
 
 commands::Play::Play(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap)
-    : ICommand(botCluster)
+    : VCCommand(botCluster)
 {
     this->queueMap = queueMap;
     dpp::slashcommand command = dpp::slashcommand("p", "노래 재생", botCluster->me.id);
@@ -20,7 +20,8 @@ commands::Play::Play(std::shared_ptr<dpp::cluster> botCluster, std::unordered_ma
     commandObjectVector.push_back(command);
 }
 
-void commands::Play::operator()(const dpp::slashcommand_t& event) {
+void commands::Play::operator()(const dpp::slashcommand_t& event)
+{
     if (std::holds_alternative<std::monostate>(event.get_parameter("query")))
     {
         event.reply("노래를 재생하려면 검색어 또는 링크를 입력해 주십시오.");
@@ -28,25 +29,19 @@ void commands::Play::operator()(const dpp::slashcommand_t& event) {
     }
 
     /* Attempt to connect to a voice channel, returns false if we fail to connect. */
-    if (event.from->get_voice(event.command.guild_id) || !dpp::find_guild(event.command.guild_id)->connect_member_voice(event.command.get_issuing_user().id))
+    if (!event.from->get_voice(event.command.guild_id))
     {
-        return event.reply("노래를 재생할 음성 채팅방에 먼저 참가하고 신청해야 합니다!");
+        if (!dpp::find_guild(event.command.guild_id)->connect_member_voice(event.command.get_issuing_user().id))
+        {
+            return event.reply("노래를 재생할 음성 채팅방에 먼저 참가하고 신청해야 합니다!");
+        }
     }
 
     std::string Query = std::get<std::string>(event.get_parameter("query"));
 
     event.thinking();
 
-    auto findResult = queueMap->find(event.command.guild_id);
-    if (findResult == queueMap->end())
-    {
-        FMusicQueueID queueID;
-        queueID.guild_id = event.command.guild_id;
-        queueID.shard_id = event.from->shard_id;
-
-        (*queueMap)[queueID.guild_id] = std::make_shared<MusicQueue>(queueID);
-    }
-    std::shared_ptr<MusicQueue> queue = queueMap->find(event.command.guild_id)->second;
+    std::shared_ptr<MusicQueue> queue = getQueue(event);
 
     std::cout << "다운로드 시작" << "\n";
     std::system(("python3 yt-download.py \"" + Query + "\" & wait").c_str());
@@ -106,7 +101,8 @@ void commands::Play::operator()(const dpp::slashcommand_t& event) {
     RequestedMusic.pop();
     event.edit_original_response(msg);
 
-    while (!RequestedMusic.empty()) {
+    while (!RequestedMusic.empty())
+    {
         dpp::message followMsg(event.command.channel_id, "");
 
         followMsg.add_embed(RequestedMusic.front().embed);
@@ -119,10 +115,11 @@ void commands::Play::operator()(const dpp::slashcommand_t& event) {
     dpp::voiceconn* v = event.from->get_voice(event.command.guild_id);
 
     /* If the voice channel was invalid, or there is an issue with it, then tell the user. */
-    if (v && v->voiceclient && v->voiceclient->is_ready()) {
-        queue->play(botCluster);
+    if (v && v->voiceclient && v->voiceclient->is_ready())
+    {
+        queue->play();
     }
 
-    botCluster->on_voice_ready([this, queue](const dpp::voice_ready_t& Voice){ queue->play(botCluster); });
+    botCluster->on_voice_ready([this, queue](const dpp::voice_ready_t& Voice){ queue->play(); });
     return;
 }

src/Commands/Queue.cpp

@@ -54,7 +54,7 @@ dpp::embed makeEmbed(std::list<FQueueElement>::iterator& iter, std::list<FQueueE
 }
 
 commands::Queue::Queue(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap)
-    : ICommand(botCluster)
+    : VCCommand(botCluster)
 {
     this->queueMap = queueMap;
     dpp::slashcommand command = dpp::slashcommand("q", "노래 예약 큐 확인", botCluster->me.id);
@@ -63,25 +63,24 @@ commands::Queue::Queue(std::shared_ptr<dpp::cluster> botCluster, std::unordered_
 }
 
 void commands::Queue::operator()(const dpp::slashcommand_t& event) {
-    dpp::message msg(event.command.channel_id, "지금 재생 중:");
+    dpp::message msg;
+    msg.set_channel_id(event.command.channel_id);
+    std::shared_ptr<MusicQueue> queue = getQueue(event);
 
-    auto findResult = queueMap->find(event.command.guild_id);
-    if (findResult == queueMap->end())
-    {
-        FMusicQueueID queueID;
-        queueID.guild_id = event.command.guild_id;
-        queueID.shard_id = event.from->shard_id;
-
-        (*queueMap)[queueID.guild_id] = std::make_shared<MusicQueue>(queueID);
+    if (queue->size() < 1) {
+        auto iter = queue->begin();
+        msg.add_embed(makeEmbed(iter, queue->end(), queue->repeat));
+    }
+    else {
+        msg.set_content("지금 재생 중:");
+        msg.add_embed(queue->peek(0).embed);
     }
-    std::shared_ptr<MusicQueue> queue = queueMap->find(event.command.guild_id)->second;
-
-    msg.add_embed(queue->peek(0).embed);
 
     event.reply(msg, [this, queue, event](const dpp::confirmation_callback_t &_event) {
         auto iter = queue->begin();
+        int queueSize = queue->size();
         iter++;
-        for (int i = 0; i < ceil((queue->size() - 1) / 5.0); i++) {
+        for (int i = 0; i < ceil(queueSize / 5.0); i++) {
             dpp::embed followEmbed = makeEmbed(iter, queue->end(), queue->repeat, i * 5 + 1);
 
             dpp::message followMsg;

src/Commands/Repeat.cpp

@@ -3,7 +3,7 @@
 #include <string>
 
 commands::Repeat::Repeat(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap)
-    : ICommand(botCluster)
+    : VCCommand(botCluster)
 {
     this->queueMap = queueMap;
     dpp::slashcommand command = dpp::slashcommand("r", "반복 켜기/끄기", botCluster->me.id);
@@ -12,16 +12,7 @@ commands::Repeat::Repeat(std::shared_ptr<dpp::cluster> botCluster, std::unordere
 }
 
 void commands::Repeat::operator()(const dpp::slashcommand_t& event) {
-    auto findResult = queueMap->find(event.command.guild_id);
-    if (findResult == queueMap->end())
-    {
-        FMusicQueueID queueID;
-        queueID.guild_id = event.command.guild_id;
-        queueID.shard_id = event.from->shard_id;
-
-        (*queueMap)[queueID.guild_id] = std::make_shared<MusicQueue>(queueID);
-    }
-    std::shared_ptr<MusicQueue> queue = queueMap->find(event.command.guild_id)->second;
+    std::shared_ptr<MusicQueue> queue = getQueue(event);
 
     if (queue->repeat) {
         event.reply("반복을 껐습니다.");

src/Commands/Skip.cpp

@@ -3,7 +3,7 @@
 #include <string>
 
 commands::Skip::Skip(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap)
-    : ICommand(botCluster)
+    : VCCommand(botCluster)
 {
     this->queueMap = queueMap;
     dpp::slashcommand command = dpp::slashcommand("s", "현재곡 스킵", botCluster->me.id);
@@ -19,19 +19,9 @@ void commands::Skip::operator()(const dpp::slashcommand_t& event) {
     }
 
     v->voiceclient->stop_audio();
+    v->voiceclient->insert_marker("next marker");
 
-    auto findResult = queueMap->find(event.command.guild_id);
-    if (findResult == queueMap->end())
-    {
-        FMusicQueueID queueID;
-        queueID.guild_id = event.command.guild_id;
-        queueID.shard_id = event.from->shard_id;
-
-        (*queueMap)[queueID.guild_id] = std::make_shared<MusicQueue>(queueID);
-    }
-    std::shared_ptr<MusicQueue> queue = queueMap->find(event.command.guild_id)->second;
-    
-    queue->play(botCluster);
+    std::shared_ptr<MusicQueue> queue = getQueue(event);
 
     event.reply("스킵했습니다!");
 

src/MusicQueue.cpp

@@ -4,11 +4,31 @@
 #include <opus/opusfile.h>
 #include <thread>
 
-MusicQueue::MusicQueue(FMusicQueueID id)
+MusicQueue::MusicQueue(FMusicQueueID id, std::shared_ptr<dpp::cluster> botCluster)
 {
     this->id = id;
     repeat = false;
-    queuePlaying = false;
+    this->botCluster = botCluster;
+
+    botCluster->on_voice_track_marker([this, botCluster](const dpp::voice_track_marker_t &marker)
+    {
+        std::cout << marker.track_meta << " Marker reached.\n";
+
+        if (empty())
+        {
+            std::cout << "Queue ended\n";
+            playMutex.unlock();
+            return;
+        }
+
+        auto music = pop(0);
+        if (repeat)
+        {
+            (*this) += music;
+        }
+        
+        markerCallback();
+    });
 }
 
 void MusicQueue::operator+=(FQueueElement operand)
@@ -89,7 +109,7 @@ FMusicQueueID MusicQueue::getId()
     return id;
 }
 
-void MusicQueue::markerCallback(std::shared_ptr<dpp::cluster> botCluster)
+void MusicQueue::markerCallback()
 {
     std::cout << "Music play started\n";
 
@@ -97,14 +117,13 @@ void MusicQueue::markerCallback(std::shared_ptr<dpp::cluster> botCluster)
     if (!joinedShard)
     {
         std::cout << "No shard\n";
-        queuePlaying = false;
         return;
     }
 
     if (empty())
     {
         std::cout << "Queue ended\n";
-        queuePlaying = false;
+        playMutex.unlock();
         return;
     }
 
@@ -114,7 +133,6 @@ void MusicQueue::markerCallback(std::shared_ptr<dpp::cluster> botCluster)
     if (!v || !v->voiceclient || !v->voiceclient->is_ready())
     {
         std::cout << "not in voicechat. quit musicplay";
-        queuePlaying = false;
         return;
     }
 
@@ -124,7 +142,6 @@ void MusicQueue::markerCallback(std::shared_ptr<dpp::cluster> botCluster)
     /* If there was an issue reading the file, tell the user and stop */
     if (!track_og) {
         fprintf(stderr, "Error opening file\n");
-        queuePlaying = false;
         return;
     }
 
@@ -169,23 +186,19 @@ void MusicQueue::markerCallback(std::shared_ptr<dpp::cluster> botCluster)
     std::cout << "audio sending complete\n";
 }
 
-void MusicQueue::play(std::shared_ptr<dpp::cluster> botCluster)
+void MusicQueue::play()
 {
-    playMutex.lock();
-    if (queuePlaying)
+    if (!playMutex.try_lock())
     {
-        std::cout << "Already Playing\n";
-        playMutex.unlock();
+        std::cout << "Already playing\n";
         return;
     }
-    queuePlaying = true;
-    playMutex.unlock();
 
     dpp::discord_client* joinedShard = botCluster->get_shard(id.shard_id);
     if (!joinedShard)
     {
         std::cout << "No shard\n";
-        queuePlaying = false;
+        playMutex.unlock();
         return;
     }
 
@@ -193,22 +206,9 @@ void MusicQueue::play(std::shared_ptr<dpp::cluster> botCluster)
     if (!v || !v->voiceclient || !v->voiceclient->is_ready())
     {
         std::cout << "not in voicechat. quit musicplay";
-        queuePlaying = false;
+        playMutex.unlock();
         return;
     }
-
-    botCluster->on_voice_track_marker([this, botCluster, v](const dpp::voice_track_marker_t &marker)
-    {
-        std::cout << marker.track_meta << " Marker reached.\n";
-
-        auto music = pop(0);
-        if (repeat)
-        {
-            (*this) += music;
-        }
-        
-        markerCallback(botCluster);
-    });
-
-    markerCallback(botCluster);
+    
+    markerCallback();
 }

src/main.cpp

@@ -4,7 +4,8 @@
 
 using json = nlohmann::json;
 
-int main() {
+int main()
+{
     json configdocument;
     std::ifstream configfile("config.json");
     configfile >> configdocument;