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

Use jid argument for /bookmark when in room

Browse Source 
fixes #983
This commit is contained in:
James Booth
2018-03-04 00:35:53 +00:00
parent f4759cf337
commit 7c5ece24c5
4 changed files with 182 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/command/cmd_funcs.c
View File

@@ -4500,11 +4500,17 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
if (window->type != WIN_CONSOLE) {
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 +4525,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 +4541,9 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (cmd == NULL) {
cons_bad_cmd_usage(command);
if (window->type != WIN_CONSOLE) {
cons_alert();
}
return TRUE;
}
@@ -4547,6 +4558,9 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
cons_bad_cmd_usage(command);
cons_show("");
}
if (window->type != WIN_CONSOLE) {
cons_alert();
}
return TRUE;
}
@@ -4561,11 +4575,17 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (jid == NULL) {
cons_bad_cmd_usage(command);
cons_show("");
if (window->type != WIN_CONSOLE) {
cons_alert();
}
return TRUE;
}
if (strchr(jid, '@') == NULL) {
cons_show("Invalid room, must be of the form room@domain.tld");
cons_show("");
if (window->type != WIN_CONSOLE) {
cons_alert();
}
return TRUE;
}
@@ -4576,6 +4596,9 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
} else {
cons_show("No bookmark exists for %s.", jid);
}
if (window->type != WIN_CONSOLE) {
cons_alert();
}
return TRUE;
}
@@ -4584,6 +4607,9 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (!joined) {
cons_show("No bookmark exists for %s.", jid);
}
if (window->type != WIN_CONSOLE) {
cons_alert();
}
return TRUE;
}
@@ -4594,6 +4620,9 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (!parsed) {
cons_bad_cmd_usage(command);
cons_show("");
if (window->type != WIN_CONSOLE) {
cons_alert();
}
return TRUE;
}
@@ -4603,6 +4632,9 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
cons_bad_cmd_usage(command);
cons_show("");
options_destroy(options);
if (window->type != WIN_CONSOLE) {
cons_alert();
}
return TRUE;
}
@@ -4617,6 +4649,9 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
cons_show("Bookmark already exists, use /bookmark update to edit.");
}
options_destroy(options);
if (window->type != WIN_CONSOLE) {
cons_alert();
}
return TRUE;
}
@@ -4628,11 +4663,17 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
cons_show("No bookmark exists for %s.", jid);
}
options_destroy(options);
if (window->type != WIN_CONSOLE) {
cons_alert();
}
return TRUE;
}
cons_bad_cmd_usage(command);
options_destroy(options);
if (window->type != WIN_CONSOLE) {
cons_alert();
}
return TRUE;
}