1 files changed, 71 insertions, 65 deletions

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 9c5c414f1..6f9c32fb1 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -20,16 +20,51 @@
  */
 
 
-/* $ModDesc: Provides the /CHECK command to retrieve information on a user, channel, hostname or IP address */
-
 #include "inspircd.h"
+#include "listmode.h"
 
 /** Handle /CHECK
  */
 class CommandCheck : public Command
 {
+	UserModeReference snomaskmode;
+
+	std::string GetSnomasks(User* user)
+	{
+		std::string ret;
+		if (snomaskmode)
+			ret = snomaskmode->GetUserParameter(user);
+
+		if (ret.empty())
+			ret = "+";
+		return ret;
+	}
+
+	static void dumpListMode(User* user, const std::string& checkstr, const ListModeBase::ModeList* list)
+	{
+		if (!list)
+			return;
+
+		std::string buf = checkstr + " modelist";
+		const std::string::size_type headlen = buf.length();
+		const size_t maxline = ServerInstance->Config->Limits.MaxLine;
+		for (ListModeBase::ModeList::const_iterator i = list->begin(); i != list->end(); ++i)
+		{
+			if (buf.size() + i->mask.size() + 1 > maxline)
+			{
+				user->SendText(buf);
+				buf.erase(headlen);
+			}
+			buf.append(" ").append(i->mask);
+		}
+		if (buf.length() > headlen)
+			user->SendText(buf);
+	}
+
  public:
-	CommandCheck(Module* parent) : Command(parent,"CHECK", 1)
+	CommandCheck(Module* parent)
+		: Command(parent,"CHECK", 1)
+		, snomaskmode(parent, "snomask")
 	{
 		flags_needed = 'o'; syntax = "<nickname>|<ip>|<hostmask>|<channel> <server>";
 	}
@@ -92,26 +127,26 @@ class CommandCheck : public Command
 			user->SendText(checkstr + " realnuh " + targuser->GetFullRealHost());
 			user->SendText(checkstr + " realname " + targuser->fullname);
 			user->SendText(checkstr + " modes +" + targuser->FormatModes());
-			user->SendText(checkstr + " snomasks +" + targuser->FormatNoticeMasks());
-			user->SendText(checkstr + " server " + targuser->server);
+			user->SendText(checkstr + " snomasks " + GetSnomasks(targuser));
+			user->SendText(checkstr + " server " + targuser->server->GetName());
 			user->SendText(checkstr + " uid " + targuser->uuid);
 			user->SendText(checkstr + " signon " + timestring(targuser->signon));
 			user->SendText(checkstr + " nickts " + timestring(targuser->age));
 			if (loctarg)
-				user->SendText(checkstr + " lastmsg " + timestring(targuser->idle_lastmsg));
+				user->SendText(checkstr + " lastmsg " + timestring(loctarg->idle_lastmsg));
 
-			if (IS_AWAY(targuser))
+			if (targuser->IsAway())
 			{
 				/* user is away */
 				user->SendText(checkstr + " awaytime " + timestring(targuser->awaytime));
 				user->SendText(checkstr + " awaymsg " + targuser->awaymsg);
 			}
 
-			if (IS_OPER(targuser))
+			if (targuser->IsOper())
 			{
 				OperInfo* oper = targuser->oper;
 				/* user is an oper of type ____ */
-				user->SendText(checkstr + " opertype " + oper->NameStr());
+				user->SendText(checkstr + " opertype " + oper->name);
 				if (loctarg)
 				{
 					std::string umodes;
@@ -127,7 +162,7 @@ class CommandCheck : public Command
 					}
 					user->SendText(checkstr + " modeperms user=" + umodes + " channel=" + cmodes);
 					std::string opcmds;
-					for(std::set<std::string>::iterator i = oper->AllowedOperCommands.begin(); i != oper->AllowedOperCommands.end(); i++)
+					for (OperInfo::PrivSet::const_iterator i = oper->AllowedOperCommands.begin(); i != oper->AllowedOperCommands.end(); ++i)
 					{
 						opcmds.push_back(' ');
 						opcmds.append(*i);
@@ -135,7 +170,7 @@ class CommandCheck : public Command
 					std::stringstream opcmddump(opcmds);
 					user->SendText(checkstr + " commandperms", opcmddump);
 					std::string privs;
-					for(std::set<std::string>::iterator i = oper->AllowedPrivs.begin(); i != oper->AllowedPrivs.end(); i++)
+					for (OperInfo::PrivSet::const_iterator i = oper->AllowedPrivs.begin(); i != oper->AllowedPrivs.end(); ++i)
 					{
 						privs.push_back(' ');
 						privs.append(*i);
@@ -147,8 +182,8 @@ class CommandCheck : public Command
 
 			if (loctarg)
 			{
-				user->SendText(checkstr + " clientaddr " + irc::sockets::satouser(loctarg->client_sa));
-				user->SendText(checkstr + " serveraddr " + irc::sockets::satouser(loctarg->server_sa));
+				user->SendText(checkstr + " clientaddr " + loctarg->client_sa.str());
+				user->SendText(checkstr + " serveraddr " + loctarg->server_sa.str());
 
 				std::string classname = loctarg->GetClass()->name;
 				if (!classname.empty())
@@ -157,10 +192,14 @@ class CommandCheck : public Command
 			else
 				user->SendText(checkstr + " onip " + targuser->GetIPString());
 
-			for (UCListIter i = targuser->chans.begin(); i != targuser->chans.end(); i++)
+			for (User::ChanList::iterator i = targuser->chans.begin(); i != targuser->chans.end(); i++)
 			{
-				Channel* c = *i;
-				chliststr.append(c->GetPrefixChar(targuser)).append(c->name).append(" ");
+				Membership* memb = *i;
+				Channel* c = memb->chan;
+				char prefix = memb->GetPrefixChar();
+				if (prefix)
+					chliststr.push_back(prefix);
+				chliststr.append(c->name).push_back(' ');
 			}
 
 			std::stringstream dump(chliststr);
@@ -187,32 +226,25 @@ class CommandCheck : public Command
 
 			/* now the ugly bit, spool current members of a channel. :| */
 
-			const UserMembList *ulist= targchan->GetUsers();
+			const Channel::MemberMap& ulist = targchan->GetUsers();
 
 			/* note that unlike /names, we do NOT check +i vs in the channel */
-			for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
+			for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
 			{
-				char tmpbuf[MAXBUF];
 				/*
-				 * Unlike Asuka, I define a clone as coming from the same host. --w00t
-				 */
-				snprintf(tmpbuf, MAXBUF, "%-3lu %s%s (%s@%s) %s ", ServerInstance->Users->GlobalCloneCount(i->first), targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(), i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
-				user->SendText(checkstr + " member " + tmpbuf);
+			 	 * Unlike Asuka, I define a clone as coming from the same host. --w00t
+			 	 */
+				const UserManager::CloneCounts& clonecount = ServerInstance->Users->GetCloneCounts(i->first);
+				user->SendText("%s member %-3u %s%s (%s@%s) %s ",
+					checkstr.c_str(), clonecount.global,
+					i->second->GetAllPrefixChars(), i->first->nick.c_str(),
+					i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
 			}
 
-			irc::modestacker modestack(true);
-			for(BanList::iterator b = targchan->bans.begin(); b != targchan->bans.end(); ++b)
-			{
-				modestack.Push('b', b->data);
-			}
-			std::vector<std::string> stackresult;
-			std::vector<TranslateType> dummy;
-			while (modestack.GetStackedLine(stackresult))
-			{
-				creator->ProtoSendMode(user, TYPE_CHANNEL, targchan, stackresult, dummy);
-				stackresult.clear();
-			}
-			FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(targchan,creator,user));
+			const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes();
+			for (ModeParser::ListModeList::const_iterator i = listmodes.begin(); i != listmodes.end(); ++i)
+				dumpListMode(user, checkstr, (*i)->GetList(targchan));
+
 			dumpExt(user, checkstr, targchan);
 		}
 		else
@@ -221,7 +253,8 @@ class CommandCheck : public Command
 			long x = 0;
 
 			/* hostname or other */
-			for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); a++)
+			const user_hash& users = ServerInstance->Users->GetUsers();
+			for (user_hash::const_iterator a = users.begin(); a != users.end(); ++a)
 			{
 				if (InspIRCd::Match(a->second->host, parameters[0], ascii_case_insensitive_map) || InspIRCd::Match(a->second->dhost, parameters[0], ascii_case_insensitive_map))
 				{
@@ -252,42 +285,15 @@ class CommandCheck : public Command
 	}
 };
 
-
 class ModuleCheck : public Module
 {
- private:
 	CommandCheck mycommand;
  public:
 	ModuleCheck() : mycommand(this)
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(mycommand);
-	}
-
-	~ModuleCheck()
-	{
-	}
-
-	void ProtoSendMode(void* uv, TargetTypeFlags, void*, const std::vector<std::string>& result, const std::vector<TranslateType>&)
-	{
-		User* user = (User*)uv;
-		std::string checkstr(":");
-		checkstr.append(ServerInstance->Config->ServerName);
-		checkstr.append(" 304 ");
-		checkstr.append(user->nick);
-		checkstr.append(" :CHECK modelist");
-		for(unsigned int i=0; i < result.size(); i++)
-		{
-			checkstr.append(" ");
-			checkstr.append(result[i]);
-		}
-		user->SendText(checkstr);
-	}
-
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("CHECK command, view user, channel, IP address or hostname information", VF_VENDOR|VF_OPTCOMMON);
 	}