aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Changed /roster empty -> /roster remove_all contacts

Browse Source 
Make it difficult to accidentally use this command.
This commit is contained in:
James Booth 2015-07-08 20:51:39 +01:00
parent dd480cd72a
commit 9a5fe29caa
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/command/command.c
View File

@ -190,26 +190,26 @@ static struct cmd_t command_defs[] =
"--------------------------", "--------------------------",
"Manage your roster, and roster display settings.", "Manage your roster, and roster display settings.",
"", "",
"command - online|show|hide|by|size|add|remove|nick|clearnick", "command - online|show|hide|by|size|add|remove|remove_all|nick|clearnick",
"", "",
"online : Show all online contacts in your roster.", "online : Show all online contacts in your roster.",
"show : Show the roster panel.", "show : Show the roster panel.",
"show offline : Show offline contacts in the roster panel.", "show offline : Show offline contacts in the roster panel.",
"show resource : Show contact's connected resources in the roster panel.", "show resource : Show contact's connected resources in the roster panel.",
"show empty : When grouping by presence, show empty presence groups", "show empty : When grouping by presence, show empty presence groups",
"hide : Hide the roster panel.", "hide : Hide the roster panel.",
"hide offline : Hide offline contacts in the roster panel.", "hide offline : Hide offline contacts in the roster panel.",
"hide resource : Hide contact's connected resources in the roster panel.", "hide resource : Hide contact's connected resources in the roster panel.",
"hide empty : When grouping by presence, hide empty presence groups", "hide empty : When grouping by presence, hide empty presence groups",
"by group : Group contacts in the roster panel by roster group.", "by group : Group contacts in the roster panel by roster group.",
"by presence : Group contacts in the roster panel by presence.", "by presence : Group contacts in the roster panel by presence.",
"by none : No grouping in the roster panel.", "by none : No grouping in the roster panel.",
"size : Percentage of the screen taken up by the roster (1-99).", "size : Percentage of the screen taken up by the roster (1-99).",
"add jid [nick] : Add a new item to the roster.", "add jid [nick] : Add a new item to the roster.",
"remove jid : Removes an item from the roster.", "remove jid : Removes an item from the roster.",
"empty : Remove all items from roster." "remove_all contacts : Remove all items from roster.",
"nick jid nick : Change a contacts nickname.", "nick jid nick : Change a contacts nickname.",
"clearnick jid : Removes the current nickname.", "clearnick jid : Removes the current nickname.",
"", "",
"Passing no arguments lists all contacts in your roster.", "Passing no arguments lists all contacts in your roster.",
"", "",
@ -1217,6 +1217,7 @@ static Autocomplete wins_ac;
static Autocomplete roster_ac; static Autocomplete roster_ac;
static Autocomplete roster_option_ac; static Autocomplete roster_option_ac;
static Autocomplete roster_by_ac; static Autocomplete roster_by_ac;
static Autocomplete roster_remove_all_ac;
static Autocomplete group_ac; static Autocomplete group_ac;
static Autocomplete bookmark_ac; static Autocomplete bookmark_ac;
static Autocomplete bookmark_property_ac; static Autocomplete bookmark_property_ac;
@ -1432,6 +1433,7 @@ cmd_init(void)
autocomplete_add(roster_ac, "nick"); autocomplete_add(roster_ac, "nick");
autocomplete_add(roster_ac, "clearnick"); autocomplete_add(roster_ac, "clearnick");
autocomplete_add(roster_ac, "remove"); autocomplete_add(roster_ac, "remove");
autocomplete_add(roster_ac, "remove_all");
autocomplete_add(roster_ac, "empty"); autocomplete_add(roster_ac, "empty");
autocomplete_add(roster_ac, "show"); autocomplete_add(roster_ac, "show");
autocomplete_add(roster_ac, "hide"); autocomplete_add(roster_ac, "hide");
@ -1448,6 +1450,9 @@ cmd_init(void)
autocomplete_add(roster_by_ac, "presence"); autocomplete_add(roster_by_ac, "presence");
autocomplete_add(roster_by_ac, "none"); autocomplete_add(roster_by_ac, "none");
roster_remove_all_ac = autocomplete_new();
autocomplete_add(roster_remove_all_ac, "contacts");
group_ac = autocomplete_new(); group_ac = autocomplete_new();
autocomplete_add(group_ac, "show"); autocomplete_add(group_ac, "show");
autocomplete_add(group_ac, "add"); autocomplete_add(group_ac, "add");
@ -1657,6 +1662,7 @@ cmd_uninit(void)
autocomplete_free(roster_ac); autocomplete_free(roster_ac);
autocomplete_free(roster_option_ac); autocomplete_free(roster_option_ac);
autocomplete_free(roster_by_ac); autocomplete_free(roster_by_ac);
autocomplete_free(roster_remove_all_ac);
autocomplete_free(group_ac); autocomplete_free(group_ac);
autocomplete_free(bookmark_ac); autocomplete_free(bookmark_ac);
autocomplete_free(bookmark_property_ac); autocomplete_free(bookmark_property_ac);
@ -1830,6 +1836,7 @@ cmd_reset_autocomplete(ProfWin *window)
autocomplete_reset(roster_ac); autocomplete_reset(roster_ac);
autocomplete_reset(roster_option_ac); autocomplete_reset(roster_option_ac);
autocomplete_reset(roster_by_ac); autocomplete_reset(roster_by_ac);
autocomplete_reset(roster_remove_all_ac);
autocomplete_reset(group_ac); autocomplete_reset(group_ac);
autocomplete_reset(titlebar_ac); autocomplete_reset(titlebar_ac);
autocomplete_reset(bookmark_ac); autocomplete_reset(bookmark_ac);
@ -2188,6 +2195,10 @@ _roster_autocomplete(ProfWin *window, const char * const input)
if (result) { if (result) {
return result; return result;
} }
result = autocomplete_param_with_ac(input, "/roster remove_all", roster_remove_all_ac, TRUE);
if (result) {
return result;
}
result = autocomplete_param_with_ac(input, "/roster show", roster_option_ac, TRUE); result = autocomplete_param_with_ac(input, "/roster show", roster_option_ac, TRUE);
if (result) { if (result) {
return result; return result;

6
src/command/commands.c
View File

@ -1678,7 +1678,11 @@ cmd_roster(ProfWin *window, gchar **args, struct cmd_help_t help)
} }
return TRUE; return TRUE;
} else if (strcmp(args[0], "empty") == 0) { } else if (strcmp(args[0], "remove_all") == 0) {
if (g_strcmp0(args[1], "contacts") != 0) {
cons_show("Usage: %s", help.usage);
return TRUE;
}
if (conn_status != JABBER_CONNECTED) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
return TRUE; return TRUE;