lesderid
/
salty-ircd
1
0
Fork 1
Code Issues 6 Pull Requests Releases Wiki Activity

Check if the user is allowed to join a channel

This commit is contained in:
Les De Ridder 2017-05-24 00:27:54 +02:00
parent 3be4710c32
commit 7ba5268e90
No known key found for this signature in database
GPG Key ID: 5EC132DFA85DB372
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/ircd/connection.d
View File

@ -331,16 +331,39 @@ class Connection
} }
auto channelList = message.parameters[0].split(','); auto channelList = message.parameters[0].split(',');
foreach(channel; channelList) foreach(channelName; channelList)
{ {
//TODO: Check if the user isn't already on the channel //TODO: Check if the user isn't already on the channel
if(!Server.isValidChannelName(channel)) if(!Server.isValidChannelName(channelName))
{ {
sendErrNoSuchChannel(channel); sendErrNoSuchChannel(channelName);
} }
else else
{ {
_server.join(this, channel); auto channelRange = _server.findChannelByName(channelName);
if(channelRange.empty)
{
_server.join(this, channelName);
}
else
{
auto channel = channelRange[0];
if(channel.maskLists['b'].any!(m => matchesMask(m)))
{
send(Message(_server.name, "474", [nick, channelName, "Cannot join channel (+b)"], true));
}
//TODO: Also account for invites from the INVITE command
else if(channel.modes.canFind('i') && !channel.maskLists['I'].any!(m => matchesMask(m)))
{
send(Message(_server.name, "473", [nick, channelName, "Cannot join channel (+i)"], true));
}
//TODO: Implement channel limit
//TODO: Implement channel key
else
{
_server.join(this, channelName);
}
}
} }
} }
} }