X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcommands.h;h=d2d138ab26b6ce99b308d63e062644714daf79d0;hb=3eb205218a321e454d873ae14e2e717ce9d64142;hp=e467cdc8b62e17328b68a10da95e7f7fd4316fa1;hpb=0cec1856ccd0cfbf7bd5d6f82be1d02f9bdeed4e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index e467cdc8b..d2d138ab2 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -19,36 +19,29 @@
 
 #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
 {
-	/** Show MAP output to a user (recursive)
-	 */
-	void ShowMap(TreeServer* Current, User* user, int depth, int &line, char* names, int &maxnamew, char* stats);
-
-	/** Returns oper-specific MAP information
-	 */
-	std::string MapOperInfo(TreeServer* Current);
-
  public:
 	CommandMap(Module* Creator);
 	CmdResult Handle(const std::vector<std::string>& parameters, User* user);
@@ -84,20 +77,40 @@ 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 ServerCommand
+class CommandUID : public ServerOnlyServerCommand<CommandUID>
 {
  public:
-	CommandUID(Module* Creator) : ServerCommand(Creator, "UID", 10) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
+	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 ServerCommand
+class CommandOpertype : public UserOnlyServerCommand<CommandOpertype>
 {
  public:
-	CommandOpertype(Module* Creator) : ServerCommand(Creator, "OPERTYPE", 1) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
+	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;
@@ -108,7 +121,16 @@ class CommandFJoin : public ServerCommand
 	 */
 	static void RemoveStatus(Channel* c);
 	static void ApplyModeStack(User* srcuser, Channel* c, irc::modestacker& stack);
-	bool ProcessModeUUIDPair(const std::string& item, TreeSocket* src_socket, Channel* chan, irc::modestacker* modestack);
+
+	/**
+	 * Lowers the TS on the given channel: removes all modes, unsets all extensions,
+	 * clears the topic and removes all pending invites.
+	 * @param chan The target channel whose TS to lower
+	 * @param TS The new TS to set
+	 * @param newname The new name of the channel; must be the same or a case change of the current name
+	 */
+	static void LowerTS(Channel* chan, time_t TS, const std::string& newname);
+	void ProcessModeUUIDPair(const std::string& item, TreeSocket* src_socket, Channel* chan, irc::modestacker* modestack);
  public:
 	CommandFJoin(Module* Creator) : ServerCommand(Creator, "FJOIN", 3) { }
 	CmdResult Handle(User* user, std::vector<std::string>& params);
@@ -124,57 +146,78 @@ 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 ServerCommand
+class CommandFHost : public UserOnlyServerCommand<CommandFHost>
 {
  public:
-	CommandFHost(Module* Creator) : ServerCommand(Creator, "FHOST", 1) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
+	CommandFHost(Module* Creator) : UserOnlyServerCommand<CommandFHost>(Creator, "FHOST", 1) { }
+	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& params);
 };
 
-class CommandFIdent : public ServerCommand
+class CommandFIdent : public UserOnlyServerCommand<CommandFIdent>
 {
  public:
-	CommandFIdent(Module* Creator) : ServerCommand(Creator, "FIDENT", 1) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
+	CommandFIdent(Module* Creator) : UserOnlyServerCommand<CommandFIdent>(Creator, "FIDENT", 1) { }
+	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& params);
 };
 
-class CommandFName : public ServerCommand
+class CommandFName : public UserOnlyServerCommand<CommandFName>
 {
  public:
-	CommandFName(Module* Creator) : ServerCommand(Creator, "FNAME", 1) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
+	CommandFName(Module* Creator) : UserOnlyServerCommand<CommandFName>(Creator, "FNAME", 1) { }
+	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& params);
 };
 
-class CommandIJoin : public ServerCommand
+class CommandIJoin : public UserOnlyServerCommand<CommandIJoin>
 {
  public:
-	CommandIJoin(Module* Creator) : ServerCommand(Creator, "IJOIN", 1) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
+	CommandIJoin(Module* Creator) : UserOnlyServerCommand<CommandIJoin>(Creator, "IJOIN", 1) { }
+	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& params);
 };
 
-class CommandResync : public ServerCommand
+class CommandResync : public ServerOnlyServerCommand<CommandResync>
 {
  public:
-	CommandResync(Module* Creator) : ServerCommand(Creator, "RESYNC", 1) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	CommandResync(Module* Creator) : ServerOnlyServerCommand<CommandResync>(Creator, "RESYNC", 1) { }
+	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 };
 
-class CommandAway : public ServerCommand
+class CommandAway : public UserOnlyServerCommand<CommandAway>
 {
  public:
-	CommandAway(Module* Creator) : ServerCommand(Creator, "AWAY", 0, 2) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	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
@@ -192,19 +235,19 @@ class CommandEncap : public ServerCommand
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
 };
 
-class CommandIdle : public ServerCommand
+class CommandIdle : public UserOnlyServerCommand<CommandIdle>
 {
  public:
-	CommandIdle(Module* Creator) : ServerCommand(Creator, "IDLE", 1) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	CommandIdle(Module* Creator) : UserOnlyServerCommand<CommandIdle>(Creator, "IDLE", 1) { }
+	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& parameters);
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_UNICAST(parameters[0]); }
 };
 
-class CommandNick : public ServerCommand
+class CommandNick : public UserOnlyServerCommand<CommandNick>
 {
  public:
-	CommandNick(Module* Creator) : ServerCommand(Creator, "NICK", 2) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	CommandNick(Module* Creator) : UserOnlyServerCommand<CommandNick>(Creator, "NICK", 2) { }
+	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& parameters);
 };
 
 class CommandPing : public ServerCommand
@@ -215,11 +258,11 @@ class CommandPing : public ServerCommand
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_UNICAST(parameters[0]); }
 };
 
-class CommandPong : public ServerCommand
+class CommandPong : public ServerOnlyServerCommand<CommandPong>
 {
  public:
-	CommandPong(Module* Creator) : ServerCommand(Creator, "PONG", 1) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	CommandPong(Module* Creator) : ServerOnlyServerCommand<CommandPong>(Creator, "PONG", 1) { }
+	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_UNICAST(parameters[0]); }
 };
 
@@ -238,18 +281,24 @@ class CommandSave : public ServerCommand
 	CmdResult Handle(User* user, std::vector<std::string>& parameters);
 };
 
-class CommandServer : public ServerCommand
+class CommandServer : public ServerOnlyServerCommand<CommandServer>
 {
  public:
-	CommandServer(Module* Creator) : ServerCommand(Creator, "SERVER", 5) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	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 ServerCommand
+class CommandSQuit : public ServerOnlyServerCommand<CommandSQuit>
 {
  public:
-	CommandSQuit(Module* Creator) : ServerCommand(Creator, "SQUIT", 2) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	CommandSQuit(Module* Creator) : ServerOnlyServerCommand<CommandSQuit>(Creator, "SQUIT", 2) { }
+	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 };
 
 class CommandSNONotice : public ServerCommand
@@ -259,33 +308,30 @@ class CommandSNONotice : public ServerCommand
 	CmdResult Handle(User* user, std::vector<std::string>& parameters);
 };
 
-class CommandVersion : public ServerCommand
+class CommandVersion : public ServerOnlyServerCommand<CommandVersion>
 {
  public:
-	CommandVersion(Module* Creator) : ServerCommand(Creator, "VERSION", 1) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	CommandVersion(Module* Creator) : ServerOnlyServerCommand<CommandVersion>(Creator, "VERSION", 1) { }
+	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 };
 
-class CommandBurst : public ServerCommand
+class CommandBurst : public ServerOnlyServerCommand<CommandBurst>
 {
  public:
-	CommandBurst(Module* Creator) : ServerCommand(Creator, "BURST") { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	CommandBurst(Module* Creator) : ServerOnlyServerCommand<CommandBurst>(Creator, "BURST") { }
+	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 };
 
-class CommandEndBurst : public ServerCommand
+class CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst>
 {
  public:
-	CommandEndBurst(Module* Creator) : ServerCommand(Creator, "ENDBURST") { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	CommandEndBurst(Module* Creator) : ServerOnlyServerCommand<CommandEndBurst>(Creator, "ENDBURST") { }
+	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 };
 
 class SpanningTreeCommands
 {
  public:
-	CommandRConnect rconnect;
-	CommandRSQuit rsquit;
-	CommandMap map;
 	CommandSVSJoin svsjoin;
 	CommandSVSPart svspart;
 	CommandSVSNick svsnick;