aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-09 21:30:42 +00:00
Code

Add params support for aliases

Browse Source 
Before aliases used spaces in their name,
now the alias part is being read only before the first space,
thus allowing execution of complex command with aliases.

Example (with plugin):
`/alias add echo "/system exec echo"`
will allow execution of
`/echo test`
as opposed to prior state when the Profanity will
search for alias "echo tests" and output `Unknown command: /echo test`

Minor change: removed an example with invalid command (`/away`)
This commit is contained in:
John Hernandez 2023-10-19 17:45:19 +02:00
parent 2ab9a306ab
commit 9ecade9919
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/command/cmd_defs.c
View File

@ -1643,12 +1643,13 @@ static const struct cmd_t command_defs[] = {
"Add, remove or list command aliases.")
CMD_ARGS(
{ "list", "List all aliases." },
{ "add <name> <value>", "Add a new command alias." },
{ "add <name> <value>", "Add a new command alias. The alias name must not contain any space characters." },
{ "remove <name>", "Remove a command alias." })
CMD_EXAMPLES(
"/alias add friends /who online friends",
"/alias add /q /quit",
"/alias add a /away \"I'm in a meeting.\"",
"/alias add urg /msg odin@valhalla.edda [URGENT]",
"/alias add afk /status set away \"Away From Keyboard\"",
"/alias remove q",
"/alias list")
},

23
src/command/cmd_funcs.c
View File

@ -5091,6 +5091,10 @@ cmd_alias(ProfWin* window, const char* const command, gchar** args)
cons_bad_cmd_usage(command);
return TRUE;
} else {
if (strchr(alias, ' ')) {
cons_bad_cmd_usage(command);
return TRUE;
}
char* alias_p = alias;
GString* ac_value = g_string_new("");
if (alias[0] == '/') {
@ -8565,15 +8569,20 @@ _cmd_execute_alias(ProfWin* window, const char* const inp, gboolean* ran)
}
auto_char char* alias = strdup(inp + 1);
auto_gchar gchar* value = prefs_get_alias(alias);
if (value) {
*ran = TRUE;
gboolean result = cmd_process_input(window, value);
return result;
auto_gcharv char** alias_parts = g_strsplit(alias, " ", 2);
auto_gchar gchar* value = prefs_get_alias(alias_parts[0]);
if (!value) {
*ran = FALSE;
return TRUE;
}
*ran = FALSE;
return TRUE;
char* params = alias_parts[1];
auto_gchar gchar* full_cmd = params ? g_strdup_printf("%s %s", value, params) : g_strdup(value);
*ran = TRUE;
gboolean result = cmd_process_input(window, full_cmd);
return result;
}
// helper function for status change commands