X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hostcycle.cpp;h=95fa3fab35f5fb2493da8f5f592f5f0c450c79c5;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=d4def647347e9e3fa0fbf4366cc85390661afa54;hpb=3e0ac4917242a6d62452e7c70aea25dc7bc1e39d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hostcycle.cpp b/src/modules/m_hostcycle.cpp
index d4def6473..95fa3fab3 100644
--- a/src/modules/m_hostcycle.cpp
+++ b/src/modules/m_hostcycle.cpp
@@ -1,8 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2015, 2018 Attila Molnar <attilamolnar@hush.com>
  *
  * 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
@@ -19,15 +19,21 @@
 
 
 #include "inspircd.h"
+#include "modules/cap.h"
 
 class ModuleHostCycle : public Module
 {
+	Cap::Reference chghostcap;
+	const std::string quitmsghost;
+	const std::string quitmsgident;
+
 	/** Send fake quit/join/mode messages for host or ident cycle.
 	 */
-	static void DoHostCycle(User* user, const std::string& newident, const std::string& newhost, const char* quitmsg)
+	void DoHostCycle(User* user, const std::string& newident, const std::string& newhost, const std::string& reason)
 	{
-		// GetFullHost() returns the original data at the time this function is called
-		const std::string quitline = ":" + user->GetFullHost() + " QUIT :" + quitmsg;
+		// The user has the original ident/host at the time this function is called
+		ClientProtocol::Messages::Quit quitmsg(user, reason);
+		ClientProtocol::Event quitevent(ServerInstance->GetRFCEvents().quit, quitmsg);
 
 		already_sent_t silent_id = ServerInstance->Users.NextAlreadySentId();
 		already_sent_t seen_id = ServerInstance->Users.NextAlreadySentId();
@@ -37,15 +43,17 @@ class ModuleHostCycle : public Module
 
 		FOREACH_MOD(OnBuildNeighborList, (user, include_chans, exceptions));
 
+		// Users shouldn't see themselves quitting when host cycling
+		exceptions.erase(user);
 		for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 		{
 			LocalUser* u = IS_LOCAL(i->first);
-			if (u && !u->quitting)
+			if ((u) && (!u->quitting) && (!chghostcap.get(u)))
 			{
 				if (i->second)
 				{
 					u->already_sent = seen_id;
-					u->Write(quitline);
+					u->Send(quitevent);
 				}
 				else
 				{
@@ -60,17 +68,8 @@ class ModuleHostCycle : public Module
 		{
 			Membership* memb = *i;
 			Channel* c = memb->chan;
-			const std::string joinline = ":" + newfullhost + " JOIN " + c->name;
-			std::string modeline;
-
-			if (!memb->modes.empty())
-			{
-				modeline = ":" + (ServerInstance->Config->CycleHostsFromUser ? newfullhost : ServerInstance->Config->ServerName)
-					+ " MODE " + c->name + " +" + memb->modes;
 
-				for (size_t j = 0; j < memb->modes.length(); j++)
-					modeline.append(" ").append(user->nick);
-			}
+			ClientProtocol::Events::Join joinevent(memb, newfullhost);
 
 			const Channel::MemberMap& ulist = c->GetUsers();
 			for (Channel::MemberMap::const_iterator j = ulist.begin(); j != ulist.end(); ++j)
@@ -80,34 +79,41 @@ class ModuleHostCycle : public Module
 					continue;
 				if (u->already_sent == silent_id)
 					continue;
+				if (chghostcap.get(u))
+					continue;
 
 				if (u->already_sent != seen_id)
 				{
-					u->Write(quitline);
+					u->Send(quitevent);
 					u->already_sent = seen_id;
 				}
 
-				u->Write(joinline);
-				if (!memb->modes.empty())
-					u->Write(modeline);
+				u->Send(joinevent);
 			}
 		}
 	}
 
  public:
+	ModuleHostCycle()
+		: chghostcap(this, "chghost")
+		, quitmsghost("Changing host")
+		, quitmsgident("Changing ident")
+	{
+	}
+
 	void OnChangeIdent(User* user, const std::string& newident) CXX11_OVERRIDE
 	{
-		DoHostCycle(user, newident, user->dhost, "Changing ident");
+		DoHostCycle(user, newident, user->GetDisplayedHost(), quitmsgident);
 	}
 
 	void OnChangeHost(User* user, const std::string& newhost) CXX11_OVERRIDE
 	{
-		DoHostCycle(user, user->ident, newhost, "Changing host");
+		DoHostCycle(user, user->ident, newhost, quitmsghost);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Cycles users in all their channels when their host or ident changes", VF_VENDOR);
+		return Version("Sends a fake disconnection and reconnection when a user's username (ident) or hostname changes to allow clients to update their internal caches.", VF_VENDOR);
 	}
 };