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

Moved /room kick to /kick

Browse Source
This commit is contained in:
James Booth
2014-10-10 13:35:50 +01:00
parent 6a2bc79ca6
commit 02a4beb6fe
4 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/command/commands.c
View File

@@ -2107,6 +2107,40 @@ cmd_form(gchar **args, struct cmd_help_t help)
return TRUE;
}
gboolean
cmd_kick(gchar **args, struct cmd_help_t help)
{
jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
return TRUE;
}
win_type_t win_type = ui_current_win_type();
if (win_type != WIN_MUC) {
cons_show("Command '/kick' only applies in chat rooms.");
return TRUE;
}
char *room = ui_current_recipient();
ProfWin *window = wins_get_by_recipient(room);
char *nick = args[0];
if (nick) {
if (muc_roster_contains_nick(room, nick)) {
char *reason = args[1];
iq_room_kick_occupant(room, nick, reason);
} else {
win_save_vprint(window, '!', NULL, 0, 0, "", "Occupant does not exist: %s", nick);
}
} else {
cons_show("Usage: %s", help.usage);
}
return TRUE;
}
gboolean
cmd_room(gchar **args, struct cmd_help_t help)
{
@@ -2127,7 +2161,6 @@ cmd_room(gchar **args, struct cmd_help_t help)
(g_strcmp0(args[0], "destroy") != 0) &&
(g_strcmp0(args[0], "config") != 0) &&
(g_strcmp0(args[0], "subject") != 0) &&
(g_strcmp0(args[0], "kick") != 0) &&
(g_strcmp0(args[0], "ban") != 0) &&
(g_strcmp0(args[0], "role") != 0) &&
(g_strcmp0(args[0], "affiliation") != 0) &&
@@ -2181,21 +2214,6 @@ cmd_room(gchar **args, struct cmd_help_t help)
return TRUE;
}
if (g_strcmp0(args[0], "kick") == 0) {
char *nick = args[1];
if (nick) {
if (muc_roster_contains_nick(room, nick)) {
char *reason = args[2];
iq_room_kick_occupant(room, nick, reason);
} else {
win_save_vprint(window, '!', NULL, 0, 0, "", "Occupant does not exist: %s", nick);
}
} else {
cons_show("Usage: %s", help.usage);
}
return TRUE;
}
if (g_strcmp0(args[0], "ban") == 0) {
char *jid = args[1];
if (jid) {