X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcommands.h;h=dd54b5b6bd2bad3117d6d9690be544751ad3fb5e;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=d08835ccc86b752b2e824d89a2f7298076768f26;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index d08835ccc..dd54b5b6b 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -17,8 +17,7 @@
  */
 
 
-#ifndef M_SPANNINGTREE_COMMANDS_H
-#define M_SPANNINGTREE_COMMANDS_H
+#pragma once
 
 #include "main.h"
 
@@ -40,7 +39,6 @@ class CommandRSQuit : public Command
         CommandRSQuit(Module* Callback, SpanningTreeUtilities* Util);
         CmdResult Handle (const std::vector<std::string>& parameters, User *user);
 		RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
-        void NoticeUser(User* user, const std::string &msg);
 };
 
 class CommandSVSJoin : public Command
@@ -60,7 +58,7 @@ class CommandSVSPart : public Command
 class CommandSVSNick : public Command
 {
  public:
-	CommandSVSNick(Module* Creator) : Command(Creator, "SVSNICK", 2) { flags_needed = FLAG_SERVERONLY; }
+	CommandSVSNick(Module* Creator) : Command(Creator, "SVSNICK", 3) { flags_needed = FLAG_SERVERONLY; }
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user);
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
 };
@@ -85,16 +83,19 @@ class CommandOpertype : public Command
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user);
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_BROADCAST; }
 };
+class TreeSocket;
 class CommandFJoin : public Command
 {
+	/** 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);
+	bool ProcessModeUUIDPair(const std::string& item, TreeSocket* src_socket, Channel* chan, irc::modestacker* modestack);
  public:
 	CommandFJoin(Module* Creator) : Command(Creator, "FJOIN", 3) { flags_needed = FLAG_SERVERONLY; }
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user);
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_BROADCAST; }
-	/** 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.
-	 */
-	void RemoveStatus(User* source, parameterlist &params);
 };
 class CommandFMode : public Command
 {
@@ -106,7 +107,7 @@ class CommandFMode : public Command
 class CommandFTopic : public Command
 {
  public:
-	CommandFTopic(Module* Creator) : Command(Creator, "FTOPIC", 4) { flags_needed = FLAG_SERVERONLY; }
+	CommandFTopic(Module* Creator) : Command(Creator, "FTOPIC", 5) { flags_needed = FLAG_SERVERONLY; }
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user);
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_BROADCAST; }
 };
@@ -132,6 +133,21 @@ class CommandFName : public Command
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_BROADCAST; }
 };
 
+class CommandIJoin : public SplitCommand
+{
+ public:
+	CommandIJoin(Module* Creator) : SplitCommand(Creator, "IJOIN", 1) { flags_needed = FLAG_SERVERONLY; }
+	CmdResult HandleRemote(const std::vector<std::string>& parameters, RemoteUser* user);
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_BROADCAST; }
+};
+
+class CommandResync : public SplitCommand
+{
+ public:
+	CommandResync(Module* Creator) : SplitCommand(Creator, "RESYNC", 1) { flags_needed = FLAG_SERVERONLY; }
+	CmdResult HandleServer(const std::vector<std::string>& parameters, FakeUser* user);
+};
+
 class SpanningTreeCommands
 {
  public:
@@ -144,6 +160,8 @@ class SpanningTreeCommands
 	CommandUID uid;
 	CommandOpertype opertype;
 	CommandFJoin fjoin;
+	CommandIJoin ijoin;
+	CommandResync resync;
 	CommandFMode fmode;
 	CommandFTopic ftopic;
 	CommandFHost fhost;
@@ -151,5 +169,3 @@ class SpanningTreeCommands
 	CommandFName fname;
 	SpanningTreeCommands(ModuleSpanningTree* module);
 };
-
-#endif