aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Merge branch 'master' into autocomplete-clear

Browse Source
This commit is contained in:
James Booth 2018-03-05 20:50:05 +00:00
commit 44cff47668
7 changed files with 164 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/command/cmd_funcs.c
View File

@ -4500,11 +4500,15 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
cons_alert();
return TRUE;
}
int num_args = g_strv_length(args);
gchar *cmd = args[0];
if (window->type == WIN_MUC && (cmd == NULL || g_strcmp0(cmd, "add") == 0)) {
if (window->type == WIN_MUC
&& num_args < 2
&& (cmd == NULL || g_strcmp0(cmd, "add") == 0)) {
// default to current nickname, password, and autojoin "on"
ProfMucWin *mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
@ -4519,7 +4523,9 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
return TRUE;
}
if (window->type == WIN_MUC && g_strcmp0(cmd, "remove") == 0) {
if (window->type == WIN_MUC
&& num_args < 2
&& g_strcmp0(cmd, "remove") == 0) {
ProfMucWin *mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
gboolean removed = bookmark_remove(mucwin->roomjid);
@ -4533,6 +4539,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (cmd == NULL) {
cons_bad_cmd_usage(command);
cons_alert();
return TRUE;
}
@ -4547,6 +4554,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
cons_bad_cmd_usage(command);
cons_show("");
}
cons_alert();
return TRUE;
}
@ -4561,11 +4569,13 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (jid == NULL) {
cons_bad_cmd_usage(command);
cons_show("");
cons_alert();
return TRUE;
}
if (strchr(jid, '@') == NULL) {
cons_show("Invalid room, must be of the form room@domain.tld");
cons_show("");
cons_alert();
return TRUE;
}
@ -4576,6 +4586,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
} else {
cons_show("No bookmark exists for %s.", jid);
}
cons_alert();
return TRUE;
}
@ -4584,6 +4595,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (!joined) {
cons_show("No bookmark exists for %s.", jid);
}
cons_alert();
return TRUE;
}
@ -4594,6 +4606,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (!parsed) {
cons_bad_cmd_usage(command);
cons_show("");
cons_alert();
return TRUE;
}
@ -4603,6 +4616,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
cons_bad_cmd_usage(command);
cons_show("");
options_destroy(options);
cons_alert();
return TRUE;
}
@ -4617,6 +4631,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
cons_show("Bookmark already exists, use /bookmark update to edit.");
}
options_destroy(options);
cons_alert();
return TRUE;
}
@ -4628,11 +4643,13 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
cons_show("No bookmark exists for %s.", jid);
}
options_destroy(options);
cons_alert();
return TRUE;
}
cons_bad_cmd_usage(command);
options_destroy(options);
cons_alert();
return TRUE;
}

2
src/config/theme.c
View File

@ -402,6 +402,7 @@ _load_preferences(void)
_set_boolean_preference("roster.contacts", PREF_ROSTER_CONTACTS);
_set_boolean_preference("roster.unsubscribed", PREF_ROSTER_UNSUBSCRIBED);
_set_boolean_preference("roster.rooms", PREF_ROSTER_ROOMS);
_set_boolean_preference("roster.rooms.server", PREF_ROSTER_ROOMS_SERVER);
_set_boolean_preference("privileges", PREF_MUC_PRIVILEGES);
_set_boolean_preference("presence", PREF_PRESENCE);
_set_boolean_preference("intype", PREF_INTYPE);
@ -427,7 +428,6 @@ _load_preferences(void)
_set_string_preference("roster.unread", PREF_ROSTER_UNREAD);
_set_string_preference("roster.rooms.order", PREF_ROSTER_ROOMS_ORDER);
_set_string_preference("roster.rooms.unread", PREF_ROSTER_ROOMS_UNREAD);
_set_string_preference("roster.rooms.server", PREF_ROSTER_ROOMS_SERVER);
_set_string_preference("roster.rooms.pos", PREF_ROSTER_ROOMS_POS);
_set_string_preference("roster.rooms.by", PREF_ROSTER_ROOMS_BY);
_set_string_preference("roster.private", PREF_ROSTER_PRIVATE);

130
tests/unittests/test_cmd_bookmark.c
View File

@ -24,10 +24,12 @@
static void test_with_connection_status(jabber_conn_status_t status)
{
ProfWin window;
window.type = WIN_CONSOLE;
will_return(connection_get_status, status);
expect_cons_show("You are not currently connected.");
gboolean result = cmd_bookmark(NULL, CMD_BOOKMARK, NULL);
gboolean result = cmd_bookmark(&window, CMD_BOOKMARK, NULL);
assert_true(result);
}
@ -165,6 +167,85 @@ void cmd_bookmark_add_adds_bookmark_with_jid(void **state)
assert_true(result);
}
void cmd_bookmark_uses_roomjid_in_room(void **state)
{
muc_init();
gchar *args[] = { NULL };
ProfMucWin muc_win;
muc_win.window.type = WIN_MUC;
muc_win.memcheck = PROFMUCWIN_MEMCHECK;
muc_win.roomjid = "room@conf.server";
will_return(connection_get_status, JABBER_CONNECTED);
expect_string(bookmark_add, jid, muc_win.roomjid);
expect_any(bookmark_add, nick);
expect_any(bookmark_add, password);
expect_any(bookmark_add, autojoin_str);
will_return(bookmark_add, TRUE);
expect_win_println("Bookmark added for room@conf.server.");
gboolean result = cmd_bookmark(&muc_win, CMD_BOOKMARK, args);
assert_true(result);
muc_close();
}
void cmd_bookmark_add_uses_roomjid_in_room(void **state)
{
muc_init();
gchar *args[] = { "add", NULL };
ProfMucWin muc_win;
muc_win.window.type = WIN_MUC;
muc_win.memcheck = PROFMUCWIN_MEMCHECK;
muc_win.roomjid = "room@conf.server";
will_return(connection_get_status, JABBER_CONNECTED);
expect_string(bookmark_add, jid, muc_win.roomjid);
expect_any(bookmark_add, nick);
expect_any(bookmark_add, password);
expect_any(bookmark_add, autojoin_str);
will_return(bookmark_add, TRUE);
expect_win_println("Bookmark added for room@conf.server.");
gboolean result = cmd_bookmark(&muc_win, CMD_BOOKMARK, args);
assert_true(result);
muc_close();
}
void cmd_bookmark_add_uses_supplied_jid_in_room(void **state)
{
muc_init();
char *jid = "room1@conf.server";
gchar *args[] = { "add", jid, NULL };
ProfMucWin muc_win;
muc_win.window.type = WIN_MUC;
muc_win.memcheck = PROFMUCWIN_MEMCHECK;
muc_win.roomjid = "room2@conf.server";
will_return(connection_get_status, JABBER_CONNECTED);
expect_string(bookmark_add, jid, jid);
expect_any(bookmark_add, nick);
expect_any(bookmark_add, password);
expect_any(bookmark_add, autojoin_str);
will_return(bookmark_add, TRUE);
expect_cons_show("Bookmark added for room1@conf.server.");
gboolean result = cmd_bookmark(&muc_win, CMD_BOOKMARK, args);
assert_true(result);
muc_close();
}
void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state)
{
char *jid = "room@conf.server";
@ -265,3 +346,50 @@ void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state)
gboolean result = cmd_bookmark(&window, CMD_BOOKMARK, args);
assert_true(result);
}
void cmd_bookmark_remove_uses_roomjid_in_room(void **state)
{
muc_init();
gchar *args[] = { "remove", NULL };
ProfMucWin muc_win;
muc_win.window.type = WIN_MUC;
muc_win.memcheck = PROFMUCWIN_MEMCHECK;
muc_win.roomjid = "room@conf.server";
will_return(connection_get_status, JABBER_CONNECTED);
expect_string(bookmark_remove, jid, muc_win.roomjid);
will_return(bookmark_remove, TRUE);
expect_win_println("Bookmark removed for room@conf.server.");
gboolean result = cmd_bookmark(&muc_win, CMD_BOOKMARK, args);
assert_true(result);
muc_close();
}
void cmd_bookmark_remove_uses_supplied_jid_in_room(void **state)
{
muc_init();
char *jid = "room1@conf.server";
gchar *args[] = { "remove", jid, NULL };
ProfMucWin muc_win;
muc_win.window.type = WIN_MUC;
muc_win.memcheck = PROFMUCWIN_MEMCHECK;
muc_win.roomjid = "room2@conf.server";
will_return(connection_get_status, JABBER_CONNECTED);
expect_string(bookmark_remove, jid, jid);
will_return(bookmark_remove, TRUE);
expect_cons_show("Bookmark removed for room1@conf.server.");
gboolean result = cmd_bookmark(&muc_win, CMD_BOOKMARK, args);
assert_true(result);
muc_close();
}

5
tests/unittests/test_cmd_bookmark.h
View File

@ -6,6 +6,11 @@ void cmd_bookmark_shows_usage_when_no_args(void **state);
void cmd_bookmark_list_shows_bookmarks(void **state);
void cmd_bookmark_add_shows_message_when_invalid_jid(void **state);
void cmd_bookmark_add_adds_bookmark_with_jid(void **state);
void cmd_bookmark_uses_roomjid_in_room(void **state);
void cmd_bookmark_add_uses_roomjid_in_room(void **state);
void cmd_bookmark_add_uses_supplied_jid_in_room(void **state);
void cmd_bookmark_remove_uses_roomjid_in_room(void **state);
void cmd_bookmark_remove_uses_supplied_jid_in_room(void **state);
void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state);
void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void **state);
void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state);

5
tests/unittests/unittests.c
View File

@ -493,6 +493,11 @@ int main(int argc, char* argv[]) {
unit_test(cmd_bookmark_list_shows_bookmarks),
unit_test(cmd_bookmark_add_shows_message_when_invalid_jid),
unit_test(cmd_bookmark_add_adds_bookmark_with_jid),
unit_test(cmd_bookmark_uses_roomjid_in_room),
unit_test(cmd_bookmark_add_uses_roomjid_in_room),
unit_test(cmd_bookmark_add_uses_supplied_jid_in_room),
unit_test(cmd_bookmark_remove_uses_roomjid_in_room),
unit_test(cmd_bookmark_remove_uses_supplied_jid_in_room),
unit_test(cmd_bookmark_add_adds_bookmark_with_jid_nick),
unit_test(cmd_bookmark_add_adds_bookmark_with_jid_autojoin),
unit_test(cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin),

4
themes/boothj5
View File

@ -102,13 +102,12 @@ statuses.muc=none
roster=true
roster.offline=false
roster.empty=false
roster.by=group
roster.by=none
roster.order=presence
roster.unread=after
roster.priority=false
roster.size=25
roster.wrap=true
roster.header.char=@
roster.contact.indent=1
roster.resource=true
roster.resource.char=/
@ -124,6 +123,7 @@ roster.rooms.order=name
roster.rooms.unread=after
roster.rooms.pos=last
roster.rooms.by=none
roster.rooms.server=false
roster.rooms.private.char=/
roster.private=room
roster.count=unread

6
themes/boothj5_slack
View File

@ -106,9 +106,8 @@ roster.by=none
roster.order=presence
roster.unread=after
roster.priority=false
roster.size=25
roster.size=15
roster.wrap=true
roster.header.char=@
roster.contact.indent=1
roster.resource=false
roster.presence=false
@ -119,7 +118,8 @@ roster.rooms=true
roster.rooms.order=name
roster.rooms.unread=after
roster.rooms.pos=first
roster.rooms.by=service
roster.rooms.by=none
roster.rooms.server=false
roster.rooms.private.char=/
roster.private=room
roster.count=unread