aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-15 19:38:07 -04:00
Code

Refactored /account set commands

Browse Source
This commit is contained in:
James Booth 2016-04-28 01:13:42 +01:00
parent 559b1608cf
commit a718e6f91b
2 changed files with 280 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

283
src/command/commands.c
View File

@ -636,130 +636,182 @@ cmd_account_default(ProfWin *window, const char *const command, gchar **args)
} }
gboolean gboolean
cmd_account_set(ProfWin *window, const char *const command, gchar **args) _account_set_jid(char *account_name, char *jid)
{ {
if (g_strv_length(args) != 4) { Jid *jidp = jid_create(jid);
cons_bad_cmd_usage(command); if (jidp == NULL) {
return TRUE; cons_show("Malformed jid: %s", jid);
}
char *account_name = args[1];
char *property = args[2];
char *value = args[3];
if (!accounts_account_exists(account_name)) {
cons_show("Account %s doesn't exist", account_name);
cons_show("");
return TRUE;
}
if (strcmp(property, "jid") == 0) {
Jid *jid = jid_create(args[3]);
if (jid == NULL) {
cons_show("Malformed jid: %s", value);
} else { } else {
accounts_set_jid(account_name, jid->barejid); accounts_set_jid(account_name, jidp->barejid);
cons_show("Updated jid for account %s: %s", account_name, jid->barejid); cons_show("Updated jid for account %s: %s", account_name, jidp->barejid);
if (jid->resourcepart) { if (jidp->resourcepart) {
accounts_set_resource(account_name, jid->resourcepart); accounts_set_resource(account_name, jidp->resourcepart);
cons_show("Updated resource for account %s: %s", account_name, jid->resourcepart); cons_show("Updated resource for account %s: %s", account_name, jidp->resourcepart);
} }
cons_show(""); cons_show("");
} }
jid_destroy(jid); jid_destroy(jidp);
} else if (strcmp(property, "server") == 0) {
accounts_set_server(account_name, value); return TRUE;
cons_show("Updated server for account %s: %s", account_name, value); }
gboolean
_account_set_server(char *account_name, char *server)
{
accounts_set_server(account_name, server);
cons_show("Updated server for account %s: %s", account_name, server);
cons_show(""); cons_show("");
} else if (strcmp(property, "port") == 0) { return TRUE;
int port; }
gboolean
_account_set_port(char *account_name, char *port)
{
int porti;
char *err_msg = NULL; char *err_msg = NULL;
gboolean res = strtoi_range(value, &port, 1, 65535, &err_msg); gboolean res = strtoi_range(port, &porti, 1, 65535, &err_msg);
if (!res) { if (!res) {
cons_show(err_msg); cons_show(err_msg);
cons_show(""); cons_show("");
free(err_msg); free(err_msg);
} else {
accounts_set_port(account_name, porti);
cons_show("Updated port for account %s: %s", account_name, port);
cons_show("");
}
return TRUE; return TRUE;
} else {
accounts_set_port(account_name, port);
cons_show("Updated port for account %s: %s", account_name, value);
cons_show("");
} }
} else if (strcmp(property, "resource") == 0) {
accounts_set_resource(account_name, value); gboolean
_account_set_resource(char *account_name, char *resource)
{
accounts_set_resource(account_name, resource);
if (jabber_get_connection_status() == JABBER_CONNECTED) { if (jabber_get_connection_status() == JABBER_CONNECTED) {
cons_show("Updated resource for account %s: %s, you will need to reconnect to pick up the change.", account_name, value); cons_show("Updated resource for account %s: %s, reconnect to pick up the change.", account_name, resource);
} else { } else {
cons_show("Updated resource for account %s: %s", account_name, value); cons_show("Updated resource for account %s: %s", account_name, resource);
} }
cons_show(""); cons_show("");
} else if (strcmp(property, "password") == 0) { return TRUE;
if(accounts_get_account(account_name)->eval_password) { }
gboolean
_account_set_password(char *account_name, char *password)
{
ProfAccount *account = accounts_get_account(account_name);
if (account->eval_password) {
cons_show("Cannot set password when eval_password is set."); cons_show("Cannot set password when eval_password is set.");
} else { } else {
accounts_set_password(account_name, value); accounts_set_password(account_name, password);
cons_show("Updated password for account %s", account_name); cons_show("Updated password for account %s", account_name);
cons_show(""); cons_show("");
} }
} else if (strcmp(property, "eval_password") == 0) { account_free(account);
if(accounts_get_account(account_name)->password) { return TRUE;
}
gboolean
_account_set_eval_password(char *account_name, char *eval_password)
{
ProfAccount *account = accounts_get_account(account_name);
if(account->password) {
cons_show("Cannot set eval_password when password is set."); cons_show("Cannot set eval_password when password is set.");
} else { } else {
accounts_set_eval_password(account_name, value); accounts_set_eval_password(account_name, eval_password);
cons_show("Updated eval_password for account %s", account_name); cons_show("Updated eval_password for account %s", account_name);
cons_show(""); cons_show("");
} }
} else if (strcmp(property, "muc") == 0) { account_free(account);
accounts_set_muc_service(account_name, value); return TRUE;
cons_show("Updated muc service for account %s: %s", account_name, value); }
gboolean
_account_set_muc(char *account_name, char *muc)
{
accounts_set_muc_service(account_name, muc);
cons_show("Updated muc service for account %s: %s", account_name, muc);
cons_show(""); cons_show("");
} else if (strcmp(property, "nick") == 0) { return TRUE;
accounts_set_muc_nick(account_name, value); }
cons_show("Updated muc nick for account %s: %s", account_name, value);
gboolean
_account_set_nick(char *account_name, char *nick)
{
accounts_set_muc_nick(account_name, nick);
cons_show("Updated muc nick for account %s: %s", account_name, nick);
cons_show(""); cons_show("");
} else if (strcmp(property, "otr") == 0) { return TRUE;
if ((g_strcmp0(value, "manual") != 0) }
&& (g_strcmp0(value, "opportunistic") != 0)
&& (g_strcmp0(value, "always") != 0)) { gboolean
_account_set_otr(char *account_name, char *policy)
{
if ((g_strcmp0(policy, "manual") != 0)
&& (g_strcmp0(policy, "opportunistic") != 0)
&& (g_strcmp0(policy, "always") != 0)) {
cons_show("OTR policy must be one of: manual, opportunistic or always."); cons_show("OTR policy must be one of: manual, opportunistic or always.");
} else { } else {
accounts_set_otr_policy(account_name, value); accounts_set_otr_policy(account_name, policy);
cons_show("Updated OTR policy for account %s: %s", account_name, value); cons_show("Updated OTR policy for account %s: %s", account_name, policy);
cons_show(""); cons_show("");
} }
} else if (strcmp(property, "status") == 0) { return TRUE;
if (!valid_resource_presence_string(value) && (strcmp(value, "last") != 0)) { }
cons_show("Invalid status: %s", value);
gboolean
_account_set_status(char *account_name, char *status)
{
if (!valid_resource_presence_string(status) && (strcmp(status, "last") != 0)) {
cons_show("Invalid status: %s", status);
} else { } else {
accounts_set_login_presence(account_name, value); accounts_set_login_presence(account_name, status);
cons_show("Updated login status for account %s: %s", account_name, value); cons_show("Updated login status for account %s: %s", account_name, status);
} }
cons_show(""); cons_show("");
} else if (strcmp(property, "pgpkeyid") == 0) { return TRUE;
}
gboolean
_account_set_pgpkeyid(char *account_name, char *pgpkeyid)
{
#ifdef HAVE_LIBGPGME #ifdef HAVE_LIBGPGME
char *err_str = NULL; char *err_str = NULL;
if (!p_gpg_valid_key(value, &err_str)) { if (!p_gpg_valid_key(pgpkeyid, &err_str)) {
cons_show("Invalid PGP key ID specified: %s, see /pgp keys", err_str); cons_show("Invalid PGP key ID specified: %s, see /pgp keys", err_str);
} else { } else {
accounts_set_pgp_keyid(account_name, value); accounts_set_pgp_keyid(account_name, pgpkeyid);
cons_show("Updated PGP key ID for account %s: %s", account_name, value); cons_show("Updated PGP key ID for account %s: %s", account_name, pgpkeyid);
} }
free(err_str); free(err_str);
#else #else
cons_show("PGP support is not included in this build."); cons_show("PGP support is not included in this build.");
#endif #endif
cons_show(""); cons_show("");
} else if (strcmp(property, "startscript") == 0) { return TRUE;
accounts_set_script_start(account_name, value); }
cons_show("Updated start script for account %s: %s", account_name, value);
} else if (strcmp(property, "theme") == 0) { gboolean
if (theme_exists(value)) { _account_set_startscript(char *account_name, char *script)
accounts_set_theme(account_name, value); {
accounts_set_script_start(account_name, script);
cons_show("Updated start script for account %s: %s", account_name, script);
return TRUE;
}
gboolean
_account_set_theme(char *account_name, char *theme)
{
if (!theme_exists(theme)) {
cons_show("Theme does not exist: %s", theme);
return TRUE;
}
accounts_set_theme(account_name, theme);
if (jabber_get_connection_status() == JABBER_CONNECTED) { if (jabber_get_connection_status() == JABBER_CONNECTED) {
ProfAccount *account = accounts_get_account(jabber_get_account_name()); ProfAccount *account = accounts_get_account(jabber_get_account_name());
if (account) { if (account) {
if (g_strcmp0(account->name, account_name) == 0) { if (g_strcmp0(account->name, account_name) == 0) {
theme_load(value); theme_load(theme);
ui_load_colours(); ui_load_colours();
if (prefs_get_boolean(PREF_ROSTER)) { if (prefs_get_boolean(PREF_ROSTER)) {
ui_show_roster(); ui_show_roster();
@ -776,26 +828,38 @@ cmd_account_set(ProfWin *window, const char *const command, gchar **args)
account_free(account); account_free(account);
} }
} }
cons_show("Updated theme for account %s: %s", account_name, value); cons_show("Updated theme for account %s: %s", account_name, theme);
} else { return TRUE;
cons_show("Theme does not exist: %s", value);
} }
} else if (strcmp(property, "tls") == 0) {
if ((g_strcmp0(value, "force") != 0) gboolean
&& (g_strcmp0(value, "allow") != 0) _account_set_tls(char *account_name, char *policy)
&& (g_strcmp0(value, "disable") != 0)) { {
if ((g_strcmp0(policy, "force") != 0)
&& (g_strcmp0(policy, "allow") != 0)
&& (g_strcmp0(policy, "disable") != 0)) {
cons_show("TLS policy must be one of: force, allow or disable."); cons_show("TLS policy must be one of: force, allow or disable.");
} else { } else {
accounts_set_tls_policy(account_name, value); accounts_set_tls_policy(account_name, policy);
cons_show("Updated TLS policy for account %s: %s", account_name, value); cons_show("Updated TLS policy for account %s: %s", account_name, policy);
cons_show(""); cons_show("");
} }
} else if (valid_resource_presence_string(property)) { return TRUE;
}
gboolean
_account_set_presence_priority(char *account_name, char *presence, char *priority)
{
int intval; int intval;
char *err_msg = NULL; char *err_msg = NULL;
gboolean res = strtoi_range(value, &intval, -128, 127, &err_msg); gboolean res = strtoi_range(priority, &intval, -128, 127, &err_msg);
if (res) { if (!res) {
resource_presence_t presence_type = resource_presence_from_string(property); cons_show(err_msg);
free(err_msg);
return TRUE;
}
resource_presence_t presence_type = resource_presence_from_string(presence);
switch (presence_type) switch (presence_type)
{ {
case (RESOURCE_ONLINE): case (RESOURCE_ONLINE):
@ -824,16 +888,49 @@ cmd_account_set(ProfWin *window, const char *const command, gchar **args)
cl_ev_presence_send(last_presence, message, 0); cl_ev_presence_send(last_presence, message, 0);
} }
} }
cons_show("Updated %s priority for account %s: %s", property, account_name, value); cons_show("Updated %s priority for account %s: %s", presence, account_name, priority);
cons_show(""); cons_show("");
} else { return TRUE;
cons_show(err_msg);
free(err_msg);
} }
} else {
gboolean
cmd_account_set(ProfWin *window, const char *const command, gchar **args)
{
if (g_strv_length(args) != 4) {
cons_bad_cmd_usage(command);
return TRUE;
}
char *account_name = args[1];
if (!accounts_account_exists(account_name)) {
cons_show("Account %s doesn't exist", account_name);
cons_show("");
return TRUE;
}
char *property = args[2];
char *value = args[3];
if (strcmp(property, "jid") == 0) return _account_set_jid(account_name, value);
if (strcmp(property, "server") == 0) return _account_set_server(account_name, value);
if (strcmp(property, "port") == 0) return _account_set_port(account_name, value);
if (strcmp(property, "resource") == 0) return _account_set_resource(account_name, value);
if (strcmp(property, "password") == 0) return _account_set_password(account_name, value);
if (strcmp(property, "eval_password") == 0) return _account_set_eval_password(account_name, value);
if (strcmp(property, "muc") == 0) return _account_set_muc(account_name, value);
if (strcmp(property, "nick") == 0) return _account_set_nick(account_name, value);
if (strcmp(property, "otr") == 0) return _account_set_otr(account_name, value);
if (strcmp(property, "status") == 0) return _account_set_status(account_name, value);
if (strcmp(property, "pgpkeyid") == 0) return _account_set_pgpkeyid(account_name, value);
if (strcmp(property, "startscript") == 0) return _account_set_startscript(account_name, value);
if (strcmp(property, "theme") == 0) return _account_set_theme(account_name, value);
if (strcmp(property, "tls") == 0) return _account_set_tls(account_name, value);
if (valid_resource_presence_string(property)) {
return _account_set_presence_priority(account_name, property, value);
}
cons_show("Invalid property: %s", property); cons_show("Invalid property: %s", property);
cons_show(""); cons_show("");
}
return TRUE; return TRUE;
} }

2
tests/unittests/test_cmd_account.c
View File

@ -398,7 +398,7 @@ void cmd_account_set_resource_sets_resource_with_online_message(void **state)
expect_string(accounts_set_resource, account_name, "a_account"); expect_string(accounts_set_resource, account_name, "a_account");
expect_string(accounts_set_resource, value, "a_resource"); expect_string(accounts_set_resource, value, "a_resource");
expect_cons_show("Updated resource for account a_account: a_resource, you will need to reconnect to pick up the change."); expect_cons_show("Updated resource for account a_account: a_resource, reconnect to pick up the change.");
expect_cons_show(""); expect_cons_show("");
gboolean result = cmd_account_set(NULL, CMD_ACCOUNT, args); gboolean result = cmd_account_set(NULL, CMD_ACCOUNT, args);