X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fchannels.cpp;h=e4b58a1a4853cd7b1a2d097c25358964537a8c8e;hb=959c67db271b593d32db022841d0723654a8dd67;hp=00f8dbce6f466a502676e33cdbaf78669ab13251;hpb=3759fe0ba2420bd564abb4b034582ea0866907aa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index 00f8dbce6..e4b58a1a4 100644
--- 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;
@@ -621,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);
 	}
 }
 
@@ -651,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);
 	}
 }
 
@@ -714,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);
 		}
 	}
 }
@@ -727,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));
 }
 
@@ -741,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++;
 	}
 
@@ -802,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;
@@ -811,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;
 
@@ -820,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?
@@ -829,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
@@ -838,10 +840,12 @@ void chanrec::UserList(userrec *user)
 			continue;
 		}
 
-		if (i->second->Visibility && !i->second->Visibility->VisibleTo(user))
+		if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
 			continue;
 
-		size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->second), i->second->nick);
+		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;