Refactor port binding, warning not yet tested fully

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

diff --git a/src/channels.cpp b/src/channels.cpp
index ce7cbb45c3d8b49a97a8f3ba01d8030e560eddf3..e4b58a1a4853cd7b1a2d097c25358964537a8c8e 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -83,7 +83,7 @@ long chanrec::GetUserCounter()
 
 void chanrec::AddUser(userrec* user)
 {
-       internal_userlist[user] = user;
+       internal_userlist[user] = user->nick;
 }
 
 unsigned long chanrec::DelUser(userrec* user)
@@ -109,7 +109,7 @@ bool chanrec::HasUser(userrec* user)
 
 void chanrec::AddOppedUser(userrec* user)
 {
-       internal_op_userlist[user] = user;
+       internal_op_userlist[user] = user->nick;
 }
 
 void chanrec::DelOppedUser(userrec* user)
@@ -124,7 +124,7 @@ void chanrec::DelOppedUser(userrec* user)
 
 void chanrec::AddHalfoppedUser(userrec* user)
 {
-       internal_halfop_userlist[user] = user;
+       internal_halfop_userlist[user] = user->nick;
 }
 
 void chanrec::DelHalfoppedUser(userrec* user)
@@ -139,7 +139,7 @@ void chanrec::DelHalfoppedUser(userrec* user)
 
 void chanrec::AddVoicedUser(userrec* user)
 {
-       internal_voice_userlist[user] = user;
+       internal_voice_userlist[user] = user->nick;
 }
 
 void chanrec::DelVoicedUser(userrec* user)
@@ -216,6 +216,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
                        Ptr->modes[CM_TOPICLOCK] = Ptr->modes[CM_NOEXTERNAL] = 1;
 
                Ptr->created = TS ? TS : Instance->Time();
+               Ptr->age = Ptr->created;
                *Ptr->topic = 0;
                *Ptr->setby = 0;
                Ptr->topicset = 0;
@@ -341,6 +342,7 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con
 {
        userrec* dummyuser = new userrec(Instance);
        std::string nick = user->nick;
+       bool silent = false;
 
        dummyuser->SetFd(FD_MAGIC_NUMBER);
        Ptr->AddUser(user);
@@ -383,7 +385,10 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con
 
        delete dummyuser;
 
-       Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
+       FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, silent));
+
+       if (!silent)
+               Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
 
        /* Theyre not the first ones in here, make sure everyone else sees the modes we gave the user */
        std::string ms = Instance->Modes->ModeString(user, Ptr);
@@ -400,8 +405,7 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con
                }
                Ptr->UserList(user);
        }
-       FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user,Ptr));
-       FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user,Ptr));
+       FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user, Ptr));
        return Ptr;
 }
 
@@ -434,14 +438,19 @@ bool chanrec::IsBanned(userrec* user)
  */
 long chanrec::PartUser(userrec *user, const char* reason)
 {
+       bool silent = false;
+
        if (!user)
                return this->GetUserCounter();
 
        UCListIter i = user->chans.find(this);
        if (i != user->chans.end())
        {
-               FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : ""));
-               this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? reason : "");
+               FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : "", silent));
+
+               if (!silent)
+                       this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? reason : "");
+
                user->chans.erase(i);
                this->RemoveAllPrefixes(user);
        }
@@ -463,6 +472,8 @@ long chanrec::PartUser(userrec *user, const char* reason)
 
 long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggerevents)
 {
+       bool silent = false;
+
        if (!user || !reason)
                return this->GetUserCounter();
 
@@ -477,13 +488,15 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven
 
        if (triggerevents)
        {
-               FOREACH_MOD(I_OnUserKick,OnUserKick(NULL,user,this,reason));
+               FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent));
        }
 
        UCListIter i = user->chans.find(this);
        if (i != user->chans.end())
        {
-               this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason);
+               if (!silent)
+                       this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason);
+
                user->chans.erase(i);
                this->RemoveAllPrefixes(user);
        }
@@ -505,6 +518,8 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven
 
 long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
 {
+       bool silent = false;
+
        if (!src || !user || !reason)
                return this->GetUserCounter();
 
@@ -549,13 +564,15 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
                }
        }
 
-       FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,this,reason));
+       FOREACH_MOD(I_OnUserKick,OnUserKick(src, user, this, reason, silent));
 
        UCListIter i = user->chans.find(this);
        if (i != user->chans.end())
        {
                /* zap it from the channel list of the user */
-               this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
+               if (!silent)
+                       this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
+
                user->chans.erase(i);
                this->RemoveAllPrefixes(user);
        }
@@ -605,8 +622,8 @@ void chanrec::WriteChannel(userrec* user, const std::string &text)
 
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if (IS_LOCAL(i->second))
-                       i->second->Write(out);
+               if (IS_LOCAL(i->first))
+                       i->first->Write(out);
        }
 }
 
@@ -635,8 +652,8 @@ void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text
 
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if (IS_LOCAL(i->second))
-                       i->second->Write(out);
+               if (IS_LOCAL(i->first))
+                       i->first->Write(out);
        }
 }
 
@@ -698,12 +715,12 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi
 
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if ((IS_LOCAL(i->second)) && (except_list.find(i->second) == except_list.end()))
+               if ((IS_LOCAL(i->first)) && (except_list.find(i->first) == except_list.end()))
                {
                        if (serversource)
-                               i->second->WriteServ(text);
+                               i->first->WriteServ(text);
                        else
-                               i->second->Write(out);
+                               i->first->Write(out);
                }
        }
 }
@@ -711,7 +728,7 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi
 void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text)
 {
        CUList except_list;
-       except_list[user] = user;
+       except_list[user] = user->nick;
        this->WriteAllExcept(user, serversource, status, except_list, std::string(text));
 }
 
@@ -725,7 +742,7 @@ int chanrec::CountInvisible()
        CUList *ulist= this->GetUsers();
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if (!(i->second->modes[UM_INVISIBLE]))
+               if (!(i->first->IsModeSet('i')))
                        count++;
        }
 
@@ -786,7 +803,7 @@ char* chanrec::ChanModes(bool showkey)
 /* 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 chanrec::UserList(userrec *user)
+void chanrec::UserList(userrec *user, CUList *ulist)
 {
        char list[MAXBUF];
        size_t dlen, curlen;
@@ -795,7 +812,7 @@ void chanrec::UserList(userrec *user)
        if (!IS_LOCAL(user))
                return;
 
-       FOREACH_RESULT(I_OnUserList,OnUserList(user, this));
+       FOREACH_RESULT(I_OnUserList,OnUserList(user, this, ulist));
        if (MOD_RESULT == 1)
                return;
 
@@ -804,7 +821,8 @@ void chanrec::UserList(userrec *user)
        int numusers = 0;
        char* ptr = list + dlen;
 
-       CUList *ulist= this->GetUsers();
+       if (!ulist)
+               ulist = this->GetUsers();
 
        /* Improvement by Brain - this doesnt change in value, so why was it inside
         * the loop?
@@ -813,7 +831,7 @@ void chanrec::UserList(userrec *user)
 
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
+               if ((!has_user) && (i->first->modes[UM_INVISIBLE]))
                {
                        /*
                         * user is +i, and source not on the channel, does not show
@@ -822,7 +840,12 @@ void chanrec::UserList(userrec *user)
                        continue;
                }
 
-               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->second), i->second->nick);
+               if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
+                       continue;
+
+               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->first), i->second.c_str());
+               /* OnUserList can change this - reset it back to normal */
+               i->second = i->first->nick;
 
                curlen += ptrlen;
                ptr += ptrlen;