aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge pull request #1670 from profanity-im/moar-cleanup

Browse Source 
Even moar cleanup
This commit is contained in:
Michael Vetter 2022-04-01 12:23:56 +02:00 committed by GitHub
commit 1bd0e4ddf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 61 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/cmd_defs.c
View File

@ -2111,7 +2111,7 @@ static struct cmd_t command_defs[] = {
{ "set <account> tls disable", "Disable TLS for the connection." }, { "set <account> tls disable", "Disable TLS for the connection." },
{ "set <account> auth default", "Use default authentication process." }, { "set <account> auth default", "Use default authentication process." },
{ "set <account> auth legacy", "Allow legacy authentication." }, { "set <account> auth legacy", "Allow legacy authentication." },
{ "set <account> <theme>", "Set the UI theme for the account." }, { "set <account> theme <theme>", "Set the UI theme for the account." },
{ "clear <account> server", "Remove the server setting for this account." }, { "clear <account> server", "Remove the server setting for this account." },
{ "clear <account> port", "Remove the port setting for this account." }, { "clear <account> port", "Remove the port setting for this account." },
{ "clear <account> password", "Remove the password setting for this account." }, { "clear <account> password", "Remove the password setting for this account." },

101
src/command/cmd_funcs.c
View File

@ -125,10 +125,10 @@ static gboolean _cmd_execute(ProfWin* window, const char* const command, const c
static gboolean _cmd_execute_default(ProfWin* window, const char* inp); static gboolean _cmd_execute_default(ProfWin* window, const char* inp);
static gboolean _cmd_execute_alias(ProfWin* window, const char* const inp, gboolean* ran); static gboolean _cmd_execute_alias(ProfWin* window, const char* const inp, gboolean* ran);
static gboolean static gboolean
_string_matches_one_of(const char* is, bool is_can_be_null, const char* first, ...) __attribute__((sentinel)); _string_matches_one_of(const char* what, const char* is, bool is_can_be_null, const char* first, ...) __attribute__((sentinel));
static gboolean static gboolean
_string_matches_one_of(const char* is, bool is_can_be_null, const char* first, ...) _string_matches_one_of(const char* what, const char* is, bool is_can_be_null, const char* first, ...)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
va_list ap; va_list ap;
@ -136,10 +136,8 @@ _string_matches_one_of(const char* is, bool is_can_be_null, const char* first, .
if (!is) if (!is)
return is_can_be_null; return is_can_be_null;
log_debug("%s vs.", is);
va_start(ap, first); va_start(ap, first);
while (cur != NULL) { while (cur != NULL) {
log_debug("%s", cur);
if (g_strcmp0(is, cur) == 0) { if (g_strcmp0(is, cur) == 0) {
ret = TRUE; ret = TRUE;
break; break;
@ -147,6 +145,39 @@ _string_matches_one_of(const char* is, bool is_can_be_null, const char* first, .
cur = va_arg(ap, const char*); cur = va_arg(ap, const char*);
} }
va_end(ap); va_end(ap);
if (!ret && what) {
cons_show("Invalid %s: '%s'", what, is);
char errmsg[256] = { 0 };
size_t sz = 0;
int s = snprintf(errmsg, sizeof(errmsg) - sz, "%s must be one of:", what);
if (s < 0 || s + sz >= sizeof(errmsg))
return ret;
sz += s;
cur = first;
va_start(ap, first);
while (cur != NULL) {
const char* next = va_arg(ap, const char*);
if (next) {
s = snprintf(errmsg + sz, sizeof(errmsg) - sz, " '%s',", cur);
} else {
/* remove last ',' */
sz--;
errmsg[sz] = '\0';
s = snprintf(errmsg + sz, sizeof(errmsg) - sz, " or '%s'.", cur);
}
if (s < 0 || s + sz >= sizeof(errmsg)) {
log_debug("Error message too long or some other error occurred (%d).", s);
s = -1;
break;
}
sz += s;
cur = next;
}
va_end(ap);
if (s > 0)
cons_show(errmsg);
}
return ret; return ret;
} }
@ -364,7 +395,7 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
char* altdomain = g_hash_table_lookup(options, "server"); char* altdomain = g_hash_table_lookup(options, "server");
char* tls_policy = g_hash_table_lookup(options, "tls"); char* tls_policy = g_hash_table_lookup(options, "tls");
if (!_string_matches_one_of(tls_policy, TRUE, "force", "allow", "trust", "disable", "legacy", NULL)) { if (!_string_matches_one_of("TLS policy", tls_policy, TRUE, "force", "allow", "trust", "disable", "legacy", NULL)) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
cons_show(""); cons_show("");
options_destroy(options); options_destroy(options);
@ -372,7 +403,7 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
} }
char* auth_policy = g_hash_table_lookup(options, "auth"); char* auth_policy = g_hash_table_lookup(options, "auth");
if (!_string_matches_one_of(auth_policy, TRUE, "default", "legacy", NULL)) { if (!_string_matches_one_of("Auth policy", auth_policy, TRUE, "default", "legacy", NULL)) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
cons_show(""); cons_show("");
options_destroy(options); options_destroy(options);
@ -757,9 +788,7 @@ _account_set_nick(char* account_name, char* nick)
gboolean gboolean
_account_set_otr(char* account_name, char* policy) _account_set_otr(char* account_name, char* policy)
{ {
if (!_string_matches_one_of(policy, FALSE, "manual", "opportunistic", "always", NULL)) { if (_string_matches_one_of("OTR policy", policy, FALSE, "manual", "opportunistic", "always", NULL)) {
cons_show("OTR policy must be one of: manual, opportunistic or always.");
} else {
accounts_set_otr_policy(account_name, policy); accounts_set_otr_policy(account_name, policy);
cons_show("Updated OTR policy for account %s: %s", account_name, policy); cons_show("Updated OTR policy for account %s: %s", account_name, policy);
cons_show(""); cons_show("");
@ -844,9 +873,7 @@ _account_set_theme(char* account_name, char* theme)
gboolean gboolean
_account_set_tls(char* account_name, char* policy) _account_set_tls(char* account_name, char* policy)
{ {
if (!_string_matches_one_of(policy, FALSE, "force", "allow", "trust", "disable", "legacy", NULL)) { if (_string_matches_one_of("TLS policy", policy, FALSE, "force", "allow", "trust", "disable", "legacy", NULL)) {
cons_show("TLS policy must be one of: force, allow, legacy or disable.");
} else {
accounts_set_tls_policy(account_name, policy); accounts_set_tls_policy(account_name, policy);
cons_show("Updated TLS policy for account %s: %s", account_name, policy); cons_show("Updated TLS policy for account %s: %s", account_name, policy);
cons_show(""); cons_show("");
@ -857,9 +884,7 @@ _account_set_tls(char* account_name, char* policy)
gboolean gboolean
_account_set_auth(char* account_name, char* policy) _account_set_auth(char* account_name, char* policy)
{ {
if (!_string_matches_one_of(policy, FALSE, "default", "legacy", NULL)) { if (_string_matches_one_of("Auth policy", policy, FALSE, "default", "legacy", NULL)) {
cons_show("Auth policy must be either default or legacy.");
} else {
accounts_set_auth_policy(account_name, policy); accounts_set_auth_policy(account_name, policy);
cons_show("Updated auth policy for account %s: %s", account_name, policy); cons_show("Updated auth policy for account %s: %s", account_name, policy);
cons_show(""); cons_show("");
@ -1781,7 +1806,7 @@ _who_room(ProfWin* window, const char* const command, gchar** args)
} }
// bad arg // bad arg
if (args[0] && (g_strcmp0(args[0], "online") != 0) && (g_strcmp0(args[0], "available") != 0) && (g_strcmp0(args[0], "unavailable") != 0) && (g_strcmp0(args[0], "away") != 0) && (g_strcmp0(args[0], "chat") != 0) && (g_strcmp0(args[0], "xa") != 0) && (g_strcmp0(args[0], "dnd") != 0) && (g_strcmp0(args[0], "any") != 0) && (g_strcmp0(args[0], "moderator") != 0) && (g_strcmp0(args[0], "participant") != 0) && (g_strcmp0(args[0], "visitor") != 0) && (g_strcmp0(args[0], "owner") != 0) && (g_strcmp0(args[0], "admin") != 0) && (g_strcmp0(args[0], "member") != 0) && (g_strcmp0(args[0], "outcast") != 0) && (g_strcmp0(args[0], "none") != 0)) { if (!_string_matches_one_of(NULL, args[0], TRUE, "online", "available", "unavailable", "away", "chat", "xa", "dnd", "any", "moderator", "participant", "visitor", "owner", "admin", "member", "outcast", "none", NULL)) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return; return;
} }
@ -1790,7 +1815,7 @@ _who_room(ProfWin* window, const char* const command, gchar** args)
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
// presence filter // presence filter
if (args[0] == NULL || (g_strcmp0(args[0], "online") == 0) || (g_strcmp0(args[0], "available") == 0) || (g_strcmp0(args[0], "unavailable") == 0) || (g_strcmp0(args[0], "away") == 0) || (g_strcmp0(args[0], "chat") == 0) || (g_strcmp0(args[0], "xa") == 0) || (g_strcmp0(args[0], "dnd") == 0) || (g_strcmp0(args[0], "any") == 0)) { if (_string_matches_one_of(NULL, args[0], TRUE, "online", "available", "unavailable", "away", "chat", "xa", "dnd", "any", NULL)) {
char* presence = args[0]; char* presence = args[0];
GList* occupants = muc_roster(mucwin->roomjid); GList* occupants = muc_roster(mucwin->roomjid);
@ -1889,16 +1914,7 @@ _who_roster(ProfWin* window, const char* const command, gchar** args)
char* presence = args[0]; char* presence = args[0];
// bad arg // bad arg
if (presence if (!_string_matches_one_of(NULL, presence, TRUE, "online", "available", "unavailable", "offline", "away", "chat", "xa", "dnd", "any", NULL)) {
&& (strcmp(presence, "online") != 0)
&& (strcmp(presence, "available") != 0)
&& (strcmp(presence, "unavailable") != 0)
&& (strcmp(presence, "offline") != 0)
&& (strcmp(presence, "away") != 0)
&& (strcmp(presence, "chat") != 0)
&& (strcmp(presence, "xa") != 0)
&& (strcmp(presence, "dnd") != 0)
&& (strcmp(presence, "any") != 0)) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return; return;
} }
@ -3791,7 +3807,7 @@ cmd_form_field(ProfWin* window, char* tag, gchar** args)
if (cmd) { if (cmd) {
value = args[1]; value = args[1];
} }
if (!_string_matches_one_of(cmd, FALSE, "add", "remove", NULL)) { if (!_string_matches_one_of(NULL, cmd, FALSE, "add", "remove", NULL)) {
win_println(window, THEME_DEFAULT, "-", "Invalid command, usage:"); win_println(window, THEME_DEFAULT, "-", "Invalid command, usage:");
confwin_field_help(confwin, tag); confwin_field_help(confwin, tag);
win_println(window, THEME_DEFAULT, "-", ""); win_println(window, THEME_DEFAULT, "-", "");
@ -3845,7 +3861,7 @@ cmd_form_field(ProfWin* window, char* tag, gchar** args)
if (cmd) { if (cmd) {
value = args[1]; value = args[1];
} }
if (!_string_matches_one_of(cmd, FALSE, "add", "remove", NULL)) { if (!_string_matches_one_of(NULL, cmd, FALSE, "add", "remove", NULL)) {
win_println(window, THEME_DEFAULT, "-", "Invalid command, usage:"); win_println(window, THEME_DEFAULT, "-", "Invalid command, usage:");
confwin_field_help(confwin, tag); confwin_field_help(confwin, tag);
win_println(window, THEME_DEFAULT, "-", ""); win_println(window, THEME_DEFAULT, "-", "");
@ -3896,7 +3912,7 @@ cmd_form_field(ProfWin* window, char* tag, gchar** args)
if (cmd) { if (cmd) {
value = args[1]; value = args[1];
} }
if (!_string_matches_one_of(cmd, FALSE, "add", "remove", NULL)) { if (!_string_matches_one_of(NULL, cmd, FALSE, "add", "remove", NULL)) {
win_println(window, THEME_DEFAULT, "-", "Invalid command, usage:"); win_println(window, THEME_DEFAULT, "-", "Invalid command, usage:");
confwin_field_help(confwin, tag); confwin_field_help(confwin, tag);
win_println(window, THEME_DEFAULT, "-", ""); win_println(window, THEME_DEFAULT, "-", "");
@ -3952,7 +3968,7 @@ cmd_form(ProfWin* window, const char* const command, gchar** args)
return TRUE; return TRUE;
} }
if ((g_strcmp0(args[0], "submit") != 0) && (g_strcmp0(args[0], "cancel") != 0) && (g_strcmp0(args[0], "show") != 0) && (g_strcmp0(args[0], "help") != 0)) { if (!_string_matches_one_of(NULL, args[0], FALSE, "submit", "cancel", "show", "help", NULL)) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return TRUE; return TRUE;
} }
@ -4201,7 +4217,7 @@ cmd_affiliation(ProfWin* window, const char* const command, gchar** args)
} }
char* affiliation = args[1]; char* affiliation = args[1];
if (!_string_matches_one_of(affiliation, TRUE, "owner", "admin", "member", "none", "outcast", NULL)) { if (!_string_matches_one_of(NULL, affiliation, TRUE, "owner", "admin", "member", "none", "outcast", NULL)) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return TRUE; return TRUE;
} }
@ -4276,7 +4292,7 @@ cmd_role(ProfWin* window, const char* const command, gchar** args)
} }
char* role = args[1]; char* role = args[1];
if (!_string_matches_one_of(role, TRUE, "visitor", "participant", "moderator", "none", NULL)) { if (!_string_matches_one_of(NULL, role, TRUE, "visitor", "participant", "moderator", "none", NULL)) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return TRUE; return TRUE;
} }
@ -5260,13 +5276,13 @@ cmd_console(ProfWin* window, const char* const command, gchar** args)
{ {
gboolean isMuc = (g_strcmp0(args[0], "muc") == 0); gboolean isMuc = (g_strcmp0(args[0], "muc") == 0);
if ((g_strcmp0(args[0], "chat") != 0) && !isMuc && (g_strcmp0(args[0], "private") != 0)) { if (!_string_matches_one_of(NULL, args[0], FALSE, "chat", "private", NULL) && !isMuc) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return TRUE; return TRUE;
} }
gchar* setting = args[1]; gchar* setting = args[1];
if (!_string_matches_one_of(setting, FALSE, "all", "first", "none", NULL)) { if (!_string_matches_one_of(NULL, setting, FALSE, "all", "first", "none", NULL)) {
if (!(isMuc && (g_strcmp0(setting, "mention") == 0))) { if (!(isMuc && (g_strcmp0(setting, "mention") == 0))) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return TRUE; return TRUE;
@ -6576,15 +6592,12 @@ cmd_ping(ProfWin* window, const char* const command, gchar** args)
gboolean gboolean
cmd_autoaway(ProfWin* window, const char* const command, gchar** args) cmd_autoaway(ProfWin* window, const char* const command, gchar** args)
{ {
if ((g_strcmp0(args[0], "mode") != 0) && (g_strcmp0(args[0], "time") != 0) && (g_strcmp0(args[0], "message") != 0) && (g_strcmp0(args[0], "check") != 0)) { if (!_string_matches_one_of("Setting", args[0], FALSE, "mode", "time", "message", "check", NULL)) {
cons_show("Setting must be one of 'mode', 'time', 'message' or 'check'");
return TRUE; return TRUE;
} }
if (g_strcmp0(args[0], "mode") == 0) { if (g_strcmp0(args[0], "mode") == 0) {
if ((g_strcmp0(args[1], "idle") != 0) && (g_strcmp0(args[1], "away") != 0) && (g_strcmp0(args[1], "off") != 0)) { if (_string_matches_one_of("Mode", args[1], FALSE, "idle", "away", "off", NULL)) {
cons_show("Mode must be one of 'idle', 'away' or 'off'");
} else {
prefs_set_string(PREF_AUTOAWAY_MODE, args[1]); prefs_set_string(PREF_AUTOAWAY_MODE, args[1]);
cons_show("Auto away mode set to: %s.", args[1]); cons_show("Auto away mode set to: %s.", args[1]);
} }
@ -7770,8 +7783,7 @@ cmd_otr_policy(ProfWin* window, const char* const command, gchar** args)
} }
char* choice = args[1]; char* choice = args[1];
if (!_string_matches_one_of(choice, FALSE, "manual", "opportunistic", "always", NULL)) { if (!_string_matches_one_of("OTR policy", choice, FALSE, "manual", "opportunistic", "always", NULL)) {
cons_show("OTR policy can be set to: manual, opportunistic or always.");
return TRUE; return TRUE;
} }
@ -8960,8 +8972,7 @@ cmd_omemo_policy(ProfWin* window, const char* const command, gchar** args)
} }
char* choice = args[1]; char* choice = args[1];
if (!_string_matches_one_of(choice, FALSE, "manual", "automatic", "always", NULL)) { if (!_string_matches_one_of("OMEMO policy", choice, FALSE, "manual", "automatic", "always", NULL)) {
cons_show("OMEMO policy can be set to: manual, automatic or always.");
return TRUE; return TRUE;
} }
@ -9574,7 +9585,7 @@ cmd_register(ProfWin* window, const char* const command, gchar** args)
} }
char* tls_policy = g_hash_table_lookup(options, "tls"); char* tls_policy = g_hash_table_lookup(options, "tls");
if (!_string_matches_one_of(tls_policy, TRUE, "force", "allow", "trust", "disable", "legacy", NULL)) { if (!_string_matches_one_of("TLS policy", tls_policy, TRUE, "force", "allow", "trust", "disable", "legacy", NULL)) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
cons_show(""); cons_show("");
options_destroy(options); options_destroy(options);

3
src/ui/window.c
View File

@ -415,6 +415,7 @@ win_get_last_sent_message(ProfWin* window)
ProfMucWin* mucwin = (ProfMucWin*)window; ProfMucWin* mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
last_message = mucwin->last_message; last_message = mucwin->last_message;
break;
} }
default: default:
break; break;
@ -1578,7 +1579,7 @@ _win_print_internal(ProfWin* window, const char* show_char, int pad_indent, GDat
char* color_pref = prefs_get_string(PREF_COLOR_NICK); char* color_pref = prefs_get_string(PREF_COLOR_NICK);
if (color_pref != NULL && (strcmp(color_pref, "false") != 0)) { if (color_pref != NULL && (strcmp(color_pref, "false") != 0)) {
if (flags & NO_ME || (!(flags & NO_ME) && prefs_get_boolean(PREF_COLOR_NICK_OWN))) { if ((flags & NO_ME) || (!(flags & NO_ME) && prefs_get_boolean(PREF_COLOR_NICK_OWN))) {
colour = theme_hash_attrs(from); colour = theme_hash_attrs(from);
} }
} }

3
tests/unittests/test_cmd_account.c
View File

@ -571,7 +571,8 @@ cmd_account_show_message_for_invalid_otr_policy(void** state)
expect_any(accounts_account_exists, account_name); expect_any(accounts_account_exists, account_name);
will_return(accounts_account_exists, TRUE); will_return(accounts_account_exists, TRUE);
expect_cons_show("OTR policy must be one of: manual, opportunistic or always."); expect_cons_show("Invalid OTR policy: 'bad_otr_policy'");
expect_cons_show("OTR policy must be one of: 'manual', 'opportunistic' or 'always'.");
gboolean result = cmd_account_set(NULL, CMD_ACCOUNT, args); gboolean result = cmd_account_set(NULL, CMD_ACCOUNT, args);
assert_true(result); assert_true(result);