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

Don’t use ! as the separator for nicknames, use % instead

Browse Source 
It’s now easier to use. The distinction between a nick and a channel name is
based on the first character (by default it's '#' and '&'). The user doesn’t
have to worry about which separator to use anymore.

fix #3066
This commit is contained in:
louiz’
2016-08-10 15:48:28 +02:00
parent 183f53d0ef
commit 0d2dd71de5
10 changed files with 210 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/iid.cpp
+28 -36
View File
@@ -47,66 +47,60 @@ namespace Catch
TEST_CASE("Iid creation")
{
Iid iid1("foo!irc.example.org");
CHECK(std::to_string(iid1) == "foo!irc.example.org");
const std::set<char> chantypes {'#', '&'};
Iid iid1("foo%irc.example.org", chantypes);
CHECK(std::to_string(iid1) == "foo%irc.example.org");
CHECK(iid1.get_local() == "foo");
CHECK(iid1.get_server() == "irc.example.org");
CHECK(!iid1.is_channel);
CHECK(iid1.is_user);
CHECK(iid1.type == Iid::Type::User);
Iid iid2("#test%irc.example.org");
Iid iid2("#test%irc.example.org", chantypes);
CHECK(std::to_string(iid2) == "#test%irc.example.org");
CHECK(iid2.get_local() == "#test");
CHECK(iid2.get_server() == "irc.example.org");
CHECK(iid2.is_channel);
CHECK(!iid2.is_user);
CHECK(iid2.type == Iid::Type::Channel);
Iid iid3("%irc.example.org");
Iid iid3("%irc.example.org", chantypes);
CHECK(std::to_string(iid3) == "%irc.example.org");
CHECK(iid3.get_local() == "");
CHECK(iid3.get_local().empty());
CHECK(iid3.get_server() == "irc.example.org");
CHECK(iid3.is_channel);
CHECK(!iid3.is_user);
CHECK(iid3.type == Iid::Type::Channel);
Iid iid4("irc.example.org");
Iid iid4("irc.example.org", chantypes);
CHECK(std::to_string(iid4) == "irc.example.org");
CHECK(iid4.get_local() == "");
CHECK(iid4.get_server() == "irc.example.org");
CHECK(!iid4.is_channel);
CHECK(!iid4.is_user);
CHECK(iid4.type == Iid::Type::Server);
Iid iid5("nick!");
CHECK(std::to_string(iid5) == "nick!");
Iid iid5("nick%", chantypes);
CHECK(std::to_string(iid5) == "nick%");
CHECK(iid5.get_local() == "nick");
CHECK(iid5.get_server() == "");
CHECK(!iid5.is_channel);
CHECK(iid5.is_user);
CHECK(iid5.type == Iid::Type::User);
Iid iid6("##channel%");
Iid iid6("##channel%", chantypes);
CHECK(std::to_string(iid6) == "##channel%");
CHECK(iid6.get_local() == "##channel");
CHECK(iid6.get_server() == "");
CHECK(iid6.is_channel);
CHECK(!iid6.is_user);
CHECK(iid6.type == Iid::Type::Channel);
}
TEST_CASE("Iid creation in fixed_server mode")
{
Config::set("fixed_irc_server", "fixed.example.com", false);
Iid iid1("foo!irc.example.org");
CHECK(std::to_string(iid1) == "foo!");
CHECK(iid1.get_local() == "foo");
const std::set<char> chantypes {'#', '&'};
Iid iid1("foo%irc.example.org", chantypes);
CHECK(std::to_string(iid1) == "foo%irc.example.org");
CHECK(iid1.get_local() == "foo%irc.example.org");
CHECK(iid1.get_server() == "fixed.example.com");
CHECK(!iid1.is_channel);
CHECK(iid1.is_user);
CHECK(iid1.type == Iid::Type::User);
Iid iid2("#test%irc.example.org");
Iid iid2("#test%irc.example.org", chantypes);
CHECK(std::to_string(iid2) == "#test%irc.example.org");
CHECK(iid2.get_local() == "#test%irc.example.org");
CHECK(iid2.get_server() == "fixed.example.com");
CHECK(iid2.is_channel);
CHECK(!iid2.is_user);
CHECK(iid2.type == Iid::Type::Channel);
// Note that it is impossible to adress the IRC server directly, or to
// use the virtual channel, in that mode
@@ -114,17 +108,15 @@ TEST_CASE("Iid creation in fixed_server mode")
// Iid iid3("%irc.example.org");
// Iid iid4("irc.example.org");
Iid iid5("nick!");
CHECK(std::to_string(iid5) == "nick!");
Iid iid5("nick", chantypes);
CHECK(std::to_string(iid5) == "nick");
CHECK(iid5.get_local() == "nick");
CHECK(iid5.get_server() == "fixed.example.com");
CHECK(!iid5.is_channel);
CHECK(iid5.is_user);
CHECK(iid5.type == Iid::Type::User);
Iid iid6("##channel%");
Iid iid6("##channel%", chantypes);
CHECK(std::to_string(iid6) == "##channel%");
CHECK(iid6.get_local() == "##channel%");
CHECK(iid6.get_server() == "fixed.example.com");
CHECK(iid6.is_channel);
CHECK(!iid6.is_user);
CHECK(iid6.type == Iid::Type::Channel);
}