Replace OnAccessCheck with OnPreMode to remove a number of redundant checks

[user/henk/code/inspircd.git] / src / modules / m_silence.cpp

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 779cb541ebaf18a028224e1d718d8f9b6a1f315c..3b07095398279cc39fbeef572087909ac2827c2b 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -298,30 +298,15 @@ class ModuleSilence : public Module
        void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
        {
                int public_silence = (message_type == MSG_PRIVMSG ? SILENCE_CHANNEL : SILENCE_CNOTICE);
-               CUList *ulist;
-               switch (status)
-               {
-                       case '@':
-                               ulist = chan->GetOppedUsers();
-                               break;
-                       case '%':
-                               ulist = chan->GetHalfoppedUsers();
-                               break;
-                       case '+':
-                               ulist = chan->GetVoicedUsers();
-                               break;
-                       default:
-                               ulist = chan->GetUsers();
-                               break;
-               }
+               const UserMembList *ulist = chan->GetUsers();
 
-               for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+               for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
                {
                        if (IS_LOCAL(i->first))
                        {
                                if (MatchPattern(i->first, sender, public_silence) == MOD_RES_ALLOW)
                                {
-                                       exempt_list[i->first] = i->first->nick;
+                                       exempt_list.insert(i->first);
                                }
                        }
                }