X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/58a70480063bdca25d52a1abd60e0e28965c9617..e02cc991bb9a7b9aac65b70d167002cea12bad46:/include/messages.h

diff --git a/include/messages.h b/include/messages.h
index d37bf327..0130111e 100644
--- a/include/messages.h
+++ b/include/messages.h
@@ -49,7 +49,7 @@
 #define NUMERIC_STR_209      "Class %s %d"
 #define NUMERIC_STR_212      "%s %u %lu :%u"
 #define NUMERIC_STR_213      "C %s %s %s %d %s %s"
-#define NUMERIC_STR_215      "I %s %s %s@%s %d %s"
+#define NUMERIC_STR_215      "I %s %s %s@%s %d %s :%s"
 #define NUMERIC_STR_216      "%c %s * %s :%s%s%s"
 #define NUMERIC_STR_217      "%c %d %s :%s"
 #define NUMERIC_STR_218      "Y %s %d %d %d %u %d.%d %d.%d %u"
@@ -78,7 +78,7 @@
 #define NUMERIC_STR_263      ":%s 263 %s %s :This command could not be completed because it has been used recently, and is rate-limited."
 #define NUMERIC_STR_265      "%d %d :Current local users %d, max %d"
 #define NUMERIC_STR_266      "%d %d :Current global users %d, max %d"
-#define NUMERIC_STR_270      "%s :%s"
+#define NUMERIC_STR_270      ":%s 270 %s %s :%s"
 #define NUMERIC_STR_276      "%s :has client certificate fingerprint %s"
 #define NUMERIC_STR_281      ":%s 281 %s %s"
 #define NUMERIC_STR_282      ":%s 282 %s :End of /ACCEPT list."
@@ -96,17 +96,16 @@
 #define NUMERIC_STR_317      "%s %ld %lu :seconds idle, signon time"
 #define NUMERIC_STR_318      "%s :End of /WHOIS list."
 #define NUMERIC_STR_319      ":%s 319 %s %s :"
-#define NUMERIC_STR_320      "%s :%s"
 #define NUMERIC_STR_321      ":%s 321 %s Channel :Users  Name"
 #define NUMERIC_STR_322      ":%s 322 %s %s%s %lu :%s"
 #define NUMERIC_STR_323      ":%s 323 %s :End of /LIST"
 #define NUMERIC_STR_324      ":%s 324 %s %s %s"
 #define NUMERIC_STR_325      ":%s 325 %s %s %s :is the current channel mode-lock"
-#define NUMERIC_STR_329      ":%s 329 %s %s %lu"
+#define NUMERIC_STR_329      ":%s 329 %s %s %lld"
 #define NUMERIC_STR_330      "%s %s :is logged in as"
 #define NUMERIC_STR_331      ":%s 331 %s %s :No topic is set."
 #define NUMERIC_STR_332      ":%s 332 %s %s :%s"
-#define NUMERIC_STR_333      ":%s 333 %s %s %s %lu"
+#define NUMERIC_STR_333      ":%s 333 %s %s %s %lld"
 #define NUMERIC_STR_337      "%s :%s"
 #define NUMERIC_STR_338      "%s %s :actually using host"
 #define NUMERIC_STR_341      ":%s 341 %s %s %s"
@@ -115,9 +114,9 @@
 #define NUMERIC_STR_348      ":%s 348 %s %s %s %s %lu"
 #define NUMERIC_STR_349      ":%s 349 %s %s :End of Channel Exception List"
 #ifndef CUSTOM_BRANDING
-#define NUMERIC_STR_351      "%s(%s). %s :%s TS%dow %s"
+#define NUMERIC_STR_351      "%s(%s). %s :%s TS%dow"
 #else
-#define NUMERIC_STR_351      "%s(%s,%s). %s :%s TS%dow %s"
+#define NUMERIC_STR_351      "%s(%s,%s). %s :%s TS%dow"
 #endif
 #define NUMERIC_STR_352      ":%s 352 %s %s %s %s %s %s %s :%d %s"
 #define NUMERIC_STR_353      ":%s 353 %s %s %s :"
@@ -145,7 +144,7 @@
 #define NUMERIC_STR_403      "%s :No such channel"
 #define NUMERIC_STR_404      "%s :Cannot send to nick/channel"
 #define NUMERIC_STR_405      ":%s 405 %s %s :You have joined too many channels"
-#define NUMERIC_STR_406      ":%s :There was no such nickname"
+#define NUMERIC_STR_406      "%s :There was no such nickname"
 #define NUMERIC_STR_407      ":%s 407 %s %s :Too many recipients."
 #define NUMERIC_STR_409      ":%s 409 %s :No origin specified"
 #define NUMERIC_STR_410      ":%s 410 %s %s :Invalid CAP subcommand"
@@ -153,13 +152,14 @@
 #define NUMERIC_STR_412      ":%s 412 %s :No text to send"
 #define NUMERIC_STR_413      "%s :No toplevel domain specified"
 #define NUMERIC_STR_414      "%s :Wildcard in toplevel Domain"
+#define NUMERIC_STR_415      "%s :Cannot send message to channel (+R) - you need to be logged into your NickServ account"
 #define NUMERIC_STR_416      ":%s 416 %s %s :output too large, truncated"
 #define NUMERIC_STR_421      ":%s 421 %s %s :Unknown command"
 #define NUMERIC_STR_422      ":%s 422 %s :MOTD File is missing"
 #define NUMERIC_STR_431      ":%s 431 %s :No nickname given"
 #define NUMERIC_STR_432      ":%s 432 %s %s :Erroneous Nickname"
 #define NUMERIC_STR_433      ":%s 433 %s %s :Nickname is already in use."
-#define NUMERIC_STR_435      "%s %s :Cannot change nickname while banned on channel"
+#define NUMERIC_STR_435      "%s %s :Cannot change nickname because you are banned or quieted while in this channel."
 #define NUMERIC_STR_436      "%s :Nickname collision KILL"
 #define NUMERIC_STR_437      ":%s 437 %s %s :Nick/channel is temporarily unavailable"
 #define NUMERIC_STR_438      ":%s 438 %s %s %s :Nick change too fast. Please wait %d seconds."
@@ -172,7 +172,7 @@
 #define NUMERIC_STR_457      ":%s 457 %s %s :is already on your accept list"
 #define NUMERIC_STR_458      ":%s 458 %s %s :is not on your accept list"
 #define NUMERIC_STR_461      ":%s 461 %s %s :Not enough parameters"
-#define NUMERIC_STR_462      ":%s 462 %s :You may not reregister"
+#define NUMERIC_STR_462      ":%s 462 %s :You are already connected and cannot handshake again"
 #define NUMERIC_STR_464      ":%s 464 %s :Password Incorrect"
 #define NUMERIC_STR_465      ":%s 465 %s :You are banned from this server- %s"
 #define NUMERIC_STR_470      "%s %s :Forwarding to another channel"
@@ -181,7 +181,7 @@
 #define NUMERIC_STR_473      ":%s 473 %s %s :Cannot join channel (+i) - you must be invited"
 #define NUMERIC_STR_474      ":%s 474 %s %s :Cannot join channel (+b) - you are banned"
 #define NUMERIC_STR_475      ":%s 475 %s %s :Cannot join channel (+k) - bad key"
-#define NUMERIC_STR_477      ":%s 477 %s %s :Cannot join channel (+r) - you need to be identified with services"
+#define NUMERIC_STR_477      ":%s 477 %s %s :Cannot join channel (+r) - you need to be logged into your NickServ account"
 #define NUMERIC_STR_478      ":%s 478 %s %s %s :Channel ban list is full"
 #define NUMERIC_STR_479      "%s :Illegal channel name"
 #define NUMERIC_STR_480      ":%s 480 %s %s :Cannot join channel (+j) - throttle exceeded, try again later"
@@ -189,7 +189,7 @@
 #define NUMERIC_STR_482      ":%s 482 %s %s :You're not a channel operator"
 #define NUMERIC_STR_483      ":You can't kill a server!"
 #define NUMERIC_STR_484      ":%s 484 %s %s %s :Cannot kick or deop a network service"
-#define NUMERIC_STR_486      "%s :You must log in with services to message this user"
+#define NUMERIC_STR_486      "%s :You must log into your NickServ account to message this user"
 #define NUMERIC_STR_489      ":%s 489 %s %s :You're neither voiced nor channel operator"
 #define NUMERIC_STR_491      ":No appropriate operator blocks were found for your host"
 #define NUMERIC_STR_492      ":Cannot send to user %s (%s)"
@@ -217,9 +217,9 @@
 #define NUMERIC_STR_713      "%s :Channel is open."
 #define NUMERIC_STR_714      ":%s 714 %s %s :You are already on that channel."
 #define NUMERIC_STR_715      ":%s 715 %s :KNOCKs are disabled."
-#define NUMERIC_STR_716      "%s :is in +g mode (server-side ignore.)"
+#define NUMERIC_STR_716      "%s :is in %s mode and must manually allow you to message them. Your message was discarded."
 #define NUMERIC_STR_717      "%s :has been informed that you messaged them."
-#define NUMERIC_STR_718      ":%s 718 %s %s %s@%s :is messaging you, and you have umode +g."
+#define NUMERIC_STR_718      ":%s 718 %s %s %s@%s :is messaging you, and you have umode %s. The message was discarded."
 #define NUMERIC_STR_720      ":%s 720 %s :Start of OPER MOTD"
 #define NUMERIC_STR_721      ":%s 721 %s :%s"
 #define NUMERIC_STR_722      ":%s 722 %s :End of OPER MOTD"