aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Fix unintended exits on some commands

Browse Source 
On some commands execution (like `/privacy logging X`
where X is any symbol/group of symbols)
FALSE is being returned.
Which main cycle understands as a signal to exit profanity.
The mistake is common since returns are often used by
developers to communicate success status.

First reported by @doctor in the Profanity MUC,
as exit on `/logging group color` command.
This commit is contained in:
John Hernandez 2023-11-11 13:58:47 +01:00
parent bba8278bb7
commit 1c02239ef6
1 changed files with 12 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

@ -5543,7 +5543,7 @@ gboolean
cmd_states(ProfWin* window, const char* const command, gchar** args) cmd_states(ProfWin* window, const char* const command, gchar** args)
{ {
if (args[0] == NULL) { if (args[0] == NULL) {
return FALSE; return TRUE;
} }
_cmd_set_boolean_preference(args[0], "Sending chat states", PREF_STATES); _cmd_set_boolean_preference(args[0], "Sending chat states", PREF_STATES);
@ -5580,7 +5580,7 @@ gboolean
cmd_outtype(ProfWin* window, const char* const command, gchar** args) cmd_outtype(ProfWin* window, const char* const command, gchar** args)
{ {
if (args[0] == NULL) { if (args[0] == NULL) {
return FALSE; return TRUE;
} }
_cmd_set_boolean_preference(args[0], "Sending typing notifications", PREF_OUTTYPE); _cmd_set_boolean_preference(args[0], "Sending typing notifications", PREF_OUTTYPE);
@ -6837,14 +6837,14 @@ cmd_privacy(ProfWin* window, const char* const command, gchar** args)
{ {
if (args[0] == NULL) { if (args[0] == NULL) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return FALSE; return TRUE;
} }
if (g_strcmp0(args[0], "logging") == 0) { if (g_strcmp0(args[0], "logging") == 0) {
gchar* arg = args[1]; gchar* arg = args[1];
if (arg == NULL) { if (arg == NULL) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return FALSE; return TRUE;
} }
if (g_strcmp0(arg, "on") == 0) { if (g_strcmp0(arg, "on") == 0) {
@ -6862,7 +6862,7 @@ cmd_privacy(ProfWin* window, const char* const command, gchar** args)
prefs_set_string(PREF_DBLOG, arg); prefs_set_string(PREF_DBLOG, arg);
} else { } else {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return FALSE; return TRUE;
} }
return TRUE; return TRUE;
} }
@ -6888,7 +6888,8 @@ cmd_logging(ProfWin* window, const char* const command, gchar** args)
return TRUE; return TRUE;
} else if (g_strcmp0(args[0], "group") == 0 && args[1] != NULL) { } else if (g_strcmp0(args[0], "group") == 0 && args[1] != NULL) {
return _cmd_set_boolean_preference(args[1], "Groupchat logging", PREF_GRLOG); _cmd_set_boolean_preference(args[1], "Groupchat logging", PREF_GRLOG);
return TRUE;
} }
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
@ -6899,7 +6900,8 @@ gboolean
cmd_history(ProfWin* window, const char* const command, gchar** args) cmd_history(ProfWin* window, const char* const command, gchar** args)
{ {
if (args[0] == NULL) { if (args[0] == NULL) {
return FALSE; cons_bad_cmd_usage(command);
return TRUE;
} }
_cmd_set_boolean_preference(args[0], "Chat history", PREF_HISTORY); _cmd_set_boolean_preference(args[0], "Chat history", PREF_HISTORY);
@ -6916,7 +6918,8 @@ gboolean
cmd_carbons(ProfWin* window, const char* const command, gchar** args) cmd_carbons(ProfWin* window, const char* const command, gchar** args)
{ {
if (args[0] == NULL) { if (args[0] == NULL) {
return FALSE; cons_bad_cmd_usage(command);
return TRUE;
} }
_cmd_set_boolean_preference(args[0], "Message carbons preference", PREF_CARBONS); _cmd_set_boolean_preference(args[0], "Message carbons preference", PREF_CARBONS);
@ -9854,7 +9857,7 @@ cmd_strophe(ProfWin* window, const char* const command, gchar** args)
} }
} }
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return FALSE; return TRUE;
} }
gboolean gboolean