aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

refactor cnotice test into function

Browse Source
This commit is contained in:
ailin-nemui 2018-10-05 16:13:47 +02:00
parent d2dbcc1999
commit 08ac2ee5be
1 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/fe-common/irc/fe-irc-messages.c
View File

@ -199,29 +199,31 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
g_free_not_null(freemsg); g_free_not_null(freemsg);
} }
static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg, static char *notice_channel_context(SERVER_REC *server, const char *msg)
const char *target)
{ {
if (*msg == '[') { if (*msg == '[') {
/* check if this is a cnotice */
char *end, *channel; char *end, *channel;
end = strpbrk(msg, " ,]"); end = strpbrk(msg, " ,]");
if (end != NULL && *end == ']') { if (end != NULL && *end == ']') {
channel = g_strndup(msg + 1, end - msg - 1); channel = g_strndup(msg + 1, end - msg - 1);
if (server_ischannel(SERVER(server), channel)) { if (server_ischannel(SERVER(server), channel)) {
printformat(server, channel, return channel;
MSGLEVEL_NOTICES | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
IRCTXT_OWN_NOTICE, target, msg);
g_free(channel);
return;
} }
g_free(channel); g_free(channel);
/* fall through. */
} }
} }
printformat(server, fe_channel_skip_prefix(server, target), MSGLEVEL_NOTICES | return NULL;
MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT, }
IRCTXT_OWN_NOTICE, target, msg);
static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg, const char *target)
{
char *channel;
/* check if this is a cnotice */
channel = notice_channel_context((SERVER_REC *) server, msg);
printformat(server, channel != NULL ? channel : fe_channel_skip_prefix(server, target),
MSGLEVEL_NOTICES | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT, IRCTXT_OWN_NOTICE,
target, msg);
g_free(channel);
} }
static void sig_message_irc_notice(SERVER_REC *server, const char *msg, static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
@ -255,28 +257,18 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
printformat(server, target, level, printformat(server, target, level,
IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg); IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg);
} else { } else {
if (*msg == '[') { char *channel;
/* check if this is a cnotice */ /* check if this is a cnotice */
char *end, *channel; channel = notice_channel_context(server, msg);
end = strpbrk(msg, " ,]");
if (end != NULL && *end == ']') {
channel = g_strndup(msg + 1, end - msg - 1);
if (server_ischannel(SERVER(server), channel)) {
printformat(server, channel, level, IRCTXT_NOTICE_PRIVATE,
nick, address, msg);
g_free(channel);
return;
}
g_free(channel);
/* fall through. */
}
}
/* private notice */ if (channel == NULL) {
privmsg_get_query(SERVER(server), nick, FALSE, /* private notice */
MSGLEVEL_NOTICES); privmsg_get_query(SERVER(server), nick, FALSE, MSGLEVEL_NOTICES);
printformat(server, nick, level, }
IRCTXT_NOTICE_PRIVATE, nick, address, msg); printformat(server, channel == NULL ? nick : channel, level, IRCTXT_NOTICE_PRIVATE,
nick, address, msg);
g_free(channel);
} }
} }