ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 11:09:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1446 from B00mX0r/master+wrongnumeric

Browse Source 
Fixed misc. instances of ERR_NOSUCHNICK instead of channel numerics

Closes #1122.
This commit is contained in:
Peter Powell 2017-12-22 12:12:36 +00:00 committed by GitHub
commit c8f515121f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/numeric.h
View File

@ -88,8 +88,7 @@ class Numeric::Numeric
namespace Numerics
{
/** ERR_NOSUCHNICK numeric
*/
/** Builder for the ERR_NOSUCHNICK numeric. */
class NoSuchNick : public Numeric::Numeric
{
public:
@ -97,7 +96,19 @@ namespace Numerics
: Numeric(ERR_NOSUCHNICK)
{
push(nick);
push("No such nick/channel");
push("No such nick");
}
};
/** Builder for the ERR_NOSUCHCHANNEL numeric. */
class NoSuchChannel : public Numeric::Numeric
{
public:
NoSuchChannel(const std::string& chan)
: Numeric(ERR_NOSUCHCHANNEL)
{
push(chan);
push("No such channel");
}
};
}

1
include/numerics.h
View File

@ -161,6 +161,7 @@ enum
* -- A message from the IRC group for coder sanity, and w00t
*/
ERR_BADCHANNELKEY = 475,
ERR_BADCHANMASK = 476,
ERR_INVITEONLYCHAN = 473,
ERR_CHANNELISFULL = 471,
ERR_BANNEDFROMCHAN = 474,

9
src/coremods/core_channel/cmd_invite.cpp
View File

@ -56,9 +56,14 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
timeout = ConvToInt(parameters[3]);
}
if ((!c) || (!u) || (u->registered != REG_ALL))
if (!c)
{
user->WriteNumeric(Numerics::NoSuchNick(c ? parameters[0] : parameters[1]));
user->WriteNumeric(Numerics::NoSuchChannel(parameters[1]));
return CMD_FAILURE;
}
if ((!u) || (u->registered != REG_ALL))
{
user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
return CMD_FAILURE;
}

2
src/coremods/core_channel/cmd_join.cpp
View File

@ -55,6 +55,6 @@ CmdResult CommandJoin::HandleLocal(const std::vector<std::string>& parameters, L
}
}
user->WriteNumeric(ERR_NOSUCHCHANNEL, parameters[0], "Invalid channel name");
user->WriteNumeric(ERR_BADCHANMASK, parameters[0], "Invalid channel name");
return CMD_FAILURE;
}

9
src/coremods/core_channel/cmd_kick.cpp
View File

@ -42,9 +42,14 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
else
u = ServerInstance->FindNick(parameters[1]);
if ((!u) || (!c) || (u->registered != REG_ALL))
if (!c)
{
user->WriteNumeric(Numerics::NoSuchNick(c ? parameters[1] : parameters[0]));
user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
return CMD_FAILURE;
}
if ((!u) || (u->registered != REG_ALL))
{
user->WriteNumeric(Numerics::NoSuchNick(parameters[1]));
return CMD_FAILURE;
}

2
src/coremods/core_channel/cmd_names.cpp
View File

@ -62,7 +62,7 @@ CmdResult CommandNames::HandleLocal(const std::vector<std::string>& parameters,
}
}
user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
return CMD_FAILURE;
}

4
src/coremods/core_channel/cmd_topic.cpp
View File

@ -38,7 +38,7 @@ CmdResult CommandTopic::HandleLocal(const std::vector<std::string>& parameters,
Channel* c = ServerInstance->FindChan(parameters[0]);
if (!c)
{
user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
return CMD_FAILURE;
}
@ -46,7 +46,7 @@ CmdResult CommandTopic::HandleLocal(const std::vector<std::string>& parameters,
{
if ((c->IsModeSet(secretmode)) && (!c->HasUser(user)))
{
user->WriteNumeric(Numerics::NoSuchNick(c->name));
user->WriteNumeric(Numerics::NoSuchChannel(c->name));
return CMD_FAILURE;
}

4
src/coremods/core_privmsg.cpp
View File

@ -180,8 +180,8 @@ CmdResult MessageCommandBase::HandleMessage(const std::vector<std::string>& para
}
else
{
/* no such nick/channel */
user->WriteNumeric(Numerics::NoSuchNick(target));
/* channel does not exist */
user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
return CMD_FAILURE;
}
return CMD_SUCCESS;

5
src/coremods/core_user/cmd_mode.cpp
View File

@ -45,7 +45,10 @@ CmdResult CommandMode::Handle(const std::vector<std::string>& parameters, User*
if ((!targetchannel) && (!targetuser))
{
user->WriteNumeric(Numerics::NoSuchNick(target));
if (target[0] == '#')
user->WriteNumeric(Numerics::NoSuchChannel(target));
else
user->WriteNumeric(Numerics::NoSuchNick(target));
return CMD_FAILURE;
}
if (parameters.size() == 1)

2
src/coremods/core_user/cmd_part.cpp
View File

@ -46,7 +46,7 @@ CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User
if (!c)
{
user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
return CMD_FAILURE;
}

2
src/modules/m_cycle.cpp
View File

@ -44,7 +44,7 @@ class CommandCycle : public SplitCommand
if (!channel)
{
user->WriteNumeric(ERR_NOSUCHCHANNEL, parameters[0], "No such channel");
user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
return CMD_FAILURE;
}

2
src/modules/m_knock.cpp
View File

@ -45,7 +45,7 @@ class CommandKnock : public Command
Channel* c = ServerInstance->FindChan(parameters[0]);
if (!c)
{
user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
return CMD_FAILURE;
}

2
src/modules/m_namedmodes.cpp
View File

@ -57,7 +57,7 @@ class CommandProp : public SplitCommand
Channel* const chan = ServerInstance->FindChan(parameters[0]);
if (!chan)
{
src->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
src->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
return CMD_FAILURE;
}

2
src/modules/m_redirect.cpp
View File

@ -38,7 +38,7 @@ class Redirect : public ParamMode<Redirect, LocalStringExt>
{
if (!ServerInstance->IsChannel(parameter))
{
source->WriteNumeric(ERR_NOSUCHCHANNEL, parameter, "Invalid channel name");
source->WriteNumeric(Numerics::NoSuchChannel(parameter));
return MODEACTION_DENY;
}
}

9
src/modules/m_remove.cpp
View File

@ -74,9 +74,14 @@ class RemoveBase : public Command
channel = ServerInstance->FindChan(channame);
/* Fix by brain - someone needs to learn to validate their input! */
if ((!target) || (target->registered != REG_ALL) || (!channel))
if (!channel)
{
user->WriteNumeric(Numerics::NoSuchNick(channel ? username.c_str() : channame.c_str()));
user->WriteNumeric(Numerics::NoSuchChannel(channame));
return CMD_FAILURE;
}
if ((!target) || (target->registered != REG_ALL))
{
user->WriteNumeric(Numerics::NoSuchNick(username));
return CMD_FAILURE;
}

2
src/modules/m_satopic.cpp
View File

@ -52,7 +52,7 @@ class CommandSATopic : public Command
}
else
{
user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
return CMD_FAILURE;
}
}

2
src/modules/m_timedbans.cpp
View File

@ -73,7 +73,7 @@ class CommandTban : public Command
Channel* channel = ServerInstance->FindChan(parameters[0]);
if (!channel)
{
user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
return CMD_FAILURE;
}
unsigned int cm = channel->GetPrefixValue(user);

2
src/modules/m_uninvite.cpp
View File

@ -51,7 +51,7 @@ class CommandUninvite : public Command
{
if (!c)
{
user->WriteNumeric(Numerics::NoSuchNick(parameters[1]));
user->WriteNumeric(Numerics::NoSuchChannel(parameters[1]));
}
else
{