comparison irccdctl/cli.cpp @ 785:7145a3df4cb7

misc: rename host to hostname, closes #941 @2h
author David Demelier <markand@malikania.fr>
date Wed, 07 Nov 2018 12:55:00 +0100
parents 8c44bbcbbab9
children 3c090c1ff4f0
comparison
equal deleted inserted replaced
783:d0bd19183743 785:7145a3df4cb7
163 { 163 {
164 std::cout << "event: onWhois\n"; 164 std::cout << "event: onWhois\n";
165 std::cout << "server: " << json_util::pretty(v.value("server", "(unknown)")) << "\n"; 165 std::cout << "server: " << json_util::pretty(v.value("server", "(unknown)")) << "\n";
166 std::cout << "nickname: " << json_util::pretty(v.value("nickname", "(unknown)")) << "\n"; 166 std::cout << "nickname: " << json_util::pretty(v.value("nickname", "(unknown)")) << "\n";
167 std::cout << "username: " << json_util::pretty(v.value("username", "(unknown)")) << "\n"; 167 std::cout << "username: " << json_util::pretty(v.value("username", "(unknown)")) << "\n";
168 std::cout << "host: " << json_util::pretty(v.value("host", "(unknown)")) << "\n"; 168 std::cout << "hostname: " << json_util::pretty(v.value("hostname", "(unknown)")) << "\n";
169 std::cout << "realname: " << json_util::pretty(v.value("realname", "(unknown)")) << "\n"; 169 std::cout << "realname: " << json_util::pretty(v.value("realname", "(unknown)")) << "\n";
170 } 170 }
171 171
172 const std::unordered_map<std::string_view, std::function<void (const nlohmann::json&)>> events{ 172 const std::unordered_map<std::string_view, std::function<void (const nlohmann::json&)>> events{
173 { "onConnect", onConnect }, 173 { "onConnect", onConnect },
773 throw std::invalid_argument("server-connect requires at least 2 arguments"); 773 throw std::invalid_argument("server-connect requires at least 2 arguments");
774 774
775 auto object = nlohmann::json::object({ 775 auto object = nlohmann::json::object({
776 { "command", "server-connect" }, 776 { "command", "server-connect" },
777 { "name", copy[0] }, 777 { "name", copy[0] },
778 { "host", copy[1] } 778 { "hostname", copy[1] }
779 }); 779 });
780 780
781 if (copy.size() == 3) { 781 if (copy.size() == 3) {
782 const auto port = string_util::to_int(copy[2]); 782 const auto port = string_util::to_int(copy[2]);
783 783
842 }); 842 });
843 843
844 request(ctl, std::move(json), [] (auto result) { 844 request(ctl, std::move(json), [] (auto result) {
845 std::cout << std::boolalpha; 845 std::cout << std::boolalpha;
846 std::cout << "Name : " << json_util::pretty(result["name"]) << std::endl; 846 std::cout << "Name : " << json_util::pretty(result["name"]) << std::endl;
847 std::cout << "Host : " << json_util::pretty(result["host"]) << std::endl; 847 std::cout << "Hostname : " << json_util::pretty(result["hostname"]) << std::endl;
848 std::cout << "Port : " << json_util::pretty(result["port"]) << std::endl; 848 std::cout << "Port : " << json_util::pretty(result["port"]) << std::endl;
849 std::cout << "Ipv6 : " << json_util::pretty(result["ipv6"]) << std::endl; 849 std::cout << "Ipv6 : " << json_util::pretty(result["ipv6"]) << std::endl;
850 std::cout << "SSL : " << json_util::pretty(result["ssl"]) << std::endl; 850 std::cout << "SSL : " << json_util::pretty(result["ssl"]) << std::endl;
851 std::cout << "SSL verified : " << json_util::pretty(result["sslVerify"]) << std::endl; 851 std::cout << "SSL verified : " << json_util::pretty(result["sslVerify"]) << std::endl;
852 std::cout << "Channels : "; 852 std::cout << "Channels : ";