Merge insp20

[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 0c1ea8e49ec0600e788b279a62efb761703131cf..1f7456426e3d6a9df87aa35a2ba956468e234470 100644 (file)
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -114,13 +114,13 @@ class CommandOpertype : public UserOnlyServerCommand<CommandOpertype>
 };
 
 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 +130,40 @@ 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);
-       bool ProcessModeUUIDPair(const std::string& item, TreeSocket* src_socket, 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<std::string>& params);
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_LOCALONLY; }
+
+       class Builder : public CmdBuilder
+       {
+               /** Maximum possible Membership::Id length in decimal digits, used for determining whether a user will fit into
+                * a message or not
+                */
+               static const size_t membid_max_digits = 20;
+               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, 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();
+       };
 };
 
 class CommandFMode : public ServerCommand
@@ -181,7 +211,7 @@ class CommandFName : public UserOnlyServerCommand<CommandFName>
 class CommandIJoin : public UserOnlyServerCommand<CommandIJoin>
 {
  public:
-       CommandIJoin(Module* Creator) : UserOnlyServerCommand<CommandIJoin>(Creator, "IJOIN", 1) { }
+       CommandIJoin(Module* Creator) : UserOnlyServerCommand<CommandIJoin>(Creator, "IJOIN", 2) { }
        CmdResult HandleRemote(RemoteUser* user, std::vector<std::string>& params);
 };
 
@@ -190,6 +220,7 @@ 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; }
 };
 
 class CommandAway : public UserOnlyServerCommand<CommandAway>
@@ -277,18 +308,28 @@ class CommandPush : public ServerCommand
 class CommandSave : public ServerCommand
 {
  public:
+       /** Timestamp of the uuid nick of all users who collided and got their nick changed to uuid
+        */
+       static const time_t SavedTimestamp = 100;
+
        CommandSave(Module* Creator) : ServerCommand(Creator, "SAVE", 2) { }
        CmdResult Handle(User* user, std::vector<std::string>& parameters);
 };
 
 class CommandServer : public ServerOnlyServerCommand<CommandServer>
 {
+       static void HandleExtra(TreeServer* newserver, const std::vector<std::string>& params);
+
  public:
-       CommandServer(Module* Creator) : ServerOnlyServerCommand<CommandServer>(Creator, "SERVER", 5) { }
+       CommandServer(Module* Creator) : ServerOnlyServerCommand<CommandServer>(Creator, "SERVER", 3) { }
        CmdResult HandleServer(TreeServer* server, std::vector<std::string>& 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);
        };
@@ -308,25 +349,24 @@ class CommandSNONotice : public ServerCommand
        CmdResult Handle(User* user, std::vector<std::string>& parameters);
 };
 
-class CommandVersion : public ServerOnlyServerCommand<CommandVersion>
+class CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst>
 {
  public:
-       CommandVersion(Module* Creator) : ServerOnlyServerCommand<CommandVersion>(Creator, "VERSION", 1) { }
+       CommandEndBurst(Module* Creator) : ServerOnlyServerCommand<CommandEndBurst>(Creator, "ENDBURST") { }
        CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 };
 
-class CommandBurst : public ServerOnlyServerCommand<CommandBurst>
+class CommandSInfo : public ServerOnlyServerCommand<CommandSInfo>
 {
  public:
-       CommandBurst(Module* Creator) : ServerOnlyServerCommand<CommandBurst>(Creator, "BURST") { }
+       CommandSInfo(Module* Creator) : ServerOnlyServerCommand<CommandSInfo>(Creator, "SINFO", 2) { }
        CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
-};
 
-class CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst>
-{
- public:
-       CommandEndBurst(Module* Creator) : ServerOnlyServerCommand<CommandEndBurst>(Creator, "ENDBURST") { }
-       CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
+       class Builder : public CmdBuilder
+       {
+        public:
+               Builder(TreeServer* server, const char* type, const std::string& value);
+       };
 };
 
 class SpanningTreeCommands
@@ -359,8 +399,7 @@ class SpanningTreeCommands
        CommandServer server;
        CommandSQuit squit;
        CommandSNONotice snonotice;
-       CommandVersion version;
-       CommandBurst burst;
        CommandEndBurst endburst;
+       CommandSInfo sinfo;
        SpanningTreeCommands(ModuleSpanningTree* module);
 };