diff options
| author |  Sadie Powell | 2019-03-30 22:06:19 +0000 |
|---|---|---|
| committer | Sadie Powell | 2019-03-30 22:06:19 +0000 |
| commit | 1fff2f7f87fa0e69494fe45902cfa315204d1e43 (patch) | |
| tree | b4f3eac01dc458cc7f3ab5b43a57c44d06044bed /src/modules/m_noctcp.cpp | |
| parent | Remove the flashpolicyd module. (diff) | |
| parent | Rename OnClientProtocolPopulateTags to OnPopulateTags. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_noctcp.cpp')
| -rw-r--r-- | src/modules/m_noctcp.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp index b7e981450..9c27b20ea 100644 --- a/src/modules/m_noctcp.cpp +++ b/src/modules/m_noctcp.cpp @@ -52,6 +52,9 @@ class ModuleNoCTCP : public Module if (target.type == MessageTarget::TYPE_CHANNEL) { + if (user->HasPrivPermission("channels/ignore-noctcp")) + return MOD_RES_PASSTHRU; + Channel* c = target.Get<Channel>(); ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp"); if (res == MOD_RES_ALLOW) @@ -65,11 +68,14 @@ class ModuleNoCTCP : public Module } else if (target.type == MessageTarget::TYPE_USER) { + if (user->HasPrivPermission("users/ignore-noctcp")) + return MOD_RES_PASSTHRU; + User* u = target.Get<User>(); if (u->IsModeSet(ncu)) { user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T set)"); - return MOD_RES_PASSTHRU; + return MOD_RES_DENY; } } return MOD_RES_PASSTHRU; |