Move stuff around a bit:

[user/henk/code/inspircd.git] / src / channels.cpp

diff --git a/src/channels.cpp b/src/channels.cpp
index c7913606f44ecdbce5907d66d88897c9a8d40575..4e266fb7c4ba860ad3c1ceb26eac32c4c336493d 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -40,15 +40,10 @@ namespace
 }
 
 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)
                throw CoreException("Cannot create duplicate channel " + cname);
-
-       this->name = cname;
-       this->age = ts ? ts : ServerInstance->Time();
-
-       topicset = 0;
-       modes.reset();
 }
 
 void Channel::SetMode(ModeHandler* mh, bool on)
@@ -162,7 +157,7 @@ void Channel::SetDefaultModes()
                ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL);
                if (mode)
                {
-                       if (mode->GetPrefixRank())
+                       if (mode->IsPrefixMode())
                                continue;
 
                        if (mode->GetNumParams(true))
@@ -199,7 +194,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
                {
                        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());
+                               user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s :You are on too many channels", cname.c_str());
                                return NULL;
                        }
                }
@@ -210,7 +205,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
                                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());
+                               user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s :You are on too many channels", cname.c_str());
                                return NULL;
                        }
                }
@@ -274,7 +269,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
                                        if (!MOD_RESULT.check((ckey == key) || can_bypass))
                                        {
                                                // 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, "%s :Cannot join channel (Incorrect channel key)", chan->name.c_str());
                                                return NULL;
                                        }
                                }
@@ -284,7 +279,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
                                        FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, chan));
                                        if (!MOD_RESULT.check(invited))
                                        {
-                                               user->WriteNumeric(ERR_INVITEONLYCHAN, "%s %s :Cannot join channel (Invite only)",user->nick.c_str(), chan->name.c_str());
+                                               user->WriteNumeric(ERR_INVITEONLYCHAN, "%s :Cannot join channel (Invite only)", chan->name.c_str());
                                                return NULL;
                                        }
                                }
@@ -295,14 +290,14 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
                                        FIRST_MOD_RESULT(OnCheckLimit, MOD_RESULT, (user, chan));
                                        if (!MOD_RESULT.check((chan->GetUserCounter() < atol(limit.c_str()) || can_bypass)))
                                        {
-                                               user->WriteNumeric(ERR_CHANNELISFULL, "%s %s :Cannot join channel (Channel is full)",user->nick.c_str(), chan->name.c_str());
+                                               user->WriteNumeric(ERR_CHANNELISFULL, "%s :Cannot join channel (Channel is full)", chan->name.c_str());
                                                return NULL;
                                        }
                                }
 
                                if (chan->IsBanned(user) && !can_bypass)
                                {
-                                       user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)",user->nick.c_str(), chan->name.c_str());
+                                       user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s :Cannot join channel (You're banned)", chan->name.c_str());
                                        return NULL;
                                }
 
@@ -342,16 +337,14 @@ void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, boo
        {
                // 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);
                        }
                }
        }
@@ -377,8 +370,8 @@ void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, boo
        {
                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);
+                       user->WriteNumeric(RPL_TOPIC, "%s :%s", this->name.c_str(), this->topic.c_str());
+                       user->WriteNumeric(RPL_TOPICTIME, "%s %s %lu", this->name.c_str(), this->setby.c_str(), (unsigned long)this->topicset);
                }
                this->UserList(user);
        }
@@ -486,7 +479,7 @@ void Channel::KickUser(User* src, User* victim, const std::string& reason, Membe
 
        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());
+               src->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s :They are not on that channel", victim->nick.c_str(), this->name.c_str());
                return;
        }
 
@@ -515,8 +508,8 @@ void Channel::KickUser(User* src, User* victim, const std::string& reason, Membe
 
                        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-");
+                               src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You must be a channel %soperator",
+                                       this->name.c_str(), req > HALFOP_VALUE ? "" : "half-");
                                return;
                        }
                }
@@ -595,7 +588,7 @@ 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();
        }
@@ -663,12 +656,11 @@ 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());
+               user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", this->name.c_str());
                return;
        }
 
-       std::string list = user->nick;
-       list.push_back(' ');
+       std::string list;
        list.push_back(this->IsModeSet(secretmode) ? '@' : this->IsModeSet(privatemode) ? '*' : '=');
        list.push_back(' ');
        list.append(this->name).append(" :");
@@ -726,7 +718,7 @@ void Channel::UserList(User *user)
                user->WriteNumeric(RPL_NAMREPLY, list);
        }
 
-       user->WriteNumeric(RPL_ENDOFNAMES, "%s %s :End of /NAMES list.", user->nick.c_str(), this->name.c_str());
+       user->WriteNumeric(RPL_ENDOFNAMES, "%s :End of /NAMES list.", this->name.c_str());
 }
 
 /* returns the status character for a given user on a channel, e.g. @ for op,
@@ -744,8 +736,7 @@ const char* Channel::GetPrefixChar(User *user)
        {
                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);
+                       PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(m->second->modes[i]);
                        if (mh && mh->GetPrefixRank() > bestrank && mh->GetPrefix())
                        {
                                bestrank = mh->GetPrefixRank();
@@ -762,7 +753,7 @@ 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();
        }
@@ -779,8 +770,7 @@ const char* Channel::GetAllPrefixChars(User* user)
        {
                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);
+                       PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(m->second->modes[i]);
                        if (mh && mh->GetPrefix())
                                prefix[ctr++] = mh->GetPrefix();
                }
@@ -798,29 +788,23 @@ unsigned int Channel::GetPrefixValue(User* user)
        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;
 }