diff options
-rw-r--r-- | conf/modules.conf.example | 6 | ||||
-rw-r--r-- | src/modules/m_muteban.cpp (renamed from src/modules/m_quietban.cpp) | 11 | ||||
-rw-r--r-- | src/modules/m_nonicks.cpp | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/conf/modules.conf.example b/conf/modules.conf.example index d30aac30e..63b6e1767 100644 --- a/conf/modules.conf.example +++ b/conf/modules.conf.example @@ -1011,9 +1011,9 @@ #<module name="m_proxyscan.so"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# Quietban: Implements extended ban q:, which stops anyone matching -# a mask like +b q:nick!user@host from speaking on channel. -#<module name="m_quietban.so"> +# Muteban: Implements extended ban m:, which stops anyone matching +# a mask like +b n:nick!user@host from speaking on channel. +#<module name="m_muteban.so"> # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# diff --git a/src/modules/m_quietban.cpp b/src/modules/m_muteban.cpp index 062c45c64..30e96e9a9 100644 --- a/src/modules/m_quietban.cpp +++ b/src/modules/m_muteban.cpp @@ -13,7 +13,7 @@ #include "inspircd.h" -/* $ModDesc: Implements extban +b q: - quiet bans */ +/* $ModDesc: Implements extban +b m: - mute bans */ class ModuleQuietBan : public Module { @@ -41,7 +41,7 @@ class ModuleQuietBan : public Module if (target_type == TYPE_CHANNEL) { - if (((Channel *)dest)->IsExtBanned(user, 'q')) + if (((Channel *)dest)->IsExtBanned(user, 'm')) { user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot send to " + ((Channel *)dest)->name + ", as you are muted"); return 1; @@ -58,7 +58,7 @@ class ModuleQuietBan : public Module if (target_type == TYPE_CHANNEL) { - if (((Channel *)dest)->IsExtBanned(user, 'q')) + if (((Channel *)dest)->IsExtBanned(user, 'm')) { user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot send to " + ((Channel *)dest)->name + ", as you are muted"); return 1; @@ -70,10 +70,7 @@ class ModuleQuietBan : public Module virtual void On005Numeric(std::string &output) { - if (output.find(" EXTBAN=:") == std::string::npos) - output.append(" EXTBAN=:q"); - else - output.insert(output.find(" EXTBAN=:") + 9, "q"); + ServerInstance->AddExtBanChar("m"); } }; diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp index 7405c7149..11a74bd1e 100644 --- a/src/modules/m_nonicks.cpp +++ b/src/modules/m_nonicks.cpp @@ -70,7 +70,7 @@ class ModuleNoNickChange : public Module virtual void On005Numeric(std::string &output) { - ServerInstance->AddExtBanChar("n"); + ServerInstance->AddExtBanChar("N"); } virtual int OnUserPreNick(User* user, const std::string &newnick) |