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

Replace large if/else blocks for target.type with switches (#1668).

Browse Source
This commit is contained in:
linuxdaemon 2019-06-24 11:10:17 -05:00 committed by Peter Powell
parent 2ab383f707
commit 7ad534c1af
8 changed files with 245 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/m_deaf.cpp
View File

@ -89,7 +89,9 @@ class ModuleDeaf : public Module
ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
{ {
if (target.type == MessageTarget::TYPE_CHANNEL) switch (target.type)
{
case MessageTarget::TYPE_CHANNEL:
{ {
Channel* chan = target.Get<Channel>(); Channel* chan = target.Get<Channel>();
bool is_bypasschar = (deaf_bypasschars.find(details.text[0]) != std::string::npos); bool is_bypasschar = (deaf_bypasschars.find(details.text[0]) != std::string::npos);
@ -121,8 +123,9 @@ class ModuleDeaf : public Module
// don't deliver message! // don't deliver message!
details.exemptions.insert(i->first); details.exemptions.insert(i->first);
} }
break;
} }
else if (target.type == MessageTarget::TYPE_USER) case MessageTarget::TYPE_USER:
{ {
User* targ = target.Get<User>(); User* targ = target.Get<User>();
if (!targ->IsModeSet(privdeafmode)) if (!targ->IsModeSet(privdeafmode))
@ -133,6 +136,11 @@ class ModuleDeaf : public Module
if (!user->HasPrivPermission("users/ignore-privdeaf")) if (!user->HasPrivPermission("users/ignore-privdeaf"))
return MOD_RES_DENY; return MOD_RES_DENY;
break;
}
case MessageTarget::TYPE_SERVER:
break;
} }
return MOD_RES_PASSTHRU; return MOD_RES_PASSTHRU;

11
src/modules/m_filter.cpp
View File

@ -372,7 +372,9 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar
{ {
bool is_selfmsg = false; bool is_selfmsg = false;
std::string target; std::string target;
if (msgtarget.type == MessageTarget::TYPE_USER) switch (msgtarget.type)
{
case MessageTarget::TYPE_USER:
{ {
User* t = msgtarget.Get<User>(); User* t = msgtarget.Get<User>();
// Check if the target nick is exempted, if yes, ignore this message // Check if the target nick is exempted, if yes, ignore this message
@ -383,14 +385,19 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar
is_selfmsg = true; is_selfmsg = true;
target = t->nick; target = t->nick;
break;
} }
else if (msgtarget.type == MessageTarget::TYPE_CHANNEL) case MessageTarget::TYPE_CHANNEL:
{ {
Channel* t = msgtarget.Get<Channel>(); Channel* t = msgtarget.Get<Channel>();
if (exemptedchans.count(t->name)) if (exemptedchans.count(t->name))
return MOD_RES_PASSTHRU; return MOD_RES_PASSTHRU;
target = t->name; target = t->name;
break;
}
case MessageTarget::TYPE_SERVER:
break;
} }
if (is_selfmsg && warnonselfmsg) if (is_selfmsg && warnonselfmsg)

24
src/modules/m_ircv3_echomessage.cpp
View File

@ -48,26 +48,32 @@ class ModuleIRCv3EchoMessage
const std::string& text = details.echo_original ? details.original_text : details.text; const std::string& text = details.echo_original ? details.original_text : details.text;
const ClientProtocol::TagMap& tags = details.echo_original ? details.tags_in : details.tags_out; const ClientProtocol::TagMap& tags = details.echo_original ? details.tags_in : details.tags_out;
if (target.type == MessageTarget::TYPE_USER) switch (target.type)
{
case MessageTarget::TYPE_USER:
{ {
User* destuser = target.Get<User>(); User* destuser = target.Get<User>();
ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, destuser, text, details.type); ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, destuser, text, details.type);
privmsg.AddTags(tags); privmsg.AddTags(tags);
localuser->Send(ServerInstance->GetRFCEvents().privmsg, privmsg); localuser->Send(ServerInstance->GetRFCEvents().privmsg, privmsg);
break;
} }
else if (target.type == MessageTarget::TYPE_CHANNEL) case MessageTarget::TYPE_CHANNEL:
{ {
Channel* chan = target.Get<Channel>(); Channel* chan = target.Get<Channel>();
ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, chan, text, details.type, target.status); ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, chan, text, details.type, target.status);
privmsg.AddTags(tags); privmsg.AddTags(tags);
localuser->Send(ServerInstance->GetRFCEvents().privmsg, privmsg); localuser->Send(ServerInstance->GetRFCEvents().privmsg, privmsg);
break;
} }
else case MessageTarget::TYPE_SERVER:
{ {
const std::string* servername = target.Get<std::string>(); const std::string* servername = target.Get<std::string>();
ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, *servername, text, details.type); ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, *servername, text, details.type);
privmsg.AddTags(tags); privmsg.AddTags(tags);
localuser->Send(ServerInstance->GetRFCEvents().privmsg, privmsg); localuser->Send(ServerInstance->GetRFCEvents().privmsg, privmsg);
break;
}
} }
} }
@ -80,23 +86,29 @@ class ModuleIRCv3EchoMessage
LocalUser* const localuser = static_cast<LocalUser*>(user); LocalUser* const localuser = static_cast<LocalUser*>(user);
const ClientProtocol::TagMap& tags = details.echo_original ? details.tags_in : details.tags_out; const ClientProtocol::TagMap& tags = details.echo_original ? details.tags_in : details.tags_out;
if (target.type == MessageTarget::TYPE_USER) switch (target.type)
{
case MessageTarget::TYPE_USER:
{ {
User* destuser = target.Get<User>(); User* destuser = target.Get<User>();
CTCTags::TagMessage message(user, destuser, tags); CTCTags::TagMessage message(user, destuser, tags);
localuser->Send(tagmsgprov, message); localuser->Send(tagmsgprov, message);
break;
} }
else if (target.type == MessageTarget::TYPE_CHANNEL) case MessageTarget::TYPE_CHANNEL:
{ {
Channel* chan = target.Get<Channel>(); Channel* chan = target.Get<Channel>();
CTCTags::TagMessage message(user, chan, tags); CTCTags::TagMessage message(user, chan, tags);
localuser->Send(tagmsgprov, message); localuser->Send(tagmsgprov, message);
break;
} }
else case MessageTarget::TYPE_SERVER:
{ {
const std::string* servername = target.Get<std::string>(); const std::string* servername = target.Get<std::string>();
CTCTags::TagMessage message(user, servername->c_str(), tags); CTCTags::TagMessage message(user, servername->c_str(), tags);
localuser->Send(tagmsgprov, message); localuser->Send(tagmsgprov, message);
break;
}
} }
} }

11
src/modules/m_noctcp.cpp
View File

@ -61,7 +61,9 @@ class ModuleNoCTCP : public Module
if (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION")) if (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION"))
return MOD_RES_PASSTHRU; return MOD_RES_PASSTHRU;
if (target.type == MessageTarget::TYPE_CHANNEL) switch (target.type)
{
case MessageTarget::TYPE_CHANNEL:
{ {
if (user->HasPrivPermission("channels/ignore-noctcp")) if (user->HasPrivPermission("channels/ignore-noctcp"))
return MOD_RES_PASSTHRU; return MOD_RES_PASSTHRU;
@ -76,8 +78,9 @@ class ModuleNoCTCP : public Module
user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C is set)"); user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C is set)");
return MOD_RES_DENY; return MOD_RES_DENY;
} }
break;
} }
else if (target.type == MessageTarget::TYPE_USER) case MessageTarget::TYPE_USER:
{ {
if (user->HasPrivPermission("users/ignore-noctcp")) if (user->HasPrivPermission("users/ignore-noctcp"))
return MOD_RES_PASSTHRU; return MOD_RES_PASSTHRU;
@ -88,6 +91,10 @@ class ModuleNoCTCP : public Module
user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T is set)"); user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T is set)");
return MOD_RES_DENY; return MOD_RES_DENY;
} }
break;
}
case MessageTarget::TYPE_SERVER:
break;
} }
return MOD_RES_PASSTHRU; return MOD_RES_PASSTHRU;
} }

11
src/modules/m_services_account.cpp
View File

@ -207,7 +207,9 @@ class ModuleServicesAccount
std::string *account = accountname.get(user); std::string *account = accountname.get(user);
bool is_registered = account && !account->empty(); bool is_registered = account && !account->empty();
if (target.type == MessageTarget::TYPE_CHANNEL) switch (target.type)
{
case MessageTarget::TYPE_CHANNEL:
{ {
Channel* targchan = target.Get<Channel>(); Channel* targchan = target.Get<Channel>();
@ -220,8 +222,9 @@ class ModuleServicesAccount
// User is messaging a +M channel and is not registered or exempt. // User is messaging a +M channel and is not registered or exempt.
user->WriteNumeric(ERR_NEEDREGGEDNICK, targchan->name, "You need to be identified to a registered account to message this channel"); user->WriteNumeric(ERR_NEEDREGGEDNICK, targchan->name, "You need to be identified to a registered account to message this channel");
return MOD_RES_DENY; return MOD_RES_DENY;
break;
} }
else if (target.type == MessageTarget::TYPE_USER) case MessageTarget::TYPE_USER:
{ {
User* targuser = target.Get<User>(); User* targuser = target.Get<User>();
if (!targuser->IsModeSet(m3) || is_registered) if (!targuser->IsModeSet(m3) || is_registered)
@ -233,6 +236,10 @@ class ModuleServicesAccount
// User is messaging a +R user and is not registered or on an accept list. // User is messaging a +R user and is not registered or on an accept list.
user->WriteNumeric(ERR_NEEDREGGEDNICK, targuser->nick, "You need to be identified to a registered account to message this user"); user->WriteNumeric(ERR_NEEDREGGEDNICK, targuser->nick, "You need to be identified to a registered account to message this user");
return MOD_RES_DENY; return MOD_RES_DENY;
break;
}
case MessageTarget::TYPE_SERVER:
break;
} }
return MOD_RES_PASSTHRU; return MOD_RES_PASSTHRU;
} }

12
src/modules/m_silence.cpp
View File

@ -384,7 +384,9 @@ class ModuleSilence
bool is_ctcp = details.IsCTCP(ctcpname) && !irc::equals(ctcpname, "ACTION"); bool is_ctcp = details.IsCTCP(ctcpname) && !irc::equals(ctcpname, "ACTION");
SilenceEntry::SilenceFlags flag = SilenceEntry::SF_NONE; SilenceEntry::SilenceFlags flag = SilenceEntry::SF_NONE;
if (target.type == MessageTarget::TYPE_CHANNEL) switch (target.type)
{
case MessageTarget::TYPE_CHANNEL:
{ {
if (is_ctcp) if (is_ctcp)
flag = SilenceEntry::SF_CTCP_CHANNEL; flag = SilenceEntry::SF_CTCP_CHANNEL;
@ -394,9 +396,9 @@ class ModuleSilence
flag = SilenceEntry::SF_PRIVMSG_CHANNEL; flag = SilenceEntry::SF_PRIVMSG_CHANNEL;
return BuildChannelExempts(user, target.Get<Channel>(), flag, details.exemptions); return BuildChannelExempts(user, target.Get<Channel>(), flag, details.exemptions);
break;
} }
case MessageTarget::TYPE_USER:
if (target.type == MessageTarget::TYPE_USER)
{ {
if (is_ctcp) if (is_ctcp)
flag = SilenceEntry::SF_CTCP_USER; flag = SilenceEntry::SF_CTCP_USER;
@ -410,6 +412,10 @@ class ModuleSilence
details.echo_original = true; details.echo_original = true;
return MOD_RES_DENY; return MOD_RES_DENY;
} }
break;
}
case MessageTarget::TYPE_SERVER:
break;
} }
return MOD_RES_PASSTHRU; return MOD_RES_PASSTHRU;

12
src/modules/m_spanningtree/main.cpp
View File

@ -392,7 +392,9 @@ void ModuleSpanningTree::OnUserPostMessage(User* user, const MessageTarget& targ
return; return;
const char* message_type = (details.type == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE"); const char* message_type = (details.type == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
if (target.type == MessageTarget::TYPE_USER) switch (target.type)
{
case MessageTarget::TYPE_USER:
{ {
User* d = target.Get<User>(); User* d = target.Get<User>();
if (!IS_LOCAL(d)) if (!IS_LOCAL(d))
@ -403,12 +405,14 @@ void ModuleSpanningTree::OnUserPostMessage(User* user, const MessageTarget& targ
params.push_last(details.text); params.push_last(details.text);
params.Unicast(d); params.Unicast(d);
} }
break;
} }
else if (target.type == MessageTarget::TYPE_CHANNEL) case MessageTarget::TYPE_CHANNEL:
{ {
Utils->SendChannelMessage(user->uuid, target.Get<Channel>(), details.text, target.status, details.tags_out, details.exemptions, message_type); Utils->SendChannelMessage(user->uuid, target.Get<Channel>(), details.text, target.status, details.tags_out, details.exemptions, message_type);
break;
} }
else if (target.type == MessageTarget::TYPE_SERVER) case MessageTarget::TYPE_SERVER:
{ {
const std::string* serverglob = target.Get<std::string>(); const std::string* serverglob = target.Get<std::string>();
CmdBuilder par(user, message_type); CmdBuilder par(user, message_type);
@ -416,6 +420,8 @@ void ModuleSpanningTree::OnUserPostMessage(User* user, const MessageTarget& targ
par.push_back(*serverglob); par.push_back(*serverglob);
par.push_last(details.text); par.push_last(details.text);
par.Broadcast(); par.Broadcast();
break;
}
} }
} }

11
src/modules/m_stripcolor.cpp
View File

@ -47,12 +47,15 @@ class ModuleStripColor : public Module
return MOD_RES_PASSTHRU; return MOD_RES_PASSTHRU;
bool active = false; bool active = false;
if (target.type == MessageTarget::TYPE_USER) switch (target.type)
{
case MessageTarget::TYPE_USER:
{ {
User* t = target.Get<User>(); User* t = target.Get<User>();
active = t->IsModeSet(usc); active = t->IsModeSet(usc);
break;
} }
else if (target.type == MessageTarget::TYPE_CHANNEL) case MessageTarget::TYPE_CHANNEL:
{ {
Channel* t = target.Get<Channel>(); Channel* t = target.Get<Channel>();
ModResult res = CheckExemption::Call(exemptionprov, user, t, "stripcolor"); ModResult res = CheckExemption::Call(exemptionprov, user, t, "stripcolor");
@ -61,6 +64,10 @@ class ModuleStripColor : public Module
return MOD_RES_PASSTHRU; return MOD_RES_PASSTHRU;
active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet(csc)); active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet(csc));
break;
}
case MessageTarget::TYPE_SERVER:
break;
} }
if (active) if (active)