Changeset 837 for branches/ithildin-1.1/modules/ircd/commands/npc.c

Timestamp:

05/11/09 01:53:14 (3 years ago)

Author:

wd

Message:

Clean that up a bit, yech!

File:

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

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

@@ -68 +68 @@
         sendto_one(cli, RPL_FMT(cli, ERR_NOSUCHCHANNEL), argv[1]);
         return COMMAND_WEIGHT_LOW;
-    }
-    if (!chanmode_isset(chan, npc_chanmode)) {
+    } else if (!chanmode_isset(chan, npc_chanmode)) {
         sendto_one(cli, RPL_FMT(cli, ERR_CANNOTSENDTOCHAN), argv[1]);
         return COMMAND_WEIGHT_LOW;
+    } else 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;
+        }
     }
 
@@ -83 +88 @@
 
     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. */