--- a/libirccd/irccd/cmd-server-join.cpp	Wed Oct 19 17:55:49 2016 +0200
+++ b/libirccd/irccd/cmd-server-join.cpp	Wed Oct 19 18:04:57 2016 +0200
@@ -20,62 +20,25 @@
 #include "irccd.hpp"
 #include "server.hpp"
 #include "service-server.hpp"
+#include "transport.hpp"
+#include "util.hpp"
 
 namespace irccd {
 
 namespace command {
 
 ServerJoinCommand::ServerJoinCommand()
-    : Command("server-join", "Server", "Join a channel")
+    : Command("server-join")
 {
 }
 
-std::vector<Command::Arg> ServerJoinCommand::args() const
-{
-    return {
-        { "server",     true    },
-        { "channel",    true    },
-        { "password",   false   }
-    };
-}
-
-std::vector<Command::Property> ServerJoinCommand::properties() const
-{
-    return {
-        { "server",     { nlohmann::json::value_t::string }},
-        { "channel",    { nlohmann::json::value_t::string }}
-    };
-}
-
-nlohmann::json ServerJoinCommand::request(Irccdctl &, const CommandRequest &args) const
+void ServerJoinCommand::exec(Irccd &irccd, TransportClient &client, const nlohmann::json &args)
 {
-    auto req = nlohmann::json::object({
-        { "server",     args.args()[0] },
-        { "channel",    args.args()[1] }
-    });
-
-    if (args.length() == 3)
-        req.push_back({"password", args.args()[2]});
-
-    return req;
-}
-
-nlohmann::json ServerJoinCommand::exec(Irccd &irccd, const nlohmann::json &request) const
-{
-    Command::exec(irccd, request);
-
-    std::string password;
-
-    if (request.find("password") != request.end())
-        password = request["password"];
-
-    irccd.servers().require(
-        request.at("server").get<std::string>())->join(
-        request.at("channel").get<std::string>(),
-        password
+    irccd.servers().require(util::json::requireIdentifier(args, "server"))->join(
+        util::json::requireString(args, "channel"),
+        util::json::getString(args, "password")
     );
-
-    return nlohmann::json::object();
+    client.success("server-join");
 }
 
 } // !command

--- a/libirccd/irccd/cmd-server-join.hpp	Wed Oct 19 17:55:49 2016 +0200
+++ b/libirccd/irccd/cmd-server-join.hpp	Wed Oct 19 18:04:57 2016 +0200
@@ -41,24 +41,9 @@
     IRCCD_EXPORT ServerJoinCommand();
 
     /**
-     * \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;
-
-    /**
      * \copydoc Command::exec
      */
-    IRCCD_EXPORT nlohmann::json exec(Irccd &irccd, const nlohmann::json &request) const override;
+    IRCCD_EXPORT void exec(Irccd &irccd, TransportClient &client, const nlohmann::json &args) override;
 };
 
 } // !command

--- a/tests/CMakeLists.txt	Wed Oct 19 17:55:49 2016 +0200
+++ b/tests/CMakeLists.txt	Wed Oct 19 18:04:57 2016 +0200
@@ -25,6 +25,7 @@
     add_subdirectory(cmd-server-disconnect)
     add_subdirectory(cmd-server-info)
     add_subdirectory(cmd-server-invite)
+    add_subdirectory(cmd-server-join)
     add_subdirectory(cmd-server-list)
     add_subdirectory(cmd-server-me)
     add_subdirectory(cmd-server-message)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/cmd-server-join/CMakeLists.txt	Wed Oct 19 18:04:57 2016 +0200
@@ -0,0 +1,24 @@
+#
+# 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-join
+    SOURCES main.cpp
+    LIBRARIES libirccd libirccdctl
+)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/cmd-server-join/main.cpp	Wed Oct 19 18:04:57 2016 +0200
@@ -0,0 +1,101 @@
+/*
+ * main.cpp -- test server-join 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-join.hpp>
+#include <command-tester.hpp>
+#include <server-tester.hpp>
+
+using namespace irccd;
+using namespace irccd::command;
+
+namespace {
+
+std::string channel;
+std::string password;
+
+} // !namespace
+
+class ServerJoinTest : public ServerTester {
+public:
+    void join(std::string channel, std::string password) override
+    {
+        ::channel = channel;
+        ::password = password;
+    }
+};
+
+class ServerJoinCommandTest : public CommandTester {
+public:
+    ServerJoinCommandTest()
+        : CommandTester(std::make_unique<ServerJoinCommand>(),
+                        std::make_unique<ServerJoinTest>())
+    {
+        channel.clear();
+        password.clear();
+
+
+    }
+};
+
+TEST_F(ServerJoinCommandTest, basic)
+{
+    try {
+        m_irccdctl.client().request({
+            { "command",    "server-join"       },
+            { "server",     "test"              },
+            { "channel",    "#music"            },
+            { "password",   "plop"              }
+        });
+
+        poll([&] () {
+            return !channel.empty();
+        });
+
+        ASSERT_EQ("#music", channel);
+        ASSERT_EQ("plop", password);
+    } catch (const std::exception &ex) {
+        FAIL() << ex.what();
+    }
+}
+
+TEST_F(ServerJoinCommandTest, nopassword)
+{
+    try {
+        m_irccdctl.client().request({
+            { "command",    "server-join"       },
+            { "server",     "test"              },
+            { "channel",    "#music"            }
+        });
+
+        poll([&] () {
+            return !channel.empty();
+        });
+
+        ASSERT_EQ("#music", channel);
+        ASSERT_EQ("", password);
+    } catch (const std::exception &ex) {
+        FAIL() << ex.what();
+    }
+}
+
+int main(int argc, char **argv)
+{
+    testing::InitGoogleTest(&argc, argv);
+
+    return RUN_ALL_TESTS();
+}