From 918d0608173d8f561eea3071613818bf3a59319d Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Wed, 22 Jun 2022 11:40:20 +0200 Subject: [PATCH] Display mood preferences --- src/command/cmd_defs.c | 2 +- src/command/cmd_funcs.c | 2 +- src/config/preferences.c | 2 +- src/ui/console.c | 11 +++++++++++ src/ui/ui.h | 1 + tests/unittests/ui/stub_ui.c | 5 +++++ 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index 8c9767d4..2eaec284 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -2714,7 +2714,7 @@ static struct cmd_t command_defs[] = { }, { "/mood", - parse_args, 1, 3, NULL, + parse_args, 1, 3, &cons_mood_setting, CMD_NOSUBFUNCS CMD_MAINFUNC(cmd_mood) CMD_TAGS( diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index bfe65d6a..4edc7c16 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -9773,7 +9773,7 @@ cmd_mood(ProfWin* window, const char* const command, gchar** args) if (g_strcmp0(args[0], "on") == 0) { _cmd_set_boolean_preference(args[0], command, "User mood", PREF_MOOD); caps_add_feature(STANZA_NS_MOOD_NOTIFY); - } else if (g_strcmp0(args[0], "off") == 0) { + } else if (g_strcmp0(args[0], "off") == 0) { _cmd_set_boolean_preference(args[0], command, "User mood", PREF_MOOD); caps_remove_feature(STANZA_NS_MOOD_NOTIFY); } else if (g_strcmp0(args[0], "set") == 0) { diff --git a/src/config/preferences.c b/src/config/preferences.c index c762f4d8..c452840d 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -1819,6 +1819,7 @@ _get_group(preference_t pref) case PREF_COMPOSE_EDITOR: case PREF_OUTGOING_STAMP: case PREF_INCOMING_STAMP: + case PREF_MOOD: return PREF_GROUP_UI; case PREF_STATES: case PREF_OUTTYPE: @@ -1867,7 +1868,6 @@ _get_group(preference_t pref) case PREF_CORRECTION_ALLOW: case PREF_MAM: case PREF_SILENCE_NON_ROSTER: - case PREF_MOOD: return PREF_GROUP_CONNECTION; case PREF_OTR_LOG: case PREF_OTR_POLICY: diff --git a/src/ui/console.c b/src/ui/console.c index 6698a503..2c4a8e41 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -1733,6 +1733,7 @@ cons_show_ui_prefs(void) cons_inpblock_setting(); cons_titlebar_setting(); cons_statusbar_setting(); + cons_mood_setting(); cons_alert(NULL); } @@ -2947,3 +2948,13 @@ cons_remove_alert(ProfWin* window) g_list_free_full(item, g_free); free(win_name); } + +void +cons_mood_setting(void) +{ + if (prefs_get_boolean(PREF_MOOD)) { + cons_show("Display user mood (/mood) : ON"); + } else { + cons_show("Display user mood (/mood) : OFF"); + } +} diff --git a/src/ui/ui.h b/src/ui/ui.h index a7886ab3..a3377690 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -334,6 +334,7 @@ void cons_executable_setting(void); void cons_slashguard_setting(void); void cons_mam_setting(void); void cons_silence_setting(void); +void cons_mood_setting(void); void cons_show_contact_online(PContact contact, Resource* resource, GDateTime* last_activity); void cons_show_contact_offline(PContact contact, char* resource, char* status); void cons_theme_properties(void); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 37323ba7..ee759bb2 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -1149,6 +1149,11 @@ cons_silence_setting(void) { } +void +cons_mood_setting(void) +{ +} + void cons_show_bookmarks_ignore(gchar** list, gsize len) {