mirror of
https://github.com/deavmi/birchwood
synced 2024-09-20 15:02:53 +02:00
Merge branch 'master' into ircv3
This commit is contained in:
commit
c51d7f402f
@ -117,6 +117,10 @@ public class Client : Thread
|
|||||||
logger.log("Generic("~message.getCommand()~", "~message.getFrom()~"): "~message.getParams());
|
logger.log("Generic("~message.getCommand()~", "~message.getFrom()~"): "~message.getParams());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// TODO: Hook certain ones default style with an implemenation
|
||||||
|
// ... for things that the client can learn from
|
||||||
|
// TODO: comment
|
||||||
/**
|
/**
|
||||||
* Called on command replies
|
* Called on command replies
|
||||||
*
|
*
|
||||||
@ -125,8 +129,18 @@ public class Client : Thread
|
|||||||
*/
|
*/
|
||||||
public void onCommandReply(Message commandReply)
|
public void onCommandReply(Message commandReply)
|
||||||
{
|
{
|
||||||
|
// TODO: Add numeric response check here for CERTAIN ones which add to client
|
||||||
|
// ... state
|
||||||
|
|
||||||
/* Default implementation */
|
/* Default implementation */
|
||||||
logger.log("Response("~to!(string)(commandReply.getReplyType())~", "~commandReply.getFrom()~"): "~commandReply.toString());
|
logger.log("Response("~to!(string)(commandReply.getReplyType())~", "~commandReply.getFrom()~"): "~commandReply.toString());
|
||||||
|
|
||||||
|
import birchwood.protocol.constants : ReplyType;
|
||||||
|
|
||||||
|
if(commandReply.getReplyType() == ReplyType.RPL_BOUNCE)
|
||||||
|
{
|
||||||
|
logger.log("Take a look:\n\n"~commandReply.getParams());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -619,6 +633,9 @@ public class Client : Thread
|
|||||||
// If the command is numeric then it is a reply of some sorts
|
// If the command is numeric then it is a reply of some sorts
|
||||||
else if(ircMessage.isResponseMessage())
|
else if(ircMessage.isResponseMessage())
|
||||||
{
|
{
|
||||||
|
// TODO: Add numeric response check here for CERTAIN ones which add to client
|
||||||
|
// ... state
|
||||||
|
|
||||||
/* Call the command reply handler */
|
/* Call the command reply handler */
|
||||||
onCommandReply(ircMessage);
|
onCommandReply(ircMessage);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,157 +1,176 @@
|
|||||||
module birchwood.protocol.constants;
|
module birchwood.protocol.constants;
|
||||||
|
|
||||||
/* Reply object */
|
/**
|
||||||
public enum ReplyType : ulong
|
* The type of numeric response
|
||||||
{
|
*/
|
||||||
/* Error replies */
|
public enum ReplyType : ulong
|
||||||
ERR_NOSUCHNICK = 401,
|
{
|
||||||
ERR_NOSUCHSERVER = 402,
|
/**
|
||||||
ERR_NOSUCHCHANNEL = 403,
|
* rfc 1459
|
||||||
ERR_CANNOTSENDTOCHAN = 404,
|
*/
|
||||||
ERR_TOOMANYCHANNELS = 405,
|
|
||||||
ERR_WASNOSUCHNICK = 406,
|
|
||||||
ERR_TOOMANYTARGETS = 407,
|
|
||||||
ERR_NOORIGIN = 409,
|
|
||||||
ERR_NORECIPIENT = 411,
|
|
||||||
ERR_NOTEXTTOSEND = 412,
|
|
||||||
ERR_NOTOPLEVEL = 413,
|
|
||||||
ERR_WILDTOPLEVEL = 414,
|
|
||||||
ERR_UNKNOWNCOMMAND = 421,
|
|
||||||
ERR_NOMOTD = 422,
|
|
||||||
ERR_NOADMININFO = 423,
|
|
||||||
ERR_FILEERROR = 424,
|
|
||||||
ERR_NONICKNAMEGIVEN = 431,
|
|
||||||
ERR_ERRONEUSNICKNAME = 432,
|
|
||||||
ERR_NICKNAMEINUSE = 433,
|
|
||||||
ERR_NICKCOLLISION = 436,
|
|
||||||
ERR_USERNOTINCHANNEL = 441,
|
|
||||||
ERR_NOTONCHANNEL = 442,
|
|
||||||
ERR_USERONCHANNEL = 443,
|
|
||||||
ERR_NOLOGIN = 444,
|
|
||||||
ERR_SUMMONDISABLED = 445,
|
|
||||||
ERR_USERSDISABLED = 446,
|
|
||||||
ERR_NOTREGISTERED = 451,
|
|
||||||
ERR_NEEDMOREPARAMS = 461,
|
|
||||||
ERR_ALREADYREGISTRED = 462,
|
|
||||||
ERR_NOPERMFORHOST = 463,
|
|
||||||
ERR_PASSWDMISMATCH = 464,
|
|
||||||
ERR_YOUREBANNEDCREEP = 465,
|
|
||||||
ERR_KEYSET = 467,
|
|
||||||
ERR_CHANNELISFULL = 471,
|
|
||||||
ERR_UNKNOWNMODE = 472,
|
|
||||||
ERR_INVITEONLYCHAN = 473,
|
|
||||||
ERR_BANNEDFROMCHAN = 474,
|
|
||||||
ERR_BADCHANNELKEY = 475,
|
|
||||||
ERR_NOPRIVILEGES = 481,
|
|
||||||
ERR_CHANOPRIVSNEEDED = 482,
|
|
||||||
ERR_CANTKILLSERVER = 483,
|
|
||||||
ERR_NOOPERHOST = 491,
|
|
||||||
ERR_UMODEUNKNOWNFLAG = 501,
|
|
||||||
ERR_USERSDONTMATCH = 502,
|
|
||||||
|
|
||||||
/* Command responses */
|
/* Error replies */
|
||||||
RPL_NONE = 300,
|
ERR_NOSUCHNICK = 401,
|
||||||
RPL_USERHOST = 302,
|
ERR_NOSUCHSERVER = 402,
|
||||||
RPL_ISON = 303,
|
ERR_NOSUCHCHANNEL = 403,
|
||||||
RPL_AWAY = 301,
|
ERR_CANNOTSENDTOCHAN = 404,
|
||||||
RPL_UNAWAY = 305,
|
ERR_TOOMANYCHANNELS = 405,
|
||||||
RPL_NOWAWAY = 306,
|
ERR_WASNOSUCHNICK = 406,
|
||||||
RPL_WHOISUSER = 311,
|
ERR_TOOMANYTARGETS = 407,
|
||||||
RPL_WHOISSERVER = 312,
|
ERR_NOORIGIN = 409,
|
||||||
RPL_WHOISOPERATOR = 313,
|
ERR_NORECIPIENT = 411,
|
||||||
RPL_WHOISIDLE = 317,
|
ERR_NOTEXTTOSEND = 412,
|
||||||
RPL_ENDOFWHOIS = 318,
|
ERR_NOTOPLEVEL = 413,
|
||||||
RPL_WHOISCHANNELS = 319,
|
ERR_WILDTOPLEVEL = 414,
|
||||||
RPL_WHOWASUSER = 314,
|
ERR_UNKNOWNCOMMAND = 421,
|
||||||
RPL_ENDOFWHOWAS = 369,
|
ERR_NOMOTD = 422,
|
||||||
RPL_LISTSTART = 321,
|
ERR_NOADMININFO = 423,
|
||||||
RPL_LIST = 322,
|
ERR_FILEERROR = 424,
|
||||||
RPL_LISTEND = 323,
|
ERR_NONICKNAMEGIVEN = 431,
|
||||||
RPL_CHANNELMODEIS = 324,
|
ERR_ERRONEUSNICKNAME = 432,
|
||||||
RPL_NOTOPIC = 331,
|
ERR_NICKNAMEINUSE = 433,
|
||||||
RPL_TOPIC = 332,
|
ERR_NICKCOLLISION = 436,
|
||||||
RPL_INVITING = 341,
|
ERR_USERNOTINCHANNEL = 441,
|
||||||
RPL_SUMMONING = 342,
|
ERR_NOTONCHANNEL = 442,
|
||||||
RPL_VERSION = 351,
|
ERR_USERONCHANNEL = 443,
|
||||||
RPL_WHOREPLY = 352,
|
ERR_NOLOGIN = 444,
|
||||||
RPL_ENDOFWHO = 315,
|
ERR_SUMMONDISABLED = 445,
|
||||||
RPL_NAMREPLY = 353,
|
ERR_USERSDISABLED = 446,
|
||||||
RPL_ENDOFNAMES = 366,
|
ERR_NOTREGISTERED = 451,
|
||||||
RPL_LINKS = 364,
|
ERR_NEEDMOREPARAMS = 461,
|
||||||
RPL_ENDOFLINKS = 365,
|
ERR_ALREADYREGISTRED = 462,
|
||||||
RPL_BANLIST = 367,
|
ERR_NOPERMFORHOST = 463,
|
||||||
RPL_ENDOFBANLIST = 368,
|
ERR_PASSWDMISMATCH = 464,
|
||||||
RPL_INFO = 371,
|
ERR_YOUREBANNEDCREEP = 465,
|
||||||
RPL_ENDOFINFO = 374,
|
ERR_KEYSET = 467,
|
||||||
RPL_MOTDSTART = 375,
|
ERR_CHANNELISFULL = 471,
|
||||||
RPL_MOTD = 372,
|
ERR_UNKNOWNMODE = 472,
|
||||||
RPL_ENDOFMOTD = 376,
|
ERR_INVITEONLYCHAN = 473,
|
||||||
RPL_YOUREOPER = 381,
|
ERR_BANNEDFROMCHAN = 474,
|
||||||
RPL_REHASHING = 382,
|
ERR_BADCHANNELKEY = 475,
|
||||||
RPL_TIME = 391,
|
ERR_NOPRIVILEGES = 481,
|
||||||
RPL_USERSSTART = 392,
|
ERR_CHANOPRIVSNEEDED = 482,
|
||||||
RPL_USERS = 393,
|
ERR_CANTKILLSERVER = 483,
|
||||||
RPL_ENDOFUSERS = 394,
|
ERR_NOOPERHOST = 491,
|
||||||
RPL_NOUSERS = 395,
|
ERR_UMODEUNKNOWNFLAG = 501,
|
||||||
RPL_TRACELINK = 200,
|
ERR_USERSDONTMATCH = 502,
|
||||||
RPL_TRACECONNECTING = 201,
|
|
||||||
RPL_TRACEHANDSHAKE = 202,
|
|
||||||
RPL_TRACEUNKNOWN = 203,
|
|
||||||
RPL_TRACEOPERATOR = 204,
|
|
||||||
RPL_TRACEUSER = 205,
|
|
||||||
RPL_TRACESERVER = 206,
|
|
||||||
RPL_TRACENEWTYPE = 208,
|
|
||||||
RPL_TRACELOG = 261,
|
|
||||||
RPL_STATSLINKINFO = 211,
|
|
||||||
RPL_STATSCOMMANDS = 212,
|
|
||||||
RPL_STATSCLINE = 213,
|
|
||||||
RPL_STATSNLINE = 214,
|
|
||||||
RPL_STATSILINE = 215,
|
|
||||||
RPL_STATSKLINE = 216,
|
|
||||||
RPL_STATSYLINE = 218,
|
|
||||||
RPL_ENDOFSTATS = 219,
|
|
||||||
RPL_STATSLLINE = 241,
|
|
||||||
RPL_STATSUPTIME = 242,
|
|
||||||
RPL_STATSOLINE = 243,
|
|
||||||
RPL_STATSHLINE = 244,
|
|
||||||
RPL_UMODEIS = 221,
|
|
||||||
RPL_LUSERCLIENT = 251,
|
|
||||||
RPL_LUSEROP = 252,
|
|
||||||
RPL_LUSERUNKNOWN = 253,
|
|
||||||
RPL_LUSERCHANNELS = 254,
|
|
||||||
RPL_LUSERME = 255,
|
|
||||||
RPL_ADMINME = 256,
|
|
||||||
RPL_ADMINLOC1 = 257,
|
|
||||||
RPL_ADMINLOC2 = 258,
|
|
||||||
RPL_ADMINEMAIL = 259,
|
|
||||||
|
|
||||||
/* Reserved Numerics (See section 6.3 in RFC 1459) */
|
/* Command responses */
|
||||||
RPL_TRACECLASS = 209,
|
RPL_NONE = 300,
|
||||||
RPL_SERVICEINFO = 231,
|
RPL_USERHOST = 302,
|
||||||
RPL_SERVICE = 233,
|
RPL_ISON = 303,
|
||||||
RPL_SERVLISTEND = 235,
|
RPL_AWAY = 301,
|
||||||
RPL_WHOISCHANOP = 316,
|
RPL_UNAWAY = 305,
|
||||||
RPL_CLOSING = 362,
|
RPL_NOWAWAY = 306,
|
||||||
RPL_INFOSTART = 372,
|
RPL_WHOISUSER = 311,
|
||||||
ERR_YOUWILLBEBANNED = 466,
|
RPL_WHOISSERVER = 312,
|
||||||
ERR_NOSERVICEHOST = 492,
|
RPL_WHOISOPERATOR = 313,
|
||||||
RPL_STATSQLINE = 217,
|
RPL_WHOISIDLE = 317,
|
||||||
RPL_ENDOFSERVICES = 232,
|
RPL_ENDOFWHOIS = 318,
|
||||||
RPL_SERVLIST = 234,
|
RPL_WHOISCHANNELS = 319,
|
||||||
RPL_KILLDONE = 361,
|
RPL_WHOWASUSER = 314,
|
||||||
RPL_CLOSEEND = 363,
|
RPL_ENDOFWHOWAS = 369,
|
||||||
RPL_MYPORTIS = 384,
|
RPL_LISTSTART = 321,
|
||||||
ERR_BADCHANMASK = 476,
|
RPL_LIST = 322,
|
||||||
|
RPL_LISTEND = 323,
|
||||||
|
RPL_CHANNELMODEIS = 324,
|
||||||
|
RPL_NOTOPIC = 331,
|
||||||
|
RPL_TOPIC = 332,
|
||||||
|
RPL_INVITING = 341,
|
||||||
|
RPL_SUMMONING = 342,
|
||||||
|
RPL_VERSION = 351,
|
||||||
|
RPL_WHOREPLY = 352,
|
||||||
|
RPL_ENDOFWHO = 315,
|
||||||
|
RPL_NAMREPLY = 353,
|
||||||
|
RPL_ENDOFNAMES = 366,
|
||||||
|
RPL_LINKS = 364,
|
||||||
|
RPL_ENDOFLINKS = 365,
|
||||||
|
RPL_BANLIST = 367,
|
||||||
|
RPL_ENDOFBANLIST = 368,
|
||||||
|
RPL_INFO = 371,
|
||||||
|
RPL_ENDOFINFO = 374,
|
||||||
|
RPL_MOTDSTART = 375,
|
||||||
|
RPL_MOTD = 372,
|
||||||
|
RPL_ENDOFMOTD = 376,
|
||||||
|
RPL_YOUREOPER = 381,
|
||||||
|
RPL_REHASHING = 382,
|
||||||
|
RPL_TIME = 391,
|
||||||
|
RPL_USERSSTART = 392,
|
||||||
|
RPL_USERS = 393,
|
||||||
|
RPL_ENDOFUSERS = 394,
|
||||||
|
RPL_NOUSERS = 395,
|
||||||
|
RPL_TRACELINK = 200,
|
||||||
|
RPL_TRACECONNECTING = 201,
|
||||||
|
RPL_TRACEHANDSHAKE = 202,
|
||||||
|
RPL_TRACEUNKNOWN = 203,
|
||||||
|
RPL_TRACEOPERATOR = 204,
|
||||||
|
RPL_TRACEUSER = 205,
|
||||||
|
RPL_TRACESERVER = 206,
|
||||||
|
RPL_TRACENEWTYPE = 208,
|
||||||
|
RPL_TRACELOG = 261,
|
||||||
|
RPL_STATSLINKINFO = 211,
|
||||||
|
RPL_STATSCOMMANDS = 212,
|
||||||
|
RPL_STATSCLINE = 213,
|
||||||
|
RPL_STATSNLINE = 214,
|
||||||
|
RPL_STATSILINE = 215,
|
||||||
|
RPL_STATSKLINE = 216,
|
||||||
|
RPL_STATSYLINE = 218,
|
||||||
|
RPL_ENDOFSTATS = 219,
|
||||||
|
RPL_STATSLLINE = 241,
|
||||||
|
RPL_STATSUPTIME = 242,
|
||||||
|
RPL_STATSOLINE = 243,
|
||||||
|
RPL_STATSHLINE = 244,
|
||||||
|
RPL_UMODEIS = 221,
|
||||||
|
RPL_LUSERCLIENT = 251,
|
||||||
|
RPL_LUSEROP = 252,
|
||||||
|
RPL_LUSERUNKNOWN = 253,
|
||||||
|
RPL_LUSERCHANNELS = 254,
|
||||||
|
RPL_LUSERME = 255,
|
||||||
|
RPL_ADMINME = 256,
|
||||||
|
RPL_ADMINLOC1 = 257,
|
||||||
|
RPL_ADMINLOC2 = 258,
|
||||||
|
RPL_ADMINEMAIL = 259,
|
||||||
|
|
||||||
|
/* Reserved Numerics (See section 6.3 in RFC 1459) */
|
||||||
|
RPL_TRACECLASS = 209,
|
||||||
|
RPL_SERVICEINFO = 231,
|
||||||
|
RPL_SERVICE = 233,
|
||||||
|
RPL_SERVLISTEND = 235,
|
||||||
|
RPL_WHOISCHANOP = 316,
|
||||||
|
RPL_CLOSING = 362,
|
||||||
|
RPL_INFOSTART = 372,
|
||||||
|
ERR_YOUWILLBEBANNED = 466,
|
||||||
|
ERR_NOSERVICEHOST = 492,
|
||||||
|
RPL_STATSQLINE = 217,
|
||||||
|
RPL_ENDOFSERVICES = 232,
|
||||||
|
RPL_SERVLIST = 234,
|
||||||
|
RPL_KILLDONE = 361,
|
||||||
|
RPL_CLOSEEND = 363,
|
||||||
|
RPL_MYPORTIS = 384,
|
||||||
|
ERR_BADCHANMASK = 476,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* rfc 2812
|
||||||
|
*/
|
||||||
|
RPL_WELCOME = 001,
|
||||||
|
RPL_YOURHOST = 002,
|
||||||
|
RPL_CREATED = 003,
|
||||||
|
RPL_MYINFO = 004,
|
||||||
|
// RPL_BOUNCE = 005, // TODO: We care about the key-value pairs here in RPL_BOUNCE
|
||||||
|
ERR_NOCHANMODES = 477,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ircv3
|
||||||
|
*/
|
||||||
|
RPL_LOCALUSERS = 265,
|
||||||
|
RPL_GLOBALUSERS = 266,
|
||||||
|
RPL_WHOISCERTFP = 276,
|
||||||
|
RPL_ISUPPORT = 005, // This overrides the old rfc2812 RPL_BOUNCE code (we can only support one of these)
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ircv3
|
|
||||||
*/
|
|
||||||
RPL_LOCALUSERS = 265,
|
|
||||||
RPL_GLOBALUSERS = 266,
|
|
||||||
RPL_WHOISCERTFP = 276,
|
|
||||||
RPL_ISUPPORT = 005, // This overrides the old rfc2812 RPL_BOUNCE code (we can only support one of these)
|
|
||||||
|
|
||||||
|
/**
|
||||||
BIRCHWOOD_UNKNOWN_RESP_CODE = 0
|
* If no code is matched then this is the default
|
||||||
|
*/
|
||||||
|
BIRCHWOOD_UNKNOWN_RESP_CODE = 0
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user