diff options
Diffstat (limited to 'src/modules/m_delayjoin.cpp')
| -rw-r--r-- | src/modules/m_delayjoin.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index dc1b47bb7..9901c8e2c 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -122,9 +122,8 @@ ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channe * Make all users visible, as +D is being removed. If we don't do this, * they remain permanently invisible on this channel! */ - const Channel::MemberMap& users = channel->GetUsers(); - for (Channel::MemberMap::const_iterator n = users.begin(); n != users.end(); ++n) - RevealUser(n->first, channel); + for (const auto& [member, _] : channel->GetUsers()) + RevealUser(member, channel); } channel->SetMode(this, change.adding); return MODEACTION_ALLOW; @@ -145,12 +144,11 @@ ModResult ModuleDelayJoin::OnNamesListItem(LocalUser* issuer, Membership* memb, static void populate(CUList& except, Membership* memb) { - const Channel::MemberMap& users = memb->chan->GetUsers(); - for (Channel::MemberMap::const_iterator i = users.begin(); i != users.end(); ++i) + for (const auto& [member, _] : memb->chan->GetUsers()) { - if (i->first == memb->user || !IS_LOCAL(i->first)) + if (member == memb->user || !IS_LOCAL(member)) continue; - except.insert(i->first); + except.insert(member); } } |