X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvsjoin.cpp;h=9598a6348bf920883e08644fb720f1bb31a867de;hb=c71361e8e4f22cb4f72881399bce2832eb080b0e;hp=032633416851e0dd4a5a71d0f84911985ce4cbcd;hpb=8f27fefa75e2952e7ab8757eb9fe4af4586817f0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svsjoin.cpp b/src/modules/m_spanningtree/svsjoin.cpp
index 032633416..9598a6348 100644
--- a/src/modules/m_spanningtree/svsjoin.cpp
+++ b/src/modules/m_spanningtree/svsjoin.cpp
@@ -1,8 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2008-2009 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -22,7 +26,7 @@
 
 #include "commands.h"
 
-CmdResult CommandSVSJoin::Handle(const std::vector<std::string>& parameters, User *user)
+CmdResult CommandSVSJoin::Handle(User* user, Params& parameters)
 {
 	// Check for valid channel name
 	if (!ServerInstance->IsChannel(parameters[1]))
@@ -36,14 +40,23 @@ CmdResult CommandSVSJoin::Handle(const std::vector<std::string>& parameters, Use
 	/* only join if it's local, otherwise just pass it on! */
 	LocalUser* localuser = IS_LOCAL(u);
 	if (localuser)
-		Channel::JoinUser(localuser, parameters[1]);
+	{
+		bool override = false;
+		std::string key;
+		if (parameters.size() >= 3)
+		{
+			key = parameters[2];
+			if (key.empty())
+				override = true;
+		}
+
+		Channel::JoinUser(localuser, parameters[1], override, key);
+	}
+
 	return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandSVSJoin::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandSVSJoin::GetRouting(User* user, const Params& parameters)
 {
-	User* u = ServerInstance->FindUUID(parameters[0]);
-	if (u)
-		return ROUTE_OPT_UCAST(u->server);
-	return ROUTE_LOCALONLY;
+	return ROUTE_OPT_UCAST(parameters[0]);
 }