]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/channels.cpp
Convert WriteNumeric() calls to pass the parameters of the numeric as method parameters
[user/henk/code/inspircd.git] / src / channels.cpp
index cab4fb73964b9188b92b0c6c52a92faf87ce6f73..a2d5c4a30f1831c8a72fcc63ff83c51c78ce330e 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "inspircd.h"
 #include "listmode.h"
-#include <cstdarg>
-#include "mode.h"
 
 namespace
 {
@@ -34,44 +32,18 @@ namespace
        ChanModeReference inviteonlymode(NULL, "inviteonly");
        ChanModeReference keymode(NULL, "key");
        ChanModeReference limitmode(NULL, "limit");
-       ChanModeReference secretmode(NULL, "secret");
-       ChanModeReference privatemode(NULL, "private");
-       UserModeReference invisiblemode(NULL, "invisible");
 }
 
 Channel::Channel(const std::string &cname, time_t ts)
        : name(cname), age(ts), topicset(0)
 {
-       if (!ServerInstance->chanlist->insert(std::make_pair(cname, this)).second)
+       if (!ServerInstance->chanlist.insert(std::make_pair(cname, this)).second)
                throw CoreException("Cannot create duplicate channel " + cname);
 }
 
 void Channel::SetMode(ModeHandler* mh, bool on)
 {
-       modes[mh->GetModeChar() - 65] = on;
-}
-
-void Channel::SetModeParam(ModeHandler* mh, const std::string& parameter)
-{
-       char mode = mh->GetModeChar();
-       if (parameter.empty())
-       {
-               custom_mode_params.erase(mode);
-               modes[mode-65] = false;
-       }
-       else
-       {
-               custom_mode_params[mode] = parameter;
-               modes[mode-65] = true;
-       }
-}
-
-std::string Channel::GetModeParameter(ModeHandler* mode)
-{
-       CustomModeList::iterator n = custom_mode_params.find(mode->GetModeChar());
-       if (n != custom_mode_params.end())
-               return n->second;
-       return "";
+       modes[mh->GetId()] = on;
 }
 
 void Channel::SetTopic(User* u, const std::string& ntopic)
@@ -86,17 +58,17 @@ void Channel::SetTopic(User* u, const std::string& ntopic)
 
 Membership* Channel::AddUser(User* user)
 {
-       Membership*& memb = userlist[user];
-       if (memb)
+       std::pair<MemberMap::iterator, bool> ret = userlist.insert(std::make_pair(user, insp::aligned_storage<Membership>()));
+       if (!ret.second)
                return NULL;
 
-       memb = new Membership(user, this);
+       Membership* memb = new(ret.first->second) Membership(user, this);
        return memb;
 }
 
 void Channel::DelUser(User* user)
 {
-       UserMembIter it = userlist.find(user);
+       MemberMap::iterator it = userlist.find(user);
        if (it != userlist.end())
                DelUser(it);
 }
@@ -111,23 +83,21 @@ void Channel::CheckDestroy()
        if (res == MOD_RES_DENY)
                return;
 
-       chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
-       /* kill the record */
-       if (iter != ServerInstance->chanlist->end())
-       {
-               FOREACH_MOD(OnChannelDelete, (this));
-               ServerInstance->chanlist->erase(iter);
-       }
+       // If the channel isn't in chanlist then it is already in the cull list, don't add it again
+       chan_hash::iterator iter = ServerInstance->chanlist.find(this->name);
+       if ((iter == ServerInstance->chanlist.end()) || (iter->second != this))
+               return;
 
-       ClearInvites();
+       FOREACH_MOD(OnChannelDelete, (this));
+       ServerInstance->chanlist.erase(iter);
        ServerInstance->GlobalCulls.AddItem(this);
 }
 
-void Channel::DelUser(const UserMembIter& membiter)
+void Channel::DelUser(const MemberMap::iterator& membiter)
 {
        Membership* memb = membiter->second;
        memb->cull();
-       delete memb;
+       memb->~Membership();
        userlist.erase(membiter);
 
        // If this channel became empty then it should be removed
@@ -136,7 +106,7 @@ void Channel::DelUser(const UserMembIter& membiter)
 
 Membership* Channel::GetUser(User* user)
 {
-       UserMembIter i = userlist.find(user);
+       MemberMap::iterator i = userlist.find(user);
        if (i == userlist.end())
                return NULL;
        return i->second;
@@ -157,14 +127,22 @@ void Channel::SetDefaultModes()
                ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL);
                if (mode)
                {
-                       if (mode->GetPrefixRank())
+                       if (mode->IsPrefixMode())
                                continue;
 
                        if (mode->GetNumParams(true))
+                       {
                                list.GetToken(parameter);
+                               // If the parameter begins with a ':' then it's invalid
+                               if (parameter.c_str()[0] == ':')
+                                       continue;
+                       }
                        else
                                parameter.clear();
 
+                       if ((mode->GetNumParams(true)) && (parameter.empty()))
+                               continue;
+
                        mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, parameter, true);
                }
        }
@@ -184,30 +162,26 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 
        /*
         * We don't restrict the number of channels that remote users or users that are override-joining may be in.
-        * We restrict local users to MaxChans channels.
-        * We restrict local operators to OperMaxChans channels.
+        * We restrict local users to <connect:maxchans> channels.
+        * We restrict local operators to <oper:maxchans> channels.
         * This is a lot more logical than how it was formerly. -- w00t
         */
        if (!override)
        {
-               if (user->HasPrivPermission("channels/high-join-limit"))
+               unsigned int maxchans = user->GetClass()->maxchans;
+               if (user->IsOper())
                {
-                       if (user->chans.size() >= ServerInstance->Config->OperMaxChans)
-                       {
-                               user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cname.c_str());
-                               return NULL;
-                       }
+                       unsigned int opermaxchans = ConvToInt(user->oper->getConfig("maxchans"));
+                       // If not set, use 2.0's <channels:opers>, if that's not set either, use limit from CC
+                       if (!opermaxchans)
+                               opermaxchans = ServerInstance->Config->OperMaxChans;
+                       if (opermaxchans)
+                               maxchans = opermaxchans;
                }
-               else
+               if (user->chans.size() >= maxchans)
                {
-                       unsigned int maxchans = user->GetClass()->maxchans;
-                       if (!maxchans)
-                               maxchans = ServerInstance->Config->MaxChans;
-                       if (user->chans.size() >= maxchans)
-                       {
-                               user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cname.c_str());
-                               return NULL;
-                       }
+                       user->WriteNumeric(ERR_TOOMANYCHANNELS, cname, "You are on too many channels");
+                       return NULL;
                }
        }
 
@@ -260,16 +234,13 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
                        if (MOD_RESULT == MOD_RES_PASSTHRU)
                        {
                                std::string ckey = chan->GetModeParameter(keymode);
-                               bool invited = user->IsInvited(chan);
-                               bool can_bypass = ServerInstance->Config->InvBypassModes && invited;
-
                                if (!ckey.empty())
                                {
                                        FIRST_MOD_RESULT(OnCheckKey, MOD_RESULT, (user, chan, key));
-                                       if (!MOD_RESULT.check((ckey == key) || can_bypass))
+                                       if (!MOD_RESULT.check(InspIRCd::TimingSafeCompare(ckey, key)))
                                        {
                                                // If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled)
-                                               user->WriteNumeric(ERR_BADCHANNELKEY, "%s %s :Cannot join channel (Incorrect channel key)",user->nick.c_str(), chan->name.c_str());
+                                               user->WriteNumeric(ERR_BADCHANNELKEY, chan->name, "Cannot join channel (Incorrect channel key)");
                                                return NULL;
                                        }
                                }
@@ -277,9 +248,9 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
                                if (chan->IsModeSet(inviteonlymode))
                                {
                                        FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, chan));
-                                       if (!MOD_RESULT.check(invited))
+                                       if (MOD_RESULT != MOD_RES_ALLOW)
                                        {
-                                               user->WriteNumeric(ERR_INVITEONLYCHAN, "%s %s :Cannot join channel (Invite only)",user->nick.c_str(), chan->name.c_str());
+                                               user->WriteNumeric(ERR_INVITEONLYCHAN, chan->name, "Cannot join channel (Invite only)");
                                                return NULL;
                                        }
                                }
@@ -288,27 +259,18 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
                                if (!limit.empty())
                                {
                                        FIRST_MOD_RESULT(OnCheckLimit, MOD_RESULT, (user, chan));
-                                       if (!MOD_RESULT.check((chan->GetUserCounter() < atol(limit.c_str()) || can_bypass)))
+                                       if (!MOD_RESULT.check((chan->GetUserCounter() < atol(limit.c_str()))))
                                        {
-                                               user->WriteNumeric(ERR_CHANNELISFULL, "%s %s :Cannot join channel (Channel is full)",user->nick.c_str(), chan->name.c_str());
+                                               user->WriteNumeric(ERR_CHANNELISFULL, chan->name, "Cannot join channel (Channel is full)");
                                                return NULL;
                                        }
                                }
 
-                               if (chan->IsBanned(user) && !can_bypass)
+                               if (chan->IsBanned(user))
                                {
-                                       user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)",user->nick.c_str(), chan->name.c_str());
+                                       user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (You're banned)");
                                        return NULL;
                                }
-
-                               /*
-                                * If the user has invites for this channel, remove them now
-                                * after a successful join so they don't build up.
-                                */
-                               if (invited)
-                               {
-                                       user->RemoveInvite(chan);
-                               }
                        }
                }
        }
@@ -319,34 +281,32 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
        return chan;
 }
 
-void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, bool created_by_local)
+Membership* Channel::ForceJoin(User* user, const std::string* privs, bool bursting, bool created_by_local)
 {
        if (IS_SERVER(user))
        {
                ServerInstance->Logs->Log("CHANNELS", LOG_DEBUG, "Attempted to join server user " + user->uuid + " to channel " + this->name);
-               return;
+               return NULL;
        }
 
        Membership* memb = this->AddUser(user);
        if (!memb)
-               return; // Already on the channel
+               return NULL; // Already on the channel
 
-       user->chans.insert(this);
+       user->chans.push_front(memb);
 
        if (privs)
        {
                // If the user was granted prefix modes (in the OnUserPreJoin hook, or he's a
                // remote user and his own server set the modes), then set them internally now
-               memb->modes = *privs;
                for (std::string::const_iterator i = privs->begin(); i != privs->end(); ++i)
                {
-                       ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL);
-                       if (mh && mh->GetPrefixRank())
+                       PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(*i);
+                       if (mh)
                        {
                                std::string nick = user->nick;
-                               /* Set, and make sure that the mode handler knows this mode was now set */
-                               this->SetPrefix(user, mh->GetModeChar(), true);
-                               mh->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, nick, true);
+                               // Set the mode on the user
+                               mh->OnModeChange(ServerInstance->FakeClient, NULL, this, nick, true);
                        }
                }
        }
@@ -368,17 +328,8 @@ void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, boo
                this->WriteAllExcept(user, !ServerInstance->Config->CycleHostsFromUser, 0, except_list, "MODE %s +%s", this->name.c_str(), ms.c_str());
        }
 
-       if (IS_LOCAL(user))
-       {
-               if (this->topicset)
-               {
-                       user->WriteNumeric(RPL_TOPIC, "%s %s :%s", user->nick.c_str(), this->name.c_str(), this->topic.c_str());
-                       user->WriteNumeric(RPL_TOPICTIME, "%s %s %s %lu", user->nick.c_str(), this->name.c_str(), this->setby.c_str(), (unsigned long)this->topicset);
-               }
-               this->UserList(user);
-       }
-
        FOREACH_MOD(OnPostJoin, (memb));
+       return memb;
 }
 
 bool Channel::IsBanned(User* user)
@@ -418,10 +369,10 @@ bool Channel::CheckBan(User* user, const std::string& mask)
                return false;
 
        const std::string nickIdent = user->nick + "!" + user->ident;
-       std::string prefix = mask.substr(0, at);
+       std::string prefix(mask, 0, at);
        if (InspIRCd::Match(nickIdent, prefix, NULL))
        {
-               std::string suffix = mask.substr(at + 1);
+               std::string suffix(mask, at + 1);
                if (InspIRCd::Match(user->host, suffix, NULL) ||
                        InspIRCd::Match(user->dhost, suffix, NULL) ||
                        InspIRCd::MatchCIDR(user->GetIPString(), suffix, NULL))
@@ -440,7 +391,6 @@ ModResult Channel::GetExtBanStatus(User *user, char type)
        ListModeBase* banlm = static_cast<ListModeBase*>(*ban);
        const ListModeBase::ModeList* bans = banlm->GetList(this);
        if (bans)
-
        {
                for (ListModeBase::ModeList::const_iterator it = bans->begin(); it != bans->end(); ++it)
                {
@@ -455,74 +405,37 @@ ModResult Channel::GetExtBanStatus(User *user, char type)
  * Remove a channel from a users record, remove the reference to the Membership object
  * from the channel and destroy it.
  */
-void Channel::PartUser(User *user, std::string &reason)
+bool Channel::PartUser(User* user, std::string& reason)
 {
-       UserMembIter membiter = userlist.find(user);
+       MemberMap::iterator membiter = userlist.find(user);
 
-       if (membiter != userlist.end())
-       {
-               Membership* memb = membiter->second;
-               CUList except_list;
-               FOREACH_MOD(OnUserPart, (memb, reason, except_list));
-
-               WriteAllExcept(user, false, 0, except_list, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
-
-               // Remove this channel from the user's chanlist
-               user->chans.erase(this);
-               // Remove the Membership from this channel's userlist and destroy it
-               this->DelUser(membiter);
-       }
-}
-
-void Channel::KickUser(User* src, User* victim, const std::string& reason, Membership* srcmemb)
-{
-       UserMembIter victimiter = userlist.find(victim);
-       Membership* memb = ((victimiter != userlist.end()) ? victimiter->second : NULL);
+       if (membiter == userlist.end())
+               return false;
 
-       if (!memb)
-       {
-               src->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s %s :They are not on that channel",src->nick.c_str(), victim->nick.c_str(), this->name.c_str());
-               return;
-       }
+       Membership* memb = membiter->second;
+       CUList except_list;
+       FOREACH_MOD(OnUserPart, (memb, reason, except_list));
 
-       // Do the following checks only if the KICK is done by a local user;
-       // each server enforces its own rules.
-       if (IS_LOCAL(src))
-       {
-               // Modules are allowed to explicitly allow or deny kicks done by local users
-               ModResult res;
-               FIRST_MOD_RESULT(OnUserPreKick, res, (src,memb,reason));
-               if (res == MOD_RES_DENY)
-                       return;
+       WriteAllExcept(user, false, 0, except_list, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
 
-               if (res == MOD_RES_PASSTHRU)
-               {
-                       if (!srcmemb)
-                               srcmemb = GetUser(src);
-                       unsigned int them = srcmemb ? srcmemb->getRank() : 0;
-                       unsigned int req = HALFOP_VALUE;
-                       for (std::string::size_type i = 0; i < memb->modes.length(); i++)
-                       {
-                               ModeHandler* mh = ServerInstance->Modes->FindMode(memb->modes[i], MODETYPE_CHANNEL);
-                               if (mh && mh->GetLevelRequired() > req)
-                                       req = mh->GetLevelRequired();
-                       }
+       // Remove this channel from the user's chanlist
+       user->chans.erase(memb);
+       // Remove the Membership from this channel's userlist and destroy it
+       this->DelUser(membiter);
 
-                       if (them < req)
-                       {
-                               src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",
-                                       src->nick.c_str(), this->name.c_str(), req > HALFOP_VALUE ? "" : "half-");
-                               return;
-                       }
-               }
-       }
+       return true;
+}
 
+void Channel::KickUser(User* src, const MemberMap::iterator& victimiter, const std::string& reason)
+{
+       Membership* memb = victimiter->second;
        CUList except_list;
        FOREACH_MOD(OnUserKick, (src, memb, reason, except_list));
 
+       User* victim = memb->user;
        WriteAllExcept(src, false, 0, except_list, "KICK %s %s :%s", name.c_str(), victim->nick.c_str(), reason.c_str());
 
-       victim->chans.erase(this);
+       victim->chans.erase(memb);
        this->DelUser(victimiter);
 }
 
@@ -537,7 +450,7 @@ void Channel::WriteChannel(User* user, const std::string &text)
 {
        const std::string message = ":" + user->GetFullHost() + " " + text;
 
-       for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
+       for (MemberMap::iterator i = userlist.begin(); i != userlist.end(); i++)
        {
                if (IS_LOCAL(i->first))
                        i->first->Write(message);
@@ -555,7 +468,7 @@ void Channel::WriteChannelWithServ(const std::string& ServName, const std::strin
 {
        const std::string message = ":" + (ServName.empty() ? ServerInstance->Config->ServerName : ServName) + " " + text;
 
-       for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
+       for (MemberMap::iterator i = userlist.begin(); i != userlist.end(); i++)
        {
                if (IS_LOCAL(i->first))
                        i->first->Write(message);
@@ -590,11 +503,11 @@ void Channel::RawWriteAllExcept(User* user, bool serversource, char status, CULi
        unsigned int minrank = 0;
        if (status)
        {
-               ModeHandler* mh = ServerInstance->Modes->FindPrefix(status);
+               PrefixMode* mh = ServerInstance->Modes->FindPrefix(status);
                if (mh)
                        minrank = mh->GetPrefixRank();
        }
-       for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
+       for (MemberMap::iterator i = userlist.begin(); i != userlist.end(); i++)
        {
                if (IS_LOCAL(i->first) && (except_list.find(i->first) == except_list.end()))
                {
@@ -624,11 +537,13 @@ const char* Channel::ChanModes(bool showkey)
        /* This was still iterating up to 190, Channel::modes is only 64 elements -- Om */
        for(int n = 0; n < 64; n++)
        {
-               if(this->modes[n])
+               ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_CHANNEL);
+               if (mh && IsModeSet(mh))
                {
                        scratch.push_back(n + 65);
-                       ModeHandler* mh = ServerInstance->Modes->FindMode(n+'A', MODETYPE_CHANNEL);
-                       if (!mh)
+
+                       ParamModeBase* pm = mh->IsParameterMode();
+                       if (!pm)
                                continue;
 
                        if (n == 'k' - 65 && !showkey)
@@ -637,12 +552,8 @@ const char* Channel::ChanModes(bool showkey)
                        }
                        else
                        {
-                               const std::string param = this->GetModeParameter(mh);
-                               if (!param.empty())
-                               {
-                                       sparam += ' ';
-                                       sparam += param;
-                               }
+                               sparam += ' ';
+                               pm->GetParameter(this, sparam);
                        }
                }
        }
@@ -651,101 +562,22 @@ const char* Channel::ChanModes(bool showkey)
        return scratch.c_str();
 }
 
-/* compile a userlist of a channel into a string, each nick seperated by
- * spaces and op, voice etc status shown as @ and +, and send it to 'user'
- */
-void Channel::UserList(User *user)
-{
-       if (this->IsModeSet(secretmode) && !this->HasUser(user) && !user->HasPrivPermission("channels/auspex"))
-       {
-               user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), this->name.c_str());
-               return;
-       }
-
-       std::string list = user->nick;
-       list.push_back(' ');
-       list.push_back(this->IsModeSet(secretmode) ? '@' : this->IsModeSet(privatemode) ? '*' : '=');
-       list.push_back(' ');
-       list.append(this->name).append(" :");
-       std::string::size_type pos = list.size();
-
-       bool has_one = false;
-
-       /* Improvement by Brain - this doesnt change in value, so why was it inside
-        * the loop?
-        */
-       bool has_user = this->HasUser(user);
-
-       std::string prefixlist;
-       std::string nick;
-       for (UserMembIter i = userlist.begin(); i != userlist.end(); ++i)
-       {
-               if (i->first->quitting)
-                       continue;
-               if ((!has_user) && (i->first->IsModeSet(invisiblemode)))
-               {
-                       /*
-                        * user is +i, and source not on the channel, does not show
-                        * nick in NAMES list
-                        */
-                       continue;
-               }
-
-               prefixlist = this->GetPrefixChar(i->first);
-               nick = i->first->nick;
-
-               FOREACH_MOD(OnNamesListItem, (user, i->second, prefixlist, nick));
-
-               /* Nick was nuked, a module wants us to skip it */
-               if (nick.empty())
-                       continue;
-
-               if (list.size() + prefixlist.length() + nick.length() + 1 > 480)
-               {
-                       /* list overflowed into multiple numerics */
-                       user->WriteNumeric(RPL_NAMREPLY, list);
-
-                       // Erase all nicks, keep the constant part
-                       list.erase(pos);
-                       has_one = false;
-               }
-
-               list.append(prefixlist).append(nick).push_back(' ');
-
-               has_one = true;
-       }
-
-       /* if whats left in the list isnt empty, send it */
-       if (has_one)
-       {
-               user->WriteNumeric(RPL_NAMREPLY, list);
-       }
-
-       user->WriteNumeric(RPL_ENDOFNAMES, "%s %s :End of /NAMES list.", user->nick.c_str(), this->name.c_str());
-}
-
 /* returns the status character for a given user on a channel, e.g. @ for op,
  * % for halfop etc. If the user has several modes set, the highest mode
  * the user has must be returned.
  */
-const char* Channel::GetPrefixChar(User *user)
+char Membership::GetPrefixChar() const
 {
-       static char pf[2] = {0, 0};
-       *pf = 0;
+       char pf = 0;
        unsigned int bestrank = 0;
 
-       UserMembIter m = userlist.find(user);
-       if (m != userlist.end())
+       for (std::string::const_iterator i = modes.begin(); i != modes.end(); ++i)
        {
-               for(unsigned int i=0; i < m->second->modes.length(); i++)
+               PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(*i);
+               if (mh && mh->GetPrefixRank() > bestrank && mh->GetPrefix())
                {
-                       char mchar = m->second->modes[i];
-                       ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
-                       if (mh && mh->GetPrefixRank() > bestrank && mh->GetPrefix())
-                       {
-                               bestrank = mh->GetPrefixRank();
-                               pf[0] = mh->GetPrefix();
-                       }
+                       bestrank = mh->GetPrefixRank();
+                       pf = mh->GetPrefix();
                }
        }
        return pf;
@@ -757,28 +589,23 @@ unsigned int Membership::getRank()
        unsigned int rv = 0;
        if (mchar)
        {
-               ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+               PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(mchar);
                if (mh)
                        rv = mh->GetPrefixRank();
        }
        return rv;
 }
 
-const char* Channel::GetAllPrefixChars(User* user)
+const char* Membership::GetAllPrefixChars() const
 {
        static char prefix[64];
        int ctr = 0;
 
-       UserMembIter m = userlist.find(user);
-       if (m != userlist.end())
+       for (std::string::const_iterator i = modes.begin(); i != modes.end(); ++i)
        {
-               for(unsigned int i=0; i < m->second->modes.length(); i++)
-               {
-                       char mchar = m->second->modes[i];
-                       ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
-                       if (mh && mh->GetPrefix())
-                               prefix[ctr++] = mh->GetPrefix();
-               }
+               PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(*i);
+               if (mh && mh->GetPrefix())
+                       prefix[ctr++] = mh->GetPrefix();
        }
        prefix[ctr] = 0;
 
@@ -787,121 +614,28 @@ const char* Channel::GetAllPrefixChars(User* user)
 
 unsigned int Channel::GetPrefixValue(User* user)
 {
-       UserMembIter m = userlist.find(user);
+       MemberMap::iterator m = userlist.find(user);
        if (m == userlist.end())
                return 0;
        return m->second->getRank();
 }
 
-bool Channel::SetPrefix(User* user, char prefix, bool adding)
+bool Membership::SetPrefix(PrefixMode* delta_mh, bool adding)
 {
-       ModeHandler* delta_mh = ServerInstance->Modes->FindMode(prefix, MODETYPE_CHANNEL);
-       if (!delta_mh)
-               return false;
-       UserMembIter m = userlist.find(user);
-       if (m == userlist.end())
-               return false;
-       for(unsigned int i=0; i < m->second->modes.length(); i++)
+       char prefix = delta_mh->GetModeChar();
+       for (unsigned int i = 0; i < modes.length(); i++)
        {
-               char mchar = m->second->modes[i];
-               ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+               char mchar = modes[i];
+               PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(mchar);
                if (mh && mh->GetPrefixRank() <= delta_mh->GetPrefixRank())
                {
-                       m->second->modes =
-                               m->second->modes.substr(0,i) +
+                       modes = modes.substr(0,i) +
                                (adding ? std::string(1, prefix) : "") +
-                               m->second->modes.substr(mchar == prefix ? i+1 : i);
+                               modes.substr(mchar == prefix ? i+1 : i);
                        return adding != (mchar == prefix);
                }
        }
        if (adding)
-               m->second->modes += std::string(1, prefix);
+               modes.push_back(prefix);
        return adding;
 }
-
-void Invitation::Create(Channel* c, LocalUser* u, time_t timeout)
-{
-       if ((timeout != 0) && (ServerInstance->Time() >= timeout))
-               // Expired, don't bother
-               return;
-
-       ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Create chan=%s user=%s", c->name.c_str(), u->uuid.c_str());
-
-       Invitation* inv = Invitation::Find(c, u, false);
-       if (inv)
-       {
-                if ((inv->expiry == 0) || (inv->expiry > timeout))
-                       return;
-               inv->expiry = timeout;
-               ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Create changed expiry in existing invitation %p", (void*) inv);
-       }
-       else
-       {
-               inv = new Invitation(c, u, timeout);
-               c->invites.push_back(inv);
-               u->invites.push_back(inv);
-               ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Create created new invitation %p", (void*) inv);
-       }
-}
-
-Invitation* Invitation::Find(Channel* c, LocalUser* u, bool check_expired)
-{
-       ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Find chan=%s user=%s check_expired=%d", c ? c->name.c_str() : "NULL", u ? u->uuid.c_str() : "NULL", check_expired);
-       if (!u || u->invites.empty())
-               return NULL;
-
-       InviteList locallist;
-       locallist.swap(u->invites);
-
-       Invitation* result = NULL;
-       for (InviteList::iterator i = locallist.begin(); i != locallist.end(); )
-       {
-               Invitation* inv = *i;
-               if ((check_expired) && (inv->expiry != 0) && (inv->expiry <= ServerInstance->Time()))
-               {
-                       /* Expired invite, remove it. */
-                       std::string expiration = ServerInstance->TimeString(inv->expiry);
-                       ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Find ecountered expired entry: %p expired %s", (void*) inv, expiration.c_str());
-                       i = locallist.erase(i);
-                       inv->cull();
-                       delete inv;
-               }
-               else
-               {
-                       /* Is it what we're searching for? */
-                       if (inv->chan == c)
-                       {
-                               result = inv;
-                               break;
-                       }
-                       ++i;
-               }
-       }
-
-       locallist.swap(u->invites);
-       ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Find result=%p", (void*) result);
-       return result;
-}
-
-Invitation::~Invitation()
-{
-       // Remove this entry from both lists
-       InviteList::iterator it = std::find(chan->invites.begin(), chan->invites.end(), this);
-       if (it != chan->invites.end())
-               chan->invites.erase(it);
-       it = std::find(user->invites.begin(), user->invites.end(), this);
-       if (it != user->invites.end())
-               user->invites.erase(it);
-}
-
-void InviteBase::ClearInvites()
-{
-       ServerInstance->Logs->Log("INVITEBASE", LOG_DEBUG, "InviteBase::ClearInvites %p", (void*) this);
-       InviteList locallist;
-       locallist.swap(invites);
-       for (InviteList::const_iterator i = locallist.begin(); i != locallist.end(); ++i)
-       {
-               (*i)->cull();
-               delete *i;
-       }
-}