mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In CAP messages, handle the last arg as a list of capabilities

Browse Source 
Instead of just one. This fixes the issue of the "trailing whitespace" since we
now split it on ' '

Fix #3442
This commit is contained in:
louiz’
2020-08-16 16:05:15 +02:00
parent df2fe0bc4b
commit b98434b5d0
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/irc/irc_client.cpp
+14 -11
View File
@@ -1340,19 +1340,22 @@ long int IrcClient::get_throttle_limit() const
void IrcClient::on_cap(const IrcMessage &message)
{
const auto& sub_command = message.arguments[1];
const auto& cap = message.arguments[2];
auto it = this->capabilities.find(cap);
if (it == this->capabilities.end())
const auto& caps = utils::split(message.arguments[2], ' ', false);
for (const auto& cap: caps)
{
log_warning("Received a CAP message for something we didn’t ask, or that we already handled.");
return;
auto it = this->capabilities.find(cap);
if (it == this->capabilities.end())
{
log_warning("Received a CAP message for something we didn’t ask, or that we already handled: [", cap, "]");
return;
}
Capability& capability = it->second;
if (sub_command == "ACK")
capability.on_ack();
else if (sub_command == "NACK")
capability.on_nack();
this->capabilities.erase(it);
}
Capability& capability = it->second;
if (sub_command == "ACK")
capability.on_ack();
else if (sub_command == "NACK")
capability.on_nack();
this->capabilities.erase(it);
if (this->capabilities.empty())
this->cap_end();
}