refactor chat and add configurable chat messages

Data/Sys/Slippi/InjectionLists/list_netplay-old2.json

@@ -0,0 +1,11 @@
+{
+ "Details": [
+  {
+   "InjectionAddress": "800056AC",
+   "Name": "Required: Slippi Online",
+   "Codetype": "Auto",
+   "Annotation": "Online/Static/ChatMessages.asm",
+   "Tags": ""
+  }
+ ]
+}

Data/Sys/Slippi/InjectionLists/list_netplay.json

@@ -1232,13 +1232,6 @@
    "Annotation": "Online/Static/CSSUpdateCSP.asm",
    "Tags": ""
   },
-  {
-   "InjectionAddress": "800056AC",
-   "Name": "Required: Slippi Online",
-   "Codetype": "Auto",
-   "Annotation": "Online/Static/ChatMessages.asm",
-   "Tags": ""
-  },
   {
    "InjectionAddress": "80005690",
    "Name": "Required: Slippi Online",

Source/Core/Common/StringUtil.cpp

@@ -544,11 +544,25 @@ std::string UTF32toUTF8(const std::u32string &input)
 }
 #else
 template <typename T>
-std::string CodeTo(const char *tocode, const char *fromcode, const std::basic_string<T>& input)
+#ifdef __APPLE__
+std::string CodeToWithFallbacks(const char *tocode, const char *fromcode, const std::basic_string<T> &input,
+                                iconv_fallbacks *fallbacks)
+#else
+std::string CodeTo(const char *tocode, const char *fromcode, const std::basic_string<T> &input)
+#endif
 {
 	std::string result;
 
 	iconv_t const conv_desc = iconv_open(tocode, fromcode);
+
+	// Only on OS X can we call iconvctl, it isn't found on Linux
+#ifdef __APPLE__
+	if (fallbacks)
+	{
+		iconvctl(conv_desc, ICONV_SET_FALLBACKS, fallbacks);
+	}
+#endif
+
 	if ((iconv_t)-1 == conv_desc)
 	{
 		ERROR_LOG(COMMON, "Iconv initialization failure [%s]: %s", fromcode, strerror(errno));
@@ -599,6 +613,13 @@ std::string CodeTo(const char *tocode, const char *fromcode, const std::basic_st
 	return result;
 }
 
+#ifdef __APPLE__
+template <typename T> std::string CodeTo(const char *tocode, const char *fromcode, const std::basic_string<T> &input)
+{
+	return CodeToWithFallbacks(tocode, fromcode, input, nullptr);
+}
+#endif
+
 template <typename T>
 std::string CodeToUTF8(const char* fromcode, const std::basic_string<T>& input)
 {
@@ -618,9 +639,48 @@ std::string SHIFTJISToUTF8(const std::string& input)
 	return CodeToUTF8("SJIS", input);
 }
 
-std::string UTF8ToSHIFTJIS(const std::string& input)
+#ifdef __APPLE__
+void uc_to_mb_fb(unsigned int code, void (*write_replacement)(const char *buf, size_t buflen, void *callback_arg),
+                 void *callback_arg, void *data)
+{
+	static std::unordered_map<unsigned int, const char*> specialCharConvert = {
+		{'!', (const char*)"\x81\x49"}, {'"', (const char*)"\x81\x68"}, {'#', (const char*)"\x81\x94"},  {'$', (const char*)"\x81\x90"},
+		{'%', (const char*)"\x81\x93"}, {'&', (const char*)"\x81\x95"}, {'\'', (const char*)"\x81\x66"}, {'(', (const char*)"\x81\x69"},
+		{')', (const char*)"\x81\x6a"}, {'*', (const char*)"\x81\x96"}, {'+', (const char*)"\x81\x7b"},  {',', (const char*)"\x81\x43"},
+		{'-', (const char*)"\x81\x7c"}, {'.', (const char*)"\x81\x44"}, {'/', (const char*)"\x81\x5e"},  {':', (const char*)"\x81\x46"},
+		{';', (const char*)"\x81\x47"}, {'<', (const char*)"\x81\x83"}, {'=', (const char*)"\x81\x81"},  {'>', (const char*)"\x81\x84"},
+		{'?', (const char*)"\x81\x48"}, {'@', (const char*)"\x81\x97"}, {'[', (const char*)"\x81\x6d"},  {'\\', (const char*)"\x81\x5f"},
+		{']', (const char*)"\x81\x6e"}, {'^', (const char*)"\x81\x4f"}, {'_', (const char*)"\x81\x51"},  {'`', (const char*)"\x81\x4d"},
+		{'{', (const char*)"\x81\x6f"}, {'|', (const char*)"\x81\x62"}, {'}', (const char*)"\x81\x70"},  {'~', (const char*)"\x81\x60"},
+		{U'¥', "\x81\x8f"}, {U'•', "\x81\x45"}, {U'—', "\x81\x7C"}
+	};
+
+	bool hasConversion = specialCharConvert.count(code);
+	if (!hasConversion)
+		return;
+
+	auto newChar = specialCharConvert[code];
+	// Add new chars to pos to replace
+	write_replacement(newChar, 2, callback_arg);
+}
+#endif
+
+std::string UTF8ToSHIFTJIS(const std::string &input)
 {
-	return CodeTo("SJIS", "UTF-8", input);
+#ifdef __APPLE__
+	// Set SHIFTJIS callbacks only if converting to shift jis
+	auto fallbacks = new iconv_fallbacks();
+	fallbacks->uc_to_mb_fallback = uc_to_mb_fb;
+	fallbacks->mb_to_uc_fallback = nullptr;
+	fallbacks->mb_to_wc_fallback = nullptr;
+	fallbacks->wc_to_mb_fallback = nullptr;
+	fallbacks->data = nullptr;
+	auto str = CodeToWithFallbacks("SJIS", "UTF-8", input, fallbacks);
+	free(fallbacks);
+#else
+	auto str = CodeTo("SJIS", "UTF-8", input);
+#endif
+	return str;
 }
 
 std::string UTF16ToUTF8(const std::wstring& input)
@@ -671,4 +731,4 @@ std::string ValueToString(int value)
 std::string ValueToString(bool value)
 {
   return value ? "True" : "False";
-}
+}

Source/Core/Common/StringUtil.h

@@ -134,6 +134,15 @@ std::string SHIFTJISToUTF8(const std::string& str);
 std::string UTF8ToSHIFTJIS(const std::string& str);
 std::string UTF16ToUTF8(const std::wstring &str);
 
+
+#ifdef __APPLE__
+/**
+ * Callback Implementation used for iconv when a unicode character could not be automatically converted.
+ * This callback is used specifically for SHIFTJIS failures when converting some special wide characters for melee.
+ */
+void uc_to_mb_fb(unsigned int code,void (*write_replacement)(const char *buf, size_t buflen, void* callback_arg), void* callback_arg, void* data);
+#endif
+
 #ifdef _WIN32
 
 std::wstring UTF8ToUTF16(const std::string& str);

Source/Core/Common/Version.cpp

@@ -24,7 +24,7 @@
 //" " BUILD_TYPE_STR " " SCM_DESC_STR;
 //#endif
 #ifndef IS_PLAYBACK
-#define SLIPPI_REV_STR "3.0.4" // netplay version
+#define SLIPPI_REV_STR "3.0.5-dev.1" // netplay version
 #else
 #define SLIPPI_REV_STR "3.0.1" // playback version
 #endif

Source/Core/Core/HW/EXI_DeviceSlippi.cpp

@@ -2070,7 +2070,7 @@ void CEXISlippi::prepareOnlineMatchState()
 	chatMessagePlayerIdx = 0;
 	localChatMessageId = 0;
 	// in CSS p1 is always current player and p2 is opponent
-	localPlayerName = p1Name = "Player 1";
+	localPlayerName = p1Name = userInfo.displayName;
 	oppName = p2Name = "Player 2";
 #endif
 
@@ -3020,6 +3020,42 @@ void CEXISlippi::handleCompleteSet(const SlippiExiTypes::ReportSetCompletionQuer
 	}
 }
 
+void CEXISlippi::handleGetPlayerSettings()
+{
+	m_read_queue.clear();
+
+	SlippiExiTypes::GetPlayerSettingsResponse resp = {};
+
+	std::vector<std::vector<std::string>> messagesByPlayer = {
+	    SlippiUser::defaultChatMessages, SlippiUser::defaultChatMessages, SlippiUser::defaultChatMessages,
+	    SlippiUser::defaultChatMessages};
+
+	// These chat messages will be used when previewing messages
+	auto userChatMessages = user->GetUserInfo().chatMessages;
+	if (userChatMessages.size() == 16) {
+		messagesByPlayer[0] = userChatMessages;
+	}
+
+	// These chat messages will be set when we have an opponent. We load their and our messages
+	auto playerInfo = matchmaking->GetPlayerInfo();
+	for (auto &player : playerInfo)
+	{
+		messagesByPlayer[player.port - 1] = player.chatMessages;
+	}
+
+	for (int i = 0; i < 4; i++)
+	{
+		for (int j = 0; j < 16; j++) 
+		{
+			auto str = ConvertStringForGame(messagesByPlayer[i][j], MAX_MESSAGE_LENGTH);
+			sprintf(resp.settings[i].chatMessages[j], "%s", str.c_str());
+		}
+	}
+
+	auto data_ptr = (u8 *)&resp;
+	m_read_queue.insert(m_read_queue.end(), data_ptr, data_ptr + sizeof(SlippiExiTypes::GetPlayerSettingsResponse));
+}
+
 void CEXISlippi::DMAWrite(u32 _uAddr, u32 _uSize)
 {
 	u8 *memPtr = Memory::GetPointer(_uAddr);
@@ -3187,6 +3223,9 @@ void CEXISlippi::DMAWrite(u32 _uAddr, u32 _uSize)
 		case CMD_REPORT_SET_COMPLETE:
 			handleCompleteSet(SlippiExiTypes::Convert<SlippiExiTypes::ReportSetCompletionQuery>(&memPtr[bufLoc]));
 			break;
+		case CMD_GET_PLAYER_SETTINGS:
+			handleGetPlayerSettings();
+			break;
 		default:
 			writeToFileAsync(&memPtr[bufLoc], payloadLen + 1, "");
 			m_slippiserver->write(&memPtr[bufLoc], payloadLen + 1);

Source/Core/Core/HW/EXI_DeviceSlippi.h

@@ -22,6 +22,7 @@
 
 #define ROLLBACK_MAX_FRAMES 7
 #define MAX_NAME_LENGTH 15
+#define MAX_MESSAGE_LENGTH 25
 #define CONNECT_CODE_LENGTH 8
 
 extern bool g_needInputForFrame;
@@ -79,6 +80,7 @@ class CEXISlippi : public IEXIDevice
 		CMD_GP_COMPLETE_STEP = 0xC0,
 		CMD_GP_FETCH_STEP = 0xC1,
 		CMD_REPORT_SET_COMPLETE = 0xC2,
+		CMD_GET_PLAYER_SETTINGS = 0xC3,
 
 		// Misc
 		CMD_LOG_MESSAGE = 0xD0,
@@ -134,6 +136,7 @@ class CEXISlippi : public IEXIDevice
 	    {CMD_GP_COMPLETE_STEP, static_cast<u32>(sizeof(SlippiExiTypes::GpCompleteStepQuery) - 1)},
 	    {CMD_GP_FETCH_STEP, static_cast<u32>(sizeof(SlippiExiTypes::GpFetchStepQuery) - 1)},
 	    {CMD_REPORT_SET_COMPLETE, static_cast<u32>(sizeof(SlippiExiTypes::ReportSetCompletionQuery) - 1)},
+	    {CMD_GET_PLAYER_SETTINGS, 0},
 
 	    // Misc
 	    {CMD_LOG_MESSAGE, 0xFFFF}, // Variable size... will only work if by itself
@@ -205,6 +208,7 @@ class CEXISlippi : public IEXIDevice
 	void handleGamePrepStepComplete(const SlippiExiTypes::GpCompleteStepQuery &query);
 	void prepareGamePrepOppStep(const SlippiExiTypes::GpFetchStepQuery &query);
 	void handleCompleteSet(const SlippiExiTypes::ReportSetCompletionQuery &query);
+	void handleGetPlayerSettings();
 
 	// replay playback stuff
 	void prepareGameInfo(u8 *payload);

Source/Core/Core/Slippi/SlippiExiTypes.h

@@ -79,6 +79,15 @@ struct OverwriteSelectionsQuery
 	OverwriteCharSelections chars[4];
 };
 
+struct PlayerSettings
+{
+	char chatMessages[16][51];
+};
+struct GetPlayerSettingsResponse
+{
+	PlayerSettings settings[4];
+};
+
 // Not sure if resetting is strictly needed, might be contained to the file
 #pragma pack()
 

Source/Core/Core/Slippi/SlippiMatchmaking.cpp

@@ -479,6 +479,16 @@ void SlippiMatchmaking::handleMatchmaking()
 			playerInfo.displayName = el.value("displayName", "");
 			playerInfo.connectCode = el.value("connectCode", "");
 			playerInfo.port = el.value("port", 0);
+			playerInfo.chatMessages = SlippiUser::defaultChatMessages;
+			if (el["chatMessages"].is_array())
+			{
+				playerInfo.chatMessages = el.value("chatMessages", SlippiUser::defaultChatMessages);
+				if (playerInfo.chatMessages.size() != 16)
+				{
+					playerInfo.chatMessages = SlippiUser::defaultChatMessages;
+				}
+			}
+
 			m_playerInfo.push_back(playerInfo);
 
 			if (isLocal)

Source/Core/Core/Slippi/SlippiUser.cpp

@@ -30,6 +30,28 @@
 #include <json.hpp>
 using json = nlohmann::json;
 
+const std::vector<std::string> SlippiUser::defaultChatMessages = {
+    "ggs",
+    "one more",
+    "brb",
+    "good luck",
+
+    "well played",
+    "that was fun",
+    "thanks",
+    "too good",
+
+    "sorry",
+    "my b",
+    "lol",
+    "wow",
+
+    "gotta go",
+    "one sec",
+    "let's play again later",
+    "bad connection",
+};
+
 #ifdef _WIN32
 #define MAX_SYSTEM_PROGRAM (4096)
 static void system_hidden(const char *cmd)
@@ -275,6 +297,16 @@ SlippiUser::UserInfo SlippiUser::parseFile(std::string fileContents)
 	info.connectCode = readString(res, "connectCode");
 	info.latestVersion = readString(res, "latestVersion");
 
+	info.chatMessages = SlippiUser::defaultChatMessages;
+	if (res["chatMessages"].is_array())
+	{
+		info.chatMessages = res.value("chatMessages", SlippiUser::defaultChatMessages);
+		if (info.chatMessages.size() != 16)
+		{
+			info.chatMessages = SlippiUser::defaultChatMessages;
+		}
+	}
+
 	return info;
 }
 
@@ -300,7 +332,7 @@ void SlippiUser::overwriteFromServer()
 
 	// Perform curl request
 	std::string resp;
-	curl_easy_setopt(m_curl, CURLOPT_URL, (url + "/" + userInfo.uid).c_str());
+	curl_easy_setopt(m_curl, CURLOPT_URL, (url + "/" + userInfo.uid + "?additionalFields=chatMessages").c_str());
 	curl_easy_setopt(m_curl, CURLOPT_WRITEDATA, &resp);
 	CURLcode res = curl_easy_perform(m_curl);
 
@@ -323,4 +355,13 @@ void SlippiUser::overwriteFromServer()
 	userInfo.connectCode = r.value("connectCode", userInfo.connectCode);
 	userInfo.latestVersion = r.value("latestVersion", userInfo.latestVersion);
 	userInfo.displayName = r.value("displayName", userInfo.displayName);
+
+	if (r["chatMessages"].is_array())
+	{
+		userInfo.chatMessages = r.value("chatMessages", SlippiUser::defaultChatMessages);
+		if (userInfo.chatMessages.size() != 16)
+		{
+			userInfo.chatMessages = SlippiUser::defaultChatMessages;
+		}
+	}
 }

Source/Core/Core/Slippi/SlippiUser.h

@@ -21,6 +21,8 @@ class SlippiUser
 		std::string fileContents = "";
 
 		int port;
+
+		std::vector<std::string> chatMessages;
 	};
 
 	SlippiUser();
@@ -36,6 +38,8 @@ class SlippiUser
 	bool IsLoggedIn();
 	void FileListenThread();
 
+	const static std::vector<std::string> defaultChatMessages;
+
   protected:
 	UserInfo parseFile(std::string fileContents);
 	void deleteFile();