diff options
author | Florent Le Coz <louiz@louiz.org> | 2015-04-21 02:48:28 +0200 |
---|---|---|
committer | Florent Le Coz <louiz@louiz.org> | 2015-04-21 02:48:28 +0200 |
commit | 61bfd1db008295b33350e7c6b9a1b98a7964f9c6 (patch) | |
tree | e8c860a24c33f2b9d4acc593ff5072494d348b9e /src | |
parent | 6a28bde1dd21809b3c1202aab0b695b11f4d4846 (diff) | |
download | biboumi-61bfd1db008295b33350e7c6b9a1b98a7964f9c6.tar.gz biboumi-61bfd1db008295b33350e7c6b9a1b98a7964f9c6.tar.bz2 biboumi-61bfd1db008295b33350e7c6b9a1b98a7964f9c6.tar.xz biboumi-61bfd1db008295b33350e7c6b9a1b98a7964f9c6.zip |
Revert "Decode incoming JIDs local part according to xep 0106"
This reverts commit ad0465b32051e224f6a234f3ed36494905e59cbf.
Conflicts:
louloulibs
Diffstat (limited to 'src')
-rw-r--r-- | src/irc/iid.cpp | 2 | ||||
-rw-r--r-- | src/test.cpp | 8 |
2 files changed, 0 insertions, 10 deletions
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 <utils/tolower.hpp> #include <config/config.hpp> -#include <utils/encoding.hpp> #include <irc/iid.hpp> @@ -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; } |