mirror of
https://github.com/osmarks/ngircd.git
synced 2024-12-13 10:20:28 +00:00
Channel_Join(): Code cleanup.
This commit is contained in:
parent
e37080400b
commit
477f2fd9e7
@ -188,25 +188,29 @@ Channel_Join( CLIENT *Client, char *Name )
|
||||
|
||||
/* Check that the channel name is valid */
|
||||
if (! Channel_IsValidName(Name)) {
|
||||
IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name );
|
||||
IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG,
|
||||
Client_ID(Client), Name);
|
||||
return false;
|
||||
}
|
||||
|
||||
chan = Channel_Search(Name);
|
||||
if(chan) {
|
||||
/* Check if the client is already in the channel */
|
||||
if( Get_Cl2Chan( chan, Client )) return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* If the specified channel doesn't exist, the channel is created */
|
||||
if (Get_Cl2Chan(chan, Client))
|
||||
return false;
|
||||
} else {
|
||||
/* If the specified channel does not exist, the channel
|
||||
* is now created */
|
||||
chan = Channel_Create(Name);
|
||||
if (!chan) return false;
|
||||
if (!chan)
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Add user to Channel */
|
||||
if( ! Add_Client( chan, Client )) return false;
|
||||
else return true;
|
||||
if (! Add_Client(chan, Client))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
} /* Channel_Join */
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user