diff options
Diffstat (limited to 'src/command')
| -rw-r--r-- | src/command/cmd_ac.c | 1 | ||||
| -rw-r--r-- | src/command/cmd_defs.c | 12 | ||||
| -rw-r--r-- | src/command/cmd_funcs.c | 41 |
3 files changed, 34 insertions, 20 deletions
diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c index b29acec5..deda8abe 100644 --- a/src/command/cmd_ac.c +++ b/src/command/cmd_ac.c @@ -1102,6 +1102,7 @@ cmd_ac_init(void) avatar_ac = autocomplete_new(); autocomplete_add(avatar_ac, "set"); + autocomplete_add(avatar_ac, "disable"); autocomplete_add(avatar_ac, "get"); autocomplete_add(avatar_ac, "open"); diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index 0dd7f10a..c6e886a5 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -2418,25 +2418,29 @@ static const struct cmd_t command_defs[] = { }, { CMD_PREAMBLE("/avatar", - parse_args, 2, 2, NULL) + parse_args, 1, 2, NULL) CMD_MAINFUNC(cmd_avatar) CMD_TAGS( CMD_TAG_CHAT) CMD_SYN( "/avatar set <path>", + "/avatar disable", "/avatar get <barejid>", "/avatar open <barejid>") CMD_DESC( - "Upload avatar for oneself (XEP-0084). " - "Download avatar (XEP-0084) for a certain contact. " - "If nothing happens after using this command the user either doesn't have an avatar set at all " + "Upload an avatar for yourself, " + "disable your avatar, " + "or download a contact's avatar (XEP-0084). " + "If nothing happens after using this command, the user either doesn't have an avatar set " "or doesn't use XEP-0084 to publish it.") CMD_ARGS( { "set <path>", "Set avatar to the image at <path>." }, + { "disable", "Disable avatar publishing; your avatar will not display to others." }, { "get <barejid>", "Download the avatar. barejid is the JID to download avatar from." }, { "open <barejid>", "Download avatar and open it with command." }) CMD_EXAMPLES( "/avatar set ~/images/avatar.png", + "/avatar disable", "/avatar get thor@valhalla.edda", "/avatar open freyja@vanaheimr.edda") }, diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index e283395e..6e9ca259 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -9287,25 +9287,34 @@ gboolean cmd_avatar(ProfWin* window, const char* const command, gchar** args) { if (args[1] == NULL) { - cons_bad_cmd_usage(command); - return TRUE; - } - - if (g_strcmp0(args[0], "set") == 0) { -#ifdef HAVE_PIXBUF - if (avatar_set(args[1])) { - cons_show("Avatar updated successfully"); + if (g_strcmp0(args[0], "disable") == 0) { + if (avatar_publishing_disable()) { + cons_show("Avatar publishing disabled. To enable avatar publishing, use '/avatar set <path>'."); + } else { + cons_show("Failed to disable avatar publishing."); + } + } else { + cons_bad_cmd_usage(command); } + } else { + if (g_strcmp0(args[0], "set") == 0) { +#ifdef HAVE_PIXBUF + if (avatar_set(args[1])) { + cons_show("Avatar updated successfully"); + } #else - cons_show("Profanity has not been built with GDK Pixbuf support enabled which is needed to scale the avatar when uploading."); + cons_show("Profanity has not been built with GDK Pixbuf support enabled which is needed to scale the avatar when uploading."); #endif - } else if (g_strcmp0(args[0], "get") == 0) { - avatar_get_by_nick(args[1], false); - } else if (g_strcmp0(args[0], "open") == 0) { - avatar_get_by_nick(args[1], true); - } else if (g_strcmp0(args[0], "cmd") == 0) { - prefs_set_string(PREF_AVATAR_CMD, args[1]); - cons_show("Avatar cmd set to: %s", args[1]); + } else if (g_strcmp0(args[0], "get") == 0) { + avatar_get_by_nick(args[1], false); + } else if (g_strcmp0(args[0], "open") == 0) { + avatar_get_by_nick(args[1], true); + } else if (g_strcmp0(args[0], "cmd") == 0) { + prefs_set_string(PREF_AVATAR_CMD, args[1]); + cons_show("Avatar cmd set to: %s", args[1]); + } else { + cons_bad_cmd_usage(command); + } } return TRUE; |