changeset 718:d615af5e505b

Irccdctl: add missing command property
author David Demelier <markand@malikania.fr>
date Tue, 10 Jul 2018 21:22:00 +0200
parents fff3ee62d0fc
children fbb0c95724c3
files irccdctl/server_connect_cli.cpp irccdctl/server_join_cli.cpp irccdctl/server_kick_cli.cpp irccdctl/server_me_cli.cpp irccdctl/server_message_cli.cpp irccdctl/server_nick_cli.cpp irccdctl/server_part_cli.cpp irccdctl/server_topic_cli.cpp
diffstat 8 files changed, 23 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/irccdctl/server_connect_cli.cpp	Mon Jul 09 21:02:00 2018 +0200
+++ b/irccdctl/server_connect_cli.cpp	Tue Jul 10 21:22:00 2018 +0200
@@ -65,8 +65,9 @@
         throw std::invalid_argument("server-connect requires at least 2 arguments");
 
     auto object = nlohmann::json::object({
-        { "name", copy[0] },
-        { "host", copy[1] }
+        { "command",    "server-connect"    },
+        { "name",       copy[0]             },
+        { "host",       copy[1]             }
     });
 
     if (copy.size() == 3) {
--- a/irccdctl/server_join_cli.cpp	Mon Jul 09 21:02:00 2018 +0200
+++ b/irccdctl/server_join_cli.cpp	Tue Jul 10 21:22:00 2018 +0200
@@ -33,6 +33,7 @@
         throw std::invalid_argument("server-join requires at least 2 arguments");
 
     auto object = nlohmann::json::object({
+        { "command",    "server-join"   },
         { "server",     args[0]         },
         { "channel",    args[1]         }
     });
--- a/irccdctl/server_kick_cli.cpp	Mon Jul 09 21:02:00 2018 +0200
+++ b/irccdctl/server_kick_cli.cpp	Tue Jul 10 21:22:00 2018 +0200
@@ -33,9 +33,10 @@
         throw std::invalid_argument("server-kick requires at least 3 arguments ");
 
     auto object = nlohmann::json::object({
-        { "server",     args[0] },
-        { "target",     args[1] },
-        { "channel",    args[2] }
+        { "command",    "server-kick"   },
+        { "server",     args[0]         },
+        { "target",     args[1]         },
+        { "channel",    args[2]         }
     });
 
     if (args.size() == 4)
--- a/irccdctl/server_me_cli.cpp	Mon Jul 09 21:02:00 2018 +0200
+++ b/irccdctl/server_me_cli.cpp	Tue Jul 10 21:22:00 2018 +0200
@@ -33,6 +33,7 @@
         throw std::runtime_error("server-me requires 3 arguments");
 
     request(ctl, {
+        { "command",    "server-me" },
         { "server",     args[0]     },
         { "target",     args[1]     },
         { "message",    args[2]     }
--- a/irccdctl/server_message_cli.cpp	Mon Jul 09 21:02:00 2018 +0200
+++ b/irccdctl/server_message_cli.cpp	Tue Jul 10 21:22:00 2018 +0200
@@ -33,9 +33,10 @@
         throw std::invalid_argument("server-message requires 3 arguments");
 
     request(ctl, {
-        { "server",     args[0] },
-        { "target",     args[1] },
-        { "message",    args[2] }
+        { "command",    "server-message"    },
+        { "server",     args[0]             },
+        { "target",     args[1]             },
+        { "message",    args[2]             }
     });
 }
 
--- a/irccdctl/server_nick_cli.cpp	Mon Jul 09 21:02:00 2018 +0200
+++ b/irccdctl/server_nick_cli.cpp	Tue Jul 10 21:22:00 2018 +0200
@@ -33,8 +33,9 @@
         throw std::invalid_argument("server-nick requires 2 arguments");
 
     request(ctl, {
-        { "server",     args[0] },
-        { "nickname",   args[1] }
+        { "command",    "server-nick"   },
+        { "server",     args[0]         },
+        { "nickname",   args[1]         }
     });
 }
 
--- a/irccdctl/server_part_cli.cpp	Mon Jul 09 21:02:00 2018 +0200
+++ b/irccdctl/server_part_cli.cpp	Tue Jul 10 21:22:00 2018 +0200
@@ -33,8 +33,9 @@
         throw std::invalid_argument("server-part requires at least 2 arguments");
 
     auto object = nlohmann::json::object({
-        { "server",     args[0] },
-        { "channel",    args[1] }
+        { "command",    "server-part"   },
+        { "server",     args[0]         },
+        { "channel",    args[1]         }
     });
 
     if (args.size() >= 3)
--- a/irccdctl/server_topic_cli.cpp	Mon Jul 09 21:02:00 2018 +0200
+++ b/irccdctl/server_topic_cli.cpp	Tue Jul 10 21:22:00 2018 +0200
@@ -33,9 +33,10 @@
         throw std::invalid_argument("server-topic requires 3 arguments");
 
     request(ctl, {
-        { "server",     args[0] },
-        { "channel",    args[1] },
-        { "topic",      args[2] }
+        { "command",    "server-topic"  },
+        { "server",     args[0]         },
+        { "channel",    args[1]         },
+        { "topic",      args[2]         }
     });
 }