Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-20 14:43:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix newline rejection and whitespace trimming for chat messages (#15290)

Browse Source 
Co-authored-by: sfan5 <sfan5@live.de>
This commit is contained in:
chmodsayshello 2024-10-28 19:39:59 +01:00 committed by GitHub
parent c81cc4fa60
commit 409e75b94d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server.cpp
View File

@ -3049,6 +3049,8 @@ std::wstring Server::handleChat(const std::string &name,
if (g_settings->getBool("strip_color_codes"))
wmessage = unescape_enriched(wmessage);
wmessage = trim(wmessage);
if (player) {
switch (player->canSendChatMessage()) {
case RPLAYER_CHATRESULT_FLOODING: {
@ -3075,13 +3077,12 @@ std::wstring Server::handleChat(const std::string &name,
L"It was refused. Send a shorter message";
}
auto message = trim(wide_to_utf8(wmessage));
auto message = wide_to_utf8(wmessage);
if (message.empty())
return L"";
if (message.find_first_of("\n\r") != std::wstring::npos) {
if (message.find_first_of("\r\n") != std::string::npos)
return L"Newlines are not permitted in chat messages";
}
// Run script hook, exit if script ate the chat message
if (m_script->on_chat_message(name, message))
@ -3103,8 +3104,7 @@ std::wstring Server::handleChat(const std::string &name,
#ifdef __ANDROID__
line += L"<" + utf8_to_wide(name) + L"> " + wmessage;
#else
line += utf8_to_wide(m_script->formatChatMessage(name,
wide_to_utf8(wmessage)));
line += utf8_to_wide(m_script->formatChatMessage(name, message));
#endif
}