Move some local-only fields to LocalUser

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 1375ffa30e80233ef345a2ef648bdda6a97880e8..d7f8f372e47b1645742027286aa4b5bee4d2bcf4 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -125,17 +125,32 @@ Membership* Channel::AddUser(User* user)
        return memb;
 }
 
-unsigned long Channel::DelUser(User* user)
+void Channel::DelUser(User* user)
 {
        UserMembIter a = userlist.find(user);
 
        if (a != userlist.end())
        {
+               a->second->cull();
                delete a->second;
                userlist.erase(a);
        }
 
-       return userlist.size();
+       if (userlist.empty())
+       {
+               ModResult res;
+               FIRST_MOD_RESULT(OnChannelPreDelete, res, (this));
+               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(I_OnChannelDelete, OnChannelDelete(this));
+                       ServerInstance->chanlist->erase(iter);
+               }
+               ServerInstance->GlobalCulls.AddItem(this);
+       }
 }
 
 bool Channel::HasUser(User* user)
@@ -158,7 +173,8 @@ const UserMembList* Channel::GetUsers()
 
 void Channel::SetDefaultModes()
 {
-       ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s", ServerInstance->Config->DefaultModes);
+       ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s",
+               ServerInstance->Config->DefaultModes.c_str());
        irc::spacesepstream list(ServerInstance->Config->DefaultModes);
        std::string modeseq;
        std::string parameter;
@@ -440,17 +456,17 @@ ModResult Channel::GetExtBanStatus(User *user, char type)
                                return MOD_RES_DENY;
                }
        }
-       return MOD_RES_ALLOW;
+       return MOD_RES_PASSTHRU;
 }
 
 /* Channel::PartUser
  * remove a channel from a users record, and return the number of users left.
  * Therefore, if this function returns 0 the caller should delete the Channel.
  */
-long Channel::PartUser(User *user, std::string &reason)
+void Channel::PartUser(User *user, std::string &reason)
 {
        if (!user)
-               return this->GetUserCounter();
+               return;
 
        Membership* memb = GetUser(user);
 
@@ -465,38 +481,23 @@ long Channel::PartUser(User *user, std::string &reason)
                this->RemoveAllPrefixes(user);
        }
 
-       if (!this->DelUser(user)) /* if there are no users left on the channel... */
-       {
-               chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
-               /* kill the record */
-               if (iter != ServerInstance->chanlist->end())
-               {
-                       ModResult res;
-                       FIRST_MOD_RESULT(OnChannelPreDelete, res, (this));
-                       if (res == MOD_RES_DENY)
-                               return 1; // delete halted by module
-                       FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
-                       ServerInstance->chanlist->erase(iter);
-               }
-               return 0;
-       }
-
-       return this->GetUserCounter();
+       this->DelUser(user);
 }
 
-long Channel::ServerKickUser(User* user, const char* reason, const char* servername)
+void Channel::ServerKickUser(User* user, const char* reason, const std::string& servername)
 {
-       if (servername == NULL || *ServerInstance->Config->HideWhoisServer)
-               servername = ServerInstance->Config->ServerName;
+       if (servername.empty() || !ServerInstance->Config->HideWhoisServer.empty())
+               ServerInstance->FakeClient->server = ServerInstance->Config->ServerName;
+       else
+               ServerInstance->FakeClient->server = servername;
 
-       ServerInstance->FakeClient->server = servername;
-       return this->KickUser(ServerInstance->FakeClient, user, reason);
+       KickUser(ServerInstance->FakeClient, user, reason);
 }
 
-long Channel::KickUser(User *src, User *user, const char* reason)
+void Channel::KickUser(User *src, User *user, const char* reason)
 {
        if (!src || !user || !reason)
-               return this->GetUserCounter();
+               return;
 
        Membership* memb = GetUser(user);
        if (IS_LOCAL(src))
@@ -504,12 +505,12 @@ long Channel::KickUser(User *src, User *user, const char* reason)
                if (!memb)
                {
                        src->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s %s :They are not on that channel",src->nick.c_str(), user->nick.c_str(), this->name.c_str());
-                       return this->GetUserCounter();
+                       return;
                }
                if ((ServerInstance->ULine(user->server)) && (!ServerInstance->ULine(src->server)))
                {
                        src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only a u-line may kick a u-line from a channel.",src->nick.c_str(), this->name.c_str());
-                       return this->GetUserCounter();
+                       return;
                }
 
                ModResult res;
@@ -519,7 +520,7 @@ long Channel::KickUser(User *src, User *user, const char* reason)
                        FIRST_MOD_RESULT(OnUserPreKick, res, (src,memb,reason));
 
                if (res == MOD_RES_DENY)
-                       return this->GetUserCounter();
+                       return;
 
                if (res == MOD_RES_PASSTHRU)
                {
@@ -528,7 +529,7 @@ long Channel::KickUser(User *src, User *user, const char* reason)
                        if ((them < HALFOP_VALUE) || (them < us))
                        {
                                src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",src->nick.c_str(), this->name.c_str(), them >= HALFOP_VALUE ? "" : "half-");
-                               return this->GetUserCounter();
+                               return;
                        }
                }
        }
@@ -544,25 +545,7 @@ long Channel::KickUser(User *src, User *user, const char* reason)
                this->RemoveAllPrefixes(user);
        }
 
-       if (!this->DelUser(user))
-       /* if there are no users left on the channel */
-       {
-               chan_hash::iterator iter = ServerInstance->chanlist->find(this->name.c_str());
-
-               /* kill the record */
-               if (iter != ServerInstance->chanlist->end())
-               {
-                       ModResult res;
-                       FIRST_MOD_RESULT(OnChannelPreDelete, res, (this));
-                       if (res == MOD_RES_DENY)
-                               return 1; // delete halted by module
-                       FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
-                       ServerInstance->chanlist->erase(iter);
-               }
-               return 0;
-       }
-
-       return this->GetUserCounter();
+       this->DelUser(user);
 }
 
 void Channel::WriteChannel(User* user, const char* text, ...)
@@ -597,7 +580,7 @@ void Channel::WriteChannel(User* user, const std::string &text)
        }
 }
 
-void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...)
+void Channel::WriteChannelWithServ(const std::string& ServName, const char* text, ...)
 {
        char textbuffer[MAXBUF];
        va_list argsPtr;
@@ -612,11 +595,11 @@ void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...)
        this->WriteChannelWithServ(ServName, std::string(textbuffer));
 }
 
-void Channel::WriteChannelWithServ(const char* ServName, const std::string &text)
+void Channel::WriteChannelWithServ(const std::string& ServName, const std::string &text)
 {
        char tb[MAXBUF];
 
-       snprintf(tb,MAXBUF,":%s %s", ServName ? ServName : ServerInstance->Config->ServerName, text.c_str());
+       snprintf(tb,MAXBUF,":%s %s", ServName.empty() ? ServerInstance->Config->ServerName.c_str() : ServName.c_str(), text.c_str());
        std::string out = tb;
 
        for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
@@ -664,7 +647,7 @@ void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList
 {
        char tb[MAXBUF];
 
-       snprintf(tb,MAXBUF,":%s %s", serversource ? ServerInstance->Config->ServerName : user->GetFullHost().c_str(), text.c_str());
+       snprintf(tb,MAXBUF,":%s %s", serversource ? ServerInstance->Config->ServerName.c_str() : user->GetFullHost().c_str(), text.c_str());
        std::string out = tb;
 
        this->RawWriteAllExcept(user, serversource, status, except_list, std::string(tb));