devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-20 03:26:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved /room ban to /ban

Browse Source
This commit is contained in:
James Booth
2014-10-11 22:43:54 +01:00
parent 02a4beb6fe
commit 9054427144
3 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/command/command.c
View File

@@ -91,6 +91,7 @@ static char * _form_autocomplete(char *input, int *size);
static char * _room_autocomplete(char *input, int *size);
static char * _occupants_autocomplete(char *input, int *size);
static char * _kick_autocomplete(char *input, int *size);
static char * _ban_autocomplete(char *input, int *size);
GHashTable *commands = NULL;
@@ -328,6 +329,15 @@ static struct cmd_t command_defs[] =
"reason - Optional reason for kicking the occupant.",
NULL } } },
{ "/ban",
cmd_ban, parse_args, 1, 2, NULL,
{ "/ban jid [reason]", "Ban users from chat rooms.",
{ "/ban jid [reason]",
"-----------------",
"jid - Bare JID of the user to ban from the room.",
"reason - Optional reason for banning the user.",
NULL } } },
{ "/occupants",
cmd_occupants, parse_args, 1, 2, &cons_occupants_setting,
{ "/occupants show|hide|default [show|hide]", "Show or hide room occupants.",
@@ -1274,7 +1284,6 @@ cmd_init(void)
autocomplete_add(room_ac, "config");
autocomplete_add(room_ac, "info");
autocomplete_add(room_ac, "subject");
autocomplete_add(room_ac, "ban");
autocomplete_add(room_ac, "role");
autocomplete_add(room_ac, "affiliation");
@@ -1790,6 +1799,7 @@ _cmd_complete_parameters(char *input, int *size)
g_hash_table_insert(ac_funcs, "/room", _room_autocomplete);
g_hash_table_insert(ac_funcs, "/occupants", _occupants_autocomplete);
g_hash_table_insert(ac_funcs, "/kick", _kick_autocomplete);
g_hash_table_insert(ac_funcs, "/ban", _ban_autocomplete);
char parsed[*size+1];
i = 0;
@@ -2347,6 +2357,23 @@ _kick_autocomplete(char *input, int *size)
return NULL;
}
static char *
_ban_autocomplete(char *input, int *size)
{
char *result = NULL;
char *recipient = ui_current_recipient();
Autocomplete jid_ac = muc_roster_jid_ac(recipient);
if (jid_ac != NULL) {
result = autocomplete_param_with_ac(input, size, "/ban", jid_ac, TRUE);
if (result != NULL) {
return result;
}
}
return NULL;
}
static char *
_room_autocomplete(char *input, int *size)
{
@@ -2421,13 +2448,6 @@ _room_autocomplete(char *input, int *size)
return result;
}
if (jid_ac != NULL) {
result = autocomplete_param_with_ac(input, size, "/room ban", jid_ac, TRUE);
if (result != NULL) {
return result;
}
}
result = autocomplete_param_with_ac(input, size, "/room", room_ac, TRUE);
if (result != NULL) {
return result;