X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcommands.h;h=434528e4601b74840655969a4b9de8675b06a7c6;hb=ba23c2b115ad3bf2632179d283165c1579332fd8;hp=cbe864275afa116cde04d8f2ee6702b523e7f660;hpb=9c934dcae25a60924fd2506126f86fcc86e73632;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h index cbe864275..434528e46 100644 --- a/src/modules/m_spanningtree/commands.h +++ b/src/modules/m_spanningtree/commands.h @@ -21,6 +21,23 @@ #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 */ @@ -28,55 +45,55 @@ class CommandRConnect : public Command { public: CommandRConnect(Module* Creator); - CmdResult Handle(const std::vector& parameters, User* user); - RouteDescriptor GetRouting(User* user, const std::vector& 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& parameters, User* user); - RouteDescriptor GetRouting(User* user, const std::vector& 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& parameters, User* user); - RouteDescriptor GetRouting(User* user, const std::vector& 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& params); - RouteDescriptor GetRouting(User* user, const std::vector& 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& params); - RouteDescriptor GetRouting(User* user, const std::vector& 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& params); - RouteDescriptor GetRouting(User* user, const std::vector& 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& params); + CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE; class Builder : public CmdBuilder { @@ -91,7 +108,7 @@ class CommandUID : public ServerOnlyServerCommand { public: CommandUID(Module* Creator) : ServerOnlyServerCommand(Creator, "UID", 10) { } - CmdResult HandleServer(TreeServer* server, std::vector& params); + CmdResult HandleServer(TreeServer* server, CommandBase::Params& params); class Builder : public CmdBuilder { @@ -104,7 +121,7 @@ class CommandOpertype : public UserOnlyServerCommand { public: CommandOpertype(Module* Creator) : UserOnlyServerCommand(Creator, "OPERTYPE", 1) { } - CmdResult HandleRemote(RemoteUser* user, std::vector& params); + CmdResult HandleRemote(RemoteUser* user, Params& params); class Builder : public CmdBuilder { @@ -114,13 +131,13 @@ class CommandOpertype : public UserOnlyServerCommand }; class TreeSocket; +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. */ static void RemoveStatus(Channel* c); - static void ApplyModeStack(User* srcuser, Channel* c, irc::modestacker& stack); /** * Lowers the TS on the given channel: removes all modes, unsets all extensions, @@ -130,10 +147,11 @@ class CommandFJoin : public ServerCommand * @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, TreeServer* sourceserver, Channel* chan, irc::modestacker* modestack); + 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& params); + CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_LOCALONLY; } class Builder : public CmdBuilder { @@ -141,13 +159,25 @@ class CommandFJoin : public ServerCommand * a message or not */ static const size_t membid_max_digits = 20; - static const size_t maxline = 480; + static const size_t maxline = 510; std::string::size_type pos; + protected: + void add(Membership* memb, std::string::const_iterator mbegin, std::string::const_iterator mend); + bool has_room(std::string::size_type nummodes) const; + public: - Builder(Channel* chan); - void add(Membership* memb); - bool has_room(Membership* memb) const; + Builder(Channel* chan, TreeServer* source = Utils->TreeRoot); + void add(Membership* memb) + { + add(memb, memb->modes.begin(), memb->modes.end()); + } + + bool has_room(Membership* memb) const + { + return has_room(memb->modes.size()); + } + void clear(); const std::string& finalize(); }; @@ -157,14 +187,14 @@ class CommandFMode : public ServerCommand { public: CommandFMode(Module* Creator) : ServerCommand(Creator, "FMODE", 3) { } - CmdResult Handle(User* user, std::vector& 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& params); + CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE; class Builder : public CmdBuilder { @@ -178,49 +208,55 @@ class CommandFHost : public UserOnlyServerCommand { public: CommandFHost(Module* Creator) : UserOnlyServerCommand(Creator, "FHOST", 1) { } - CmdResult HandleRemote(RemoteUser* user, std::vector& params); + CmdResult HandleRemote(RemoteUser* user, Params& params); }; class CommandFIdent : public UserOnlyServerCommand { public: CommandFIdent(Module* Creator) : UserOnlyServerCommand(Creator, "FIDENT", 1) { } - CmdResult HandleRemote(RemoteUser* user, std::vector& params); + CmdResult HandleRemote(RemoteUser* user, Params& params); }; class CommandFName : public UserOnlyServerCommand { public: CommandFName(Module* Creator) : UserOnlyServerCommand(Creator, "FNAME", 1) { } - CmdResult HandleRemote(RemoteUser* user, std::vector& params); + CmdResult HandleRemote(RemoteUser* user, Params& params); }; class CommandIJoin : public UserOnlyServerCommand { public: CommandIJoin(Module* Creator) : UserOnlyServerCommand(Creator, "IJOIN", 2) { } - CmdResult HandleRemote(RemoteUser* user, std::vector& params); + CmdResult HandleRemote(RemoteUser* user, Params& params); }; class CommandResync : public ServerOnlyServerCommand { public: CommandResync(Module* Creator) : ServerOnlyServerCommand(Creator, "RESYNC", 1) { } - CmdResult HandleServer(TreeServer* server, std::vector& parameters); - RouteDescriptor GetRouting(User* user, const std::vector& 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 +class SpanningTree::CommandAway : public UserOnlyServerCommand { + private: + Away::EventProvider awayevprov; + public: - CommandAway(Module* Creator) : UserOnlyServerCommand(Creator, "AWAY", 0, 2) { } - CmdResult HandleRemote(RemoteUser* user, std::vector& parameters); + CommandAway(Module* Creator) + : UserOnlyServerCommand(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); }; }; @@ -229,7 +265,7 @@ class CommandAddLine : public ServerCommand { public: CommandAddLine(Module* Creator) : ServerCommand(Creator, "ADDLINE", 6, 6) { } - CmdResult Handle(User* user, std::vector& parameters); + CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE; class Builder : public CmdBuilder { @@ -242,54 +278,46 @@ class CommandDelLine : public ServerCommand { public: CommandDelLine(Module* Creator) : ServerCommand(Creator, "DELLINE", 2, 2) { } - CmdResult Handle(User* user, std::vector& 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& parameters); - RouteDescriptor GetRouting(User* user, const std::vector& parameters); + CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; }; class CommandIdle : public UserOnlyServerCommand { public: CommandIdle(Module* Creator) : UserOnlyServerCommand(Creator, "IDLE", 1) { } - CmdResult HandleRemote(RemoteUser* user, std::vector& parameters); - RouteDescriptor GetRouting(User* user, const std::vector& 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 +class SpanningTree::CommandNick : public UserOnlyServerCommand { public: - CommandNick(Module* Creator) : UserOnlyServerCommand(Creator, "NICK", 2) { } - CmdResult HandleRemote(RemoteUser* user, std::vector& parameters); + CommandNick(Module* Creator) : UserOnlyServerCommand(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& parameters); - RouteDescriptor GetRouting(User* user, const std::vector& 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 +class SpanningTree::CommandPong : public ServerOnlyServerCommand { public: - CommandPong(Module* Creator) : ServerOnlyServerCommand(Creator, "PONG", 1) { } - CmdResult HandleServer(TreeServer* server, std::vector& parameters); - RouteDescriptor GetRouting(User* user, const std::vector& parameters) { return ROUTE_UNICAST(parameters[0]); } -}; - -class CommandPush : public ServerCommand -{ - public: - CommandPush(Module* Creator) : ServerCommand(Creator, "PUSH", 2) { } - CmdResult Handle(User* user, std::vector& parameters); - RouteDescriptor GetRouting(User* user, const std::vector& parameters) { return ROUTE_UNICAST(parameters[0]); } + CommandPong(Module* Creator) : ServerOnlyServerCommand(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 @@ -300,17 +328,23 @@ class CommandSave : public ServerCommand static const time_t SavedTimestamp = 100; CommandSave(Module* Creator) : ServerCommand(Creator, "SAVE", 2) { } - CmdResult Handle(User* user, std::vector& parameters); + CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE; }; -class CommandServer : public ServerOnlyServerCommand +class SpanningTree::CommandServer : public ServerOnlyServerCommand { + static void HandleExtra(TreeServer* newserver, Params& params); + public: - CommandServer(Module* Creator) : ServerOnlyServerCommand(Creator, "SERVER", 3) { } - CmdResult HandleServer(TreeServer* server, std::vector& parameters); + CommandServer(Module* Creator) : ServerOnlyServerCommand(Creator, "SERVER", 3) { } + CmdResult HandleServer(TreeServer* server, Params& parameters); class Builder : public CmdBuilder { + void push_property(const char* key, const std::string& val) + { + push(key).push_raw('=').push_raw(val); + } public: Builder(TreeServer* server); }; @@ -320,35 +354,28 @@ class CommandSQuit : public ServerOnlyServerCommand { public: CommandSQuit(Module* Creator) : ServerOnlyServerCommand(Creator, "SQUIT", 2) { } - CmdResult HandleServer(TreeServer* server, std::vector& 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& parameters); -}; - -class CommandBurst : public ServerOnlyServerCommand -{ - public: - CommandBurst(Module* Creator) : ServerOnlyServerCommand(Creator, "BURST") { } - CmdResult HandleServer(TreeServer* server, std::vector& parameters); + CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE; }; class CommandEndBurst : public ServerOnlyServerCommand { public: CommandEndBurst(Module* Creator) : ServerOnlyServerCommand(Creator, "ENDBURST") { } - CmdResult HandleServer(TreeServer* server, std::vector& parameters); + CmdResult HandleServer(TreeServer* server, Params& parameters); }; class CommandSInfo : public ServerOnlyServerCommand { public: CommandSInfo(Module* Creator) : ServerOnlyServerCommand(Creator, "SINFO", 2) { } - CmdResult HandleServer(TreeServer* server, std::vector& parameters); + CmdResult HandleServer(TreeServer* server, Params& parameters); class Builder : public CmdBuilder { @@ -357,6 +384,20 @@ class CommandSInfo : public ServerOnlyServerCommand }; }; +class CommandNum : public ServerOnlyServerCommand +{ + public: + CommandNum(Module* Creator) : ServerOnlyServerCommand(Creator, "NUM", 3) { } + CmdResult HandleServer(TreeServer* server, Params& parameters); + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + + class Builder : public CmdBuilder + { + public: + Builder(SpanningTree::RemoteUser* target, const Numeric::Numeric& numeric); + }; +}; + class SpanningTreeCommands { public: @@ -374,21 +415,20 @@ 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; - CommandPush push; + SpanningTree::CommandNick nick; + SpanningTree::CommandPing ping; + SpanningTree::CommandPong pong; CommandSave save; - CommandServer server; + SpanningTree::CommandServer server; CommandSQuit squit; CommandSNONotice snonotice; - CommandBurst burst; CommandEndBurst endburst; CommandSInfo sinfo; + CommandNum num; SpanningTreeCommands(ModuleSpanningTree* module); };