X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fcommands.h;h=a1a44daf53580c47bf09a2e4cf65508f892a60cc;hb=4f9abe96a4301a740d4a5fd7932550d88d60a3fc;hp=feecc7dd2b5621aa7f48765f836f361b88249403;hpb=b9e11915a976daaf790ebc763aff56e19fd49e0f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index feecc7dd2..a1a44daf5 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -1,7 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2018-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -22,6 +26,22 @@
 #include "servercommand.h"
 #include "commandbuilder.h"
 #include "remoteuser.h"
+#include "modules/away.h"
+
+namespace SpanningTree
+{
+	class CommandAway;
+	class CommandNick;
+	class CommandPing;
+	class CommandPong;
+	class CommandServer;
+}
+
+using SpanningTree::CommandAway;
+using SpanningTree::CommandNick;
+using SpanningTree::CommandPing;
+using SpanningTree::CommandPong;
+using SpanningTree::CommandServer;
 
 /** Handle /RCONNECT
  */
@@ -29,55 +49,55 @@ 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);
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
 };
 
 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);
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
 };
 
 class CommandMap : public Command
 {
  public:
 	CommandMap(Module* Creator);
-	CmdResult Handle(const std::vector<std::string>& parameters, User* user);
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
 };
 
 class CommandSVSJoin : public ServerCommand
 {
  public:
 	CommandSVSJoin(Module* Creator) : ServerCommand(Creator, "SVSJOIN", 2) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
+	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
 };
 
 class CommandSVSPart : public ServerCommand
 {
  public:
 	CommandSVSPart(Module* Creator) : ServerCommand(Creator, "SVSPART", 2) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
+	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
 };
 
 class CommandSVSNick : public ServerCommand
 {
  public:
 	CommandSVSNick(Module* Creator) : ServerCommand(Creator, "SVSNICK", 3) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
+	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
 };
 
 class CommandMetadata : public ServerCommand
 {
  public:
 	CommandMetadata(Module* Creator) : ServerCommand(Creator, "METADATA", 2) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
+	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
 
 	class Builder : public CmdBuilder
 	{
@@ -92,7 +112,7 @@ class CommandUID : public ServerOnlyServerCommand<CommandUID>
 {
  public:
 	CommandUID(Module* Creator) : ServerOnlyServerCommand<CommandUID>(Creator, "UID", 10) { }
-	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& params);
+	CmdResult HandleServer(TreeServer* server, CommandBase::Params& params);
 
 	class Builder : public CmdBuilder
 	{
@@ -105,7 +125,7 @@ class CommandOpertype : public UserOnlyServerCommand<CommandOpertype>
 {
  public:
 	CommandOpertype(Module* Creator) : UserOnlyServerCommand<CommandOpertype>(Creator, "OPERTYPE", 1) { }
-	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& params);
+	CmdResult HandleRemote(RemoteUser* user, Params& params);
 
 	class Builder : public CmdBuilder
 	{
@@ -119,7 +139,7 @@ class FwdFJoinBuilder;
 class CommandFJoin : public ServerCommand
 {
 	/** Remove all modes from a channel, including statusmodes (+qaovh etc), simplemodes, parameter modes.
-	 * This does not update the timestamp of the target channel, this must be done seperately.
+	 * This does not update the timestamp of the target channel, this must be done separately.
 	 */
 	static void RemoveStatus(Channel* c);
 
@@ -134,8 +154,8 @@ class CommandFJoin : public ServerCommand
 	void ProcessModeUUIDPair(const std::string& item, TreeServer* sourceserver, Channel* chan, Modes::ChangeList* modechangelist, FwdFJoinBuilder& fwdfjoin);
  public:
 	CommandFJoin(Module* Creator) : ServerCommand(Creator, "FJOIN", 3) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_LOCALONLY; }
+	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_LOCALONLY; }
 
 	class Builder : public CmdBuilder
 	{
@@ -171,14 +191,14 @@ class CommandFMode : public ServerCommand
 {
  public:
 	CommandFMode(Module* Creator) : ServerCommand(Creator, "FMODE", 3) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
+	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
 };
 
 class CommandFTopic : public ServerCommand
 {
  public:
 	CommandFTopic(Module* Creator) : ServerCommand(Creator, "FTOPIC", 4, 5) { }
-	CmdResult Handle(User* user, std::vector<std::string>& params);
+	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
 
 	class Builder : public CmdBuilder
 	{
@@ -192,49 +212,55 @@ class CommandFHost : public UserOnlyServerCommand<CommandFHost>
 {
  public:
 	CommandFHost(Module* Creator) : UserOnlyServerCommand<CommandFHost>(Creator, "FHOST", 1) { }
-	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& params);
+	CmdResult HandleRemote(RemoteUser* user, Params& params);
 };
 
 class CommandFIdent : public UserOnlyServerCommand<CommandFIdent>
 {
  public:
 	CommandFIdent(Module* Creator) : UserOnlyServerCommand<CommandFIdent>(Creator, "FIDENT", 1) { }
-	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& params);
+	CmdResult HandleRemote(RemoteUser* user, Params& params);
 };
 
 class CommandFName : public UserOnlyServerCommand<CommandFName>
 {
  public:
 	CommandFName(Module* Creator) : UserOnlyServerCommand<CommandFName>(Creator, "FNAME", 1) { }
-	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& params);
+	CmdResult HandleRemote(RemoteUser* user, Params& params);
 };
 
 class CommandIJoin : public UserOnlyServerCommand<CommandIJoin>
 {
  public:
 	CommandIJoin(Module* Creator) : UserOnlyServerCommand<CommandIJoin>(Creator, "IJOIN", 2) { }
-	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& params);
+	CmdResult HandleRemote(RemoteUser* user, Params& params);
 };
 
 class CommandResync : public ServerOnlyServerCommand<CommandResync>
 {
  public:
 	CommandResync(Module* Creator) : ServerOnlyServerCommand<CommandResync>(Creator, "RESYNC", 1) { }
-	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_LOCALONLY; }
+	CmdResult HandleServer(TreeServer* server, Params& parameters);
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_LOCALONLY; }
 };
 
-class CommandAway : public UserOnlyServerCommand<CommandAway>
+class SpanningTree::CommandAway : public UserOnlyServerCommand<SpanningTree::CommandAway>
 {
+ private:
+	Away::EventProvider awayevprov;
+
  public:
-	CommandAway(Module* Creator) : UserOnlyServerCommand<CommandAway>(Creator, "AWAY", 0, 2) { }
-	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& parameters);
+	CommandAway(Module* Creator)
+		: UserOnlyServerCommand<SpanningTree::CommandAway>(Creator, "AWAY", 0, 2)
+		, awayevprov(Creator)
+	{
+	}
+	CmdResult HandleRemote(::RemoteUser* user, Params& parameters);
 
 	class Builder : public CmdBuilder
 	{
 	 public:
 		Builder(User* user);
-		Builder(User* user, const std::string& msg);
 	};
 };
 
@@ -243,7 +269,7 @@ class CommandAddLine : public ServerCommand
 {
  public:
 	CommandAddLine(Module* Creator) : ServerCommand(Creator, "ADDLINE", 6, 6) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE;
 
 	class Builder : public CmdBuilder
 	{
@@ -256,49 +282,49 @@ class CommandDelLine : public ServerCommand
 {
  public:
 	CommandDelLine(Module* Creator) : ServerCommand(Creator, "DELLINE", 2, 2) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE;
 };
 
 class CommandEncap : public ServerCommand
 {
  public:
 	CommandEncap(Module* Creator) : ServerCommand(Creator, "ENCAP", 2) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
+	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
 };
 
 class CommandIdle : public UserOnlyServerCommand<CommandIdle>
 {
  public:
 	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]); }
+	CmdResult HandleRemote(RemoteUser* user, Params& parameters);
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_UNICAST(parameters[0]); }
 };
 
-class CommandNick : public UserOnlyServerCommand<CommandNick>
+class SpanningTree::CommandNick : public UserOnlyServerCommand<SpanningTree::CommandNick>
 {
  public:
-	CommandNick(Module* Creator) : UserOnlyServerCommand<CommandNick>(Creator, "NICK", 2) { }
-	CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& parameters);
+	CommandNick(Module* Creator) : UserOnlyServerCommand<SpanningTree::CommandNick>(Creator, "NICK", 2) { }
+	CmdResult HandleRemote(::RemoteUser* user, Params& parameters);
 };
 
-class CommandPing : public ServerCommand
+class SpanningTree::CommandPing : public ServerCommand
 {
  public:
 	CommandPing(Module* Creator) : ServerCommand(Creator, "PING", 1) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_UNICAST(parameters[0]); }
+	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_UNICAST(parameters[0]); }
 };
 
-class CommandPong : public ServerOnlyServerCommand<CommandPong>
+class SpanningTree::CommandPong : public ServerOnlyServerCommand<SpanningTree::CommandPong>
 {
  public:
-	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]); }
+	CommandPong(Module* Creator) : ServerOnlyServerCommand<SpanningTree::CommandPong>(Creator, "PONG", 1) { }
+	CmdResult HandleServer(TreeServer* server, Params& parameters);
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_UNICAST(parameters[0]); }
 };
 
-class CommandSave : public ServerCommand
+class DllExport CommandSave : public ServerCommand
 {
  public:
 	/** Timestamp of the uuid nick of all users who collided and got their nick changed to uuid
@@ -306,16 +332,16 @@ class CommandSave : public ServerCommand
 	static const time_t SavedTimestamp = 100;
 
 	CommandSave(Module* Creator) : ServerCommand(Creator, "SAVE", 2) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE;
 };
 
-class CommandServer : public ServerOnlyServerCommand<CommandServer>
+class SpanningTree::CommandServer : public ServerOnlyServerCommand<SpanningTree::CommandServer>
 {
-	static void HandleExtra(TreeServer* newserver, const std::vector<std::string>& params);
+	static void HandleExtra(TreeServer* newserver, Params& params);
 
  public:
-	CommandServer(Module* Creator) : ServerOnlyServerCommand<CommandServer>(Creator, "SERVER", 3) { }
-	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
+	CommandServer(Module* Creator) : ServerOnlyServerCommand<SpanningTree::CommandServer>(Creator, "SERVER", 3) { }
+	CmdResult HandleServer(TreeServer* server, Params& parameters);
 
 	class Builder : public CmdBuilder
 	{
@@ -332,28 +358,28 @@ class CommandSQuit : public ServerOnlyServerCommand<CommandSQuit>
 {
  public:
 	CommandSQuit(Module* Creator) : ServerOnlyServerCommand<CommandSQuit>(Creator, "SQUIT", 2) { }
-	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
+	CmdResult HandleServer(TreeServer* server, Params& parameters);
 };
 
 class CommandSNONotice : public ServerCommand
 {
  public:
 	CommandSNONotice(Module* Creator) : ServerCommand(Creator, "SNONOTICE", 2) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
+	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE;
 };
 
 class CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst>
 {
  public:
 	CommandEndBurst(Module* Creator) : ServerOnlyServerCommand<CommandEndBurst>(Creator, "ENDBURST") { }
-	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
+	CmdResult HandleServer(TreeServer* server, Params& parameters);
 };
 
 class CommandSInfo : public ServerOnlyServerCommand<CommandSInfo>
 {
  public:
 	CommandSInfo(Module* Creator) : ServerOnlyServerCommand<CommandSInfo>(Creator, "SINFO", 2) { }
-	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
+	CmdResult HandleServer(TreeServer* server, Params& parameters);
 
 	class Builder : public CmdBuilder
 	{
@@ -366,8 +392,8 @@ class CommandNum : public ServerOnlyServerCommand<CommandNum>
 {
  public:
 	CommandNum(Module* Creator) : ServerOnlyServerCommand<CommandNum>(Creator, "NUM", 3) { }
-	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
+	CmdResult HandleServer(TreeServer* server, Params& parameters);
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
 
 	class Builder : public CmdBuilder
 	{
@@ -393,16 +419,16 @@ class SpanningTreeCommands
 	CommandFHost fhost;
 	CommandFIdent fident;
 	CommandFName fname;
-	CommandAway away;
+	SpanningTree::CommandAway away;
 	CommandAddLine addline;
 	CommandDelLine delline;
 	CommandEncap encap;
 	CommandIdle idle;
-	CommandNick nick;
-	CommandPing ping;
-	CommandPong pong;
+	SpanningTree::CommandNick nick;
+	SpanningTree::CommandPing ping;
+	SpanningTree::CommandPong pong;
 	CommandSave save;
-	CommandServer server;
+	SpanningTree::CommandServer server;
 	CommandSQuit squit;
 	CommandSNONotice snonotice;
 	CommandEndBurst endburst;