--- a/libirccd/irccd/cmd-server-info.cpp	Sat Oct 15 23:01:26 2016 +0200
+++ b/libirccd/irccd/cmd-server-info.cpp	Tue Oct 18 18:30:45 2016 +0200
@@ -22,35 +22,22 @@
 #include "irccd.hpp"
 #include "server.hpp"
 #include "service-server.hpp"
+#include "transport.hpp"
+#include "util.hpp"
 
 namespace irccd {
 
 namespace command {
 
 ServerInfoCommand::ServerInfoCommand()
-    : Command("server-info", "Server", "Get server information")
+    : Command("server-info")
 {
 }
 
-std::vector<Command::Arg> ServerInfoCommand::args() const
-{
-    return {{ "server", true }};
-}
-
-std::vector<Command::Property> ServerInfoCommand::properties() const
+void ServerInfoCommand::exec(Irccd &irccd, TransportClient &client, const nlohmann::json &args)
 {
-    return {{ "server", { nlohmann::json::value_t::string }}};
-}
-
-nlohmann::json ServerInfoCommand::request(Irccdctl &, const CommandRequest &args) const
-{
-    return {{ "server", args.args()[0] }};
-}
-
-nlohmann::json ServerInfoCommand::exec(Irccd &irccd, const nlohmann::json &request) const
-{
-    auto response = Command::exec(irccd, request);
-    auto server = irccd.servers().require(request["server"]);
+    auto response = nlohmann::json::object();
+    auto server = irccd.servers().require(util::json::requireIdentifier(args, "server"));
 
     // General stuff.
     response.push_back({"name", server->name()});
@@ -69,44 +56,7 @@
     if (server->flags() & Server::SslVerify)
         response.push_back({"sslVerify", true});
 
-    return response;
-}
-
-void ServerInfoCommand::result(Irccdctl &irccdctl, const nlohmann::json &response) const
-{
-    Command::result(irccdctl, response);
-
-    auto get = [&] (auto key) -> std::string {
-        auto v = response.find(key);
-
-        if (v == response.end() || !v->is_primitive())
-            return "";
-
-        return v->dump();
-    };
-
-    // Server information.
-    std::cout << std::boolalpha;
-    std::cout << "Name           : " << get("name") << std::endl;
-    std::cout << "Host           : " << get("host") << std::endl;
-    std::cout << "Port           : " << get("port") << std::endl;
-    std::cout << "Ipv6           : " << get("ipv6") << std::endl;
-    std::cout << "SSL            : " << get("ssl") << std::endl;
-    std::cout << "SSL verified   : " << get("sslVerify") << std::endl;
-
-    // Channels.
-    std::cout << "Channels       : ";
-
-    if (response.count("channels") != 0)
-        for (const auto &v : response["channels"])
-            std::cout << v.dump() << " ";
-
-    std::cout << std::endl;
-
-    // Identity.
-    std::cout << "Nickname       : " << get("nickname") << std::endl;
-    std::cout << "User name      : " << get("username") << std::endl;
-    std::cout << "Real name      : " << get("realname") << std::endl;
+    client.success("server-info", response);
 }
 
 } // !command

--- a/libirccd/irccd/cmd-server-info.hpp	Sat Oct 15 23:01:26 2016 +0200
+++ b/libirccd/irccd/cmd-server-info.hpp	Tue Oct 18 18:30:45 2016 +0200
@@ -25,6 +25,7 @@
  */
 
 #include "command.hpp"
+#include "sysconfig.hpp"
 
 namespace irccd {
 
@@ -33,37 +34,17 @@
 /**
  * \brief Implementation of server-info transport command.
  */
-class ServerInfoCommand : public Command {
+class IRCCD_EXPORT ServerInfoCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerInfoCommand();
-
-    /**
-     * \copydoc Command::args
-     */
-    IRCCD_EXPORT std::vector<Arg> args() const override;
-
-    /**
-     * \copydoc Command::properties
-     */
-    IRCCD_EXPORT std::vector<Property> properties() const override;
-
-    /**
-     * \copydoc Command::request
-     */
-    IRCCD_EXPORT nlohmann::json request(Irccdctl &irccdctl, const CommandRequest &args) const override;
+    ServerInfoCommand();
 
     /**
      * \copydoc Command::exec
      */
-    IRCCD_EXPORT nlohmann::json exec(Irccd &irccd, const nlohmann::json &request) const override;
-
-    /**
-     * \copydoc Command::result
-     */
-    IRCCD_EXPORT void result(Irccdctl &irccdctl, const nlohmann::json &response) const override;
+    void exec(Irccd &irccd, TransportClient &client, const nlohmann::json &args) override;
 };
 
 } // !command

--- a/tests/CMakeLists.txt	Sat Oct 15 23:01:26 2016 +0200
+++ b/tests/CMakeLists.txt	Tue Oct 18 18:30:45 2016 +0200
@@ -23,6 +23,7 @@
     add_subdirectory(cmd-server-cmode)
     add_subdirectory(cmd-server-cnotice)
     add_subdirectory(cmd-server-disconnect)
+    add_subdirectory(cmd-server-info)
     add_subdirectory(cmd-server-me)
     add_subdirectory(cmd-server-message)
     add_subdirectory(cmd-server-mode)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/cmd-server-info/CMakeLists.txt	Tue Oct 18 18:30:45 2016 +0200
@@ -0,0 +1,23 @@
+#
+# CMakeLists.txt -- CMake build system for irccd
+#
+# Copyright (c) 2013-2016 David Demelier <markand@malikania.fr>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+irccd_define_test(
+    NAME cmd-server-info
+    SOURCES main.cpp
+    LIBRARIES libirccd libirccdctl
+)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/cmd-server-info/main.cpp	Tue Oct 18 18:30:45 2016 +0200
@@ -0,0 +1,109 @@
+/*
+ * main.cpp -- test server-cmode remote command
+ *
+ * Copyright (c) 2013-2016 David Demelier <markand@malikania.fr>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <cmd-server-info.hpp>
+#include <command-tester.hpp>
+#include <server-tester.hpp>
+#include <service-server.hpp>
+
+using namespace irccd;
+using namespace irccd::command;
+
+namespace {
+
+nlohmann::json message;
+
+} // !namespace
+
+class ServerInfoCommandTest : public CommandTester {
+public:
+    ServerInfoCommandTest()
+        : CommandTester(std::make_unique<ServerInfoCommand>())
+    {
+        message = nullptr;
+
+        m_irccdctl.client().onMessage.connect([&] (auto message) {
+            ::message = message;
+        });
+    }
+};
+
+TEST_F(ServerInfoCommandTest, basic)
+{
+    try {
+        auto server = std::make_unique<ServerTester>();
+
+        server->setHost("example.org");
+        server->setPort(8765);
+        server->setPassword("none");
+        server->setNickname("pascal");
+        server->setUsername("psc");
+        server->setRealname("Pascal le grand frere");
+        server->setCtcpVersion("yeah");
+        server->setCommandCharacter("@");
+        server->setReconnectTries(80);
+        server->setPingTimeout(20000);
+
+        m_irccd.servers().add(std::move(server));
+        m_irccdctl.client().request({
+            { "command",    "server-info"       },
+            { "server",     "test"              },
+        });
+
+        poll([&] () {
+            return message.is_object();
+        });
+
+        ASSERT_TRUE(message.is_object());
+        ASSERT_EQ("example.org", message["host"]);
+        ASSERT_EQ("test", message["name"]);
+        ASSERT_EQ("pascal", message["nickname"]);
+        ASSERT_EQ(8765, message["port"]);
+        ASSERT_EQ("Pascal le grand frere", message["realname"]);
+        ASSERT_EQ("psc", message["username"]);
+    } catch (const std::exception &ex) {
+        FAIL() << ex.what();
+    }
+}
+
+TEST_F(ServerInfoCommandTest, notfound)
+{
+    try {
+        m_irccdctl.client().request({
+            { "command",    "server-info"       },
+            { "server",     "test"              },
+        });
+
+        poll([&] () {
+            return message.is_object();
+        });
+
+        ASSERT_TRUE(message.is_object());
+        ASSERT_FALSE(message["status"]);
+        ASSERT_EQ("server test not found", message["error"]);
+    } catch (const std::exception &ex) {
+        FAIL() << ex.what();
+    }
+}
+
+int main(int argc, char **argv)
+{
+    testing::InitGoogleTest(&argc, argv);
+
+    return RUN_ALL_TESTS();
+}