diff options
| author |  Sadie Powell | 2021-04-06 20:06:18 +0100 |
|---|---|---|
| committer | Sadie Powell | 2021-04-07 10:36:11 +0100 |
| commit | 942fd2bcfd384a12c900999fe663202c87319a68 (patch) | |
| tree | c2bad1906af27afbc3c7d96c3e5ca3c27c83f090 /src/modules/m_nonicks.cpp | |
| parent | Merge branch 'insp3' into master. (diff) | |
Switch simple iterator loops to use range-based for loops.
Diffstat (limited to 'src/modules/m_nonicks.cpp')
| -rw-r--r-- | src/modules/m_nonicks.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp index 61995c29f..e6dac07f0 100644 --- a/src/modules/m_nonicks.cpp +++ b/src/modules/m_nonicks.cpp @@ -47,22 +47,20 @@ class ModuleNoNickChange : public Module ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) override { - for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++) + for (const auto* memb : user->chans) { - Channel* curr = (*i)->chan; - - ModResult res = CheckExemption::Call(exemptionprov, user, curr, "nonick"); + ModResult res = CheckExemption::Call(exemptionprov, user, memb->chan, "nonick"); if (res == MOD_RES_ALLOW) continue; if (user->HasPrivPermission("channels/ignore-nonicks")) continue; - bool modeset = curr->IsModeSet(nn); - if (!extban.GetStatus(user, curr).check(!modeset)) + bool modeset = memb->chan->IsModeSet(nn); + if (!extban.GetStatus(user, memb->chan).check(!modeset)) { user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Can't change nickname while on %s (%s)", - curr->name.c_str(), modeset ? "+N is set" : "you're extbanned")); + memb->chan->name.c_str(), modeset ? "+N is set" : "you're extbanned")); return MOD_RES_DENY; } } |