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

Rename the modes in the services_account module to be less confusable.

Browse Source
This commit is contained in:
Sadie Powell 2020-01-05 15:15:16 +00:00
parent 6bd4024fd2
commit 007e0b46a8
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/modules/m_services_account.cpp
View File

@ -145,11 +145,11 @@ class ModuleServicesAccount
private:
CallerID::API calleridapi;
CheckExemption::EventProvider exemptionprov;
SimpleChannelModeHandler m1;
SimpleChannelModeHandler m2;
SimpleUserModeHandler m3;
Channel_r m4;
User_r m5;
SimpleChannelModeHandler reginvitemode;
SimpleChannelModeHandler regmoderatedmode;
SimpleUserModeHandler regdeafmode;
Channel_r chanregmode;
User_r userregmode;
AccountExtItemImpl accountname;
bool checking_ban;
@ -159,11 +159,11 @@ class ModuleServicesAccount
, CTCTags::EventListener(this)
, calleridapi(this)
, exemptionprov(this)
, m1(this, "reginvite", 'R')
, m2(this, "regmoderated", 'M')
, m3(this, "regdeaf", 'R')
, m4(this)
, m5(this)
, reginvitemode(this, "reginvite", 'R')
, regmoderatedmode(this, "regmoderated", 'M')
, regdeafmode(this, "regdeaf", 'R')
, chanregmode(this)
, userregmode(this)
, accountname(this)
, checking_ban(false)
{
@ -185,7 +185,7 @@ class ModuleServicesAccount
whois.SendLine(RPL_WHOISACCOUNT, *account, "is logged in as");
}
if (whois.GetTarget()->IsModeSet(m5))
if (whois.GetTarget()->IsModeSet(userregmode))
{
/* user is registered */
whois.SendLine(RPL_WHOISREGNICK, "is a registered nick");
@ -195,8 +195,8 @@ class ModuleServicesAccount
void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE
{
/* On nickchange, if they have +r, remove it */
if ((user->IsModeSet(m5)) && (ServerInstance->FindNickOnly(oldnick) != user))
m5.RemoveMode(user);
if ((user->IsModeSet(userregmode)) && (ServerInstance->FindNickOnly(oldnick) != user))
userregmode.RemoveMode(user);
}
ModResult HandleMessage(User* user, const MessageTarget& target)
@ -213,7 +213,7 @@ class ModuleServicesAccount
{
Channel* targchan = target.Get<Channel>();
if (!targchan->IsModeSet(m2) || is_registered)
if (!targchan->IsModeSet(regmoderatedmode) || is_registered)
return MOD_RES_PASSTHRU;
if (CheckExemption::Call(exemptionprov, user, targchan, "regmoderated") == MOD_RES_ALLOW)
@ -227,7 +227,7 @@ class ModuleServicesAccount
case MessageTarget::TYPE_USER:
{
User* targuser = target.Get<User>();
if (!targuser->IsModeSet(m3) || is_registered)
if (!targuser->IsModeSet(regdeafmode) || is_registered)
return MOD_RES_PASSTHRU;
if (calleridapi && calleridapi->IsOnAcceptList(user, targuser))
@ -297,7 +297,7 @@ class ModuleServicesAccount
if (chan)
{
if (chan->IsModeSet(m1))
if (chan->IsModeSet(reginvitemode))
{
if (!is_registered)
{