From 1eff191e65d79e6622283c6d5287148457a4a612 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 20 Nov 2001 02:22:12 +0000 Subject: [PATCH] Added halfop support for nick modes. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2117 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/fe-common/core/fe-messages.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c index 2c720dc4..f77ee843 100644 --- a/src/fe-common/core/fe-messages.c +++ b/src/fe-common/core/fe-messages.c @@ -111,24 +111,6 @@ char *expand_emphasis(WI_ITEM_REC *item, const char *text) return ret; } -char *channel_get_nickmode(CHANNEL_REC *channel, const char *nick) -{ - NICK_REC *nickrec; - char *emptystr; - - g_return_val_if_fail(nick != NULL, NULL); - - if (!settings_get_bool("show_nickmode")) - return ""; - - emptystr = settings_get_bool("show_nickmode_empty") ? " " : ""; - - nickrec = channel == NULL ? NULL : - nicklist_find(channel, nick); - return nickrec == NULL ? emptystr : - (nickrec->op ? "@" : (nickrec->voice ? "+" : emptystr)); -} - static char *channel_get_nickmode_rec(NICK_REC *nickrec) { char *emptystr; @@ -139,7 +121,18 @@ static char *channel_get_nickmode_rec(NICK_REC *nickrec) emptystr = settings_get_bool("show_nickmode_empty") ? " " : ""; return nickrec == NULL ? emptystr : - (nickrec->op ? "@" : (nickrec->voice ? "+" : emptystr)); + nickrec->op ? "@" : + nickrec->halfop ? "%" : + nickrec->voice ? "+" : + emptystr; +} + +char *channel_get_nickmode(CHANNEL_REC *channel, const char *nick) +{ + g_return_val_if_fail(nick != NULL, NULL); + + return channel_get_nickmode_rec(channel == NULL ? NULL : + nicklist_find(channel, nick)); } static void sig_message_public(SERVER_REC *server, const char *msg,