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

Group simultaneous JOINs into a single command, to avoid flooding

Browse Source 
We still split the JOINs with a key and the ones without
This commit is contained in:
louiz’
2017-04-21 22:47:25 +02:00
parent 3666f35e0e
commit f588ce071e
2 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/irc/irc_client.cpp
+29 -1
View File
@@ -846,8 +846,36 @@ void IrcClient::on_welcome_message(const IrcMessage& message)
// Install a repeated events to regularly send a PING
TimedEventsManager::instance().add_event(TimedEvent(240s, std::bind(&IrcClient::send_ping_command, this),
"PING"s + this->hostname + this->bridge.get_jid()));
std::string channels{};
std::string channels_with_key{};
std::string keys{};
for (const auto& tuple: this->channels_to_join)
this->send_join_command(std::get<0>(tuple), std::get<1>(tuple));
{
const auto& chan = std::get<0>(tuple);
const auto& key = std::get<1>(tuple);
if (chan.empty())
continue;
if (!key.empty())
{
if (!keys.empty())
keys += ",";
keys += key;
if (!channels_with_key.empty())
channels_with_key += ",";
channels_with_key += chan;
}
else
{
if (!channels.empty())
channels += ",";
channels += chan;
}
}
if (!channels.empty())
this->send_join_command(channels, {});
if (!channels_with_key.empty())
this->send_join_command(channels_with_key, keys);
this->channels_to_join.clear();
// Indicate that the dummy channel is joined as well, if needed
if (this->dummy_channel.joining)