X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_list.cpp;h=f840c9ab0a51eeb846e67c2ae78987e89e169bcc;hb=11916574f67962dce1d7a2fdf7ef6a3d2d1fa49f;hp=d1eddad9df2040ca69ff2fe5c67499a38760766b;hpb=3ae7efa14f06720b24d17a11e851439fb645376f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_list.cpp b/src/commands/cmd_list.cpp
index d1eddad9d..f840c9ab0 100644
--- a/src/commands/cmd_list.cpp
+++ b/src/commands/cmd_list.cpp
@@ -27,10 +27,20 @@
  */
 class CommandList : public Command
 {
+	ChanModeReference secretmode;
+	ChanModeReference privatemode;
+
  public:
 	/** Constructor for list.
 	 */
-	CommandList ( Module* parent) : Command(parent,"LIST", 0, 0) { Penalty = 5; }
+	CommandList(Module* parent)
+		: Command(parent,"LIST", 0, 0)
+		, secretmode(creator, "secret")
+		, privatemode(creator, "private")
+	{
+		Penalty = 5;
+	}
+
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
@@ -47,7 +57,7 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
 {
 	int minusers = 0, maxusers = 0;
 
-	user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
+	user->WriteNumeric(RPL_LISTSTART, "Channel :Users Name");
 
 	/* Work around mIRC suckyness. YOU SUCK, KHALED! */
 	if (parameters.size() == 1)
@@ -73,7 +83,7 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
 		if (too_many || too_few)
 			continue;
 
-		if (parameters.size() && (parameters[0][0] != '<' && parameters[0][0] != '>') && !parameters[0].empty())
+		if (parameters.size() && !parameters[0].empty() && (parameters[0][0] != '<' && parameters[0][0] != '>'))
 		{
 			if (!InspIRCd::Match(i->second->name, parameters[0]) && !InspIRCd::Match(i->second->topic, parameters[0]))
 				continue;
@@ -82,21 +92,21 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
 		// if the channel is not private/secret, OR the user is on the channel anyway
 		bool n = (i->second->HasUser(user) || user->HasPrivPermission("channels/auspex"));
 
-		if (!n && i->second->IsModeSet('p'))
+		if (!n && i->second->IsModeSet(privatemode))
 		{
 			/* Channel is +p and user is outside/not privileged */
-			user->WriteNumeric(322, "%s * %ld :",user->nick.c_str(), users);
+			user->WriteNumeric(RPL_LIST, "* %ld :", users);
 		}
 		else
 		{
-			if (n || !i->second->IsModeSet('s'))
+			if (n || !i->second->IsModeSet(secretmode))
 			{
 				/* User is in the channel/privileged, channel is not +s */
-				user->WriteNumeric(322, "%s %s %ld :[+%s] %s",user->nick.c_str(),i->second->name.c_str(),users,i->second->ChanModes(n),i->second->topic.c_str());
+				user->WriteNumeric(RPL_LIST, "%s %ld :[+%s] %s",i->second->name.c_str(),users,i->second->ChanModes(n),i->second->topic.c_str());
 			}
 		}
 	}
-	user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
+	user->WriteNumeric(RPL_LISTEND, ":End of channel list.");
 
 	return CMD_SUCCESS;
 }