aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Align avatar behaviour with urlopen

Browse Source 
`/executable avatar` now also uses cmdtemplate and parse %p.
It seems to me that the `/avatar` command was actually completely broken
on master.
This commit is contained in:
Michael Vetter 2023-05-09 19:58:21 +02:00
parent daf3d193e2
commit 8075b32ebc
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/command/cmd_defs.c
View File

@ -2437,7 +2437,7 @@ static const struct cmd_t command_defs[] = {
{ "set <path>", "Set avatar to the image at <path>." }, { "set <path>", "Set avatar to the image at <path>." },
{ "disable", "Disable avatar publishing; your avatar will not display to others." }, { "disable", "Disable avatar publishing; your avatar will not display to others." },
{ "get <barejid>", "Download the avatar. barejid is the JID to download avatar from." }, { "get <barejid>", "Download the avatar. barejid is the JID to download avatar from." },
{ "open <barejid>", "Download avatar and open it with command." }) { "open <barejid>", "Download avatar and open it with command. See /executable." })
CMD_EXAMPLES( CMD_EXAMPLES(
"/avatar set ~/images/avatar.png", "/avatar set ~/images/avatar.png",
"/avatar disable", "/avatar disable",
@ -2534,7 +2534,8 @@ static const struct cmd_t command_defs[] = {
CMD_TAGS( CMD_TAGS(
CMD_TAG_DISCOVERY) CMD_TAG_DISCOVERY)
CMD_SYN( CMD_SYN(
"/executable avatar <cmd>", "/executable avatar set <cmdtemplate>",
"/executable avatar default",
"/executable urlopen set <cmdtemplate>", "/executable urlopen set <cmdtemplate>",
"/executable urlopen default", "/executable urlopen default",
"/executable urlsave set <cmdtemplate>", "/executable urlsave set <cmdtemplate>",
@ -2545,7 +2546,8 @@ static const struct cmd_t command_defs[] = {
CMD_DESC( CMD_DESC(
"Configure executable that should be called upon a certain command.") "Configure executable that should be called upon a certain command.")
CMD_ARGS( CMD_ARGS(
{ "avatar", "Set executable that is run by /avatar open. Use your favorite image viewer." }, { "avatar set", "Set executable that is run by /avatar open. Use your favorite image viewer." },
{ "avatar default", "Restore to default settings." },
{ "urlopen set", "Set executable that is run by /url open. Takes a command template that replaces %u and %p with the URL and path respectively." }, { "urlopen set", "Set executable that is run by /url open. Takes a command template that replaces %u and %p with the URL and path respectively." },
{ "urlopen default", "Restore to default settings." }, { "urlopen default", "Restore to default settings." },
{ "urlsave set", "Set executable that is run by /url save. Takes a command template that replaces %u and %p with the URL and path respectively." }, { "urlsave set", "Set executable that is run by /url save. Takes a command template that replaces %u and %p with the URL and path respectively." },

33
src/command/cmd_funcs.c
View File

@ -9617,15 +9617,7 @@ out:
} }
gboolean gboolean
cmd_executable_avatar(ProfWin* window, const char* const command, gchar** args) _cmd_executable_template(const preference_t setting, const char* command, gchar** args)
{
prefs_set_string(PREF_AVATAR_CMD, args[1]);
cons_show("`avatar` command set to invoke '%s'", args[1]);
return TRUE;
}
gboolean
cmd_executable_urlopen(ProfWin* window, const char* const command, gchar** args)
{ {
guint num_args = g_strv_length(args); guint num_args = g_strv_length(args);
if (num_args < 2) { if (num_args < 2) {
@ -9635,14 +9627,14 @@ cmd_executable_urlopen(ProfWin* window, const char* const command, gchar** args)
if (g_strcmp0(args[1], "set") == 0 && num_args >= 3) { if (g_strcmp0(args[1], "set") == 0 && num_args >= 3) {
gchar* str = g_strjoinv(" ", &args[2]); gchar* str = g_strjoinv(" ", &args[2]);
prefs_set_string(PREF_URL_OPEN_CMD, str); prefs_set_string(setting, str);
cons_show("`url open` command set to invoke '%s'", str); cons_show("`%s` command set to invoke '%s'", command, str);
g_free(str); g_free(str);
} else if (g_strcmp0(args[1], "default") == 0) { } else if (g_strcmp0(args[1], "default") == 0) {
prefs_set_string(PREF_URL_OPEN_CMD, NULL); prefs_set_string(setting, NULL);
gchar* def = prefs_get_string(PREF_URL_OPEN_CMD); gchar* def = prefs_get_string(setting);
cons_show("`url open` command set to invoke %s (default)", def); cons_show("`%s` command set to invoke %s (default)", command, def);
g_free(def); g_free(def);
} else { } else {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
@ -9651,10 +9643,21 @@ cmd_executable_urlopen(ProfWin* window, const char* const command, gchar** args)
return TRUE; return TRUE;
} }
gboolean
cmd_executable_avatar(ProfWin* window, const char* const command, gchar** args)
{
return _cmd_executable_template(PREF_AVATAR_CMD, args[0], args);
}
gboolean
cmd_executable_urlopen(ProfWin* window, const char* const command, gchar** args)
{
return _cmd_executable_template(PREF_URL_OPEN_CMD, args[0], args);
}
gboolean gboolean
cmd_executable_urlsave(ProfWin* window, const char* const command, gchar** args) cmd_executable_urlsave(ProfWin* window, const char* const command, gchar** args)
{ {
guint num_args = g_strv_length(args); guint num_args = g_strv_length(args);
if (num_args < 2) { if (num_args < 2) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);

2
src/config/preferences.c
View File

@ -2314,7 +2314,7 @@ _get_default_string(preference_t pref)
case PREF_COLOR_NICK: case PREF_COLOR_NICK:
return "false"; return "false";
case PREF_AVATAR_CMD: case PREF_AVATAR_CMD:
return "xdg-open"; return "xdg-open %p";
case PREF_URL_OPEN_CMD: case PREF_URL_OPEN_CMD:
return "xdg-open %u"; return "xdg-open %u";
case PREF_VCARD_PHOTO_CMD: case PREF_VCARD_PHOTO_CMD: