diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2015-02-06 00:16:46 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2015-02-06 00:16:46 +0100 |
| commit | 43b5073d6f80a8dcb7044ecd127fd5893da033ab (patch) | |
| tree | f940ee307f891939ecff9e25259fcb6d44204bd1 | |
| parent | b3bafc6aaee4b6b95c6aaefcc6f2e80eca6bd370 (diff) | |
| parent | 6ec3d27b2a32ca54d8f62d5cd4b1e8e170ac0783 (diff) | |
Merge pull request #984 from Renegade334/modules-exempt-uline
Allow U-lined services to bypass m_silence (configurable)
| -rw-r--r-- | docs/conf/modules.conf.example | 5 | ||||
| -rw-r--r-- | src/modules/m_silence.cpp | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example index 1071f5039..881c5f077 100644 --- a/docs/conf/modules.conf.example +++ b/docs/conf/modules.conf.example @@ -1841,7 +1841,10 @@ #<module name="m_silence.so"> # # Set the maximum number of entries allowed on a user's silence list. -#<silence maxentries="32"> +#<silence maxentries="32" +# +# Whether messages from U-lined servers will bypass silence masks. +#exemptuline="yes"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # SQLite3 module: Allows other SQL modules to access SQLite3 # diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 91822b4e4..502f947f4 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -291,6 +291,7 @@ class CommandSilence : public Command class ModuleSilence : public Module { unsigned int maxsilence; + bool ExemptULine; CommandSilence cmdsilence; CommandSVSSilence cmdsvssilence; public: @@ -302,9 +303,13 @@ class ModuleSilence : public Module void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - maxsilence = ServerInstance->Config->ConfValue("silence")->getInt("maxentries", 32); + ConfigTag* tag = ServerInstance->Config->ConfValue("silence"); + + maxsilence = tag->getInt("maxentries", 32); if (!maxsilence) maxsilence = 32; + + ExemptULine = tag->getBool("exemptuline", true); } void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE @@ -351,6 +356,9 @@ class ModuleSilence : public Module ModResult MatchPattern(User* dest, User* source, int pattern) { + if (ExemptULine && source->server->IsULine()) + return MOD_RES_PASSTHRU; + silencelist* sl = cmdsilence.ext.get(dest); if (sl) { |