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

Validate usage of /room config command, added UI messages

Browse Source
This commit is contained in:
James Booth
2014-09-03 22:56:33 +01:00
parent 64521eb135
commit b50b786dcc
7 changed files with 87 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/command.c
View File

@@ -309,7 +309,7 @@ static struct cmd_t command_defs[] =
{ "/room config accept|cancel", "Room configuration.",
{ "/room config accept|cncel",
"-------------------------",
"Accept or cancel room creation.",
"Accept or cancel default room configuration.",
NULL } } },
{ "/rooms",

55
src/command/commands.c
View File

@@ -65,6 +65,7 @@
#include "xmpp/xmpp.h"
#include "xmpp/bookmark.h"
#include "ui/ui.h"
#include "ui/windows.h"
static void _update_presence(const resource_presence_t presence,
const char * const show, gchar **args);
@@ -1796,19 +1797,49 @@ cmd_room(gchar **args, struct cmd_help_t help)
return TRUE;
}
if (g_strcmp0(args[1], "accept") == 0) {
// TODO check that we're in room, we're owner and room requires configuration
char *room = ui_current_recipient();
iq_create_instant_room(room);
} else if (g_strcmp0(args[1], "cancel") == 0) {
// check that we're in room, we're owner and room requires configuration
char *room = ui_current_recipient();
iq_destroy_instant_room(room);
} else {
cons_show("Usage: %s", help.usage);
win_type_t win_type = ui_current_win_type();
if (win_type != WIN_MUC) {
cons_show("Command /room only usable in chat rooms.");
return TRUE;
}
if (g_strcmp0(args[0], "config") != 0) {
cons_show("Usage: %s", help.usage);
return TRUE;
}
if ((g_strcmp0(args[1], "accept") != 0) &&
(g_strcmp0(args[1], "cancel") != 0)) {
cons_show("Usage: %s", help.usage);
return TRUE;
}
char *room = ui_current_recipient();
ProfWin *window = wins_get_by_recipient(room);
int num = wins_get_num(window);
int ui_index = num;
if (ui_index == 10) {
ui_index = 0;
}
gboolean requires_config = muc_requires_config(room);
if (!requires_config) {
win_save_vprint(window, '!', NULL, 0, COLOUR_ROOMINFO, "", "Current room ooes not require configuration.");
return TRUE;
}
if (g_strcmp0(args[1], "accept") == 0) {
iq_confirm_instant_room(room);
muc_set_requires_config(room, FALSE);
win_save_vprint(window, '!', NULL, 0, COLOUR_ROOMINFO, "", "Room unlocked.");
cons_show("Room unlocked: %s (%d)", room, ui_index);
return TRUE;
}
if (g_strcmp0(args[1], "cancel") == 0) {
iq_destroy_instant_room(room);
return TRUE;
}
return TRUE;
}