diff options
| author | Michael Vetter <jubalh@iodoru.org> | 2020-02-12 14:50:58 +0100 |
|---|---|---|
| committer | Michael Vetter <jubalh@iodoru.org> | 2020-02-14 10:17:07 +0100 |
| commit | 8f37afcd37ad8663ca36c13ca7fbc4a431119f73 (patch) | |
| tree | 31875c3361ed79658ff3bfc2c10ea4ec05a49a16 /src/command | |
| parent | 1072cdab0add1389d0ab6667aceecf64e583fcc4 (diff) | |
| download | profani-tty-8f37afcd37ad8663ca36c13ca7fbc4a431119f73.tar.gz | |
xep-0308: Make /correct work without quotation marks
Now we can specify an unlimited amount of arguments for commands. Maybe this is also helpful for other commands that use quotation marks so far.
Diffstat (limited to 'src/command')
| -rw-r--r-- | src/command/cmd_ac.c | 3 | ||||
| -rw-r--r-- | src/command/cmd_defs.c | 8 | ||||
| -rw-r--r-- | src/command/cmd_funcs.c | 10 |
3 files changed, 12 insertions, 9 deletions
diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c index c91bb447..386e8939 100644 --- a/src/command/cmd_ac.c +++ b/src/command/cmd_ac.c @@ -3765,9 +3765,8 @@ _correct_autocomplete(ProfWin *window, const char *const input, gboolean previou return NULL; } - GString *result_str = g_string_new("/correct \""); + GString *result_str = g_string_new("/correct "); g_string_append(result_str, last_message); - g_string_append(result_str, "\""); char *result = result_str->str; g_string_free(result_str, FALSE); diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index a7b7e49c..60fb262e 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -2382,7 +2382,7 @@ static struct cmd_t command_defs[] = }, { "/correct", - parse_args, 1, 1, NULL, + parse_args, 1, -1, NULL, CMD_NOSUBFUNCS CMD_MAINFUNC(cmd_correct) CMD_TAGS( @@ -2393,10 +2393,8 @@ static struct cmd_t command_defs[] = CMD_DESC( "Correct and resend the last message (XEP-0308).") CMD_ARGS( - { "\"message\"", "The corrected message. Multiple words need quotation marks."}) - CMD_EXAMPLES( - "/correct Profanity", - "/correct \"Profanity is the best\"") + { "message", "The corrected message."}) + CMD_NOEXAMPLES }, }; diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index cfb78cd4..40f5d8f4 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -8701,7 +8701,10 @@ cmd_correct(ProfWin *window, const char *const command, gchar **args) } // send message again, with replace flag - cl_ev_send_msg_correct(chatwin, args[0], FALSE, TRUE); + gchar *message = g_strjoinv(" ", args); + cl_ev_send_msg_correct(chatwin, message, FALSE, TRUE); + + free(message); return TRUE; } else if (window->type == WIN_MUC) { ProfMucWin *mucwin = (ProfMucWin*)window; @@ -8713,7 +8716,10 @@ cmd_correct(ProfWin *window, const char *const command, gchar **args) } // send message again, with replace flag - cl_ev_send_muc_msg_corrected(mucwin, args[0], FALSE, TRUE); + gchar *message = g_strjoinv(" ", args); + cl_ev_send_muc_msg_corrected(mucwin, message, FALSE, TRUE); + + free(message); return TRUE; } |