Skip to content

Escape chat messages at the server #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ann0see merged 1 commit into from
Feb 10, 2021
Merged

Escape chat messages at the server #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ MESSAGES (with connection)
| 2 bytes number n | n bytes UTF-8 string |
+------------------+----------------------+

- "UTF-8 string": the chat message (plain text from client to server;
HTML from server to client)


- PROTMESSID_NETW_TRANSPORT_PROPS: Properties for network transport

Expand Down
2 changes: 1 addition & 1 deletion src/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,7 @@ void CServer::CreateAndSendChatTextForAllConChannels ( const int iCurChanID
"<font color=""" + sCurColor + """>(" +
QTime::currentTime().toString ( "hh:mm:ss AP" ) + ") <b>" +
ChanName.toHtmlEscaped() +
"</b></font> " + strChatText;
"</b></font> " + strChatText.toHtmlEscaped();
Copy link
Copy Markdown
Member

@ann0see ann0see Feb 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume it works as intended. Should I test it again?

Copy link
Copy Markdown
Member

@softins softins Feb 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the change is trivial enough just to approve. I tested it:
image



// Send chat text to all connected clients ---------------------------------
Expand Down