Fix sending color codes to clients that don't support them. #5950
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sfan5
reviewed
Jun 9, 2017
src/server.cpp
Outdated
| @@ -1644,14 +1644,21 @@ void Server::SendChatMessage(u16 peer_id, const std::wstring &message) | |||
| { | |||
| DSTACK(FUNCTION_NAME); | |||
|
|
|||
| std::wstring proccesed_message; | |||
sfan5
reviewed
Jun 9, 2017
src/server.cpp
Outdated
|
|
||
| if (peer_id != PEER_ID_INEXISTENT) { | ||
| Send(&pkt); | ||
| } | ||
| else { | ||
| m_clients.sendToAll(&pkt); | ||
| for (u16 id: m_clients.getClientIDs()) | ||
| SendChatMessage(message); |
There was a problem hiding this comment.
this looks like it definitely doesn't do the right thing
There was a problem hiding this comment.
yeah you are right, I have no idea how that even compiled.
nerzhul
approved these changes
Jun 9, 2017
nerzhul
requested changes
Jun 9, 2017
src/server.cpp
Outdated
|
|
||
| if (peer_id != PEER_ID_INEXISTENT) { | ||
| Send(&pkt); | ||
| } | ||
| else { | ||
| m_clients.sendToAll(&pkt); | ||
| for (u16 id: m_clients.getClientIDs()) |
There was a problem hiding this comment.
please change function to be properly recursive if needed, here we create a packet and verify the peer_id in broadcast mode, please move packet ceration into unicast mode and the proto version check
Also remove `disable_escape_sequences` since it's not needed anymore.
nerzhul
requested changes
Jun 9, 2017
src/server.cpp
Outdated
| if (m_clients.getProtocolVersion(peer_id) < 27) | ||
| processed_message = unescape_enriched(message); | ||
| else | ||
| processed_message = message; |
There was a problem hiding this comment.
i forget to tell you to remove this temporary variable and write directly to packet in the condition members
nerzhul
approved these changes
Jun 9, 2017
SmallJoker
approved these changes
Jun 9, 2017
red-001
added a commit
to red-001/minetest
that referenced
this pull request
Oct 17, 2017
…#5950) Also remove `disable_escape_sequences` since it's not needed anymore.
sfan5
pushed a commit
that referenced
this pull request
Nov 19, 2017
Also remove `disable_escape_sequences` since it's not needed anymore.
Closed
SmallJoker
pushed a commit
that referenced
this pull request
Jun 3, 2018
Also remove `disable_escape_sequences` since it's not needed anymore.
osjc
pushed a commit
to osjc/minetest
that referenced
this pull request
Jan 11, 2019
…#5950) Also remove `disable_escape_sequences` since it's not needed anymore.
osjc
pushed a commit
to osjc/minetest
that referenced
this pull request
Jan 23, 2019
…#5950) Also remove `disable_escape_sequences` since it's not needed anymore.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.