Merge branch 'develop'

Author: yourWaifu

.gitignore

@@ -262,8 +262,11 @@ ModelManifest.xml
 *.db
 *.opendb
 
+# Visual Studio CMake files
+out/
+CMakeSettings.json
+
 #my files
-/deps/
-/thirdparty/
+deps/
 /discord token.txt
-include/sleepy_discord/version\.h
+include/sleepy_discord/version.h

.travis.yml

@@ -9,12 +9,14 @@ addons:
     packages:
     - gcc-5
     - g++-5
+    - cmake
+    - libcurl4-openssl-dev
 
 install:
   - export CXX="g++-5" CC="gcc-5";
 
 script:
 - g++-5 --version
 - cd buildtools
-- cmake .. -DBUILD_SLEEPY_DISCORD_EXAMPLES=1
+- cmake .. -DSLEEPY_DISCORD_BUILD_EXAMPLES=1
 - make

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
 project(sleepy-discord)
 
 option(BUILD_EXAMPLES                "Build examples of Sleepy Discord and all dependencies"              OFF)
-option(BUILD_SLEEPY_DISCORD_EXAMPLES "Build examples of Sleepy Discord"                                   OFF)
+option(SLEEPY_DISCORD_BUILD_EXAMPLES "Build examples of Sleepy Discord"                                   OFF)
 option(ONLY_SLEEPY_DISCORD           "Sleepy Discord but none of the dependencies, except build in onces" OFF)
 option(ENABLE_VOICE                  "Enable voice support"                                               OFF)
 if (NOT ONLY_SLEEPY_DISCORD)
@@ -15,9 +15,12 @@ if (NOT ONLY_SLEEPY_DISCORD)
 	option(USE_LIBSODIUM                 "Use libsodium cryptography library"                                 OFF)
 endif()
 
+#Define a variable to use to check if this file has been executed
+set(SLEEPY_DISCORD_CMAKE ON)
+
 #set variables based on other variables
 if(BUILD_EXAMPLES)
-	set(BUILD_SLEEPY_DISCORD_EXAMPLES ON)
+	set(SLEEPY_DISCORD_BUILD_EXAMPLES ON)
 endif()
 
 if(ENABLE_VOICE)
@@ -29,50 +32,31 @@ if(USE_WEBSOCKETPP OR USE_UWEBSOCKETS)
 	set(USE_ASIO ON)
 endif()
 
+find_package(Git)
+
 # Find and Download libraries
 if(AUTO_DOWNLOAD_LIBRARY)
+
+	if(NOT Git_FOUND)
+		string(CONCAT GIT_NOT_FOUND_WARNING
+			"GIT was not found, CMake list will likely fail. "
+			"Please make sure that GIT is inside your PATH variable")
+		message(WARNING ${GIT_NOT_FOUND_WARNING})
+	endif()
+
+	#to do find librarys before downloading them
+
 	include(ExternalProject)
 	include(buildtools/cmake/DownloadProject.cmake)
 	if(USE_CPR)
 		#to do install libssl-dev
-
-		#the cmake test has issues on visual studio so disable them
-		if(NOT DEFINED BUILD_CPR_TESTS)
-			set(BUILD_CPR_TESTS OFF CACHE BOOL "")
-		endif()
-
-		set(BUILD_CURL_EXE OFF CACHE BOOL "")
-		set(CURL_STATICLIB ON CACHE BOOL "")
-		set(CURL_ZLIB OFF CACHE BOOL "")
-
-		#set what ssl library to use for curl based on OS
-		#this fixes
-		if(NOT DEFINED CMAKE_USE_OPENSSL)
-			if(WIN32)
-				set(CMAKE_USE_WINSSL ON CACHE BOOL "")
-				set(CMAKE_USE_OPENSSL OFF CACHE BOOL "")
-			elseif(APPLE)
-				set(CMAKE_USE_DARWINSSL ON CACHE BOOL "")
-				set(CMAKE_USE_OPENSSL OFF CACHE BOOL "")
-			endif()
-			#to do, set one for linux
-		endif()
-		if(NOT DEFINED USE_SYSTEM_CURL AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-			#using cmake to configure curl on linux has issues
-			#so use system curl
-			set(USE_SYSTEM_CURL ON CACHE BOOL "")
-			set(USE_SYSTEM_CURL ON CACHE INTERNAL BOOL "")
-		endif()
-
 		download_project(
 			PROJ           cpr
 			GIT_REPOSITORY https://github.com/whoshuu/cpr.git
-			GIT_TAG        master
+			GIT_TAG        b748095
 			SOURCE_DIR     ${PROJECT_SOURCE_DIR}/deps/cpr
 			UPDATE_DISCONNECTED 1
 		)
-
-		add_subdirectory(deps/cpr)
 	endif()
 
 	if(USE_ASIO)
@@ -95,10 +79,6 @@ if(AUTO_DOWNLOAD_LIBRARY)
 			SOURCE_DIR     ${PROJECT_SOURCE_DIR}/deps/websocketpp
 			UPDATE_DISCONNECTED 1
 		)
-
-		set(THREADS_PREFER_PTHREAD_FLAG ON)
-		find_package(Threads REQUIRED)
-		add_subdirectory(deps/websocketpp)
 	endif()
 
 	if(USE_UWEBSOCKETS)
@@ -117,23 +97,21 @@ if(AUTO_DOWNLOAD_LIBRARY)
 		#needs libtool
 		download_project(
 			PROJ           opus
-			GIT_REPOSITORY https://git.xiph.org/opus.git
-			GIT_TAG        master
+			GIT_REPOSITORY https://gitlab.xiph.org/xiph/opus.git
+			GIT_TAG        7628d844
 			SOURCE_DIR     ${PROJECT_SOURCE_DIR}/deps/opus
 			UPDATE_DISCONNECTED 1
 		)
-		add_subdirectory(deps/opus)
 	endif()
 
-	if(USE_LIBSODIUM)
+	if(USE_LIBSODIUM AND NOT WIN32)
 		download_project(
 			PROJ           libsodium
 			GIT_REPOSITORY https://github.com/jedisct1/libsodium.git
 			GIT_TAG        stable
 			SOURCE_DIR     ${PROJECT_SOURCE_DIR}/deps/libsodium
 			UPDATE_DISCONNECTED 1
 		)
-		#I would like use libsodium_BINARY_DIR as the BINARY_DIR but for some reason, that doesn't work
 		ExternalProject_Add(libsodium-make
 			SOURCE_DIR          "${libsodium_SOURCE_DIR}"
 			BINARY_DIR          "${libsodium_BINARY_DIR}"
@@ -144,10 +122,119 @@ if(AUTO_DOWNLOAD_LIBRARY)
 			TEST_COMMAND        ""
 		)
 	endif()
+else()
+	if(USE_CPR)
+		set(cpr_SOURCE_DIR ${PROJECT_SOURCE_DIR}/deps/cpr)
+	endif()
+	if(USE_ASIO)
+		set(asio_SOURCE_DIR ${PROJECT_SOURCE_DIR}/deps/asio)
+	endif()
+	if(USE_WEBSOCKETPP)
+		set(websocketpp_SOURCE_DIR ${PROJECT_SOURCE_DIR}/deps/websocketpp)
+	endif()
+	if(USE_UWEBSOCKETS)
+		set(uwebsockets_SOURCE_DIR ${PROJECT_SOURCE_DIR}/deps/uwebsockets)
+	endif()
+	if(USE_LIBOPUS)
+		set(opus_SOURCE_DIR ${PROJECT_SOURCE_DIR}/deps/opus)
+	endif()
+	if(USE_LIBSODIUM AND NOT WIN32)
+		set(libsodium_SOURCE_DIR ${PROJECT_SOURCE_DIR}/deps/libsodium)
+	endif()
+endif()
+
+# Configure libraries
+if(USE_CPR)
+	#the cmake test has issues on visual studio so disable them
+	if(NOT DEFINED BUILD_CPR_TESTS)
+		set(BUILD_CPR_TESTS OFF CACHE BOOL "")
+	endif()
+
+	set(BUILD_CURL_EXE OFF CACHE BOOL "")
+	set(CURL_STATICLIB ON CACHE BOOL "")
+	set(CURL_ZLIB OFF CACHE BOOL "")
+
+	#set what ssl library to use for curl based on OS
+	#this fixes
+	if(NOT DEFINED CMAKE_USE_OPENSSL)
+		if(WIN32)
+			set(CMAKE_USE_WINSSL ON CACHE BOOL "")
+			set(CMAKE_USE_OPENSSL OFF CACHE BOOL "")
+		elseif(APPLE)
+			set(CMAKE_USE_DARWINSSL ON CACHE BOOL "")
+			set(CMAKE_USE_OPENSSL OFF CACHE BOOL "")
+		elseif(UNIX)
+			set(CMAKE_USE_OPENSSL OFF CACHE BOOL "")
+		endif()
+	endif()
+	if(NOT DEFINED USE_SYSTEM_CURL AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+		#using cmake to configure curl on linux has issues
+		#so use system curl
+		set(USE_SYSTEM_CURL ON CACHE BOOL "")
+	endif()
+
+	add_subdirectory(deps/cpr)
+endif()
+
+if(USE_WEBSOCKETPP)
+	set(THREADS_PREFER_PTHREAD_FLAG ON)
+	find_package(Threads REQUIRED)
+	add_subdirectory(deps/websocketpp)
+endif()
+
+if(USE_LIBOPUS)
+	add_subdirectory(deps/opus)
+endif()
+
+# Get Version Info
+if(Git_FOUND)
+	execute_process(
+		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
+		COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD
+		OUTPUT_VARIABLE SLEEPY_DISCORD_VERSION_BUILD
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+	execute_process(
+		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
+		COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+		OUTPUT_VARIABLE SLEEPY_DISCORD_VERSION_BRANCH
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+	execute_process(
+		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
+		COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+		OUTPUT_VARIABLE SLEEPY_DISCORD_VERSION_HASH
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+	if (SLEEPY_DISCORD_VERSION_BRANCH STREQUAL "master")
+		set(SLEEPY_DISCORD_VERSION_IS_MASTER "1")
+	else()
+		set(SLEEPY_DISCORD_VERSION_IS_MASTER "0")
+	endif()
+	execute_process(
+		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
+		COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
+		OUTPUT_VARIABLE SLEEPY_DISCORD_VERSION_DESCRIPTION
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+	if(
+		NOT SLEEPY_DISCORD_VERSION_DESCRIPTION STREQUAL ""
+	)
+		set(SLEEPY_DISCORD_VERSION_DESCRIPTION_CONCAT " ")
+	else()
+		set(SLEEPY_DISCORD_VERSION_DESCRIPTION_CONCAT "")
+	endif()
+	configure_file(
+		"${PROJECT_SOURCE_DIR}/include/sleepy_discord/version.h.in"
+		"${PROJECT_SOURCE_DIR}/include/sleepy_discord/version.h"
+	)
 endif()
 
 # Add Subdirectories
 add_subdirectory(sleepy_discord)
-if (BUILD_SLEEPY_DISCORD_EXAMPLES)
+if (SLEEPY_DISCORD_BUILD_EXAMPLES)
 	add_subdirectory(examples/hello)
+	if (ENABLE_VOICE)
+		add_subdirectory(examples/sound-player)
+	endif()
 endif()

README.md

@@ -22,7 +22,7 @@ Just for the novelty of using a C++ library for Discord. I would also love for t
 
 # Example
 ```cpp
-#include "sleepy_discord/websocketpp_websocket.h"
+#include "sleepy_discord/sleepy_discord.h"
 
 class MyClientClass : public SleepyDiscord::DiscordClient {
 public:
@@ -34,7 +34,7 @@ public:
 };
 
 int main() {
-	MyClientClass client("token", 2);
+	myClientClass client("token", SleepyDiscord::USER_CONTROLED_THREADS);
 	client.run();
 }
 ```

azure-pipelines.yml

@@ -12,7 +12,7 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
-#Do both 32 bit and 64 bit
+#To Do: Do both 32 bit and 64 bit
 
 - script: |
     git clone https://github.com/Microsoft/vcpkg.git

buildtools/Makefile.3ds

@@ -27,7 +27,7 @@ TARGET		:=	sleepy_discord
 SOURCES		:=	../sleepy_discord
 
 DATA		:=	data
-INCLUDES	:=	../sleepy_discord/IncludeNonexistent
+INCLUDES	:=	../sleepy_discord ../sleepy_discord/IncludeNonexistent
 
 #---------------------------------------------------------------------------------
 # options for code generation

examples/hello/CMakeLists.txt

@@ -1,3 +1,10 @@
+cmake_minimum_required (VERSION 3.6)
+project(hello-example)
+
+if(NOT SLEEPY_DISCORD_CMAKE)
+	add_subdirectory(../../ ${CMAKE_CURRENT_BINARY_DIR}/sleepy-discord)
+endif()
+
 add_executable(hello-example
 	example0.cpp
 )

examples/hello/example0.cpp

@@ -1,6 +1,4 @@
-/*If you are using uWebSockets,
-  remember to change this to uwebsockets_websocket.h*/
-#include "sleepy_discord/websocketpp_websocket.h"
+#include "sleepy_discord/sleepy_discord.h"
 
 class MyClientClass : public SleepyDiscord::DiscordClient {
 public:
@@ -12,6 +10,6 @@ class MyClientClass : public SleepyDiscord::DiscordClient {
 };
 
 int main() {
-	MyClientClass client("token", 2);
+	MyClientClass client("token", SleepyDiscord::USER_CONTROLED_THREADS);
 	client.run();
 }

examples/rock-paper-scissors/CMakeLists.txt

@@ -0,0 +1,7 @@
+cmake_minimum_required (VERSION 3.6)
+project(rock-paper-scissors)
+
+add_executable(rock-paper-scissors main.cpp)
+
+add_subdirectory(../../ ${CMAKE_CURRENT_BINARY_DIR}/sleepy-discord)
+target_link_libraries(rock-paper-scissors sleepy-discord)

examples/rock-paper-scissors/main.cpp

@@ -1,4 +1,7 @@
-#include "sleepy_discord/websocketpp_websocket.h"
+#include "sleepy_discord/sleepy_discord.h"
+#include <list>
+#include <iostream>
+#include <memory>
 
 class GameClient : public SleepyDiscord::DiscordClient {
 private:
@@ -126,6 +129,9 @@ class GameClient : public SleepyDiscord::DiscordClient {
 
 int main() {
 	srand(static_cast<unsigned int>(time(0)));	//create seed to make random numbers
-	GameClient client("Your Token Goes Here", 2);
+	GameClient client("Your Token Goes Here", SleepyDiscord::USER_CONTROLED_THREADS);
+	client.setIntents({
+		SleepyDiscord::Intent::SERVER_MESSAGES,
+		SleepyDiscord::Intent::DIRECT_MESSAGES });
 	client.run();
 }