aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

xep-0308: Make /correct work without quotation marks

Browse Source 
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.
This commit is contained in:
Michael Vetter 2020-02-12 14:50:58 +01:00
parent 1072cdab0a
commit 8f37afcd37
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/command/cmd_ac.c
View File

@ -3765,9 +3765,8 @@ _correct_autocomplete(ProfWin *window, const char *const input, gboolean previou
return NULL; 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, last_message);
g_string_append(result_str, "\"");
char *result = result_str->str; char *result = result_str->str;
g_string_free(result_str, FALSE); g_string_free(result_str, FALSE);

8
src/command/cmd_defs.c
View File

@ -2382,7 +2382,7 @@ static struct cmd_t command_defs[] =
}, },
{ "/correct", { "/correct",
parse_args, 1, 1, NULL, parse_args, 1, -1, NULL,
CMD_NOSUBFUNCS CMD_NOSUBFUNCS
CMD_MAINFUNC(cmd_correct) CMD_MAINFUNC(cmd_correct)
CMD_TAGS( CMD_TAGS(
@ -2393,10 +2393,8 @@ static struct cmd_t command_defs[] =
CMD_DESC( CMD_DESC(
"Correct and resend the last message (XEP-0308).") "Correct and resend the last message (XEP-0308).")
CMD_ARGS( CMD_ARGS(
{ "\"message\"", "The corrected message. Multiple words need quotation marks."}) { "message", "The corrected message."})
CMD_EXAMPLES( CMD_NOEXAMPLES
"/correct Profanity",
"/correct \"Profanity is the best\"")
}, },
}; };

10
src/command/cmd_funcs.c
View File

@ -8701,7 +8701,10 @@ cmd_correct(ProfWin *window, const char *const command, gchar **args)
} }
// send message again, with replace flag // 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; return TRUE;
} else if (window->type == WIN_MUC) { } else if (window->type == WIN_MUC) {
ProfMucWin *mucwin = (ProfMucWin*)window; ProfMucWin *mucwin = (ProfMucWin*)window;
@ -8713,7 +8716,10 @@ cmd_correct(ProfWin *window, const char *const command, gchar **args)
} }
// send message again, with replace flag // 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; return TRUE;
} }

4
src/tools/parser.c
View File

@ -48,7 +48,7 @@
* *
* inp - The line of input * inp - The line of input
* min - The minimum allowed number of arguments * min - The minimum allowed number of arguments
* max - The maximum allowed number of arguments * max - The maximum allowed number of arguments, -1 for infinite
* *
* Returns - An NULL terminated array of strings representing the arguments * Returns - An NULL terminated array of strings representing the arguments
* of the command, or NULL if the validation fails. * of the command, or NULL if the validation fails.
@ -135,7 +135,7 @@ parse_args(const char *const inp, int min, int max, gboolean *result)
int num = g_slist_length(tokens) - 1; int num = g_slist_length(tokens) - 1;
// if num args not valid return NULL // if num args not valid return NULL
if ((num < min) || (num > max)) { if ((num < min) || ((max != -1) && (num > max))) {
g_slist_free_full(tokens, free); g_slist_free_full(tokens, free);
g_free(copy); g_free(copy);
*result = FALSE; *result = FALSE;