diff --git a/build/CMakeFiles/gbp-bot.dir/src/main.cpp.o b/build/CMakeFiles/gbp-bot.dir/src/main.cpp.o index 90c6d8d..60f8858 100644 Binary files a/build/CMakeFiles/gbp-bot.dir/src/main.cpp.o and b/build/CMakeFiles/gbp-bot.dir/src/main.cpp.o differ diff --git a/src/main.cpp b/src/main.cpp index 0a89007..03aceed 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -44,21 +44,6 @@ bool hasCommand(dpp::message msg) return msg.content.substr(0, (msg.content.find(" "))) == config["bot_command"]; } -dpp::message setMessage(unsigned int channel_id, std::string content) -{ - std::vector messageArgs = separate_args(content); - if (messageArgs[0] == std::string(FILE_WARNING)) { - dpp::message msg = dpp::message(channel_id, ""); - msg.add_file("gbp-list.txt", dpp::utility::read_file(content.substr(content.find(" ") + 1, content.length() - (content.find(" ") + 1)))); - return msg; - } else { - dpp::message msg = dpp::message(channel_id, content); - return msg; - } -} - - - /** * ##onMessage * @@ -78,9 +63,16 @@ void onMessage(dpp::cluster &bot, dpp::message msg) std::vector args = separate_args(argument); std::string msgContent = commandParse(args); - std::cout << msgContent << std::endl; - dpp::message toSend = setMessage(msg.channel_id, msgContent); + std::vector messageArgs = separate_args(msgContent); + dpp::message toSend; + if (messageArgs[0] == std::string(FILE_WARNING)) { + std::cout << "Handling file!\n"; + toSend = dpp::message(msg.channel_id, ""); + toSend.add_file("gbp-list.txt", dpp::utility::read_file(msgContent.substr(msgContent.find(" ") + 1, msgContent.length() - (msgContent.find(" ") + 1)))); + } else { + toSend = dpp::message(msg.channel_id, msgContent); + } bot.message_create(toSend); }