Merge remote-tracking branch 'upstream/dev' into coroutine2

README.md

@@ -104,6 +104,10 @@ If you prefer to build the library from source, detailed instructions are availa
 
 For frequently asked questions and their answers, please visit our [FAQ page](https://dpp.dev/md_docpages_01_frequently_asked_questions.html).
 
+### Nightly Builds
+
+If you prefer to use Nightly Builds (This is only if you know what you are doing!) then you can use either our [master nightly builds](https://nightly.link/brainboxdotcc/DPP/workflows/ci/master) or our [dev nightly builds](https://nightly.link/brainboxdotcc/DPP/workflows/ci/dev).
+
 ## 🤝 Contributing
 
 Contributions, issues and feature requests are welcome. After cloning and setting up project locally, you can just submit 

buildtools/emojis.php

@@ -1,5 +1,7 @@
 <?php
 
+ini_set("default_charset", "UTF-8");
+
 echo "-- Autogenrating include/dpp/unicode_emoji.h\n";
 
 $url = "https://raw.githubusercontent.com/ArkinSolomon/discord-emoji-converter/master/emojis.json";
@@ -29,7 +31,13 @@
         if (preg_match("/^\d+/", $name)) {
             $name = "_" . $name;
         }
-        $header .= "	constexpr const char[] " .$name . " = \"$code\";\n";
+	$name = str_replace("-", "minus", $name);
+	$name = str_replace("+", "plus", $name);
+	$name = str_replace("ñ", "n", $name);
+	if ($name == "new") {
+		$name = "_new";
+	}
+        $header .= "	inline constexpr const char " .$name . "[] = \"$code\";\n";
     }
     $header .= "}\n};\n";
     file_put_contents("include/dpp/unicode_emoji.h", $header);

cmake/DetectArchitecture.cmake

@@ -39,7 +39,7 @@ endif()
 
 set(CMAKE_REQUIRED_FLAGS_SAVE "${CMAKE_REQUIRED_FLAGS}")
 
-set(AVX_NAME "T_Fallback")
+set(AVX_NAME "T_fallback")
 if ((${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i386") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64"))
 
 foreach(INSTRUCTION_SET IN LISTS INSTRUCTION_SETS)
@@ -56,5 +56,5 @@ endforeach()
 	message(STATUS "Detected ${CMAKE_SYSTEM_PROCESSOR} SSE type: ${AVX_DISPLAY}")
 	set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS_SAVE}")
 else()
-	message(STATUS "SSE not supported by architecture ${CMAKE_SYSTEM_PROCESSOR}")
+	message(STATUS "SSE not supported by architecture ${CMAKE_SYSTEM_PROCESSOR} ${AVX_NAME}")
 endif()

library/CMakeLists.txt

@@ -25,12 +25,13 @@ add_compile_definitions(DPP_OS=${CMAKE_SYSTEM_NAME})
 if(${AVX_TYPE} STREQUAL "OFF")
 	include("${CMAKE_CURRENT_SOURCE_DIR}/../cmake/DetectArchitecture.cmake")
 	add_compile_options("${AVX_FLAG}")
+	add_compile_definitions("${AVX_NAME}")
+	message("--- AVX type: ${AVX_NAME}")
 else()
 	message("-- AVX type overridden by configuration: ${AVX_TYPE}")
+	add_compile_definitions("${AVX_TYPE}")
 endif()
 
-add_compile_definitions("${AVX_TYPE}")
-
 if(WIN32 AND NOT MINGW)
 	if (NOT WINDOWS_32_BIT)
 		message("-- Building for windows with precompiled packaged dependencies")

src/dpp/discordevents.cpp

@@ -354,6 +354,7 @@ const std::map<std::string, dpp::events::event*> eventmap = {
 	{ "APPLICATION_COMMAND_PERMISSIONS_UPDATE", nullptr },
 	{ "EMBEDDED_ACTIVITY_UPDATE", nullptr },
 	{ "GUILD_APPLICATION_COMMAND_INDEX_UPDATE", nullptr },
+	{ "CHANNEL_TOPIC_UPDATE", nullptr },
 	{ "GUILD_SCHEDULED_EVENT_CREATE", new dpp::events::guild_scheduled_event_create() },
 	{ "GUILD_SCHEDULED_EVENT_UPDATE", new dpp::events::guild_scheduled_event_update() },
 	{ "GUILD_SCHEDULED_EVENT_DELETE", new dpp::events::guild_scheduled_event_delete() },

src/unittest/test.cpp

@@ -21,16 +21,10 @@
  ************************************************************************************/
 #include "test.h"
 #include <dpp/dpp.h>
+#include <dpp/unicode_emoji.h>
 #include <dpp/restrequest.h>
 #include <dpp/json.h>
 
-namespace {
-	/**
-	 * @brief Thread emoji - https://www.compart.com/en/unicode/U+1F9F5
-	 */
-	inline const std::string THREAD_EMOJI = "\xF0\x9F\xA7\xB5";
-} // namespace
-
 /* Unit tests go here */
 int main(int argc, char *argv[])
 {
@@ -1114,15 +1108,15 @@ Markdown lol \\|\\|spoiler\\|\\| \\~\\~strikethrough\\~\\~ \\`small \\*code\\* b
 							return;
 						}
 						events_to_test_mask |= MESSAGE_REACT;
-						bot.message_add_reaction(message_id, thread_id, THREAD_EMOJI, [this, message_id](const dpp::confirmation_callback_t &callback) {
+						bot.message_add_reaction(message_id, thread_id, dpp::unicode_emoji::thread, [this, message_id](const dpp::confirmation_callback_t &callback) {
 							std::lock_guard lock{mutex};
 							if (callback.is_error()) {
 								events_abort();
 								set_messages_tested();
 								return;
 							}
 							events_to_test_mask |= MESSAGE_REMOVE_REACT;
-							bot.message_delete_reaction(message_id, thread_id, bot.me.id, THREAD_EMOJI, [this, message_id](const dpp::confirmation_callback_t &callback) {
+							bot.message_delete_reaction(message_id, thread_id, bot.me.id, dpp::unicode_emoji::thread, [this, message_id](const dpp::confirmation_callback_t &callback) {
 								std::lock_guard lock{mutex};
 								if (callback.is_error()) {
 									events_abort();
@@ -1224,7 +1218,7 @@ Markdown lol \\|\\|spoiler\\|\\| \\~\\~strikethrough\\~\\~ \\`small \\*code\\* b
 				if (event.reacting_emoji.name == "😄") {
 					set_test(REACTEVENT, true);
 				}
-				if (event.channel_id == thread_helper.thread_id && event.reacting_emoji.name == THREAD_EMOJI) {
+				if (event.channel_id == thread_helper.thread_id && event.reacting_emoji.name == dpp::unicode_emoji::thread) {
 					set_test(THREAD_MESSAGE_REACT_ADD_EVENT, true);
 					thread_helper.notify_event_tested(thread_test_helper::MESSAGE_REACT);
 				}
@@ -1233,7 +1227,7 @@ Markdown lol \\|\\|spoiler\\|\\| \\~\\~strikethrough\\~\\~ \\`small \\*code\\* b
 
 		bot.on_message_reaction_remove([&](const dpp::message_reaction_remove_t & event) {
 			if (event.reacting_user_id == bot.me.id) {
-				if (event.channel_id == thread_helper.thread_id && event.reacting_emoji.name == THREAD_EMOJI) {
+				if (event.channel_id == thread_helper.thread_id && event.reacting_emoji.name == dpp::unicode_emoji::thread) {
 					set_test(THREAD_MESSAGE_REACT_REMOVE_EVENT, true);
 					thread_helper.notify_event_tested(thread_test_helper::MESSAGE_REMOVE_REACT);
 				}