Changeset b441614 for root_commands.c

Timestamp:

2015-06-17T23:24:26Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

114154c

Parents:

b75671d

Message:

Fix HANDLE_DOMAINS + add command nick argument compatibility.

The order was wrong, it'd set the nick for $NAKED_HANDLE and then add
$NAKED_HANDLE@$DOMAIN which is pretty pointless.

File:

• root_commands.c (modified) (2 diffs)

root_commands.c

@@ -661 +661 @@
         }
 
+        if ((a->flags & ACC_FLAG_HANDLE_DOMAINS) && cmd[2][0] != '_' &&
+            (!(s = strchr(cmd[2], '@')) || s[1] == '\0')) {
+                /* If there's no @ or it's the last char, append the user's
+                   domain name now. Exclude handles starting with a _ so
+                   adding _xmlconsole will keep working. */
+                if (s) {
+                        *s = '\0';
+                }
+                if ((s = strchr(a->user, '@'))) {
+                        cmd[2] = handle = g_strconcat(cmd[2], s, NULL);
+                }
+        }
+
         if (cmd[3]) {
                 if (!nick_ok(irc, cmd[3])) {
@@ -670 +683 @@
                 } else {
                         nick_set_raw(a, cmd[2], cmd[3]);
-                }
-        }
-
-        if ((a->flags & ACC_FLAG_HANDLE_DOMAINS) && cmd[2][0] != '_' &&
-            (!(s = strchr(cmd[2], '@')) || s[1] == '\0')) {
-                /* If there's no @ or it's the last char, append the user's
-                   domain name now. Exclude handles starting with a _ so
-                   adding _xmlconsole will keep working. */
-                if (s) {
-                        *s = '\0';
-                }
-                if ((s = strchr(a->user, '@'))) {
-                        cmd[2] = handle = g_strconcat(cmd[2], s, NULL);
                 }
         }