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

Adding password handling for joining chatrooms

Browse Source
This commit is contained in:
Kristofer M White
2014-02-27 05:31:10 +00:00
parent 79d55a4668
commit 8a54c5895d
6 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/command/commands.c
View File

@@ -1594,6 +1594,7 @@ cmd_join(gchar **args, struct cmd_help_t help)
int num_args = g_strv_length(args);
char *room = NULL;
char *nick = NULL;
char *passwd = NULL;
GString *room_str = g_string_new("");
Jid *my_jid = jid_create(jabber_get_fulljid());
@@ -1610,7 +1611,7 @@ cmd_join(gchar **args, struct cmd_help_t help)
}
// nick supplied
if (num_args == 2) {
if (num_args > 1) {
nick = args[1];
// otherwise use account preference
@@ -1618,10 +1619,15 @@ cmd_join(gchar **args, struct cmd_help_t help)
nick = account->muc_nick;
}
// pass supplied
if (num_args == 3) {
passwd = args[2];
}
Jid *room_jid = jid_create_from_bare_and_resource(room, nick);
if (!muc_room_is_active(room_jid)) {
presence_join_room(room_jid);
presence_join_room(room_jid, passwd);
}
ui_room_join(room_jid);
muc_remove_invite(room);