X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcommands.h;h=3047e7e60960ca99089af45a2d6949af416c5e63;hb=f62654a6859998f9d63eb22702c572d5ebcff15c;hp=9690eba46a4ca8d60cbd3cfb927ce6f9c42f4fb4;hpb=2f753f7864bf847af26f7a1aedc727927c163738;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 9690eba46..3047e7e60 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -42,14 +42,6 @@ class CommandRSQuit : public Command
 
 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);
@@ -129,10 +121,36 @@ 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, TreeServer* sourceserver, Channel* chan, irc::modestacker* modestack);
  public:
 	CommandFJoin(Module* Creator) : ServerCommand(Creator, "FJOIN", 3) { }
 	CmdResult Handle(User* user, std::vector<std::string>& params);
+
+	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 = 480;
+		std::string::size_type pos;
+
+	 public:
+		Builder(Channel* chan);
+		void add(Membership* memb);
+		bool has_room(Membership* memb) const;
+		void clear();
+		const std::string& finalize();
+	};
 };
 
 class CommandFMode : public ServerCommand
@@ -180,7 +198,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);
 };
 
@@ -189,6 +207,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>
@@ -307,25 +326,31 @@ class CommandSNONotice : public ServerCommand
 	CmdResult Handle(User* user, std::vector<std::string>& parameters);
 };
 
-class CommandVersion : public ServerOnlyServerCommand<CommandVersion>
+class CommandBurst : public ServerOnlyServerCommand<CommandBurst>
 {
  public:
-	CommandVersion(Module* Creator) : ServerOnlyServerCommand<CommandVersion>(Creator, "VERSION", 1) { }
+	CommandBurst(Module* Creator) : ServerOnlyServerCommand<CommandBurst>(Creator, "BURST") { }
 	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 };
 
-class CommandBurst : public ServerOnlyServerCommand<CommandBurst>
+class CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst>
 {
  public:
-	CommandBurst(Module* Creator) : ServerOnlyServerCommand<CommandBurst>(Creator, "BURST") { }
+	CommandEndBurst(Module* Creator) : ServerOnlyServerCommand<CommandEndBurst>(Creator, "ENDBURST") { }
 	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 };
 
-class CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst>
+class CommandSInfo : public ServerOnlyServerCommand<CommandSInfo>
 {
  public:
-	CommandEndBurst(Module* Creator) : ServerOnlyServerCommand<CommandEndBurst>(Creator, "ENDBURST") { }
+	CommandSInfo(Module* Creator) : ServerOnlyServerCommand<CommandSInfo>(Creator, "SINFO", 2) { }
 	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
@@ -358,8 +383,8 @@ class SpanningTreeCommands
 	CommandServer server;
 	CommandSQuit squit;
 	CommandSNONotice snonotice;
-	CommandVersion version;
 	CommandBurst burst;
 	CommandEndBurst endburst;
+	CommandSInfo sinfo;
 	SpanningTreeCommands(ModuleSpanningTree* module);
 };