devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Implemented /room kick command

Browse Source
This commit is contained in:
James Booth
2014-10-05 20:52:34 +01:00
parent ac7bc02c63
commit d12534c58e
8 changed files with 334 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/ui/core.c
View File

@@ -1493,6 +1493,31 @@ _ui_room_member_offline(const char * const room, const char * const nick)
}
}
static void
_ui_room_member_kicked(const char * const room, const char * const nick, const char * const actor,
const char * const reason)
{
ProfWin *window = wins_get_by_recipient(room);
if (window == NULL) {
log_error("Received kick for room participant %s, but no window open for %s.", nick, room);
} else {
GString *message = g_string_new(nick);
g_string_append(message, " has been kicked from the room");
if (actor) {
g_string_append(message, " by ");
g_string_append(message, actor);
}
if (reason) {
g_string_append(message, ", reason: ");
g_string_append(message, reason);
}
win_save_vprint(window, '!', NULL, 0, COLOUR_OFFLINE, "", "<- %s", message->str);
g_string_free(message, TRUE);
}
}
static void
_ui_room_member_online(const char * const room, const char * const nick,
const char * const show, const char * const status)
@@ -1691,7 +1716,7 @@ _ui_room_requires_config(const char * const room_jid)
}
static void
_ui_room_destroyed(const char * const room_jid)
_ui_room_destroy(const char * const room_jid)
{
ProfWin *window = wins_get_by_recipient(room_jid);
if (window == NULL) {
@@ -1703,6 +1728,71 @@ _ui_room_destroyed(const char * const room_jid)
}
}
static void
_ui_leave_room(const char * const room)
{
ProfWin *window = wins_get_by_recipient(room);
if (window) {
int num = wins_get_num(window);
ui_close_win(num);
}
}
static void
_ui_room_destroyed(const char * const room, const char * const reason, const char * const new_jid,
const char * const password)
{
ProfWin *window = wins_get_by_recipient(room);
if (window == NULL) {
log_error("Received room destroy, but no window open for %s.", room);
} else {
int num = wins_get_num(window);
ui_close_win(num);
ProfWin *console = wins_get_console();
if (reason) {
win_save_vprint(console, '!', NULL, 0, COLOUR_TYPING, "", "<- Room destroyed: %s, reason: %s", room, reason);
} else {
win_save_vprint(console, '!', NULL, 0, COLOUR_TYPING, "", "<- Room destroyed: %s", room);
}
if (new_jid) {
if (password) {
win_save_vprint(console, '!', NULL, 0, COLOUR_TYPING, "", "Replacement room: %s, password: %s", new_jid, password);
} else {
win_save_vprint(console, '!', NULL, 0, COLOUR_TYPING, "", "Replacement room: %s", new_jid);
}
}
}
}
static void
_ui_room_kicked(const char * const room, const char * const actor, const char * const reason)
{
ProfWin *window = wins_get_by_recipient(room);
if (window == NULL) {
log_error("Received kick, but no window open for %s.", room);
} else {
int num = wins_get_num(window);
ui_close_win(num);
GString *message = g_string_new("Kicked from ");
g_string_append(message, room);
if (actor) {
g_string_append(message, " by ");
g_string_append(message, actor);
}
if (reason) {
g_string_append(message, ", reason: ");
g_string_append(message, reason);
}
ProfWin *console = wins_get_console();
win_save_vprint(console, '!', NULL, 0, COLOUR_TYPING, "", "<- %s", message->str);
g_string_free(message, TRUE);
}
}
static void
_ui_room_subject(const char * const room, const char * const nick, const char * const subject)
{
@@ -1750,17 +1840,6 @@ _ui_handle_room_kick_error(const char * const room, const char * const nick, con
}
}
static void
_ui_handle_room_kick(const char * const room, const char * const nick)
{
ProfWin *window = wins_get_by_recipient(room);
if (window == NULL) {
log_error("Kick result received for %s, but no window open for %s.", nick, room);
} else {
win_save_vprint(window, '!', NULL, 0, 0, "", "%s has been kicked from the room", nick);
}
}
static void
_ui_room_broadcast(const char * const room_jid, const char * const message)
{
@@ -2766,7 +2845,7 @@ ui_init_module(void)
ui_swap_wins = _ui_swap_wins;
ui_update = _ui_update;
ui_room_requires_config = _ui_room_requires_config;
ui_room_destroyed = _ui_room_destroyed;
ui_room_destroy = _ui_room_destroy;
ui_handle_room_configuration = _ui_handle_room_configuration;
ui_handle_room_config_submit_result = _ui_handle_room_config_submit_result;
ui_handle_room_config_submit_result_error = _ui_handle_room_config_submit_result_error;
@@ -2783,9 +2862,13 @@ ui_init_module(void)
ui_handle_room_info_error = _ui_handle_room_info_error;
ui_show_room_disco_info = _ui_show_room_disco_info;
ui_handle_room_affiliation_list_error = _ui_handle_room_affiliation_list_error;
ui_handle_room_affiliation_list =_ui_handle_room_affiliation_list;
ui_handle_room_affiliation_set_error =_ui_handle_room_affiliation_set_error;
ui_handle_room_affiliation_list = _ui_handle_room_affiliation_list;
ui_handle_room_affiliation_set_error = _ui_handle_room_affiliation_set_error;
ui_handle_room_affiliation_set = _ui_handle_room_affiliation_set;
ui_handle_room_kick_error =_ui_handle_room_kick_error;
ui_handle_room_kick = _ui_handle_room_kick;
ui_handle_room_kick_error = _ui_handle_room_kick_error;
ui_room_destroyed = _ui_room_destroyed;
ui_room_kicked = _ui_room_kicked;
ui_leave_room = _ui_leave_room;
ui_room_member_kicked = _ui_room_member_kicked;
}

10
src/ui/ui.h
View File

@@ -135,13 +135,18 @@ void (*ui_room_message)(const char * const room_jid, const char * const nick,
const char * const message);
void (*ui_room_subject)(const char * const room, const char * const nick, const char * const subject);
void (*ui_room_requires_config)(const char * const room_jid);
void (*ui_room_destroyed)(const char * const room_jid);
void (*ui_room_destroy)(const char * const room_jid);
void (*ui_show_room_info)(ProfWin *window, const char * const room);
void (*ui_show_room_role_list)(ProfWin *window, const char * const room, muc_role_t role);
void (*ui_show_room_affiliation_list)(ProfWin *window, const char * const room, muc_affiliation_t affiliation);
void (*ui_handle_room_info_error)(const char * const room, const char * const error);
void (*ui_show_room_disco_info)(const char * const room, GSList *identities, GSList *features);
void (*ui_room_destroyed)(const char * const room, const char * const reason, const char * const new_jid,
const char * const password);
void (*ui_room_kicked)(const char * const room, const char * const actor, const char * const reason);
void (*ui_room_member_kicked)(const char * const room, const char * const nick, const char * const actor,
const char * const reason);
void (*ui_leave_room)(const char * const room);
void (*ui_room_broadcast)(const char * const room_jid,
const char * const message);
void (*ui_room_member_offline)(const char * const room, const char * const nick);
@@ -176,7 +181,6 @@ void (*ui_handle_room_affiliation_set_error)(const char * const room, const char
const char * const affiliation, const char * const error);
void (*ui_handle_room_affiliation_set)(const char * const room, const char * const jid, const char * const affiliation);
void (*ui_handle_room_kick_error)(const char * const room, const char * const nick, const char * const error);
void (*ui_handle_room_kick)(const char * const room, const char * const nick);
void (*ui_show_form)(ProfWin *window, const char * const room, DataForm *form);
void (*ui_show_form_field)(ProfWin *window, DataForm *form, char *tag);
void (*ui_show_form_help)(ProfWin *window, DataForm *form);