deavmi
/
dnetd
mirror of https://github.com/deavminet/dnetd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use new tristanable methods

This commit is contained in:
Tristan B. Kildaire 2021-01-30 12:20:32 +02:00
parent ed350c5c71
commit 85c86ad3ba
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source/dnetd/dconnection.d
View File

@ -339,14 +339,14 @@ public class DConnection : Thread
* multi-thread job processing, only need this to differentiate * multi-thread job processing, only need this to differentiate
* between commands and async notifications * between commands and async notifications
*/ */
long tag = message.tag; long tag = message.getTag();
gprintln("tag: "~ to!(string)(tag)); gprintln("tag: "~ to!(string)(tag));
/* The reply */ /* The reply */
byte[] reply; byte[] reply;
/* Get the command */ /* Get the command */
byte commandByte = message.data[0]; byte commandByte = message.getData()[0];
Command command = getCommand(commandByte); Command command = getCommand(commandByte);
gprintln(to!(string)(this)~" ~> "~to!(string)(command)); gprintln(to!(string)(this)~" ~> "~to!(string)(command));
@ -354,11 +354,11 @@ public class DConnection : Thread
if(command == Command.AUTH && !hasAuthed) if(command == Command.AUTH && !hasAuthed)
{ {
/* Get the length of the username */ /* Get the length of the username */
ubyte usernameLength = message.data[1]; ubyte usernameLength = message.getData()[1];
/* Get the username and password */ /* Get the username and password */
string username = cast(string)message.data[2..2+cast(uint)usernameLength]; string username = cast(string)message.getData()[2..2+cast(uint)usernameLength];
string password = cast(string)message.data[2+cast(uint)usernameLength..message.data.length]; string password = cast(string)message.getData()[2+cast(uint)usernameLength..message.getData().length];
/* Authenticate */ /* Authenticate */
bool status = authenticate(username, password); bool status = authenticate(username, password);
@ -399,7 +399,7 @@ public class DConnection : Thread
else if(command == Command.JOIN && hasAuthed && connType == ConnectionType.CLIENT) else if(command == Command.JOIN && hasAuthed && connType == ConnectionType.CLIENT)
{ {
/* Get the channel names */ /* Get the channel names */
string channelList = cast(string)message.data[1..message.data.length]; string channelList = cast(string)message.getData()[1..message.getData().length];
string[] channels = split(channelList, ","); string[] channels = split(channelList, ",");
/** /**
@ -429,7 +429,7 @@ public class DConnection : Thread
else if(command == Command.PART && hasAuthed && connType == ConnectionType.CLIENT) else if(command == Command.PART && hasAuthed && connType == ConnectionType.CLIENT)
{ {
/* Get the channel names */ /* Get the channel names */
string channelList = cast(string)message.data[1..message.data.length]; string channelList = cast(string)message.getData()[1..message.getData().length];
string[] channels = split(channelList, ","); string[] channels = split(channelList, ",");
/** /**
@ -484,16 +484,16 @@ public class DConnection : Thread
bool status = true; bool status = true;
/* Get the type of message */ /* Get the type of message */
ubyte messageType = message.data[1]; ubyte messageType = message.getData()[1];
/* Get the location length */ /* Get the location length */
ubyte locationLength = message.data[2]; ubyte locationLength = message.getData()[2];
/* Get the channel/person name */ /* Get the channel/person name */
string destination = cast(string)message.data[3..3+cast(uint)locationLength]; string destination = cast(string)message.getData()[3..3+cast(uint)locationLength];
/* Get the message */ /* Get the message */
string msg = cast(string)message.data[3+cast(uint)locationLength..message.data.length]; string msg = cast(string)message.getData()[3+cast(uint)locationLength..message.getData().length];
/* Send status */ /* Send status */
bool sendStatus; bool sendStatus;
@ -541,7 +541,7 @@ public class DConnection : Thread
bool status = true; bool status = true;
/* Get the channel name */ /* Get the channel name */
string channelName = cast(string)message.data[1..message.data.length]; string channelName = cast(string)message.getData()[1..message.getData().length];
/* The memebr count */ /* The memebr count */
long memberCount; long memberCount;
@ -580,7 +580,7 @@ public class DConnection : Thread
bool status = true; bool status = true;
/* Get the channel name */ /* Get the channel name */
string channelName = cast(string)message.data[1..message.data.length]; string channelName = cast(string)message.getData()[1..message.getData().length];
/* Get the channel */ /* Get the channel */
DChannel channel = server.getChannelByName(channelName); DChannel channel = server.getChannelByName(channelName);
@ -659,7 +659,7 @@ public class DConnection : Thread
bool status = true; bool status = true;
/* TODO: Implement me */ /* TODO: Implement me */
string user = cast(string)message.data[1..message.data.length]; string user = cast(string)message.getData()[1..message.getData().length];
/* TODO: fetch longontime, serveron, status */ /* TODO: fetch longontime, serveron, status */
string logontime; string logontime;
@ -677,7 +677,7 @@ public class DConnection : Thread
else if(command == Command.STATUS && hasAuthed && connType == ConnectionType.CLIENT) else if(command == Command.STATUS && hasAuthed && connType == ConnectionType.CLIENT)
{ {
/* Get the new status line */ /* Get the new status line */
string statusMessage = cast(string)message.data[1..message.data.length]; string statusMessage = cast(string)message.getData()[1..message.getData().length];
/* Set the new status message */ /* Set the new status message */
setStatusMessage(statusMessage); setStatusMessage(statusMessage);
@ -690,7 +690,7 @@ public class DConnection : Thread
else if(command == Command.GET_USER_PROPS && hasAuthed && connType == ConnectionType.CLIENT) else if(command == Command.GET_USER_PROPS && hasAuthed && connType == ConnectionType.CLIENT)
{ {
/* Get the username */ /* Get the username */
string username = cast(string)message.data[1..message.data.length]; string username = cast(string)message.getData()[1..message.getData().length];
/* Get the user */ /* Get the user */
DConnection connection = server.findUser(username); DConnection connection = server.findUser(username);
@ -727,7 +727,7 @@ public class DConnection : Thread
else if(command == Command.GET_USER_PROP && hasAuthed && connType == ConnectionType.CLIENT) else if(command == Command.GET_USER_PROP && hasAuthed && connType == ConnectionType.CLIENT)
{ {
/* Get the <user>,<propertyName> */ /* Get the <user>,<propertyName> */
string[] dataLine = split(cast(string)message.data[1..message.data.length],","); string[] dataLine = split(cast(string)message.getData()[1..message.getData().length],",");
/* Get the username */ /* Get the username */
string username = dataLine[0]; string username = dataLine[0];
@ -758,7 +758,7 @@ public class DConnection : Thread
else if(command == Command.SET_USER_PROP && hasAuthed && connType == ConnectionType.CLIENT) else if(command == Command.SET_USER_PROP && hasAuthed && connType == ConnectionType.CLIENT)
{ {
/* Set the <propertyName>,<propertyValue> */ /* Set the <propertyName>,<propertyValue> */
string[] dataLine = split(cast(string)message.data[1..message.data.length],","); string[] dataLine = split(cast(string)message.getData()[1..message.getData().length],",");
/* Get the property */ /* Get the property */
string propertyName = dataLine[0]; string propertyName = dataLine[0];
@ -776,7 +776,7 @@ public class DConnection : Thread
else if(command == Command.DELETE_USER_PROP && hasAuthed && connType == ConnectionType.CLIENT) else if(command == Command.DELETE_USER_PROP && hasAuthed && connType == ConnectionType.CLIENT)
{ {
/* Get the property */ /* Get the property */
string property = cast(string)message.data[1..message.data.length]; string property = cast(string)message.getData()[1..message.getData().length];
/* Check if the key exists */ /* Check if the key exists */
bool keyExists = isProperty(property); bool keyExists = isProperty(property);
@ -794,7 +794,7 @@ public class DConnection : Thread
else if(command == Command.IS_USER_PROP && hasAuthed && connType == ConnectionType.CLIENT) else if(command == Command.IS_USER_PROP && hasAuthed && connType == ConnectionType.CLIENT)
{ {
/* Get the <user>,<propertyName> */ /* Get the <user>,<propertyName> */
string[] dataLine = split(cast(string)message.data[1..message.data.length],","); string[] dataLine = split(cast(string)message.getData()[1..message.getData().length],",");
/* Get the username */ /* Get the username */
string username = dataLine[0]; string username = dataLine[0];