summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2013-12-28 09:37:22 -0500
committerAdam <Adam@anope.org>2013-12-28 09:39:16 -0500
commit3d12752655405ae75265622cbec565f9efa23be3 (patch)
tree09d5f627296003b12a7f94b975e2435878030b23
parent9c0ceed36a31bd1bd00d41f7a2a29bb3ee6d9de7 (diff)
Fix naming collision between modes +g and +G on inspircd, rename the common badwords censor mode to censor
-rw-r--r--modules/protocol/inspircd12.cpp4
-rw-r--r--modules/protocol/inspircd20.cpp4
-rw-r--r--modules/protocol/unreal.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index a21bb37dc..1d3605c88 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -604,7 +604,7 @@ struct IRCDMessageCapab : Message::Capab
ModeManager::AddChannelMode(new ChannelMode("DELAYEDJOIN", 'D'));
continue;
case 'G':
- ModeManager::AddChannelMode(new ChannelMode("FILTER", 'G'));
+ ModeManager::AddChannelMode(new ChannelMode("CENSOR", 'G'));
continue;
case 'K':
ModeManager::AddChannelMode(new ChannelMode("NOKNOCK", 'K'));
@@ -687,7 +687,7 @@ struct IRCDMessageCapab : Message::Capab
ModeManager::AddUserMode(new UserMode("BOT", 'B'));
continue;
case 'G':
- ModeManager::AddUserMode(new UserMode("FILTER", 'G'));
+ ModeManager::AddUserMode(new UserMode("CENSOR", 'G'));
continue;
case 'H':
ModeManager::AddUserMode(new UserModeOperOnly("HIDEOPER", 'H'));
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 56194970a..633a804ad 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -316,7 +316,7 @@ struct IRCDMessageCapab : Message::Capab
else if (modename.equals_cs("c_registered"))
cm = new ChannelModeNoone("REGISTERED", modechar[0]);
else if (modename.equals_cs("censor"))
- cm = new ChannelMode("FILTER", modechar[0]);
+ cm = new ChannelMode("CENSOR", modechar[0]);
else if (modename.equals_cs("delayjoin"))
cm = new ChannelMode("DELAYEDJOIN", modechar[0]);
else if (modename.equals_cs("delaymsg"))
@@ -437,7 +437,7 @@ struct IRCDMessageCapab : Message::Capab
else if (modename.equals_cs("showwhois"))
um = new UserMode("WHOIS", modechar[0]);
else if (modename.equals_cs("u_censor"))
- um = new UserMode("FILTER", modechar[0]);
+ um = new UserMode("CENSOR", modechar[0]);
else if (modename.equals_cs("u_registered"))
um = new UserModeNoone("REGISTERED", modechar[0]);
else if (modename.equals_cs("u_stripcolor"))
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index 67462432d..9bdc6ad7c 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -669,7 +669,7 @@ struct IRCDMessageCapab : Message::Capab
ModeManager::AddChannelMode(new ChannelMode("NONOTICE", 'T'));
continue;
case 'G':
- ModeManager::AddChannelMode(new ChannelMode("FILTER", 'G'));
+ ModeManager::AddChannelMode(new ChannelMode("CENSOR", 'G'));
continue;
case 'Z':
ModeManager::AddChannelMode(new ChannelModeUnrealSSL("", 'Z'));
@@ -1193,7 +1193,7 @@ class ProtoUnreal : public Module
ModeManager::AddUserMode(new UserModeOperOnly("SERV_ADMIN", 'A'));
ModeManager::AddUserMode(new UserMode("BOT", 'B'));
ModeManager::AddUserMode(new UserModeOperOnly("CO_ADMIN", 'C'));
- ModeManager::AddUserMode(new UserMode("FILTER", 'G'));
+ ModeManager::AddUserMode(new UserMode("CENSOR", 'G'));
ModeManager::AddUserMode(new UserModeOperOnly("HIDEOPER", 'H'));
ModeManager::AddUserMode(new UserMode("HIDEIDLE", 'I'));
ModeManager::AddUserMode(new UserModeOperOnly("NETADMIN", 'N'));