Do not handle the "%" char in a special way, in the fixed_server mode
Also fix some doc
This commit is contained in:
+1
-4
@@ -35,7 +35,7 @@ void Iid::init_with_fixed_server(const std::string& iid, const std::string& host
|
||||
{
|
||||
this->set_server(hostname);
|
||||
|
||||
const std::string::size_type sep = iid.find_first_of("%!");
|
||||
const std::string::size_type sep = iid.find("!");
|
||||
|
||||
// Without any separator, we consider that it's a channel
|
||||
if (sep == std::string::npos)
|
||||
@@ -47,9 +47,6 @@ void Iid::init_with_fixed_server(const std::string& iid, const std::string& host
|
||||
// but the part behind it (the hostname) is ignored
|
||||
{
|
||||
this->set_local(iid.substr(0, sep));
|
||||
if (iid[sep] == '%')
|
||||
this->is_channel = true;
|
||||
else
|
||||
this->is_user = true;
|
||||
}
|
||||
}
|
||||
|
||||
+5
-5
@@ -369,13 +369,13 @@ int main()
|
||||
|
||||
Iid iid2("#test%irc.example.org");
|
||||
std::cout << std::to_string(iid2) << std::endl;
|
||||
assert(std::to_string(iid2) == "#test");
|
||||
assert(iid2.get_local() == "#test");
|
||||
assert(std::to_string(iid2) == "#test%irc.example.org");
|
||||
assert(iid2.get_local() == "#test%irc.example.org");
|
||||
assert(iid2.get_server() == "fixed.example.com");
|
||||
assert(iid2.is_channel);
|
||||
assert(!iid2.is_user);
|
||||
|
||||
// Note that it is impossible to adress the XMPP server directly, or to
|
||||
// Note that it is impossible to adress the IRC server directly, or to
|
||||
// use the virtual channel, in that mode
|
||||
|
||||
// Iid iid3("%irc.example.org");
|
||||
@@ -391,8 +391,8 @@ int main()
|
||||
|
||||
Iid iid6("##channel%");
|
||||
std::cout << std::to_string(iid6) << std::endl;
|
||||
assert(std::to_string(iid6) == "##channel");
|
||||
assert(iid6.get_local() == "##channel");
|
||||
assert(std::to_string(iid6) == "##channel%");
|
||||
assert(iid6.get_local() == "##channel%");
|
||||
assert(iid6.get_server() == "fixed.example.com");
|
||||
assert(iid6.is_channel);
|
||||
assert(!iid6.is_user);
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
// #include <utils/empty_if_fixed_server.hpp>
|
||||
|
||||
// #include <config/config.hpp>
|
||||
|
||||
// namespace utils
|
||||
// {
|
||||
// inline std::string empty_if_fixed_server(std::string&& str)
|
||||
// }
|
||||
Reference in New Issue
Block a user