From 38df7bfd29cb6aefa149bb7a48cb469782d9eab0 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Sun, 18 Aug 2019 11:24:48 +0200 Subject: [PATCH] make extended account info visible and formattable --- src/fe-common/core/fe-messages.c | 14 ++++++++++++-- src/fe-common/core/module-formats.c | 2 ++ src/fe-common/core/module-formats.h | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c index 3d8651f9..c1d87b2b 100644 --- a/src/fe-common/core/fe-messages.c +++ b/src/fe-common/core/fe-messages.c @@ -356,8 +356,17 @@ static void sig_message_join(SERVER_REC *server, const char *channel, ignore_check_plus(server, nick, address, channel, NULL, &level, FALSE); - printformat(server, channel, level, - TXT_JOIN, nick, address, channel, account, realname); + if (settings_get_bool("show_extended_join")) { + int txt; + if (*account == '\0') txt = TXT_JOIN; + else if (g_strcmp0("*", account) == 0) txt = TXT_JOIN_EXTENDED; + else txt = TXT_JOIN_EXTENDED_ACCOUNT; + printformat(server, channel, level, + txt, nick, address, channel, account, realname); + } else { + printformat(server, channel, level, + TXT_JOIN, nick, address, channel, account, realname); + } } static void sig_message_part(SERVER_REC *server, const char *channel, @@ -787,6 +796,7 @@ void fe_messages_init(void) settings_add_bool("lookandfeel", "show_quit_once", FALSE); settings_add_bool("lookandfeel", "show_own_nickchange_once", FALSE); settings_add_bool("lookandfeel", "away_notify_public", FALSE); + settings_add_bool("lookandfeel", "show_extended_join", FALSE); settings_add_bool("lookandfeel", "show_account_notify", FALSE); signal_add_last("message public", (SIGNAL_FUNC) sig_message_public); diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c index a5e99619..0319ee11 100644 --- a/src/fe-common/core/module-formats.c +++ b/src/fe-common/core/module-formats.c @@ -95,6 +95,8 @@ FORMAT_REC fecommon_core_formats[] = { { NULL, "Channels", 0 }, { "join", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2}", 5, { 0, 0, 0, 0, 0 } }, + { "join_extended", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2} {comment realname {reason $4}}", 5, { 0, 0, 0, 0, 0 } }, + { "join_extended_account", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2} {reason account {hilight $3}} {comment realname {reason $4}}", 5, { 0, 0, 0, 0, 0 } }, { "host_changed", "{channick_hilight $0} {chanhost_hilight $1} has changed host", 4, { 0, 0, 0, 0 } }, { "logged_out", "{channick $0} {chanhost $1} has logged out of their account", 4, { 0, 0, 0, 0 } }, { "logged_in", "{channick_hilight $0} {chanhost_hilight $1} has logged in to account {hilight $2}", 4, { 0, 0, 0, 0 } }, diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h index b1cf1578..1b1927b1 100644 --- a/src/fe-common/core/module-formats.h +++ b/src/fe-common/core/module-formats.h @@ -71,6 +71,8 @@ enum { TXT_FILL_3, TXT_JOIN, + TXT_JOIN_EXTENDED, + TXT_JOIN_EXTENDED_ACCOUNT, TXT_HOST_CHANGED, TXT_LOGGED_OUT, TXT_LOGGED_IN,