Merge pull request #708 from SaberUK/master+development-branch

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / commands.h

diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 96cb425633ef111c72bb259dcf783438205197d0..9690eba46a4ca8d60cbd3cfb927ce6f9c42f4fb4 100644 (file)
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -19,24 +19,25 @@
 
 #pragma once
 
-#include "main.h"
+#include "servercommand.h"
+#include "commandbuilder.h"
 
 /** Handle /RCONNECT
  */
 class CommandRConnect : public Command
 {
  public:
-        CommandRConnect(Module* Creator);
-        CmdResult Handle (const std::vector<std::string>& parameters, User *user);
-               RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
+       CommandRConnect(Module* Creator);
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user);
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
 };
 
 class CommandRSQuit : public Command
 {
  public:
-        CommandRSQuit(Module* Creator);
-        CmdResult Handle (const std::vector<std::string>& parameters, User *user);
-               RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
+       CommandRSQuit(Module* Creator);
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user);
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
 };
 
 class CommandMap : public Command
@@ -84,6 +85,14 @@ class CommandMetadata : public ServerCommand
  public:
        CommandMetadata(Module* Creator) : ServerCommand(Creator, "METADATA", 2) { }
        CmdResult Handle(User* user, std::vector<std::string>& params);
+
+       class Builder : public CmdBuilder
+       {
+        public:
+               Builder(User* user, const std::string& key, const std::string& val);
+               Builder(Channel* chan, const std::string& key, const std::string& val);
+               Builder(const std::string& key, const std::string& val);
+       };
 };
 
 class CommandUID : public ServerOnlyServerCommand<CommandUID>
@@ -91,6 +100,12 @@ class CommandUID : public ServerOnlyServerCommand<CommandUID>
  public:
        CommandUID(Module* Creator) : ServerOnlyServerCommand<CommandUID>(Creator, "UID", 10) { }
        CmdResult HandleServer(TreeServer* server, std::vector<std::string>& params);
+
+       class Builder : public CmdBuilder
+       {
+        public:
+               Builder(User* user);
+       };
 };
 
 class CommandOpertype : public UserOnlyServerCommand<CommandOpertype>
@@ -98,6 +113,12 @@ class CommandOpertype : public UserOnlyServerCommand<CommandOpertype>
  public:
        CommandOpertype(Module* Creator) : UserOnlyServerCommand<CommandOpertype>(Creator, "OPERTYPE", 1) { }
        CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& params);
+
+       class Builder : public CmdBuilder
+       {
+        public:
+               Builder(User* user);
+       };
 };
 
 class TreeSocket;
@@ -124,8 +145,15 @@ class CommandFMode : public ServerCommand
 class CommandFTopic : public ServerCommand
 {
  public:
-       CommandFTopic(Module* Creator) : ServerCommand(Creator, "FTOPIC", 5) { }
+       CommandFTopic(Module* Creator) : ServerCommand(Creator, "FTOPIC", 4, 5) { }
        CmdResult Handle(User* user, std::vector<std::string>& params);
+
+       class Builder : public CmdBuilder
+       {
+        public:
+               Builder(Channel* chan);
+               Builder(User* user, Channel* chan);
+       };
 };
 
 class CommandFHost : public UserOnlyServerCommand<CommandFHost>
@@ -168,13 +196,27 @@ class CommandAway : public UserOnlyServerCommand<CommandAway>
  public:
        CommandAway(Module* Creator) : UserOnlyServerCommand<CommandAway>(Creator, "AWAY", 0, 2) { }
        CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& parameters);
+
+       class Builder : public CmdBuilder
+       {
+        public:
+               Builder(User* user);
+               Builder(User* user, const std::string& msg);
+       };
 };
 
+class XLine;
 class CommandAddLine : public ServerCommand
 {
  public:
        CommandAddLine(Module* Creator) : ServerCommand(Creator, "ADDLINE", 6, 6) { }
        CmdResult Handle(User* user, std::vector<std::string>& parameters);
+
+       class Builder : public CmdBuilder
+       {
+        public:
+               Builder(XLine* xline, User* user = ServerInstance->FakeClient);
+       };
 };
 
 class CommandDelLine : public ServerCommand
@@ -243,6 +285,12 @@ class CommandServer : public ServerOnlyServerCommand<CommandServer>
  public:
        CommandServer(Module* Creator) : ServerOnlyServerCommand<CommandServer>(Creator, "SERVER", 5) { }
        CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
+
+       class Builder : public CmdBuilder
+       {
+        public:
+               Builder(TreeServer* server);
+       };
 };
 
 class CommandSQuit : public ServerOnlyServerCommand<CommandSQuit>
@@ -259,10 +307,10 @@ class CommandSNONotice : public ServerCommand
        CmdResult Handle(User* user, std::vector<std::string>& parameters);
 };
 
-class CommandVersion : public ServerOnlyServerCommand<CommandServer>
+class CommandVersion : public ServerOnlyServerCommand<CommandVersion>
 {
  public:
-       CommandVersion(Module* Creator) : ServerOnlyServerCommand<CommandServer>(Creator, "VERSION", 1) { }
+       CommandVersion(Module* Creator) : ServerOnlyServerCommand<CommandVersion>(Creator, "VERSION", 1) { }
        CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 };
 
@@ -283,9 +331,6 @@ class CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst>
 class SpanningTreeCommands
 {
  public:
-       CommandRConnect rconnect;
-       CommandRSQuit rsquit;
-       CommandMap map;
        CommandSVSJoin svsjoin;
        CommandSVSPart svspart;
        CommandSVSNick svsnick;