forked from lesderid/salty-ircd
Merge branch 'valnick' of albino/salty-ircd into master
This commit is contained in:
commit
dd33015ec7
|
@ -203,6 +203,12 @@ class Connection
|
|||
return;
|
||||
}
|
||||
|
||||
if(!_server.isValidNick(newNick))
|
||||
{
|
||||
send(Message(_server.name, "432", [nick, newNick, "Erroneous nickname"]));
|
||||
return;
|
||||
}
|
||||
|
||||
if(nick !is null)
|
||||
{
|
||||
sendToPeers(Message(nick, "NICK", [newNick]));
|
||||
|
|
|
@ -76,8 +76,20 @@ class Server
|
|||
|
||||
static bool isValidNick(string name)
|
||||
{
|
||||
//TODO: Use the real rules
|
||||
return !name.startsWith('#') && !name.startsWith('&') && name.length <= 9;
|
||||
import std.ascii : digits, letters;
|
||||
|
||||
if(name.length > 9)
|
||||
return false;
|
||||
foreach(i, c; name)
|
||||
{
|
||||
auto allowed = letters ~ "[]\\`_^{|}";
|
||||
if(i > 0)
|
||||
allowed = allowed ~ digits ~ "-";
|
||||
|
||||
if (!allowed.canFind(c))
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool isNickAvailable(string nick)
|
||||
|
|
Loading…
Reference in New Issue