X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ffjoin.cpp;h=71d837b2840b4bf0b150029ac935fd12a484115e;hb=ee5e5aa77574a8e2cf9d142ccecf76de1fe72eb6;hp=f6adc76206fec2a1553eaa0eb788883f9cbb8415;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index f6adc7620..71d837b28 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -55,8 +55,6 @@ CmdResult CommandFJoin::Handle(const std::vector<std::string>& params, User *src
 	 * losing side, so only its own modes get applied. Life is simple for those
 	 * who succeed at internets. :-)
 	 */
-	if (params.size() < 3)
-		return CMD_INVALID;
 
 	irc::modestacker modestack(true);			/* Modes to apply from the users in the user list */
 	User* who = NULL;		   				/* User we are currently checking */
@@ -80,14 +78,14 @@ CmdResult CommandFJoin::Handle(const std::vector<std::string>& params, User *src
 	if (created)
 	{
 		chan = new Channel(channel, TS);
-		ServerInstance->SNO->WriteToSnoMask('d', "Creation FJOIN recieved for %s, timestamp: %lu", chan->name.c_str(), (unsigned long)TS);
+		ServerInstance->SNO->WriteToSnoMask('d', "Creation FJOIN received for %s, timestamp: %lu", chan->name.c_str(), (unsigned long)TS);
 	}
 	else
 	{
 		time_t ourTS = chan->age;
 
 		if (TS != ourTS)
-			ServerInstance->SNO->WriteToSnoMask('d', "Merge FJOIN recieved for %s, ourTS: %lu, TS: %lu, difference: %lu",
+			ServerInstance->SNO->WriteToSnoMask('d', "Merge FJOIN received for %s, ourTS: %lu, TS: %lu, difference: %lu",
 				chan->name.c_str(), (unsigned long)ourTS, (unsigned long)TS, (unsigned long)(ourTS - TS));
 		/* If our TS is less than theirs, we dont accept their modes */
 		if (ourTS < TS)
@@ -105,6 +103,7 @@ CmdResult CommandFJoin::Handle(const std::vector<std::string>& params, User *src
 			// while the name is equal in case-insensitive compare, it might differ in case; use the remote version
 			chan->name = channel;
 			chan->age = TS;
+			chan->ClearInvites();
 			param_list.push_back(channel);
 			this->RemoveStatus(ServerInstance->FakeClient, param_list);
 		}