fix: fix malformed emoji symbol names -1, +1 and new, use unico…

…de_emoji namespace in unit tests instead of hard coded emoji content
brainboxdotcc · Aug 30, 2023 · ca61b11 · ca61b11
1 parent f70a138
commit ca61b11
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/buildtools/emojis.php b/buildtools/emojis.php
@@ -29,6 +29,11 @@
         if (preg_match("/^\d+/", $name)) {
             $name = "_" . $name;
         }
+	$name = str_replace("-", "minus", $name);
+	$name = str_replace("+", "plus", $name);
+	if ($name == "new") {
+		$name = "_new";
+	}
         $header .= "	constexpr const char " .$name . "[] = \"$code\";\n";
     }
     $header .= "}\n};\n";

diff --git a/include/dpp/unicode_emoji.h b/include/dpp/unicode_emoji.h
@@ -1749,25 +1749,25 @@ namespace unicode_emoji {
 	constexpr const char handshake_dark_skin_tone_medium_dark_skin_tone[] = "🫱🏿‍🫲🏾";
 	constexpr const char handshake_dark_skin_tone[] = "🤝🏿";
 	constexpr const char thumbsup[] = "👍";
-	constexpr const char +1[] = "👍";
+	constexpr const char plus1[] = "👍";
 	constexpr const char thumbup[] = "👍";
 	constexpr const char thumbsup_tone1[] = "👍🏻";
-	constexpr const char +1_tone1[] = "👍🏻";
+	constexpr const char plus1_tone1[] = "👍🏻";
 	constexpr const char thumbup_tone1[] = "👍🏻";
 	constexpr const char thumbsup_tone2[] = "👍🏼";
-	constexpr const char +1_tone2[] = "👍🏼";
+	constexpr const char plus1_tone2[] = "👍🏼";
 	constexpr const char thumbup_tone2[] = "👍🏼";
 	constexpr const char thumbsup_tone3[] = "👍🏽";
-	constexpr const char +1_tone3[] = "👍🏽";
+	constexpr const char plus1_tone3[] = "👍🏽";
 	constexpr const char thumbup_tone3[] = "👍🏽";
 	constexpr const char thumbsup_tone4[] = "👍🏾";
-	constexpr const char +1_tone4[] = "👍🏾";
+	constexpr const char plus1_tone4[] = "👍🏾";
 	constexpr const char thumbup_tone4[] = "👍🏾";
 	constexpr const char thumbsup_tone5[] = "👍🏿";
-	constexpr const char +1_tone5[] = "👍🏿";
+	constexpr const char plus1_tone5[] = "👍🏿";
 	constexpr const char thumbup_tone5[] = "👍🏿";
 	constexpr const char thumbsdown[] = "👎";
-	constexpr const char -1[] = "👎";
+	constexpr const char minus1[] = "👎";
 	constexpr const char thumbdown[] = "👎";
 	constexpr const char thumbsdown_tone1[] = "👎🏻";
 	constexpr const char _1_tone1[] = "👎🏻";
@@ -5145,7 +5145,7 @@ namespace unicode_emoji {
 	constexpr const char ok[] = "🆗";
 	constexpr const char up[] = "🆙";
 	constexpr const char cool[] = "🆒";
-	constexpr const char new[] = "🆕";
+	constexpr const char _new[] = "🆕";
 	constexpr const char free[] = "🆓";
 	constexpr const char zero[] = "0️⃣";
 	constexpr const char one[] = "1️⃣";

diff --git a/src/unittest/test.cpp b/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);
 				}