From 87145f5790f5f135517ab30cadbc6a56e0a531b8 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 7 Nov 2024 22:28:40 +0000 Subject: Backport support for the IRCv3 websocket subprotocols. --- src/modules/m_websocket.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/modules/m_websocket.cpp') diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp index a88af2df5..81c22382b 100644 --- a/src/modules/m_websocket.cpp +++ b/src/modules/m_websocket.cpp @@ -450,8 +450,11 @@ class WebSocketHook : public IOHookMiddle { proto.erase(std::remove_if(proto.begin(), proto.end(), ::isspace), proto.end()); - bool is_binary = stdalgo::string::equalsci(proto, "binary.inspircd.org"); - bool is_text = stdalgo::string::equalsci(proto, "text.inspircd.org"); + bool is_binary = (sock->type == StreamSocket::SS_USER && stdalgo::string::equalsci(proto, "binary.ircv3.net")) + || stdalgo::string::equalsci(proto, "binary.inspircd.org"); + + bool is_text = (sock->type == StreamSocket::SS_USER && stdalgo::string::equalsci(proto, "text.ircv3.net")) + || stdalgo::string::equalsci(proto, "text.inspircd.org"); if (is_binary || is_text) { -- cgit v1.3.1-10-gc9f91