Changeset 843 for branches/ithildin-1.1

Timestamp:

05/12/09 02:16:47 (3 years ago)

Author:

wd

Message:

Add a quarantine (and whatever else) check for NPC, clean up some text, make
it fold arguments to not require the : (meh).

File:

• branches/ithildin-1.1/modules/ircd/commands/npc.c (modified) (2 diffs)

branches/ithildin-1.1/modules/ircd/commands/npc.c

@@ -47 +47 @@
  * argv[3] == npc text
  */
-CLIENT_COMMAND(npc, 3, 3, COMMAND_FL_REGISTERED) {
+CLIENT_COMMAND(npc, 3, 3, COMMAND_FL_REGISTERED | COMMAND_FL_FOLDMAX) {
     static client_t fake_client;
 
@@ -81 +81 @@
     /* copy as much of the nick as possible, reserve space for underscoring */
     if (find_client(argv[2]) != NULL) {
-        /* XXX: Don't hardcode this. */
-        sendto_one(cli, "NOTICE", ":NPC nickname %s is in use by a different user.",
-                   argv[2]);
+        sendto_one(cli, "NOTICE", ":NPC name %s is in use by an existing user and "
+                   "is not available at this time.", argv[2]);
         return COMMAND_WEIGHT_LOW;
     } else if (strlen(argv[2]) > NICKLEN - 2) {
-        sendto_one(cli, "NOTICE", ":NPC nickname %s is too long (maximum is %d letters)",
+        sendto_one(cli, "NOTICE", ":NPC name %s is too long (maximum is %d letters)",
                    argv[2], NICKLEN - 2);
         return COMMAND_WEIGHT_LOW;
+    } else {
+        if (can_can_nick_client(cli, argv[2])) {
+            sendto_one(cli, "NOTICE", ":NPC name %s is not available for use.",
+                       argv[2]);
+            return COMMAND_WEIGHT_LOW;
+        }
     }
+
     snprintf(fake_client.nick, NICKLEN, "%s", argv[2]);