Added jid autocomplete for affiliation commands

1 files changed, 17 insertions, 4 deletions

diff --git a/src/command/command.c b/src/command/command.c
index daa86d76..9c4fd746 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -1423,6 +1423,7 @@ cmd_reset_autocomplete()
     if (ui_current_win_type() == WIN_MUC) {
         char *recipient = ui_current_recipient();
         muc_autocomplete_reset(recipient);
+        muc_jid_autocomplete_reset(recipient);
     }
 
     autocomplete_reset(who_room_ac);
@@ -2281,14 +2282,13 @@ _room_autocomplete(char *input, int *size)
 
     char *recipient = ui_current_recipient();
     Autocomplete nick_ac = muc_roster_ac(recipient);
+    Autocomplete jid_ac = muc_roster_jid_ac(recipient);
 
     input[*size] = '\0';
     gchar **args = parse_args(input, 4, 4, &parse_result);
 
-    if ((strncmp(input, "/room", 5) == 0) && (parse_result == TRUE)) {
-        GString *beginning = g_string_new("/room ");
-        g_string_append(beginning, args[0]);
-        g_string_append(beginning, " ");
+    if ((strncmp(input, "/room role", 10) == 0) && (parse_result == TRUE)) {
+        GString *beginning = g_string_new("/room role ");
         g_string_append(beginning, args[1]);
         g_string_append(beginning, " ");
         g_string_append(beginning, args[2]);
@@ -2300,6 +2300,19 @@ _room_autocomplete(char *input, int *size)
         }
     }
 
+    if ((strncmp(input, "/room affiliation", 17) == 0) && (parse_result == TRUE)) {
+        GString *beginning = g_string_new("/room affiliation ");
+        g_string_append(beginning, args[1]);
+        g_string_append(beginning, " ");
+        g_string_append(beginning, args[2]);
+
+        result = autocomplete_param_with_ac(input, size, beginning->str, jid_ac, TRUE);
+        g_string_free(beginning, TRUE);
+        if (result != NULL) {
+            return result;
+        }
+    }
+
     result = autocomplete_param_with_ac(input, size, "/room role set", room_role_ac, TRUE);
     if (result != NULL) {
         return result;