about summary refs log tree commit diff stats
path: root/src/command
diff options
context:
space:
mode:
Diffstat (limited to 'src/command')
-rw-r--r--src/command/command.c3
-rw-r--r--src/command/commands.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/command/command.c b/src/command/command.c
index 0184eb97..8a0baf3f 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -307,7 +307,7 @@ static struct cmd_t command_defs[] =
           NULL } } },
 
     { "/room",
-        cmd_room, parse_args, 1, 4, NULL,
+        cmd_room, parse_args_with_freetext, 1, 5, NULL,
         { "/room accept|destroy|config|info", "Room configuration.",
         { "/room accept|destroy|config|info",
           "--------------------------------",
@@ -1257,7 +1257,6 @@ cmd_init(void)
     autocomplete_add(room_affiliation_ac, "admin");
     autocomplete_add(room_affiliation_ac, "member");
     autocomplete_add(room_affiliation_ac, "outcast");
-    autocomplete_add(room_affiliation_ac, "none");
 
     room_role_ac = autocomplete_new();
     autocomplete_add(room_role_ac, "moderator");
diff --git a/src/command/commands.c b/src/command/commands.c
index 1ba8af72..8a6150c0 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -2159,8 +2159,7 @@ cmd_room(gchar **args, struct cmd_help_t help)
         if ((g_strcmp0(affiliation, "owner") != 0) &&
                 (g_strcmp0(affiliation, "admin") != 0) &&
                 (g_strcmp0(affiliation, "member") != 0) &&
-                (g_strcmp0(affiliation, "outcast") != 0) &&
-                (g_strcmp0(affiliation, "none") != 0)) {
+                (g_strcmp0(affiliation, "outcast") != 0)) {
             cons_show("Usage: %s", help.usage);
             return TRUE;
         }