Changeset 836 for branches/ithildin-1.1

Timestamp:

05/11/09 01:51:43 (3 years ago)

Author:

wd

Message:

Add normal send check to NPC command (duhhh)

File:

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

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

@@ -48 +48 @@
  */
 CLIENT_COMMAND(npc, 3, 3, COMMAND_FL_REGISTERED) {
+    static client_t fake_client;
+
     bool action = !strcasecmp(argv[0], NPC_ACTION_COMMAND);
     channel_t *chan = find_channel(argv[1]);
-    static client_t fake_client;
+    int sendok = CLIENT_CHECK_OK;
     size_t message_space = 512;
     size_t message_length = 0;
@@ -76 +78 @@
         sendto_one(cli, "NOTICE", ":NPC nickname %s is too long (maximum is %d letters)",
                    argv[2], NICKLEN - 2);
-        return COMMAND_WEIGHT_NONE;
+        return COMMAND_WEIGHT_LOW;
     }
     snprintf(fake_client.nick, NICKLEN, "%s", argv[2]);
 
     if (MYCLIENT(cli)) {
+        if (!CLIENT_MASTER(cli)) {
+            sendok = can_can_send_channel(cli, chan, argv[3]);
+            if (sendok > 0) {
+                sendto_one(cli, RPL_FMT(cli, sendok), chan->name);
+                return COMMAND_WEIGHT_MEDIUM;
+            }
+        }
+
         /* calculate against: ":nick!user@host PRIVMSG #channel :blah (Sender)\r\n"
          * which is the most antiquated way of passing messages. */
@@ -96 +106 @@
                        "was too long.  Please remove %u characters to send it.",
                        argv[3], message_length - message_space);
-            return COMMAND_WEIGHT_LOW;
+            return COMMAND_WEIGHT_MEDIUM;
         }
     }