From 0ed0fa4af62554a7281d403b6895b29e198e8186 Mon Sep 17 00:00:00 2001 From: Adam- Date: Thu, 21 Jan 2010 06:31:17 +0000 Subject: Rewrote how Anope stores channel status modes on users. This allows 3rd party modules to add and track their own status mode. Additionally we now store a users status in both the UserContainer and ChannelContainer. This also fixes the ModeStacker to not send any mode strings unnecessarially and shuffles some code around so we don't have to manually remove channels from users lists everywhere. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2775 5417fbe8-f217-4b02-8779-1006273d7864 --- src/protocol/bahamut.c | 4 ++-- src/protocol/inspircd11.c | 10 +++++----- src/protocol/inspircd12.cpp | 10 +++++----- src/protocol/ratbox.c | 4 ++-- src/protocol/unreal32.c | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/protocol') diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index e57604b8b..d3c92df86 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -828,8 +828,8 @@ void moduleAddModes() ModeManager::AddChannelMode('b', new ChannelModeBan()); /* v/h/o/a/q */ - ModeManager::AddChannelMode('v', new ChannelModeStatus(CMODE_VOICE, CUS_VOICE, '+')); - ModeManager::AddChannelMode('o', new ChannelModeStatus(CMODE_OP, CUS_OP, '@', true)); + ModeManager::AddChannelMode('v', new ChannelModeStatus(CMODE_VOICE, '+')); + ModeManager::AddChannelMode('o', new ChannelModeStatus(CMODE_OP, '@', true)); /* Add channel modes */ ModeManager::AddChannelMode('c', new ChannelMode(CMODE_BLOCKCOLOR)); diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index a4f4fc55d..85612f010 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -1058,11 +1058,11 @@ void moduleAddModes() ModeManager::AddChannelMode('b', new ChannelModeBan()); /* v/h/o/a/q */ - ModeManager::AddChannelMode('v', new ChannelModeStatus(CMODE_VOICE, CUS_VOICE, '+')); - ModeManager::AddChannelMode('h', new ChannelModeStatus(CMODE_HALFOP, CUS_HALFOP, '%')); - ModeManager::AddChannelMode('o', new ChannelModeStatus(CMODE_OP, CUS_OP, '@', true)); - ModeManager::AddChannelMode('a', new ChannelModeStatus(CMODE_PROTECT, CUS_PROTECT, '&', true)); - ModeManager::AddChannelMode('q', new ChannelModeStatus(CMODE_OWNER, CUS_OWNER, '~')); + ModeManager::AddChannelMode('v', new ChannelModeStatus(CMODE_VOICE, '+')); + ModeManager::AddChannelMode('h', new ChannelModeStatus(CMODE_HALFOP, '%')); + ModeManager::AddChannelMode('o', new ChannelModeStatus(CMODE_OP, '@', true)); + ModeManager::AddChannelMode('a', new ChannelModeStatus(CMODE_PROTECT, '&', true)); + ModeManager::AddChannelMode('q', new ChannelModeStatus(CMODE_OWNER, '~')); /* Add channel modes */ ModeManager::AddChannelMode('c', new ChannelMode(CMODE_BLOCKCOLOR)); diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index f07d5896e..f7f57971e 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -1236,11 +1236,11 @@ void moduleAddModes() ModeManager::AddChannelMode('b', new ChannelModeBan()); /* v/h/o/a/q */ - ModeManager::AddChannelMode('v', new ChannelModeStatus(CMODE_VOICE, CUS_VOICE, '+')); - ModeManager::AddChannelMode('h', new ChannelModeStatus(CMODE_HALFOP, CUS_HALFOP, '%')); - ModeManager::AddChannelMode('o', new ChannelModeStatus(CMODE_OP, CUS_OP, '@', true)); - ModeManager::AddChannelMode('a', new ChannelModeStatus(CMODE_PROTECT, CUS_PROTECT, '&', true)); - ModeManager::AddChannelMode('q', new ChannelModeStatus(CMODE_OWNER, CUS_OWNER, '~')); + ModeManager::AddChannelMode('v', new ChannelModeStatus(CMODE_VOICE, '+')); + ModeManager::AddChannelMode('h', new ChannelModeStatus(CMODE_HALFOP, '%')); + ModeManager::AddChannelMode('o', new ChannelModeStatus(CMODE_OP, '@', true)); + ModeManager::AddChannelMode('a', new ChannelModeStatus(CMODE_PROTECT, '&', true)); + ModeManager::AddChannelMode('q', new ChannelModeStatus(CMODE_OWNER, '~')); /* Add channel modes */ ModeManager::AddChannelMode('i', new ChannelMode(CMODE_INVITE)); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index 11141b6a5..46431c38c 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -931,8 +931,8 @@ void moduleAddModes() ModeManager::AddChannelMode('I', new ChannelModeInvite()); /* v/h/o/a/q */ - ModeManager::AddChannelMode('v', new ChannelModeStatus(CMODE_VOICE, CUS_VOICE, '+')); - ModeManager::AddChannelMode('o', new ChannelModeStatus(CMODE_OP, CUS_OP, '@', true)); + ModeManager::AddChannelMode('v', new ChannelModeStatus(CMODE_VOICE, '+')); + ModeManager::AddChannelMode('o', new ChannelModeStatus(CMODE_OP, '@', true)); /* Add channel modes */ ModeManager::AddChannelMode('i', new ChannelMode(CMODE_INVITE)); diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 76411ed51..e2b66b2ea 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -1261,12 +1261,12 @@ void moduleAddModes() ModeManager::AddChannelMode('I', new ChannelModeInvite()); /* v/h/o/a/q */ - ModeManager::AddChannelMode('v', new ChannelModeStatus(CMODE_VOICE, CUS_VOICE, '+')); - ModeManager::AddChannelMode('h', new ChannelModeStatus(CMODE_HALFOP, CUS_HALFOP, '%')); - ModeManager::AddChannelMode('o', new ChannelModeStatus(CMODE_OP, CUS_OP, '@', true)); - ModeManager::AddChannelMode('a', new ChannelModeStatus(CMODE_PROTECT, CUS_PROTECT, '&', true)); + ModeManager::AddChannelMode('v', new ChannelModeStatus(CMODE_VOICE, '+')); + ModeManager::AddChannelMode('h', new ChannelModeStatus(CMODE_HALFOP, '%')); + ModeManager::AddChannelMode('o', new ChannelModeStatus(CMODE_OP, '@', true)); + ModeManager::AddChannelMode('a', new ChannelModeStatus(CMODE_PROTECT, '&', true)); /* Unreal sends +q as * */ - ModeManager::AddChannelMode('q', new ChannelModeStatus(CMODE_OWNER, CUS_OWNER, '*')); + ModeManager::AddChannelMode('q', new ChannelModeStatus(CMODE_OWNER, '*')); /* Add channel modes */ ModeManager::AddChannelMode('c', new ChannelMode(CMODE_BLOCKCOLOR)); -- cgit