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

Support multi-prefix

Browse Source 
See http://ircv3.net/specs/extensions/multi-prefix-3.1.html
ref #3103
This commit is contained in:
Florent Le Coz
2016-01-04 13:47:27 +01:00
parent dfcb0a6e0e
commit a38b17692e
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/irc/irc_client.cpp
+3
View File
@@ -151,6 +151,9 @@ void IrcClient::on_connected()
}
}
this->send_message({"CAP", {"REQ", "multi-prefix"}});
this->send_message({"CAP", {"END"}});
#ifdef USE_DATABASE
auto options = Database::get_irc_server_options(this->bridge.get_bare_jid(),
this->get_hostname());
src/irc/irc_user.cpp
+14 -4
View File
@@ -7,8 +7,20 @@ IrcUser::IrcUser(const std::string& name,
{
if (name.empty())
return ;
const std::map<char, char>::const_iterator prefix = prefix_to_mode.find(name[0]);
const std::string::size_type name_begin = prefix == prefix_to_mode.end()? 0: 1;
// One or more prefix (with multi-prefix support) may come before the
// actual nick
std::string::size_type name_begin = 0;
while (name_begin != name.size())
{
const auto prefix = prefix_to_mode.find(name[name_begin]);
// This is not a prefix
if (prefix == prefix_to_mode.end())
break;
this->modes.insert(prefix->second);
name_begin++;
}
const std::string::size_type sep = name.find("!", name_begin);
if (sep == std::string::npos)
this->nick = name.substr(name_begin);
@@ -17,8 +29,6 @@ IrcUser::IrcUser(const std::string& name,
this->nick = name.substr(name_begin, sep-name_begin);
this->host = name.substr(sep+1);
}
if (prefix != prefix_to_mode.end())
this->modes.insert(prefix->second);
}
IrcUser::IrcUser(const std::string& name):