From f474e7e6dc2d36f96150ebe33b23b4ea76814415 Mon Sep 17 00:00:00 2001 From: w00t Date: Mon, 14 Jul 2008 12:15:11 +0000 Subject: [PATCH] Rename quietban to muteban, change character to +b m:, this way it fits with cmode +m, which is what it does. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10019 e03df62e-2008-0410-955e-edbf42e46eb7 --- conf/modules.conf.example | 6 +++--- src/modules/{m_quietban.cpp => m_muteban.cpp} | 11 ++++------- src/modules/m_nonicks.cpp | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) rename src/modules/{m_quietban.cpp => m_muteban.cpp} (84%) 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 @@ # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# Quietban: Implements extended ban q:, which stops anyone matching -# a mask like +b q:nick!user@host from speaking on channel. -# +# Muteban: Implements extended ban m:, which stops anyone matching +# a mask like +b n:nick!user@host from speaking on channel. +# # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# diff --git a/src/modules/m_quietban.cpp b/src/modules/m_muteban.cpp similarity index 84% rename from src/modules/m_quietban.cpp rename to 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)