Added service discovery to /room info command

This commit is contained in:
James Booth
2014-10-02 23:37:10 +01:00
parent 2ce1a9186b
commit 25b04537e1
7 changed files with 109 additions and 4 deletions

View File

@@ -1382,6 +1382,56 @@ _ui_room_join(const char * const room, gboolean focus)
}
}
static void
_ui_handle_room_info_error(const char * const room, const char * const error)
{
ProfWin *window = wins_get_by_recipient(room);
if (window) {
win_save_vprint(window, '!', NULL, 0, 0, "", "Room info request failed: %s", error);
win_save_print(window, '-', NULL, 0, 0, "", "");
}
}
static void
_ui_show_room_disco_info(const char * const room, GSList *identities, GSList *features)
{
ProfWin *window = wins_get_by_recipient(room);
if (window) {
if (((identities != NULL) && (g_slist_length(identities) > 0)) ||
((features != NULL) && (g_slist_length(features) > 0))) {
if (identities != NULL) {
win_save_print(window, '!', NULL, 0, 0, "", " Identities:");
}
while (identities != NULL) {
DiscoIdentity *identity = identities->data; // anme trpe, cat
GString *identity_str = g_string_new(" ");
if (identity->name != NULL) {
identity_str = g_string_append(identity_str, identity->name);
identity_str = g_string_append(identity_str, " ");
}
if (identity->type != NULL) {
identity_str = g_string_append(identity_str, identity->type);
identity_str = g_string_append(identity_str, " ");
}
if (identity->category != NULL) {
identity_str = g_string_append(identity_str, identity->category);
}
win_save_print(window, '!', NULL, 0, 0, "", identity_str->str);
g_string_free(identity_str, FALSE);
identities = g_slist_next(identities);
}
if (features != NULL) {
win_save_print(window, '!', NULL, 0, 0, "", " Features:");
}
while (features != NULL) {
win_save_vprint(window, '!', NULL, 0, 0, "", " %s", features->data);
features = g_slist_next(features);
}
}
}
}
static void
_ui_room_roster(const char * const room, GList *roster, const char * const presence)
{
@@ -2645,4 +2695,6 @@ ui_init_module(void)
ui_show_room_info = _ui_show_room_info;
ui_show_room_role_list = _ui_show_room_role_list;
ui_show_room_affiliation_list = _ui_show_room_affiliation_list;
ui_handle_room_info_error = _ui_handle_room_info_error;
ui_show_room_disco_info = _ui_show_room_disco_info;
}

View File

@@ -140,6 +140,8 @@ void (*ui_room_destroyed)(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_broadcast)(const char * const room_jid,
const char * const message);