diff options
| author |  Sadie Powell | 2020-04-09 18:06:50 +0100 |
|---|---|---|
| committer | Sadie Powell | 2020-04-09 18:06:50 +0100 |
| commit | e1ed9b275f465fbc235a23e416ba7626c7cba6cc (patch) | |
| tree | a0cda4ca3cf14e2731ada5cd6fc890eb90e80731 /src/modules/m_nonotice.cpp | |
| parent | Merge branch 'insp3' into master. (diff) | |
| parent | Set the minimum length to 1 for most config items with a default. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_nonotice.cpp')
| -rw-r--r-- | src/modules/m_nonotice.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp index 18b27ae7f..f9210006d 100644 --- a/src/modules/m_nonotice.cpp +++ b/src/modules/m_nonotice.cpp @@ -60,11 +60,15 @@ class ModuleNoNotice if (res == MOD_RES_ALLOW) return MOD_RES_PASSTHRU; - bool modeset = c->IsModeSet(nt); - if (!c->GetExtBanStatus(user, 'T').check(!modeset)) + if (c->IsModeSet(nt)) { - user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, InspIRCd::Format("Can't send NOTICE to channel (%s)", - modeset ? "+T is set" : "you're extbanned")); + user->WriteNumeric(Numerics::CannotSendTo(c, "notices", &nt)); + return MOD_RES_DENY; + } + + if (c->GetExtBanStatus(user, 'T') == MOD_RES_DENY) + { + user->WriteNumeric(Numerics::CannotSendTo(c, "notices", 'T', "nonotice")); return MOD_RES_DENY; } } |