From 61bfd1db008295b33350e7c6b9a1b98a7964f9c6 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Tue, 21 Apr 2015 02:48:28 +0200 Subject: Revert "Decode incoming JIDs local part according to xep 0106" This reverts commit ad0465b32051e224f6a234f3ed36494905e59cbf. Conflicts: louloulibs --- src/irc/iid.cpp | 2 -- src/test.cpp | 8 -------- 2 files changed, 10 deletions(-) (limited to 'src') diff --git a/src/irc/iid.cpp b/src/irc/iid.cpp index 5d8dc0a..9d39129 100644 --- a/src/irc/iid.cpp +++ b/src/irc/iid.cpp @@ -1,6 +1,5 @@ #include #include -#include #include @@ -69,7 +68,6 @@ Iid::Iid(): void Iid::set_local(const std::string& loc) { this->local = utils::tolower(loc); - xep0106::decode(local); } void Iid::set_server(const std::string& serv) diff --git a/src/test.cpp b/src/test.cpp index a46bfd1..553140f 100644 --- a/src/test.cpp +++ b/src/test.cpp @@ -396,15 +396,7 @@ int main() assert(iid6.get_server() == "fixed.example.com"); assert(iid6.is_channel); assert(!iid6.is_user); - - Config::set("fixed_irc_server", "", false); } - std::cout << color << "Testing JID (xep 0106) decoding…" << reset << std::endl; - assert(Iid{"space\\20cadet!"}.get_local() == "space cadet"); - assert(Iid{"call\\20me\\20\\22ishmael\\22!"}.get_local() == "call me \"ishmael\""); - assert(Iid{"\\2f.fanboy!"}.get_local() == "/.fanboy"); - assert(Iid{"Q\\40CServe.quakenet.org!"}.get_local() == "q@cserve.quakenet.org"); - return 0; } -- cgit v1.2.3