diff --git a/CMakeLists.txt b/CMakeLists.txt index f2f28a2..b9e16c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,19 +2,22 @@ cmake_minimum_required(VERSION 3.15) # Project name, version and description project(gbp-bot VERSION 1.0 DESCRIPTION "A discord bot") - + +find_package(Python3 REQUIRED COMPONENTS Interpreter Development) + # Add DPP as dependency add_subdirectory(libs/DPP) # Create an executable add_executable(${PROJECT_NAME} src/main.cpp - # your others files... ) - + + # Linking libraries -target_link_libraries(${PROJECT_NAME} +target_link_libraries(${PROJECT_NAME} dpp + Python3::Python ) # Specify includes @@ -26,4 +29,5 @@ target_include_directories(${PROJECT_NAME} PRIVATE set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 17 # or 20 if you want something more recent CXX_STANDARD_REQUIRED ON + LINKER_LANGUAGE CXX ) diff --git a/build/CMakeCache.txt b/build/CMakeCache.txt index 2651056..08a821f 100644 --- a/build/CMakeCache.txt +++ b/build/CMakeCache.txt @@ -571,6 +571,8 @@ CPACK_SOURCE_ZIP-ADVANCED:INTERNAL=1 FIND_PACKAGE_MESSAGE_DETAILS_OpenSSL:INTERNAL=[/usr/lib/x86_64-linux-gnu/libcrypto.so][/usr/include][c ][v1.1.1k()] //Details about finding Opus FIND_PACKAGE_MESSAGE_DETAILS_Opus:INTERNAL=[/usr/include][/usr/lib/x86_64-linux-gnu/libopus.so;/usr/lib/x86_64-linux-gnu/libm.so][1][v()] +//Details about finding Python3 +FIND_PACKAGE_MESSAGE_DETAILS_Python3:INTERNAL=[/usr/bin/python3.9][/usr/include/python3.9][/usr/lib/x86_64-linux-gnu/libpython3.9.so][cfound components: Interpreter Development Development.Module Development.Embed ][v3.9.2()] //Details about finding Threads FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()] //Details about finding ZLIB @@ -636,6 +638,17 @@ _OPENSSL_openssl_INCLUDEDIR:INTERNAL= _OPENSSL_openssl_LIBDIR:INTERNAL= _OPENSSL_openssl_PREFIX:INTERNAL= _OPENSSL_openssl_VERSION:INTERNAL= +_Python3_DEVELOPMENT_EMBED_SIGNATURE:INTERNAL=eb570793687ff1cfcb35fdf811570585 +_Python3_DEVELOPMENT_MODULE_SIGNATURE:INTERNAL=cd1014fa434c9f908cf41b54cd547222 +//Path to a program. +_Python3_EXECUTABLE:INTERNAL=/usr/bin/python3.9 +//Path to a file. +_Python3_INCLUDE_DIR:INTERNAL=/usr/include/python3.9 +//Python3 Properties +_Python3_INTERPRETER_PROPERTIES:INTERNAL=Python;3;9;2;64;;cpython-39-x86_64-linux-gnu;/usr/lib/python3.9;/usr/lib/python3.9;/usr/lib/python3/dist-packages;/usr/lib/python3/dist-packages +_Python3_INTERPRETER_SIGNATURE:INTERNAL=4c68ce0cc4d267693d7c5b1e646e8b91 +//Path to a library. +_Python3_LIBRARY_RELEASE:INTERNAL=/usr/lib/x86_64-linux-gnu/libpython3.9.so __pkg_config_arguments__OPENSSL:INTERNAL=QUIET;openssl __pkg_config_arguments_sodium_PKG:INTERNAL=QUIET;libsodium __pkg_config_checked__OPENSSL:INTERNAL=1 diff --git a/build/CMakeFiles/Makefile.cmake b/build/CMakeFiles/Makefile.cmake index 8319d9f..032442d 100644 --- a/build/CMakeFiles/Makefile.cmake +++ b/build/CMakeFiles/Makefile.cmake @@ -42,6 +42,8 @@ set(CMAKE_MAKEFILE_DEPENDS "/usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake" "/usr/share/cmake-3.18/Modules/FindPackageMessage.cmake" "/usr/share/cmake-3.18/Modules/FindPkgConfig.cmake" + "/usr/share/cmake-3.18/Modules/FindPython/Support.cmake" + "/usr/share/cmake-3.18/Modules/FindPython3.cmake" "/usr/share/cmake-3.18/Modules/FindThreads.cmake" "/usr/share/cmake-3.18/Modules/FindZLIB.cmake" "/usr/share/cmake-3.18/Modules/GNUInstallDirs.cmake" diff --git a/build/CMakeFiles/gbp-bot.dir/CXX.includecache b/build/CMakeFiles/gbp-bot.dir/CXX.includecache index cd6377c..8e54ca9 100644 --- a/build/CMakeFiles/gbp-bot.dir/CXX.includecache +++ b/build/CMakeFiles/gbp-bot.dir/CXX.includecache @@ -6,1139 +6,3 @@ #IncludeRegexTransform: -../libs/DPP/include/dpp/appcommand.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/managed.h -- -dpp/message.h -- -dpp/channel.h -- -dpp/role.h -- -dpp/user.h -- -variant -- -dpp/json_fwd.hpp -- - -../libs/DPP/include/dpp/application.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/managed.h -- -dpp/utility.h -- -dpp/user.h -- -dpp/json_fwd.hpp -- - -../libs/DPP/include/dpp/auditlog.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/json_fwd.hpp -- -optional -- - -../libs/DPP/include/dpp/ban.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/json_fwd.hpp -- -unordered_map -- - -../libs/DPP/include/dpp/cache.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/managed.h -- -unordered_map -- -mutex -- -shared_mutex -- - -../libs/DPP/include/dpp/channel.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/managed.h -- -dpp/utility.h -- -dpp/voicestate.h -- -dpp/json_fwd.hpp -- -unordered_map -- - -../libs/DPP/include/dpp/cluster.h -dpp/export.h -- -string -- -map -- -variant -- -dpp/snowflake.h -- -dpp/dispatcher.h -- -dpp/misc-enum.h -- -dpp/timer.h -- -dpp/json_fwd.hpp -- -dpp/discordclient.h -- -dpp/voiceregion.h -- -dpp/dtemplate.h -- -dpp/prune.h -- -dpp/auditlog.h -- -dpp/queues.h -- -dpp/cache.h -- -dpp/intents.h -- -algorithm -- -iostream -- -shared_mutex -- -cstring -- - -../libs/DPP/include/dpp/commandhandler.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/misc-enum.h -- -dpp/user.h -- -dpp/guild.h -- -dpp/role.h -- -dpp/appcommand.h -- -dpp/dispatcher.h -- -dpp/json_fwd.hpp -- -unordered_map -- -vector -- -functional -- -variant -- - -../libs/DPP/include/dpp/discordclient.h -dpp/export.h -- -string -- -map -- -vector -- -dpp/json_fwd.hpp -- -dpp/wsclient.h -- -dpp/dispatcher.h -- -dpp/cluster.h -- -dpp/discordvoiceclient.h -- -dpp/event.h -- -queue -- -thread -- -deque -- -mutex -- - -../libs/DPP/include/dpp/discordevents.h -dpp/export.h -- -dpp/json_fwd.hpp -- - -../libs/DPP/include/dpp/discordvoiceclient.h -dpp/export.h -- -cerrno -- -WinSock2.h -- -WS2tcpip.h -- -io.h -- -netinet/in.h -- -resolv.h -- -netdb.h -- -sys/socket.h -- -netinet/tcp.h -- -unistd.h -- -cstdio -- -cstdlib -- -sys/types.h -- -fcntl.h -- -csignal -- -cstring -- -string -- -map -- -vector -- -dpp/json_fwd.hpp -- -dpp/wsclient.h -- -dpp/dispatcher.h -- -dpp/cluster.h -- -dpp/discordevents.h -- -dpp/socket.h -- -queue -- -thread -- -deque -- -mutex -- -chrono -- - -../libs/DPP/include/dpp/dispatcher.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/misc-enum.h -- -dpp/managed.h -- -dpp/utility.h -- -dpp/role.h -- -dpp/user.h -- -dpp/channel.h -- -dpp/guild.h -- -dpp/invite.h -- -dpp/emoji.h -- -dpp/ban.h -- -dpp/webhook.h -- -dpp/presence.h -- -dpp/message.h -- -dpp/appcommand.h -- -dpp/application.h -- -dpp/scheduled_event.h -- -dpp/stage_instance.h -- -dpp/integration.h -- -functional -- -variant -- -exception -- -algorithm -- - -../libs/DPP/include/dpp/dpp.h -dpp/export.h -- -dpp/version.h -- -string -- -map -- -vector -- -fstream -- -iostream -- -ctime -- -string -- -vector -- -map -- -functional -- -dpp/exception.h -- -dpp/snowflake.h -- -dpp/misc-enum.h -- -dpp/managed.h -- -dpp/utility.h -- -dpp/voicestate.h -- -dpp/role.h -- -dpp/user.h -- -dpp/channel.h -- -dpp/guild.h -- -dpp/invite.h -- -dpp/dtemplate.h -- -dpp/emoji.h -- -dpp/ban.h -- -dpp/prune.h -- -dpp/voiceregion.h -- -dpp/integration.h -- -dpp/webhook.h -- -dpp/presence.h -- -dpp/intents.h -- -dpp/message.h -- -dpp/appcommand.h -- -dpp/stage_instance.h -- -dpp/auditlog.h -- -dpp/application.h -- -dpp/scheduled_event.h -- -dpp/discordclient.h -- -dpp/dispatcher.h -- -dpp/cluster.h -- -dpp/cache.h -- -dpp/httpsclient.h -- -dpp/queues.h -- -dpp/commandhandler.h -- -dpp/once.h -- - -../libs/DPP/include/dpp/dtemplate.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/json_fwd.hpp -- -unordered_map -- - -../libs/DPP/include/dpp/emoji.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/misc-enum.h -- -dpp/managed.h -- -dpp/json_fwd.hpp -- -unordered_map -- - -../libs/DPP/include/dpp/event.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/json_fwd.hpp -- - -../libs/DPP/include/dpp/exception.h -dpp/export.h -- -string -- -exception -- -algorithm -- - -../libs/DPP/include/dpp/export.h -dpp/win32_safe_warnings.h -- -WinSock2.h -- - -../libs/DPP/include/dpp/guild.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/managed.h -- -dpp/utility.h -- -dpp/voicestate.h -- -string -- -unordered_map -- - -../libs/DPP/include/dpp/httpsclient.h -dpp/export.h -- -string -- -map -- -vector -- -variant -- -dpp/sslclient.h -- - -../libs/DPP/include/dpp/integration.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/managed.h -- -dpp/json_fwd.hpp -- -unordered_map -- - -../libs/DPP/include/dpp/intents.h - -../libs/DPP/include/dpp/invite.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/json_fwd.hpp -- -dpp/stage_instance.h -- -unordered_map -- - -../libs/DPP/include/dpp/json_fwd.hpp -cstdint -- -map -- -memory -- -string -- -vector -- - -../libs/DPP/include/dpp/managed.h -dpp/export.h -- -dpp/snowflake.h -- -string -- - -../libs/DPP/include/dpp/message.h -dpp/export.h -- -dpp/queues.h -- -dpp/snowflake.h -- -dpp/managed.h -- -dpp/user.h -- -dpp/guild.h -- -optional -- -variant -- -dpp/json_fwd.hpp -- - -../libs/DPP/include/dpp/misc-enum.h -dpp/export.h -- -stddef.h -- - -../libs/DPP/include/dpp/nlohmann/json.hpp -algorithm -- -cstddef -- -functional -- -initializer_list -- -iosfwd -- -iterator -- -memory -- -numeric -- -string -- -utility -- -vector -- -type_traits -- -utility -- -algorithm -- -array -- -forward_list -- -iterator -- -map -- -string -- -tuple -- -type_traits -- -unordered_map -- -utility -- -valarray -- -exception -- -stdexcept -- -string -- -vector -- -array -- -cstddef -- -cstdint -- -string -- -string -- -utility -- -stdint.h -- -stdint.h -- -type_traits -- -cstdlib -- -cassert -- -cstddef -- -cstddef -- -type_traits -- -utility -- -limits -- -type_traits -- -utility -- -tuple -- -iterator -- -cstdint -- -map -- -memory -- -string -- -vector -- -experimental/filesystem -- -filesystem -- -algorithm -- -iterator -- -string -- -tuple -- -type_traits -- -utility -- -valarray -- -vector -- -cstddef -- -iterator -- -string -- -tuple -- -utility -- -experimental/filesystem -- -filesystem -- -cstdint -- -tuple -- -utility -- -cstdint -- -cstddef -- -functional -- -algorithm -- -array -- -cmath -- -cstddef -- -cstdint -- -cstdio -- -cstring -- -iterator -- -limits -- -string -- -utility -- -vector -- -array -- -cstddef -- -cstring -- -iterator -- -memory -- -numeric -- -string -- -type_traits -- -utility -- -cstdio -- -istream -- -cstddef -- -string -- -utility -- -vector -- -array -- -clocale -- -cstddef -- -cstdio -- -cstdlib -- -initializer_list -- -string -- -utility -- -vector -- -cstdint -- -utility -- -string -- -cmath -- -cstdint -- -functional -- -string -- -utility -- -vector -- -cstddef -- -limits -- -iterator -- -type_traits -- -cstddef -- -iterator -- -utility -- -algorithm -- -cctype -- -limits -- -numeric -- -string -- -utility -- -vector -- -initializer_list -- -utility -- -algorithm -- -array -- -cmath -- -cstdint -- -cstring -- -limits -- -string -- -utility -- -algorithm -- -cstddef -- -iterator -- -memory -- -string -- -vector -- -ios -- -ostream -- -algorithm -- -array -- -clocale -- -cmath -- -cstddef -- -cstdint -- -cstdio -- -limits -- -string -- -iomanip -- -sstream -- -type_traits -- -utility -- -array -- -cmath -- -cstdint -- -cstring -- -limits -- -type_traits -- -functional -- -initializer_list -- -iterator -- -memory -- -stdexcept -- -type_traits -- -utility -- -vector -- -string_view -- - -../libs/DPP/include/dpp/once.h -dpp/export.h -- - -../libs/DPP/include/dpp/presence.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/emoji.h -- -dpp/json_fwd.hpp -- -unordered_map -- - -../libs/DPP/include/dpp/prune.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/json_fwd.hpp -- - -../libs/DPP/include/dpp/queues.h -dpp/export.h -- -unordered_map -- -string -- -queue -- -map -- -thread -- -mutex -- -vector -- -functional -- -condition_variable -- - -../libs/DPP/include/dpp/role.h -dpp/export.h -- -dpp/managed.h -- -dpp/json_fwd.hpp -- -dpp/guild.h -- - -../libs/DPP/include/dpp/scheduled_event.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/managed.h -- -dpp/user.h -- -dpp/guild.h -- -dpp/json_fwd.hpp -- - -../libs/DPP/include/dpp/snowflake.h -dpp/export.h -- -stdint.h -- - -../libs/DPP/include/dpp/socket.h - -../libs/DPP/include/dpp/sslclient.h -dpp/export.h -- -dpp/misc-enum.h -- -string -- -functional -- -dpp/socket.h -- - -../libs/DPP/include/dpp/stage_instance.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/managed.h -- -dpp/json_fwd.hpp -- -unordered_map -- - -../libs/DPP/include/dpp/timer.h -dpp/export.h -- -stdint.h -- -map -- -unordered_map -- -stddef.h -- -functional -- - -../libs/DPP/include/dpp/user.h -dpp/export.h -- -dpp/json_fwd.hpp -- -dpp/snowflake.h -- -dpp/managed.h -- -dpp/utility.h -- - -../libs/DPP/include/dpp/utility.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/misc-enum.h -- -string -- -vector -- -unordered_map -- -map -- -functional -- - -../libs/DPP/include/dpp/version.h - -../libs/DPP/include/dpp/voiceregion.h -dpp/export.h -- -unordered_map -- -dpp/json_fwd.hpp -- - -../libs/DPP/include/dpp/voicestate.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/json_fwd.hpp -- -unordered_map -- - -../libs/DPP/include/dpp/webhook.h -dpp/export.h -- -dpp/snowflake.h -- -dpp/misc-enum.h -- -dpp/managed.h -- -dpp/json_fwd.hpp -- -unordered_map -- - -../libs/DPP/include/dpp/win32_safe_warnings.h - -../libs/DPP/include/dpp/wsclient.h -dpp/export.h -- -string -- -map -- -vector -- -variant -- -dpp/sslclient.h -- - -/home/seth/documents/programming/discord-bots/gbp/src/gbp.h -bits/stdc++.h -- - -/home/seth/documents/programming/discord-bots/gbp/src/main.cpp -dpp/appcommand.h -- -dpp/dispatcher.h -- -dpp/dpp.h -- -dpp/intents.h -- -dpp/message.h -- -dpp/once.h -- -dpp/queues.h -- -dpp/nlohmann/json.hpp -- -string -- -gbp.h -/home/seth/documents/programming/discord-bots/gbp/src/gbp.h - diff --git a/build/CMakeFiles/gbp-bot.dir/DependInfo.cmake b/build/CMakeFiles/gbp-bot.dir/DependInfo.cmake index 6739e2f..7d67878 100644 --- a/build/CMakeFiles/gbp-bot.dir/DependInfo.cmake +++ b/build/CMakeFiles/gbp-bot.dir/DependInfo.cmake @@ -11,6 +11,7 @@ set(CMAKE_CXX_COMPILER_ID "GNU") # The include file search paths: set(CMAKE_CXX_TARGET_INCLUDE_PATH "../libs/DPP/include" + "/usr/include/python3.9" ) # Targets to which this target links. diff --git a/build/CMakeFiles/gbp-bot.dir/build.make b/build/CMakeFiles/gbp-bot.dir/build.make index 0847151..1a5f31a 100644 --- a/build/CMakeFiles/gbp-bot.dir/build.make +++ b/build/CMakeFiles/gbp-bot.dir/build.make @@ -99,6 +99,7 @@ gbp__bot_EXTERNAL_OBJECTS = gbp-bot: CMakeFiles/gbp-bot.dir/src/main.cpp.o gbp-bot: CMakeFiles/gbp-bot.dir/build.make gbp-bot: libs/DPP/libdpp.so.1.0 +gbp-bot: /usr/lib/x86_64-linux-gnu/libpython3.9.so gbp-bot: /usr/lib/x86_64-linux-gnu/libcrypto.so gbp-bot: /usr/lib/x86_64-linux-gnu/libssl.so gbp-bot: /usr/lib/x86_64-linux-gnu/libz.so diff --git a/build/CMakeFiles/gbp-bot.dir/depend.internal b/build/CMakeFiles/gbp-bot.dir/depend.internal index 1fb7922..f1132e6 100644 --- a/build/CMakeFiles/gbp-bot.dir/depend.internal +++ b/build/CMakeFiles/gbp-bot.dir/depend.internal @@ -49,5 +49,103 @@ CMakeFiles/gbp-bot.dir/src/main.cpp.o ../libs/DPP/include/dpp/webhook.h ../libs/DPP/include/dpp/win32_safe_warnings.h ../libs/DPP/include/dpp/wsclient.h - /home/seth/documents/programming/discord-bots/gbp/src/gbp.h + /home/seth/documents/programming/discord-bots/gbp/src/commands.cpp + /home/seth/documents/programming/discord-bots/gbp/src/gbp.cpp /home/seth/documents/programming/discord-bots/gbp/src/main.cpp + /usr/include/python3.9/Python.h + /usr/include/python3.9/abstract.h + /usr/include/python3.9/bltinmodule.h + /usr/include/python3.9/boolobject.h + /usr/include/python3.9/bytearrayobject.h + /usr/include/python3.9/bytesobject.h + /usr/include/python3.9/cellobject.h + /usr/include/python3.9/ceval.h + /usr/include/python3.9/classobject.h + /usr/include/python3.9/code.h + /usr/include/python3.9/codecs.h + /usr/include/python3.9/compile.h + /usr/include/python3.9/complexobject.h + /usr/include/python3.9/context.h + /usr/include/python3.9/cpython/abstract.h + /usr/include/python3.9/cpython/bytearrayobject.h + /usr/include/python3.9/cpython/bytesobject.h + /usr/include/python3.9/cpython/ceval.h + /usr/include/python3.9/cpython/code.h + /usr/include/python3.9/cpython/dictobject.h + /usr/include/python3.9/cpython/fileobject.h + /usr/include/python3.9/cpython/fileutils.h + /usr/include/python3.9/cpython/import.h + /usr/include/python3.9/cpython/initconfig.h + /usr/include/python3.9/cpython/listobject.h + /usr/include/python3.9/cpython/methodobject.h + /usr/include/python3.9/cpython/object.h + /usr/include/python3.9/cpython/objimpl.h + /usr/include/python3.9/cpython/pyerrors.h + /usr/include/python3.9/cpython/pylifecycle.h + /usr/include/python3.9/cpython/pymem.h + /usr/include/python3.9/cpython/pystate.h + /usr/include/python3.9/cpython/sysmodule.h + /usr/include/python3.9/cpython/traceback.h + /usr/include/python3.9/cpython/tupleobject.h + /usr/include/python3.9/cpython/unicodeobject.h + /usr/include/python3.9/descrobject.h + /usr/include/python3.9/dictobject.h + /usr/include/python3.9/enumobject.h + /usr/include/python3.9/eval.h + /usr/include/python3.9/exports.h + /usr/include/python3.9/fileobject.h + /usr/include/python3.9/fileutils.h + /usr/include/python3.9/floatobject.h + /usr/include/python3.9/funcobject.h + /usr/include/python3.9/genericaliasobject.h + /usr/include/python3.9/genobject.h + /usr/include/python3.9/import.h + /usr/include/python3.9/intrcheck.h + /usr/include/python3.9/iterobject.h + /usr/include/python3.9/listobject.h + /usr/include/python3.9/longintrepr.h + /usr/include/python3.9/longobject.h + /usr/include/python3.9/memoryobject.h + /usr/include/python3.9/methodobject.h + /usr/include/python3.9/modsupport.h + /usr/include/python3.9/moduleobject.h + /usr/include/python3.9/namespaceobject.h + /usr/include/python3.9/object.h + /usr/include/python3.9/objimpl.h + /usr/include/python3.9/odictobject.h + /usr/include/python3.9/osmodule.h + /usr/include/python3.9/patchlevel.h + /usr/include/python3.9/picklebufobject.h + /usr/include/python3.9/pyarena.h + /usr/include/python3.9/pycapsule.h + /usr/include/python3.9/pyconfig.h + /usr/include/python3.9/pyctype.h + /usr/include/python3.9/pydebug.h + /usr/include/python3.9/pyerrors.h + /usr/include/python3.9/pyfpe.h + /usr/include/python3.9/pyframe.h + /usr/include/python3.9/pyhash.h + /usr/include/python3.9/pylifecycle.h + /usr/include/python3.9/pymacconfig.h + /usr/include/python3.9/pymacro.h + /usr/include/python3.9/pymath.h + /usr/include/python3.9/pymem.h + /usr/include/python3.9/pyport.h + /usr/include/python3.9/pystate.h + /usr/include/python3.9/pystrcmp.h + /usr/include/python3.9/pystrtod.h + /usr/include/python3.9/pythonrun.h + /usr/include/python3.9/pythread.h + /usr/include/python3.9/pytime.h + /usr/include/python3.9/rangeobject.h + /usr/include/python3.9/setobject.h + /usr/include/python3.9/sliceobject.h + /usr/include/python3.9/structseq.h + /usr/include/python3.9/sysmodule.h + /usr/include/python3.9/traceback.h + /usr/include/python3.9/tracemalloc.h + /usr/include/python3.9/tupleobject.h + /usr/include/python3.9/typeslots.h + /usr/include/python3.9/unicodeobject.h + /usr/include/python3.9/warnings.h + /usr/include/python3.9/weakrefobject.h diff --git a/build/CMakeFiles/gbp-bot.dir/depend.make b/build/CMakeFiles/gbp-bot.dir/depend.make index 913e5cb..437d91f 100644 --- a/build/CMakeFiles/gbp-bot.dir/depend.make +++ b/build/CMakeFiles/gbp-bot.dir/depend.make @@ -48,6 +48,104 @@ CMakeFiles/gbp-bot.dir/src/main.cpp.o: ../libs/DPP/include/dpp/voicestate.h CMakeFiles/gbp-bot.dir/src/main.cpp.o: ../libs/DPP/include/dpp/webhook.h CMakeFiles/gbp-bot.dir/src/main.cpp.o: ../libs/DPP/include/dpp/win32_safe_warnings.h CMakeFiles/gbp-bot.dir/src/main.cpp.o: ../libs/DPP/include/dpp/wsclient.h -CMakeFiles/gbp-bot.dir/src/main.cpp.o: ../src/gbp.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: ../src/commands.cpp +CMakeFiles/gbp-bot.dir/src/main.cpp.o: ../src/gbp.cpp CMakeFiles/gbp-bot.dir/src/main.cpp.o: ../src/main.cpp +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/Python.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/abstract.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/bltinmodule.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/boolobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/bytearrayobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/bytesobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cellobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/ceval.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/classobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/code.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/codecs.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/compile.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/complexobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/context.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/abstract.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/bytearrayobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/bytesobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/ceval.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/code.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/dictobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/fileobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/fileutils.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/import.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/initconfig.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/listobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/methodobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/object.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/objimpl.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/pyerrors.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/pylifecycle.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/pymem.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/pystate.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/sysmodule.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/traceback.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/tupleobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/cpython/unicodeobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/descrobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/dictobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/enumobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/eval.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/exports.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/fileobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/fileutils.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/floatobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/funcobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/genericaliasobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/genobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/import.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/intrcheck.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/iterobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/listobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/longintrepr.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/longobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/memoryobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/methodobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/modsupport.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/moduleobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/namespaceobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/object.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/objimpl.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/odictobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/osmodule.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/patchlevel.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/picklebufobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pyarena.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pycapsule.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pyconfig.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pyctype.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pydebug.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pyerrors.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pyfpe.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pyframe.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pyhash.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pylifecycle.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pymacconfig.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pymacro.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pymath.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pymem.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pyport.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pystate.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pystrcmp.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pystrtod.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pythonrun.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pythread.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/pytime.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/rangeobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/setobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/sliceobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/structseq.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/sysmodule.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/traceback.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/tracemalloc.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/tupleobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/typeslots.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/unicodeobject.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/warnings.h +CMakeFiles/gbp-bot.dir/src/main.cpp.o: /usr/include/python3.9/weakrefobject.h diff --git a/build/CMakeFiles/gbp-bot.dir/flags.make b/build/CMakeFiles/gbp-bot.dir/flags.make index 057fbab..1959a99 100644 --- a/build/CMakeFiles/gbp-bot.dir/flags.make +++ b/build/CMakeFiles/gbp-bot.dir/flags.make @@ -4,7 +4,7 @@ # compile CXX with /usr/bin/c++ CXX_DEFINES = -CXX_INCLUDES = -I/home/seth/documents/programming/discord-bots/gbp/libs/DPP/include +CXX_INCLUDES = -I/home/seth/documents/programming/discord-bots/gbp/libs/DPP/include -isystem /usr/include/python3.9 CXX_FLAGS = -std=gnu++17 diff --git a/build/CMakeFiles/gbp-bot.dir/link.txt b/build/CMakeFiles/gbp-bot.dir/link.txt index c029800..d144960 100644 --- a/build/CMakeFiles/gbp-bot.dir/link.txt +++ b/build/CMakeFiles/gbp-bot.dir/link.txt @@ -1 +1 @@ -/usr/bin/c++ CMakeFiles/gbp-bot.dir/src/main.cpp.o -o gbp-bot -Wl,-rpath,/home/seth/documents/programming/discord-bots/gbp/build/libs/DPP libs/DPP/libdpp.so.1.0 /usr/lib/x86_64-linux-gnu/libcrypto.so /usr/lib/x86_64-linux-gnu/libssl.so /usr/lib/x86_64-linux-gnu/libz.so /usr/lib/x86_64-linux-gnu/libsodium.so /usr/lib/x86_64-linux-gnu/libopus.so -lm +/usr/bin/c++ CMakeFiles/gbp-bot.dir/src/main.cpp.o -o gbp-bot -Wl,-rpath,/home/seth/documents/programming/discord-bots/gbp/build/libs/DPP libs/DPP/libdpp.so.1.0 /usr/lib/x86_64-linux-gnu/libpython3.9.so /usr/lib/x86_64-linux-gnu/libcrypto.so /usr/lib/x86_64-linux-gnu/libssl.so /usr/lib/x86_64-linux-gnu/libz.so /usr/lib/x86_64-linux-gnu/libsodium.so /usr/lib/x86_64-linux-gnu/libopus.so -lm diff --git a/build/CMakeFiles/gbp-bot.dir/src/main.cpp.o b/build/CMakeFiles/gbp-bot.dir/src/main.cpp.o index 108c63e..8e228e2 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/.gbp.h.swp b/src/.gbp.h.swp new file mode 100644 index 0000000..0f9b012 Binary files /dev/null and b/src/.gbp.h.swp differ diff --git a/src/commands.cpp b/src/commands.cpp index 2bdd37c..730ed12 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -1,2 +1,18 @@ -#include "gbp.h" +#include "gbp.cpp" +std::string printFullGBPList(bool update = false) +{ + std::map gbp; + if (update) + gbp = fetchAndReadGBP(); + else + gbp = readGBPIntoList(); + + std::string msg; + int i = 1; + for (std::map::iterator it = gbp.end(); it != gbp.begin(); it--) { + msg += "#[i] [it->second], GBP: [it->first]\n"; + i++; + } + return msg; +} diff --git a/src/gbp.h b/src/gbp.h deleted file mode 100644 index ddb0930..0000000 --- a/src/gbp.h +++ /dev/null @@ -1,5 +0,0 @@ -#include - -void fetchLatestGBP(); -std::mapreadGBPIntoList(); -std::mapfetchAndReadGBP(); diff --git a/src/main.cpp b/src/main.cpp index 86f7400..383b7c8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,7 +7,7 @@ #include #include #include -#include "gbp.h" +#include "commands.cpp" using json = nlohmann::json; @@ -41,9 +41,16 @@ void onMessage(dpp::cluster &bot, dpp::message msg) if (!hasCommand(msg)) return; + readGBPIntoList(); + int argIdx = msg.content.find(" "); std::string argument = msg.content.substr(argIdx, msg.content.length() - argIdx); - dpp::message toSend = dpp::message(msg.channel_id, argument); + + std::string msgContent = "guh"; + if (argument == "gbp") + msgContent = printFullGBPList(); + + dpp::message toSend = dpp::message(msg.channel_id, msgContent); bot.message_create(toSend); }