From f485105bde17447b5d0c5a914ba9afd9a06888b5 Mon Sep 17 00:00:00 2001 From: Thibaut Meyer Date: Fri, 21 Apr 2023 18:35:19 +0200 Subject: [PATCH 1/3] adds print_topic_on_join boolean under lookandfeel --- src/fe-common/irc/fe-events-numeric.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c index 34ba3fe7..89873f33 100644 --- a/src/fe-common/irc/fe-events-numeric.c +++ b/src/fe-common/irc/fe-events-numeric.c @@ -715,6 +715,8 @@ void fe_events_numeric_init(void) last_away_nick = NULL; last_away_msg = NULL; + settings_add_bool("lookandfeel", "print_topic_on_join", TRUE); + /* clang-format off */ signal_add("event 221", (SIGNAL_FUNC) event_user_mode); signal_add("event 303", (SIGNAL_FUNC) event_ison); @@ -729,8 +731,12 @@ void fe_events_numeric_init(void) signal_add("event 348", (SIGNAL_FUNC) event_eban_list); signal_add("event 346", (SIGNAL_FUNC) event_invite_list); signal_add("event 433", (SIGNAL_FUNC) event_nick_in_use); - signal_add("event 332", (SIGNAL_FUNC) event_topic_get); - signal_add("event 333", (SIGNAL_FUNC) event_topic_info); + + if (settings_get_bool("print_topic_on_join")) { + signal_add("event 332", (SIGNAL_FUNC) event_topic_get); + signal_add("event 333", (SIGNAL_FUNC) event_topic_info); + } + signal_add("event 324", (SIGNAL_FUNC) event_channel_mode); signal_add("event 329", (SIGNAL_FUNC) event_channel_created); signal_add("event 306", (SIGNAL_FUNC) event_nowaway); @@ -827,8 +833,12 @@ void fe_events_numeric_deinit(void) signal_remove("event 348", (SIGNAL_FUNC) event_eban_list); signal_remove("event 346", (SIGNAL_FUNC) event_invite_list); signal_remove("event 433", (SIGNAL_FUNC) event_nick_in_use); - signal_remove("event 332", (SIGNAL_FUNC) event_topic_get); - signal_remove("event 333", (SIGNAL_FUNC) event_topic_info); + + if (settings_get_bool("print_topic_on_join")) { + signal_remove("event 332", (SIGNAL_FUNC) event_topic_get); + signal_remove("event 333", (SIGNAL_FUNC) event_topic_info); + } + signal_remove("event 324", (SIGNAL_FUNC) event_channel_mode); signal_remove("event 329", (SIGNAL_FUNC) event_channel_created); signal_remove("event 306", (SIGNAL_FUNC) event_nowaway); From 9aaf8d3f4f4bfae9305b5a483d76a340faed63ae Mon Sep 17 00:00:00 2001 From: Thibaut Meyer Date: Fri, 21 Apr 2023 18:51:24 +0200 Subject: [PATCH 2/3] adds print_url_on_join under lookandfeel --- src/fe-common/irc/fe-events-numeric.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c index 89873f33..d7d6eb20 100644 --- a/src/fe-common/irc/fe-events-numeric.c +++ b/src/fe-common/irc/fe-events-numeric.c @@ -716,6 +716,7 @@ void fe_events_numeric_init(void) last_away_msg = NULL; settings_add_bool("lookandfeel", "print_topic_on_join", TRUE); + settings_add_bool("lookandfeel", "print_url_on_join", TRUE); /* clang-format off */ signal_add("event 221", (SIGNAL_FUNC) event_user_mode); @@ -742,7 +743,11 @@ void fe_events_numeric_init(void) signal_add("event 306", (SIGNAL_FUNC) event_nowaway); signal_add("event 305", (SIGNAL_FUNC) event_unaway); signal_add("event 301", (SIGNAL_FUNC) event_away); - signal_add("event 328", (SIGNAL_FUNC) event_chanserv_url); + + if (settings_get_bool("print_url_on_join")) { + signal_add("event 328", (SIGNAL_FUNC) event_chanserv_url); + } + signal_add("event 302", (SIGNAL_FUNC) event_userhost); signal_add("event 341", (SIGNAL_FUNC) event_sent_invite); @@ -844,7 +849,11 @@ void fe_events_numeric_deinit(void) signal_remove("event 306", (SIGNAL_FUNC) event_nowaway); signal_remove("event 305", (SIGNAL_FUNC) event_unaway); signal_remove("event 301", (SIGNAL_FUNC) event_away); - signal_remove("event 328", (SIGNAL_FUNC) event_chanserv_url); + + if (settings_get_bool("print_url_on_join")) { + signal_remove("event 328", (SIGNAL_FUNC) event_chanserv_url); + } + signal_remove("event 302", (SIGNAL_FUNC) event_userhost); signal_remove("event 341", (SIGNAL_FUNC) event_sent_invite); From 20ca1bc280892cdb1fcdbda7572029bdbb6c76fb Mon Sep 17 00:00:00 2001 From: Thibaut Meyer Date: Mon, 24 Apr 2023 11:38:26 +0200 Subject: [PATCH 3/3] changed spaces for tabs --- src/fe-common/irc/fe-events-numeric.c | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c index d7d6eb20..520354a0 100644 --- a/src/fe-common/irc/fe-events-numeric.c +++ b/src/fe-common/irc/fe-events-numeric.c @@ -715,8 +715,8 @@ void fe_events_numeric_init(void) last_away_nick = NULL; last_away_msg = NULL; - settings_add_bool("lookandfeel", "print_topic_on_join", TRUE); - settings_add_bool("lookandfeel", "print_url_on_join", TRUE); + settings_add_bool("lookandfeel", "print_topic_on_join", TRUE); + settings_add_bool("lookandfeel", "print_url_on_join", TRUE); /* clang-format off */ signal_add("event 221", (SIGNAL_FUNC) event_user_mode); @@ -733,10 +733,10 @@ void fe_events_numeric_init(void) signal_add("event 346", (SIGNAL_FUNC) event_invite_list); signal_add("event 433", (SIGNAL_FUNC) event_nick_in_use); - if (settings_get_bool("print_topic_on_join")) { - signal_add("event 332", (SIGNAL_FUNC) event_topic_get); - signal_add("event 333", (SIGNAL_FUNC) event_topic_info); - } + if (settings_get_bool("print_topic_on_join")) { + signal_add("event 332", (SIGNAL_FUNC) event_topic_get); + signal_add("event 333", (SIGNAL_FUNC) event_topic_info); + } signal_add("event 324", (SIGNAL_FUNC) event_channel_mode); signal_add("event 329", (SIGNAL_FUNC) event_channel_created); @@ -744,9 +744,9 @@ void fe_events_numeric_init(void) signal_add("event 305", (SIGNAL_FUNC) event_unaway); signal_add("event 301", (SIGNAL_FUNC) event_away); - if (settings_get_bool("print_url_on_join")) { - signal_add("event 328", (SIGNAL_FUNC) event_chanserv_url); - } + if (settings_get_bool("print_url_on_join")) { + signal_add("event 328", (SIGNAL_FUNC) event_chanserv_url); + } signal_add("event 302", (SIGNAL_FUNC) event_userhost); signal_add("event 341", (SIGNAL_FUNC) event_sent_invite); @@ -839,10 +839,10 @@ void fe_events_numeric_deinit(void) signal_remove("event 346", (SIGNAL_FUNC) event_invite_list); signal_remove("event 433", (SIGNAL_FUNC) event_nick_in_use); - if (settings_get_bool("print_topic_on_join")) { - signal_remove("event 332", (SIGNAL_FUNC) event_topic_get); - signal_remove("event 333", (SIGNAL_FUNC) event_topic_info); - } + if (settings_get_bool("print_topic_on_join")) { + signal_remove("event 332", (SIGNAL_FUNC) event_topic_get); + signal_remove("event 333", (SIGNAL_FUNC) event_topic_info); + } signal_remove("event 324", (SIGNAL_FUNC) event_channel_mode); signal_remove("event 329", (SIGNAL_FUNC) event_channel_created); @@ -850,9 +850,9 @@ void fe_events_numeric_deinit(void) signal_remove("event 305", (SIGNAL_FUNC) event_unaway); signal_remove("event 301", (SIGNAL_FUNC) event_away); - if (settings_get_bool("print_url_on_join")) { - signal_remove("event 328", (SIGNAL_FUNC) event_chanserv_url); - } + if (settings_get_bool("print_url_on_join")) { + signal_remove("event 328", (SIGNAL_FUNC) event_chanserv_url); + } signal_remove("event 302", (SIGNAL_FUNC) event_userhost); signal_remove("event 341", (SIGNAL_FUNC) event_sent_invite);