Merge pull request #1271 from SaberUK/master+exemption

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

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 7ad7ba1a3d8d684fc9609cdd764f206572d66687..cd257eff3237ebb1c294e4fb0be881f6c80d9aa0 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -21,6 +21,7 @@
 
 
 #include "inspircd.h"
+#include "modules/exemption.h"
 
 class AuditoriumMode : public SimpleChannelModeHandler
 {
@@ -33,13 +34,16 @@ class AuditoriumMode : public SimpleChannelModeHandler
 
 class ModuleAuditorium : public Module
 {
+       CheckExemption::EventProvider exemptionprov;
        AuditoriumMode aum;
        bool OpsVisible;
        bool OpsCanSee;
        bool OperCanSee;
 
  public:
-       ModuleAuditorium() : aum(this)
+       ModuleAuditorium()
+               : exemptionprov(this)
+               , aum(this)
        {
        }
 
@@ -62,7 +66,8 @@ class ModuleAuditorium : public Module
                if (!memb->chan->IsModeSet(&aum))
                        return true;
 
-               ModResult res = ServerInstance->OnCheckExemption(memb->user, memb->chan, "auditorium-vis");
+               ModResult res;
+               FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (memb->user, memb->chan, "auditorium-vis"));
                return res.check(OpsVisible && memb->getRank() >= OP_VALUE);
        }
 
@@ -78,7 +83,8 @@ class ModuleAuditorium : public Module
                        return true;
 
                // Can you see the list by permission?
-               ModResult res = ServerInstance->OnCheckExemption(issuer,memb->chan,"auditorium-see");
+               ModResult res;
+               FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (issuer, memb->chan, "auditorium-see"));
                if (res.check(OpsCanSee && memb->chan->GetPrefixValue(issuer) >= OP_VALUE))
                        return true;
 
@@ -149,15 +155,15 @@ class ModuleAuditorium : public Module
                }
        }
 
-       void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
+       ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
        {
                if (!memb)
-                       return;
+                       return MOD_RES_PASSTHRU;
                if (IsVisible(memb))
-                       return;
+                       return MOD_RES_PASSTHRU;
                if (CanSee(source, memb))
-                       return;
-               line.clear();
+                       return MOD_RES_PASSTHRU;
+               return MOD_RES_DENY;
        }
 };