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

In fixed mode, fix the iid type of the component JID

Browse Source
This commit is contained in:
louiz’
2017-07-20 21:28:18 +02:00
parent ffb402f0ad
commit 24f2511d7b
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/irc/iid.cpp
+2 -1
View File
@@ -35,7 +35,8 @@ Iid::Iid(const std::string& iid, const Bridge *bridge)
void Iid::set_type(const std::set<char>& chantypes) void Iid::set_type(const std::set<char>& chantypes)
{ {
if (this->local.empty() && this->server.empty()) if (this->local.empty() && (
!Config::get("fixed_irc_server", "").empty() || this->server.empty()))
this->type = Iid::Type::None; this->type = Iid::Type::None;
if (this->local.empty()) if (this->local.empty())
return; return;
tests/iid.cpp
+6
View File
@@ -125,4 +125,10 @@ TEST_CASE("Iid creation in fixed_server mode")
CHECK(iid6.get_local() == "##channel%"); CHECK(iid6.get_local() == "##channel%");
CHECK(iid6.get_server() == "fixed.example.com"); CHECK(iid6.get_server() == "fixed.example.com");
CHECK(iid6.type == Iid::Type::Channel); CHECK(iid6.type == Iid::Type::Channel);
Iid iid7("", chantypes);
CHECK(std::to_string(iid7) == "");
CHECK(iid7.get_local() == "");
CHECK(iid7.get_server() == "fixed.example.com");
CHECK(iid7.type == Iid::Type::None);
} }